Changeset 74314 in vbox for trunk/src/VBox

Timestamp:

Sep 17, 2018 3:54:12 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/crypto: Simple symmetric cipher abstraction with just was we need right now. Untested. bugref:9246 [build fix]

File:

• trunk/src/VBox/Runtime/common/crypto/cipher-openssl.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/crypto/cipher-openssl.cpp

@@ -228 +228 @@
              * Do the encryption.
              */
-            int cbEncrypted = 0;
-            rcOssl = EVP_EncryptUpdate(pCipherCtx, (unsigned char *)pvEncrypted, &cbEncrypted,
+            int cbEncrypted1 = 0;
+            rcOssl = EVP_EncryptUpdate(pCipherCtx, (unsigned char *)pvEncrypted, &cbEncrypted1,
                                        (unsigned char const *)pvPlainText, (int)cbPlainText);
             if (rcOssl > 0)
             {
-                Assert(cbEncrypted <= (ssize_t)cbNeeded);
-                int cbEncryptedFinal = 0;
-                rcOssl = EVP_DecryptFinal(pCipherCtx, (unsigned char *)pvEncrypted + cbEncrypted, &cbEncryptedFinal);
+                Assert(cbEncrypted1 <= (ssize_t)cbNeeded);
+                int cbEncrypted2 = 0;
+                rcOssl = EVP_DecryptFinal(pCipherCtx, (unsigned char *)pvEncrypted + cbEncrypted1, &cbEncrypted1);
                 if (rcOssl > 0)
                 {
-                    Assert(cbEncryptedFinal + cbEncrypted == (ssize_t)cbNeeded);
+                    Assert(cbEncrypted1 + cbEncrypted2 == (ssize_t)cbNeeded);
                     if (pcbEncrypted)
-                        *pcbEncrypted = cbEncryptedFinal + cbEncrypted;
+                        *pcbEncrypted = cbEncrypted1 + cbEncrypted2;
                     rc = VINF_SUCCESS;
                 }
@@ -312 +312 @@
              * Do the decryption.
              */
-            int cbDecrypted = 0;
-            rcOssl = EVP_DecryptUpdate(pCipherCtx, (unsigned char *)pvPlainText, &cbDecrypted,
+            int cbDecrypted1 = 0;
+            rcOssl = EVP_DecryptUpdate(pCipherCtx, (unsigned char *)pvPlainText, &cbDecrypted1,
                                        (unsigned char const *)pvEncrypted, (int)cbEncrypted);
             if (rcOssl > 0)
             {
-                Assert(cbDecrypted <= (ssize_t)cbNeeded);
-                int cbDecryptedFinal = 0;
-                rcOssl = EVP_DecryptFinal(pCipherCtx, (unsigned char *)pvPlainText + cbDecrypted, &cbDecryptedFinal);
+                Assert(cbDecrypted1 <= (ssize_t)cbNeeded);
+                int cbDecrypted2 = 0;
+                rcOssl = EVP_DecryptFinal(pCipherCtx, (unsigned char *)pvPlainText + cbDecrypted1, &cbDecrypted2);
                 if (rcOssl > 0)
                 {
-                    Assert(cbDecryptedFinal + cbDecrypted == (ssize_t)cbNeeded);
+                    Assert(cbDecrypted1 + cbDecrypted2 == (ssize_t)cbNeeded);
                     if (pcbPlainText)
-                        *pcbPlainText = cbDecryptedFinal + cbDecrypted;
+                        *pcbPlainText = cbDecrypted1 + cbDecrypted2;
                     rc = VINF_SUCCESS;
                 }