|
 |
9189f03 |
diff -up openssl-1.1.1-pre8/apps/speed.c.curves openssl-1.1.1-pre8/apps/speed.c
|
|
|
9189f03 |
--- openssl-1.1.1-pre8/apps/speed.c.curves 2018-07-17 08:48:56.106625020 +0200
|
|
|
9189f03 |
+++ openssl-1.1.1-pre8/apps/speed.c 2018-07-17 08:50:07.526521809 +0200
|
|
|
9189f03 |
@@ -511,56 +511,20 @@ static double rsa_results[RSA_NUM][2];
|
|
|
9189f03 |
#define R_EC_X448 23
|
|
|
510bcc2 |
#ifndef OPENSSL_NO_EC
|
|
|
510bcc2 |
static OPT_PAIR ecdsa_choices[] = {
|
|
|
510bcc2 |
- {"ecdsap160", R_EC_P160},
|
|
|
510bcc2 |
- {"ecdsap192", R_EC_P192},
|
|
|
e443a79 |
{"ecdsap224", R_EC_P224},
|
|
|
510bcc2 |
{"ecdsap256", R_EC_P256},
|
|
|
510bcc2 |
{"ecdsap384", R_EC_P384},
|
|
|
510bcc2 |
{"ecdsap521", R_EC_P521},
|
|
|
510bcc2 |
- {"ecdsak163", R_EC_K163},
|
|
|
510bcc2 |
- {"ecdsak233", R_EC_K233},
|
|
|
510bcc2 |
- {"ecdsak283", R_EC_K283},
|
|
|
510bcc2 |
- {"ecdsak409", R_EC_K409},
|
|
|
510bcc2 |
- {"ecdsak571", R_EC_K571},
|
|
|
510bcc2 |
- {"ecdsab163", R_EC_B163},
|
|
|
510bcc2 |
- {"ecdsab233", R_EC_B233},
|
|
|
510bcc2 |
- {"ecdsab283", R_EC_B283},
|
|
|
510bcc2 |
- {"ecdsab409", R_EC_B409},
|
|
|
510bcc2 |
- {"ecdsab571", R_EC_B571},
|
|
|
9189f03 |
- {"ecdsabrp256r1", R_EC_BRP256R1},
|
|
|
9189f03 |
- {"ecdsabrp256t1", R_EC_BRP256T1},
|
|
|
9189f03 |
- {"ecdsabrp384r1", R_EC_BRP384R1},
|
|
|
9189f03 |
- {"ecdsabrp384t1", R_EC_BRP384T1},
|
|
|
9189f03 |
- {"ecdsabrp512r1", R_EC_BRP512R1},
|
|
|
9189f03 |
- {"ecdsabrp512t1", R_EC_BRP512T1}
|
|
|
510bcc2 |
};
|
|
|
9189f03 |
# define ECDSA_NUM OSSL_NELEM(ecdsa_choices)
|
|
|
510bcc2 |
|
|
|
9189f03 |
static double ecdsa_results[ECDSA_NUM][2]; /* 2 ops: sign then verify */
|
|
|
9189f03 |
|
|
|
9189f03 |
static const OPT_PAIR ecdh_choices[] = {
|
|
|
510bcc2 |
- {"ecdhp160", R_EC_P160},
|
|
|
510bcc2 |
- {"ecdhp192", R_EC_P192},
|
|
|
e443a79 |
{"ecdhp224", R_EC_P224},
|
|
|
510bcc2 |
{"ecdhp256", R_EC_P256},
|
|
|
510bcc2 |
{"ecdhp384", R_EC_P384},
|
|
|
510bcc2 |
{"ecdhp521", R_EC_P521},
|
|
|
510bcc2 |
- {"ecdhk163", R_EC_K163},
|
|
|
510bcc2 |
- {"ecdhk233", R_EC_K233},
|
|
|
510bcc2 |
- {"ecdhk283", R_EC_K283},
|
|
|
510bcc2 |
- {"ecdhk409", R_EC_K409},
|
|
|
510bcc2 |
- {"ecdhk571", R_EC_K571},
|
|
|
510bcc2 |
- {"ecdhb163", R_EC_B163},
|
|
|
510bcc2 |
- {"ecdhb233", R_EC_B233},
|
|
|
510bcc2 |
- {"ecdhb283", R_EC_B283},
|
|
|
510bcc2 |
- {"ecdhb409", R_EC_B409},
|
|
|
510bcc2 |
- {"ecdhb571", R_EC_B571},
|
|
|
9189f03 |
- {"ecdhbrp256r1", R_EC_BRP256R1},
|
|
|
9189f03 |
- {"ecdhbrp256t1", R_EC_BRP256T1},
|
|
|
9189f03 |
- {"ecdhbrp384r1", R_EC_BRP384R1},
|
|
|
9189f03 |
- {"ecdhbrp384t1", R_EC_BRP384T1},
|
|
|
9189f03 |
- {"ecdhbrp512r1", R_EC_BRP512R1},
|
|
|
9189f03 |
- {"ecdhbrp512t1", R_EC_BRP512T1},
|
|
|
510bcc2 |
{"ecdhx25519", R_EC_X25519},
|
|
|
9189f03 |
{"ecdhx448", R_EC_X448}
|
|
|
510bcc2 |
};
|
|
|
9189f03 |
diff -up openssl-1.1.1-pre8/crypto/ec/ecp_smpl.c.curves openssl-1.1.1-pre8/crypto/ec/ecp_smpl.c
|
|
|
9189f03 |
--- openssl-1.1.1-pre8/crypto/ec/ecp_smpl.c.curves 2018-06-20 16:48:10.000000000 +0200
|
|
|
9189f03 |
+++ openssl-1.1.1-pre8/crypto/ec/ecp_smpl.c 2018-07-17 08:48:56.107625044 +0200
|
|
|
9189f03 |
@@ -141,6 +141,11 @@ int ec_GFp_simple_group_set_curve(EC_GRO
|
|
|
e443a79 |
return 0;
|
|
|
e443a79 |
}
|
|
|
510bcc2 |
|
|
|
e443a79 |
+ if (BN_num_bits(p) < 224) {
|
|
|
e443a79 |
+ ECerr(EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE, EC_R_UNSUPPORTED_FIELD);
|
|
|
e443a79 |
+ return 0;
|
|
|
e443a79 |
+ }
|
|
|
e443a79 |
+
|
|
|
e443a79 |
if (ctx == NULL) {
|
|
|
e443a79 |
ctx = new_ctx = BN_CTX_new();
|
|
|
e443a79 |
if (ctx == NULL)
|
|
|
9189f03 |
diff -up openssl-1.1.1-pre8/test/ecdsatest.c.curves openssl-1.1.1-pre8/test/ecdsatest.c
|
|
|
9189f03 |
--- openssl-1.1.1-pre8/test/ecdsatest.c.curves 2018-06-20 16:48:14.000000000 +0200
|
|
|
9189f03 |
+++ openssl-1.1.1-pre8/test/ecdsatest.c 2018-07-17 08:48:56.107625044 +0200
|
|
|
9189f03 |
@@ -173,6 +173,7 @@ static int x9_62_tests(void)
|
|
|
c676ac3 |
if (!change_rand())
|
|
|
c676ac3 |
goto x962_err;
|
|
|
c676ac3 |
|
|
|
c676ac3 |
+#if 0
|
|
|
9189f03 |
if (!TEST_true(x9_62_test_internal(NID_X9_62_prime192v1,
|
|
|
9189f03 |
"3342403536405981729393488334694600415596881826869351677613",
|
|
|
9189f03 |
"5735822328888155254683894997897571951568553642892029982342")))
|
|
|
9189f03 |
@@ -183,6 +184,7 @@ static int x9_62_tests(void)
|
|
|
9189f03 |
"3238135532097973577080787768312505059318910517550078427819"
|
|
|
9189f03 |
"78505179448783")))
|
|
|
c676ac3 |
goto x962_err;
|
|
|
c676ac3 |
+#endif
|
|
|
9189f03 |
|
|
|
c676ac3 |
# ifndef OPENSSL_NO_EC2M
|
|
|
9189f03 |
if (!TEST_true(x9_62_test_internal(NID_X9_62_c2tnb191v1,
|