Changeset 97372 in vbox for trunk/src/libs/openssl-3.0.7/test/ffc_internal_test.c

Timestamp:

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

Author:

vboxsync

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

154372

Message:

libs: Switch to openssl-3.0.7, bugref:10317

Location:

trunk/src/libs/openssl-3.0.7

Files:

• . (modified) (1 prop)
• test/ffc_internal_test.c (modified) (6 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/test/ffc_internal_test.c

@@ -1 +1 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2019-2020, Oracle and/or its affiliates.  All rights reserved.
  *
@@ -28 +28 @@
 
 #include "internal/ffc.h"
+#include "crypto/security_bits.h"
 
 #ifndef OPENSSL_NO_DSA
@@ -599 +600 @@
     if (!TEST_false(ossl_ffc_generate_private_key(ctx, params, N + 1, 112, priv)))
         goto err;
+    /* s must be always set */
+    if (!TEST_false(ossl_ffc_generate_private_key(ctx, params, N, 0, priv)))
+        goto err;
     /* pass since 2s <= N <= len(q) */
     if (!TEST_true(ossl_ffc_generate_private_key(ctx, params, N, 112, priv)))
@@ -610 +614 @@
     if (!TEST_true(ossl_ffc_validate_private_key(params->q, priv, &res)))
         goto err;
-
-    /* N and s are ignored in this case */
-    if (!TEST_true(ossl_ffc_generate_private_key(ctx, params, 0, 0, priv)))
+    /* N is ignored in this case */
+    if (!TEST_true(ossl_ffc_generate_private_key(ctx, params, 0,
+                                                 ossl_ifc_ffc_compute_security_bits(BN_num_bits(params->p)),
+                                                 priv)))
+        goto err;
+    if (!TEST_int_le(BN_num_bits(priv), 225))
         goto err;
     if (!TEST_true(ossl_ffc_validate_private_key(params->q, priv, &res)))
@@ -622 +629 @@
     BN_free(priv);
     BN_CTX_free(ctx);
+    return ret;
+}
+
+static int ffc_params_copy_test(void)
+{
+    int ret = 0;
+    DH *dh = NULL;
+    FFC_PARAMS *params, copy;
+
+    ossl_ffc_params_init(&copy);
+
+    if (!TEST_ptr(dh = DH_new_by_nid(NID_ffdhe3072)))
+        goto err;
+    params = ossl_dh_get0_params(dh);
+
+    if (!TEST_int_eq(params->keylength, 275))
+        goto err;
+
+    if (!TEST_true(ossl_ffc_params_copy(&copy, params)))
+        goto err;
+
+    if (!TEST_int_eq(copy.keylength, 275))
+        goto err;
+
+    if (!TEST_true(ossl_ffc_params_cmp(&copy, params, 0)))
+        goto err;
+
+    ret = 1;
+err:
+    ossl_ffc_params_cleanup(&copy);
+    DH_free(dh);
     return ret;
 }
@@ -639 +677 @@
     ADD_TEST(ffc_private_validate_test);
     ADD_ALL_TESTS(ffc_private_gen_test, 10);
+    ADD_TEST(ffc_params_copy_test);
 #endif /* OPENSSL_NO_DH */
     return 1;

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