Second Life viewer sources 1.14.0.0

1 files changed, 55 insertions, 9 deletions

diff --git a/linden/indra/llmessage/llmail.cpp b/linden/indra/llmessage/llmail.cpp
index e84d097..aea3689 100644
--- a/linden/indra/llmessage/llmail.cpp
+++ b/linden/indra/llmessage/llmail.cpp
@@ -27,6 +27,8 @@
 
 #include "linden_common.h"
 
+#include "llmail.h"
+
 // APR on Windows needs full windows headers
 #ifdef LL_WINDOWS
 #       undef WIN32_LEAN_AND_MEAN
@@ -38,14 +40,16 @@
 #include <sstream>
 #include <boost/regex.hpp>
 
-#include "llmail.h"
-
 #include "apr-1/apr_pools.h"
 #include "apr-1/apr_network_io.h"
 
 #include "llapr.h"
+#include "llbase32.h"   // IM-to-email address
+#include "llblowfishcipher.h"
 #include "llerror.h"
 #include "llhost.h"
+#include "llstring.h"
+#include "lluuid.h"
 #include "net.h"
 
 //
@@ -105,11 +109,12 @@ void disconnect_smtp()
 
 // Returns TRUE on success.
 // message should NOT be SMTP escaped.
-BOOL send_mail(const char* from_name, const char* from_address,
+// static
+BOOL LLMail::send(const char* from_name, const char* from_address,
                            const char* to_name, const char* to_address,
                            const char* subject, const char* message)
 {
-        std::string header = build_smtp_transaction(
+        std::string header = buildSMTPTransaction(
                 from_name,
                 from_address,
                 to_name,
@@ -125,12 +130,13 @@ BOOL send_mail(const char* from_name, const char* from_address,
         {
                 message_str = message;
         }
-        bool rv = send_mail(header, message_str, to_address, from_address);
+        bool rv = send(header, message_str, to_address, from_address);
         if(rv) return TRUE;
         return FALSE;
 }
 
-void init_mail(const std::string& hostname, apr_pool_t* pool)
+// static
+void LLMail::init(const std::string& hostname, apr_pool_t* pool)
 {
         gMailSocket = NULL;
         if(hostname.empty() || !pool)
@@ -157,12 +163,14 @@ void init_mail(const std::string& hostname, apr_pool_t* pool)
         }
 }
 
-void enable_mail(bool mail_enabled)
+// static
+void LLMail::enable(bool mail_enabled)
 {
         gMailEnabled = mail_enabled;
 }
 
-std::string build_smtp_transaction(
+// static
+std::string LLMail::buildSMTPTransaction(
         const char* from_name,
         const char* from_address,
         const char* to_name,
@@ -216,7 +224,8 @@ std::string build_smtp_transaction(
         return header.str();
 }
 
-bool send_mail(
+// static
+bool LLMail::send(
         const std::string& header,
         const std::string& message,
         const char* from_address,
@@ -309,3 +318,40 @@ bool send_mail(
 #endif
         return true;
 }
+
+
+// static
+std::string LLMail::encryptIMEmailAddress(const LLUUID& from_agent_id,
+                                                                                        const LLUUID& to_agent_id,
+                                                                                        U32 time,
+                                                                                        const U8* secret,
+                                                                                        size_t secret_size)
+{
+#if LL_WINDOWS
+        return "blowfish-not-supported-on-windows";
+#else
+        size_t data_size = 4 + UUID_BYTES + UUID_BYTES;
+        // Convert input data into a binary blob
+        std::vector<U8> data;
+        data.resize(data_size);
+        // *NOTE: This may suffer from endian issues.  Could be htonmemcpy.
+        memcpy(&data[0], &time, 4);
+        memcpy(&data[4], &from_agent_id.mData[0], UUID_BYTES);
+        memcpy(&data[4 + UUID_BYTES], &to_agent_id.mData[0], UUID_BYTES);
+        
+        // Encrypt the blob
+        LLBlowfishCipher cipher(secret, secret_size);
+        size_t encrypted_size = cipher.requiredEncryptionSpace(data.size());
+        U8* encrypted = new U8[encrypted_size];
+        cipher.encrypt(&data[0], data_size, encrypted, encrypted_size);
+
+        std::string address = LLBase32::encode(encrypted, encrypted_size);
+
+        // Make it more pretty for humans.
+        LLString::toLower(address);
+
+        delete [] encrypted;
+
+        return address;
+#endif
+}