livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Result of svn merge -r85981:85991 svn+ssh://svn/svn/linden/branches/ssl-sanity-merge into release. QAR-487

meow-7.2.2
Aaron Brashears 2008-04-29 18:41:48 +00:00
parent 6217b3fca7
commit 90377a270d
1 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
indra/llmessage/llblowfishcipher.cpp
View File

@ -30,8 +30,8 @@
*/
#include "linden_common.h"
#include "llblowfishcipher.h"
#include <openssl/evp.h>
LLBlowfishCipher::LLBlowfishCipher(const U8* secret, size_t secret_size)
@ -50,11 +50,6 @@ LLBlowfishCipher::~LLBlowfishCipher()
mSecret = NULL;
}
#if LL_LINUX
#include <openssl/evp.h>
// virtual
U32 LLBlowfishCipher::encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len)
{
@ -133,29 +128,3 @@ U32 LLBlowfishCipher::requiredEncryptionSpace(U32 len) const
len -= (len % BLOCK_SIZE);
return len;
}
#else // !LL_LINUX
// virtual
U32 LLBlowfishCipher::encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len)
{
llerrs << "LLBlowfishCipher only supported on Linux" << llendl;
return 0;
}
// virtual
U32 LLBlowfishCipher::decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len)
{
llerrs << "LLBlowfishCipher only supported on Linux" << llendl;
return 0;
}
// virtual
U32 LLBlowfishCipher::requiredEncryptionSpace(U32 len) const
{
llerrs << "LLBlowfishCipher only supported on Linux" << llendl;
return 0;
}
#endif