Changeset 105945 in vbox for trunk/src/libs/openssl-3.1.7/crypto/engine

Timestamp:

Sep 4, 2024 11:32:47 AM (5 months ago)

Author:

vboxsync

Message:

openssl-3.1.7: Applied and adjusted our OpenSSL changes to 3.1.7. bugref:10757

Location:

trunk/src/libs/openssl-3.1.7

Files:

• . (modified) (1 prop)
• crypto/engine/eng_pkey.c (modified) (2 diffs)
• crypto/engine/eng_table.c (modified) (2 diffs)

trunk/src/libs/openssl-3.1.7

@@ -25 +25 @@
 /vendor/openssl/3.0.3:151497-151729
 /vendor/openssl/3.0.7:154371
+/vendor/openssl/3.1.7:164675-164677

@@ -25 +25 @@
 /vendor/openssl/3.0.3:151497-151729
 /vendor/openssl/3.0.7:154371
+/vendor/openssl/3.1.7:164675-164677

trunk/src/libs/openssl-3.1.7/crypto/engine/eng_pkey.c

@@ -1 +1 @@
 /*
- * Copyright 2001-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2024 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -81 +81 @@
         return NULL;
     }
-    /* We enforce check for legacy key */
-    switch (EVP_PKEY_get_id(pkey)) {
-    case EVP_PKEY_RSA:
-        {
-        RSA *rsa = EVP_PKEY_get1_RSA(pkey);
-        EVP_PKEY_set1_RSA(pkey, rsa);
-        RSA_free(rsa);
-        }
-        break;
-#  ifndef OPENSSL_NO_EC
-    case EVP_PKEY_SM2:
-    case EVP_PKEY_EC:
-        {
-        EC_KEY *ec = EVP_PKEY_get1_EC_KEY(pkey);
-        EVP_PKEY_set1_EC_KEY(pkey, ec);
-        EC_KEY_free(ec);
-        }
-        break;
-#  endif
-#  ifndef OPENSSL_NO_DSA
-    case EVP_PKEY_DSA:
-        {
-        DSA *dsa = EVP_PKEY_get1_DSA(pkey);
-        EVP_PKEY_set1_DSA(pkey, dsa);
-        DSA_free(dsa);
-        }
-        break;
-#endif
-#  ifndef OPENSSL_NO_DH
-    case EVP_PKEY_DH:
-        {
-        DH *dh = EVP_PKEY_get1_DH(pkey);
-        EVP_PKEY_set1_DH(pkey, dh);
-        DH_free(dh);
-        }
-        break;
-#endif
-    default:
-        /*Do nothing */
-        break;
-    }
-
     return pkey;
 }

trunk/src/libs/openssl-3.1.7/crypto/engine/eng_table.c

@@ -1 +1 @@
 /*
- * Copyright 2001-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2024 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -216 +216 @@
         return NULL;
     }
+
+    if (!CRYPTO_THREAD_write_lock(global_engine_lock))
+        return NULL;
+
     ERR_set_mark();
-    if (!CRYPTO_THREAD_write_lock(global_engine_lock))
-        goto end;
     /*
      * Check again inside the lock otherwise we could race against cleanup

@@ -25 +25 @@
 /vendor/openssl/3.0.3:151497-151729
 /vendor/openssl/3.0.7:154371
+/vendor/openssl/3.1.7:164675-164677