1 files changed, 9 insertions, 52 deletions

diff --git a/linden/indra/llmessage/llcrypto.h b/linden/indra/llmessage/llxorcipher.h
index b142d25..fbb879e 100644
--- a/linden/indra/llmessage/llcrypto.h
+++ b/linden/indra/llmessage/llxorcipher.h
@@ -1,8 +1,5 @@
 /** 
- * @file llcrypto.h
- * @brief llcrypto library module header. For now, all crypto classes
- * are here, and as we grow the library, we can split these things
- * out.
+ * @file llxorcipher.h
  *
  * Copyright (c) 2003-2007, Linden Research, Inc.
  * 
@@ -27,50 +24,10 @@
  * COMPLETENESS OR PERFORMANCE.
  */
 
-#ifndef LL_LLCRYPTO_H
-#define LL_LLCRYPTO_H
+#ifndef LLXORCIPHER_H
+#define LLXORCIPHER_H
 
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Class LLCipher
-//
-// Abstract base class for a cipher object.
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-class LLCipher
-{
-public:
-        virtual ~LLCipher() {}
-
-        // encrypt src and place result into dst. returns TRUE if
-        // encryption was successful, otherwise FALSE.
-        virtual BOOL encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len) = 0;
-
-        // decrypt src and place result into dst. returns TRUE if
-        // encryption was successful, otherwise FALSE. 
-        virtual BOOL decrpyt(const U8* src, U32 src_len, U8* dst, U32 dst_len) = 0;
-
-        // returns the space required to encrypt for a unencrypted source
-        // buffer of length len.
-        virtual U32 requiredEncryptionSpace(U32 src_len) const = 0 ;
-};
-
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Class LLNullCipher
-//
-// A class which implements LLCipher, but does not transform src
-// during encryption.
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-class LLNullCipher
-{
-public:
-        LLNullCipher() {}
-        virtual ~LLNullCipher() {}
-        virtual BOOL encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len);
-        virtual BOOL decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len);
-        virtual U32 requiredEncryptionSpace(U32 src_len);
-};
+#include "llcipher.h"
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLXORCipher
@@ -78,7 +35,7 @@ public:
 // Implementation of LLCipher which encrypts using a XOR pad.
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-class LLXORCipher
+class LLXORCipher : public LLCipher
 {
 public:
         LLXORCipher(const U8* pad, U32 pad_len);
@@ -87,9 +44,9 @@ public:
         LLXORCipher& operator=(const LLXORCipher& cipher);
 
         // Cipher functions
-        virtual BOOL encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len);
-        virtual BOOL decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len);
-        virtual U32 requiredEncryptionSpace(U32 src_len);
+        /*virtual*/ U32 encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len);
+        /*virtual*/ U32 decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len);
+        /*virtual*/ U32 requiredEncryptionSpace(U32 src_len) const;
 
         // special syntactic-sugar since xor can be performed in place.
         BOOL encrypt(U8* buf, U32 len) { return encrypt((const U8*)buf, len, buf, len); }
@@ -108,4 +65,4 @@ protected:
         U32 mPadLen;
 };
 
-#endif // LL_LLCRYPTO_H
+#endif