diff options
author | Rye Mutt <rye@alchemyviewer.org> | 2024-08-14 11:01:02 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-08-14 08:01:02 -0700 |
commit | b5e306f7d89e82984a37824a3640bd67a5c45d61 (patch) | |
tree | a855c4f66ddf54c13f7ac2288606cb59d5dc3eac /indra/llmessage | |
parent | 31774e82c4c9ba2c1243fbc417174e966314dfca (diff) |
Enable /permissive- on MSVC for better standards conformance (#2251)
* Enable /permissive- on MSVC for better C++ conformance and fix related errors
* Clean up left over warning suppressions from old library or msvc versions
Diffstat (limited to 'indra/llmessage')
-rw-r--r-- | indra/llmessage/llblowfishcipher.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llmessage/llblowfishcipher.cpp b/indra/llmessage/llblowfishcipher.cpp index ed036e396d..3973565e22 100644 --- a/indra/llmessage/llblowfishcipher.cpp +++ b/indra/llmessage/llblowfishcipher.cpp @@ -88,7 +88,7 @@ U32 LLBlowfishCipher::encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len) src_len)) { LL_WARNS() << "LLBlowfishCipher::encrypt EVP_EncryptUpdate failure" << LL_ENDL; - goto ERROR; + goto BF_ENCRYPT_ERROR; } // There may be some final data left to encrypt if the input is @@ -96,14 +96,14 @@ U32 LLBlowfishCipher::encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len) if (!EVP_EncryptFinal_ex(context, (unsigned char*)(dst + output_len), &temp_len)) { LL_WARNS() << "LLBlowfishCipher::encrypt EVP_EncryptFinal failure" << LL_ENDL; - goto ERROR; + goto BF_ENCRYPT_ERROR; } output_len += temp_len; EVP_CIPHER_CTX_free(context); return output_len; -ERROR: +BF_ENCRYPT_ERROR: EVP_CIPHER_CTX_free(context); return 0; } |