Changeset 94630 in vbox for trunk

Timestamp:

Apr 19, 2022 10:49:10 AM (3 years ago)

Author:

vboxsync

Message:

Runtime/crypto: Add additional APIs and supported algorithms for symmetric enc-/decryption, bugref:9955 [build fix for older openssl versions]

File:

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

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

@@ -45 +45 @@
 
 # include "internal/magics.h"
+
+
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
+#if OPENSSL_VERSION_NUMBER >= 0x10002000
+# define MY_EVP_CTRL_AEAD_GET_TAG EVP_CTRL_AEAD_GET_TAG
+#else
+# define MY_EVP_CTRL_AEAD_GET_TAG EVP_CTRL_GCM_GET_TAG
+#endif
+
+#if OPENSSL_VERSION_NUMBER >= 0x10002000
+# define MY_EVP_CTRL_AEAD_SET_TAG EVP_CTRL_AEAD_SET_TAG
+#else
+# define MY_EVP_CTRL_AEAD_SET_TAG EVP_CTRL_GCM_SET_TAG
+#endif
 
 
@@ -325 +341 @@
         if (pvTag && cbTag)
         {
-            if (EVP_CIPHER_CTX_ctrl(pCtx->pCipherCtx, EVP_CTRL_AEAD_GET_TAG, (int)cbTag, pvTag))
+            if (EVP_CIPHER_CTX_ctrl(pCtx->pCipherCtx, MY_EVP_CTRL_AEAD_GET_TAG, (int)cbTag, pvTag))
             {
                 *pcbTag = cbTag;
@@ -387 +403 @@
         {
             rc = VINF_SUCCESS;
-            if (pvTag && cbTag && !EVP_CIPHER_CTX_ctrl(pCtx->pCipherCtx, EVP_CTRL_AEAD_SET_TAG, (int)cbTag, pvTag))
+            if (pvTag && cbTag && !EVP_CIPHER_CTX_ctrl(pCtx->pCipherCtx, MY_EVP_CTRL_AEAD_SET_TAG, (int)cbTag, pvTag))
                 rc = VERR_CR_CIPHER_OSSL_SET_TAG_FAILED;