Changeset 97372 in vbox for trunk/src/libs/openssl-3.0.7/ssl/ssl_ciph.c

Timestamp:

Nov 2, 2022 7:40:16 AM (2 years ago)

Author:

vboxsync

Message:

libs: Switch to openssl-3.0.7, bugref:10317

Location:

trunk/src/libs/openssl-3.0.7

Files:

• . (modified) (1 prop)
• ssl/ssl_ciph.c (modified) (4 diffs)

trunk/src/libs/openssl-3.0.7

@@ -15 +15 @@
 /vendor/openssl/3.0.2:150728-150729
 /vendor/openssl/3.0.3:151497-151729
-/vendor/openssl/current:147554-151496
+/vendor/openssl/3.0.7:154371
+/vendor/openssl/current:147554-154370

@@ -15 +15 @@
 /vendor/openssl/3.0.2:150728-150729
 /vendor/openssl/3.0.3:151497-151729
-/vendor/openssl/current:147554-151496
+/vendor/openssl/3.0.7:154371
+/vendor/openssl/current:147554-154370

trunk/src/libs/openssl-3.0.7/ssl/ssl_ciph.c

@@ -1 +1 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  * Copyright 2005 Nokia. All rights reserved.
@@ -533 +533 @@
         if (ssl_comp_methods != NULL) {
             i = sk_SSL_COMP_find(ssl_comp_methods, &ctmp);
-            *comp = sk_SSL_COMP_value(ssl_comp_methods, i);
+            if (i >= 0)
+                *comp = sk_SSL_COMP_value(ssl_comp_methods, i);
         }
         /* If were only interested in comp then return success */
@@ -556 +557 @@
             mac_pkey_type = NULL;
     } else {
-        if (!ssl_evp_md_up_ref(ctx->ssl_digest_methods[i])) {
+        const EVP_MD *digest = ctx->ssl_digest_methods[i];
+
+        if (digest == NULL
+                || !ssl_evp_md_up_ref(digest)) {
             ssl_evp_cipher_free(*enc);
             return 0;
         }
-        *md = ctx->ssl_digest_methods[i];
+        *md = digest;
         if (mac_pkey_type != NULL)
             *mac_pkey_type = ctx->ssl_mac_pkey_id[i];
@@ -1060 +1064 @@
                  */
                 ERR_raise(ERR_LIB_SSL, SSL_R_INVALID_COMMAND);
-                retval = found = 0;
-                l++;
-                break;
+                return 0;
             }
 

@@ -15 +15 @@
 /vendor/openssl/3.0.2:150728-150729
 /vendor/openssl/3.0.3:151497-151729
-/vendor/openssl/current:147554-151496
+/vendor/openssl/3.0.7:154371
+/vendor/openssl/current:147554-154370