From 12ac04231b8d358e70c830f7958f7efbc0f7c0d1 Mon Sep 17 00:00:00 2001 From: James Cook Date: Thu, 15 Feb 2007 20:24:08 +0000 Subject: merge -r 57761:57967 im-email-session-3, removes database load from IM to email session tracking, introduces new format for email return addresses --- indra/llmessage/llnullcipher.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'indra/llmessage/llnullcipher.cpp') diff --git a/indra/llmessage/llnullcipher.cpp b/indra/llmessage/llnullcipher.cpp index 53bb748415..0d28b5c393 100644 --- a/indra/llmessage/llnullcipher.cpp +++ b/indra/llmessage/llnullcipher.cpp @@ -8,33 +8,33 @@ #include "linden_common.h" -#include "llcrypto.h" +#include "llnullcipher.h" ///---------------------------------------------------------------------------- /// Class LLNullCipher ///---------------------------------------------------------------------------- -BOOL LLNullCipher::encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len) +U32 LLNullCipher::encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len) { if((src_len == dst_len) && src && dst) { memmove(dst, src, src_len); - return TRUE; + return src_len; } - return FALSE; + return 0; } -BOOL LLNullCipher::decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len) +U32 LLNullCipher::decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len) { if((src_len == dst_len) && src && dst) { memmove(dst, src, src_len); - return TRUE; + return src_len; } - return FALSE; + return 0; } -U32 LLNullCipher::requiredEncryptionSpace(U32 len) +U32 LLNullCipher::requiredEncryptionSpace(U32 len) const { return len; } -- cgit v1.2.3