Changeset 105949 in vbox for trunk/src/libs/openssl-3.1.7/crypto/evp/names.c

Timestamp:

Sep 4, 2024 12:53:14 PM (6 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

164683

Message:

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

File:

• trunk/src/libs/openssl-3.1.7/crypto/evp/names.c (modified) (5 diffs)

trunk/src/libs/openssl-3.1.7/crypto/evp/names.c

@@ -1 +1 @@
 /*
- * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -79 +79 @@
     OSSL_NAMEMAP *namemap;
     int id;
-    int do_retry = 1;
 
     if (!OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS, NULL))
@@ -96 +95 @@
 
     namemap = ossl_namemap_stored(libctx);
- retry:
     id = ossl_namemap_name2num(namemap, name);
-    if (id == 0) {
-        EVP_CIPHER *fetched_cipher;
-
-        /* Try to fetch it because the name might not be known yet. */
-        if (!do_retry)
-            return NULL;
-        do_retry = 0;
-        ERR_set_mark();
-        fetched_cipher = EVP_CIPHER_fetch(libctx, name, NULL);
-        EVP_CIPHER_free(fetched_cipher);
-        ERR_pop_to_mark();
-        goto retry;
-    }
+    if (id == 0)
+        return NULL;
 
     if (!ossl_namemap_doall_names(namemap, id, cipher_from_name, &cp))
@@ -138 +125 @@
     OSSL_NAMEMAP *namemap;
     int id;
-    int do_retry = 1;
 
     if (!OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_DIGESTS, NULL))
@@ -155 +141 @@
 
     namemap = ossl_namemap_stored(libctx);
- retry:
     id = ossl_namemap_name2num(namemap, name);
-    if (id == 0) {
-        EVP_MD *fetched_md;
-
-        /* Try to fetch it because the name might not be known yet. */
-        if (!do_retry)
-            return NULL;
-        do_retry = 0;
-        ERR_set_mark();
-        fetched_md = EVP_MD_fetch(libctx, name, NULL);
-        EVP_MD_free(fetched_md);
-        ERR_pop_to_mark();
-        goto retry;
-    }
+    if (id == 0)
+        return NULL;
 
     if (!ossl_namemap_doall_names(namemap, id, digest_from_name, &dp))