Changeset 94404 in vbox for trunk/src/libs/openssl-3.0.2/crypto/dsa/dsa_backend.c

Timestamp:

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

Author:

vboxsync

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)
• crypto/dsa/dsa_backend.c (modified) (3 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/crypto/dsa/dsa_backend.c

@@ -1 +1 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -28 +28 @@
  */
 
-int ossl_dsa_key_fromdata(DSA *dsa, const OSSL_PARAM params[])
+int ossl_dsa_key_fromdata(DSA *dsa, const OSSL_PARAM params[],
+                          int include_private)
 {
-    const OSSL_PARAM *param_priv_key, *param_pub_key;
+    const OSSL_PARAM *param_priv_key = NULL, *param_pub_key;
     BIGNUM *priv_key = NULL, *pub_key = NULL;
 
@@ -36 +37 @@
         return 0;
 
-    param_priv_key =
-        OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PRIV_KEY);
+    if (include_private) {
+        param_priv_key =
+            OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PRIV_KEY);
+    }
     param_pub_key =
         OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PUB_KEY);

@@ -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