diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2008-04-29 18:41:48 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2008-04-29 18:41:48 +0000 |
| commit | 90377a270da834c94f2d79595c3dedbd42f99c98 (patch) | |
| tree | ee172c669f9a3a36e764b78c5765aa75ab42d049 | |
| parent | 6217b3fca759b49dede767c6c99a312d3482e720 (diff) | |
Result of svn merge -r85981:85991 svn+ssh://svn/svn/linden/branches/ssl-sanity-merge into release. QAR-487
| -rw-r--r-- | indra/llmessage/llblowfishcipher.cpp | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/indra/llmessage/llblowfishcipher.cpp b/indra/llmessage/llblowfishcipher.cpp index 8c055a72f6..94e6bffe0f 100644 --- a/indra/llmessage/llblowfishcipher.cpp +++ b/indra/llmessage/llblowfishcipher.cpp @@ -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 - |