provider_core.c

Timestamp:

Mar 31, 2022 9:00:36 AM (3 years ago)

Author:

vboxsync

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

150730

Message:

libs/openssl: Update to 3.0.2 and switch to it, bugref:10128

Location:

trunk/src/libs/openssl-3.0.2

Files:

trunk/src/libs/openssl-3.0.2

Property svn:mergeinfo

-              r94320
+              r94404
     OSSL_PROVIDER *actualtmp = NULL;
+    if (actualprov != NULL)
+        *actualprov = NULL;
     if ((store = get_provider_store(prov->libctx)) == NULL)
         return 0;
 …
     CRYPTO_THREAD_unlock(store->lock);
     if (actualprov != NULL)
         ossl_provider_free(actualtmp);
+        ossl_provider_free(*actualprov);
     return 0;
+}
 …
+{
     int sign_nid = OBJ_txt2nid(sign_name);
     int digest_nid = OBJ_txt2nid(digest_name);
+    int digest_nid = NID_undef;
     int pkey_nid = OBJ_txt2nid(pkey_name);
+    if (digest_name != NULL && digest_name[0] != '\0'
+        && (digest_nid = OBJ_txt2nid(digest_name)) == NID_undef)
+            return 0;
     if (sign_nid == NID_undef)
 …
         return 1;
+    if (digest_nid == NID_undef
+            || pkey_nid == NID_undef)
+    if (pkey_nid == NID_undef)
         return 0;

Note: See TracChangeset for help on using the changeset viewer.