Changeset 94404 in vbox for trunk/src/libs/openssl-3.0.2/test/helpers/handshake_srp.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:

• . (modified) (1 prop)
• test/helpers/handshake_srp.c (modified) (4 diffs)

trunk/src/libs/openssl-3.0.2

@@ -13 +13 @@
 /vendor/openssl/1.1.1k:145841-145843
 /vendor/openssl/3.0.1:150323-150324
-/vendor/openssl/current:147554-150322
+/vendor/openssl/3.0.2:150728-150729
+/vendor/openssl/current:147554-150727

@@ -13 +13 @@
 /vendor/openssl/1.1.1k:145841-145843
 /vendor/openssl/3.0.1:150323-150324
-/vendor/openssl/current:147554-150322
+/vendor/openssl/3.0.2:150728-150729
+/vendor/openssl/current:147554-150727

trunk/src/libs/openssl-3.0.2/test/helpers/handshake_srp.c

@@ -1 +1 @@
 /*
- * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -50 +50 @@
         server_ctx_data->srp_user = OPENSSL_strdup(extra->server.srp_user);
         server_ctx_data->srp_password = OPENSSL_strdup(extra->server.srp_password);
+        if (server_ctx_data->srp_user == NULL || server_ctx_data->srp_password == NULL) {
+            OPENSSL_free(server_ctx_data->srp_user);
+            OPENSSL_free(server_ctx_data->srp_password);
+            server_ctx_data->srp_user = NULL;
+            server_ctx_data->srp_password = NULL;
+            return 0;
+        }
         SSL_CTX_set_srp_cb_arg(server_ctx, server_ctx_data);
     }
@@ -58 +65 @@
         server2_ctx_data->srp_user = OPENSSL_strdup(extra->server2.srp_user);
         server2_ctx_data->srp_password = OPENSSL_strdup(extra->server2.srp_password);
+        if (server2_ctx_data->srp_user == NULL || server2_ctx_data->srp_password == NULL) {
+            OPENSSL_free(server2_ctx_data->srp_user);
+            OPENSSL_free(server2_ctx_data->srp_password);
+            server2_ctx_data->srp_user = NULL;
+            server2_ctx_data->srp_password = NULL;
+            return 0;
+        }
         SSL_CTX_set_srp_cb_arg(server2_ctx, server2_ctx_data);
     }
@@ -66 +80 @@
         SSL_CTX_set_srp_client_pwd_callback(client_ctx, client_srp_cb);
         client_ctx_data->srp_password = OPENSSL_strdup(extra->client.srp_password);
+        if (client_ctx_data->srp_password == NULL)
+            return 0;
         SSL_CTX_set_srp_cb_arg(client_ctx, client_ctx_data);
     }

@@ -13 +13 @@
 /vendor/openssl/1.1.1k:145841-145843
 /vendor/openssl/3.0.1:150323-150324
-/vendor/openssl/current:147554-150322
+/vendor/openssl/3.0.2:150728-150729
+/vendor/openssl/current:147554-150727