From 90377a270da834c94f2d79595c3dedbd42f99c98 Mon Sep 17 00:00:00 2001
From: Aaron Brashears <aaronb@lindenlab.com>
Date: Tue, 29 Apr 2008 18:41:48 +0000
Subject: [PATCH] Result of svn merge -r85981:85991
svn+ssh://svn/svn/linden/branches/ssl-sanity-merge into release. QAR-487
---
indra/llmessage/llblowfishcipher.cpp | 33 +---------------------------
1 file changed, 1 insertion(+), 32 deletions(-)
diff --git a/indra/llmessage/llblowfishcipher.cpp b/indra/llmessage/llblowfishcipher.cpp
index 8c055a72f60..94e6bffe0f9 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
-
--
GitLab