Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A

# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp

1 files changed, 64 insertions, 64 deletions

diff --git a/indra/llmessage/llblowfishcipher.cpp b/indra/llmessage/llblowfishcipher.cpp
index 949d4cc0c7..ed036e396d 100644
--- a/indra/llmessage/llblowfishcipher.cpp
+++ b/indra/llmessage/llblowfishcipher.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llblowfishcipher.cpp
  * @brief Wrapper around OpenSSL Blowfish encryption algorithm.
  *
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -30,28 +30,28 @@
 
 
 LLBlowfishCipher::LLBlowfishCipher(const U8* secret, size_t secret_size)
-:	LLCipher()
+:   LLCipher()
 {
-	llassert(secret);
+    llassert(secret);
 
-	mSecretSize = secret_size;
-	mSecret = new U8[mSecretSize];
-	memcpy(mSecret, secret, mSecretSize);
+    mSecretSize = secret_size;
+    mSecret = new U8[mSecretSize];
+    memcpy(mSecret, secret, mSecretSize);
 }
 
 LLBlowfishCipher::~LLBlowfishCipher()
 {
-	delete [] mSecret;
-	mSecret = NULL;
+    delete [] mSecret;
+    mSecret = NULL;
 }
 
 // virtual
 U32 LLBlowfishCipher::encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len)
 {
-	if (!src || !src_len || !dst || !dst_len) return 0;
-	if (src_len > dst_len) return 0;
+    if (!src || !src_len || !dst || !dst_len) return 0;
+    if (src_len > dst_len) return 0;
 
-	// OpenSSL uses "cipher contexts" to hold encryption parameters.
+    // OpenSSL uses "cipher contexts" to hold encryption parameters.
     EVP_CIPHER_CTX *context = EVP_CIPHER_CTX_new();
     if (!context)
     {
@@ -59,71 +59,71 @@ U32 LLBlowfishCipher::encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len)
         return 0;
     }
 
-	// We want a blowfish cyclic block chain cipher, but need to set 
-	// the key length before we pass in a key, so call EncryptInit 
-	// first with NULLs.
-	EVP_EncryptInit_ex(context, EVP_bf_cbc(), NULL, NULL, NULL);
-	EVP_CIPHER_CTX_set_key_length(context, (int)mSecretSize);
-	
-	// Complete initialization.  Per EVP_EncryptInit man page, the
-	// cipher pointer must be NULL.  Apparently initial_vector must
-	// be 8 bytes for blowfish, as this is the block size.
+    // We want a blowfish cyclic block chain cipher, but need to set
+    // the key length before we pass in a key, so call EncryptInit
+    // first with NULLs.
+    EVP_EncryptInit_ex(context, EVP_bf_cbc(), NULL, NULL, NULL);
+    EVP_CIPHER_CTX_set_key_length(context, (int)mSecretSize);
+
+    // Complete initialization.  Per EVP_EncryptInit man page, the
+    // cipher pointer must be NULL.  Apparently initial_vector must
+    // be 8 bytes for blowfish, as this is the block size.
     unsigned char initial_vector[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
-	EVP_EncryptInit_ex(context, NULL, NULL, mSecret, initial_vector);
+    EVP_EncryptInit_ex(context, NULL, NULL, mSecret, initial_vector);
 
     int blocksize = EVP_CIPHER_CTX_block_size(context);
     int keylen = EVP_CIPHER_CTX_key_length(context);
     int iv_length = EVP_CIPHER_CTX_iv_length(context);
     LL_DEBUGS() << "LLBlowfishCipher blocksize " << blocksize
-		<< " keylen " << keylen
-		<< " iv_len " << iv_length
-		<< LL_ENDL;
-
-	int output_len = 0;
-	int temp_len = 0;
-	if (!EVP_EncryptUpdate(context,
-			dst,
-			&output_len,
-			src,
-			src_len))
-	{
-		LL_WARNS() << "LLBlowfishCipher::encrypt EVP_EncryptUpdate failure" << LL_ENDL;
-		goto ERROR;
-	}
-
-	// There may be some final data left to encrypt if the input is
-	// not an exact multiple of the block size.
-	if (!EVP_EncryptFinal_ex(context, (unsigned char*)(dst + output_len), &temp_len))
-	{
-		LL_WARNS() << "LLBlowfishCipher::encrypt EVP_EncryptFinal failure" << LL_ENDL;
-		goto ERROR;
-	}
-	output_len += temp_len;
-
-	EVP_CIPHER_CTX_free(context);
-	return output_len;
+        << " keylen " << keylen
+        << " iv_len " << iv_length
+        << LL_ENDL;
+
+    int output_len = 0;
+    int temp_len = 0;
+    if (!EVP_EncryptUpdate(context,
+            dst,
+            &output_len,
+            src,
+            src_len))
+    {
+        LL_WARNS() << "LLBlowfishCipher::encrypt EVP_EncryptUpdate failure" << LL_ENDL;
+        goto ERROR;
+    }
+
+    // There may be some final data left to encrypt if the input is
+    // not an exact multiple of the block size.
+    if (!EVP_EncryptFinal_ex(context, (unsigned char*)(dst + output_len), &temp_len))
+    {
+        LL_WARNS() << "LLBlowfishCipher::encrypt EVP_EncryptFinal failure" << LL_ENDL;
+        goto ERROR;
+    }
+    output_len += temp_len;
+
+    EVP_CIPHER_CTX_free(context);
+    return output_len;
 
 ERROR:
-	EVP_CIPHER_CTX_free(context);
-	return 0;
+    EVP_CIPHER_CTX_free(context);
+    return 0;
 }
 
 // virtual
 U32 LLBlowfishCipher::decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len)
 {
-	LL_ERRS() << "LLBlowfishCipher decrypt unsupported" << LL_ENDL;
-	return 0;
+    LL_ERRS() << "LLBlowfishCipher decrypt unsupported" << LL_ENDL;
+    return 0;
 }
 
 // virtual
 U32 LLBlowfishCipher::requiredEncryptionSpace(U32 len) const
 {
-	// *HACK: We know blowfish uses an 8 byte block size.
-	// Oddly, sometimes EVP_Encrypt produces an extra block
-	// if the input is an exact multiple of the block size.
-	// So round up.
-	const U32 BLOCK_SIZE = 8;
-	len += BLOCK_SIZE;
-	len -= (len % BLOCK_SIZE);
-	return len;
+    // *HACK: We know blowfish uses an 8 byte block size.
+    // Oddly, sometimes EVP_Encrypt produces an extra block
+    // if the input is an exact multiple of the block size.
+    // So round up.
+    const U32 BLOCK_SIZE = 8;
+    len += BLOCK_SIZE;
+    len -= (len % BLOCK_SIZE);
+    return len;
 }