1ff978b22e
SRP and GOST is now allowed, note that GOST support requires adding GOST engine which is not part of openssl anymore
81 lines
2.9 KiB
Diff
81 lines
2.9 KiB
Diff
diff -up openssl-1.1.0e/apps/speed.c.curves openssl-1.1.0e/apps/speed.c
|
|
--- openssl-1.1.0e/apps/speed.c.curves 2017-02-16 12:58:20.000000000 +0100
|
|
+++ openssl-1.1.0e/apps/speed.c 2017-02-16 15:46:22.271504354 +0100
|
|
@@ -536,42 +536,18 @@ static OPT_PAIR rsa_choices[] = {
|
|
#define R_EC_X25519 16
|
|
#ifndef OPENSSL_NO_EC
|
|
static OPT_PAIR ecdsa_choices[] = {
|
|
- {"ecdsap160", R_EC_P160},
|
|
- {"ecdsap192", R_EC_P192},
|
|
{"ecdsap224", R_EC_P224},
|
|
{"ecdsap256", R_EC_P256},
|
|
{"ecdsap384", R_EC_P384},
|
|
{"ecdsap521", R_EC_P521},
|
|
- {"ecdsak163", R_EC_K163},
|
|
- {"ecdsak233", R_EC_K233},
|
|
- {"ecdsak283", R_EC_K283},
|
|
- {"ecdsak409", R_EC_K409},
|
|
- {"ecdsak571", R_EC_K571},
|
|
- {"ecdsab163", R_EC_B163},
|
|
- {"ecdsab233", R_EC_B233},
|
|
- {"ecdsab283", R_EC_B283},
|
|
- {"ecdsab409", R_EC_B409},
|
|
- {"ecdsab571", R_EC_B571},
|
|
{NULL}
|
|
};
|
|
|
|
static OPT_PAIR ecdh_choices[] = {
|
|
- {"ecdhp160", R_EC_P160},
|
|
- {"ecdhp192", R_EC_P192},
|
|
{"ecdhp224", R_EC_P224},
|
|
{"ecdhp256", R_EC_P256},
|
|
{"ecdhp384", R_EC_P384},
|
|
{"ecdhp521", R_EC_P521},
|
|
- {"ecdhk163", R_EC_K163},
|
|
- {"ecdhk233", R_EC_K233},
|
|
- {"ecdhk283", R_EC_K283},
|
|
- {"ecdhk409", R_EC_K409},
|
|
- {"ecdhk571", R_EC_K571},
|
|
- {"ecdhb163", R_EC_B163},
|
|
- {"ecdhb233", R_EC_B233},
|
|
- {"ecdhb283", R_EC_B283},
|
|
- {"ecdhb409", R_EC_B409},
|
|
- {"ecdhb571", R_EC_B571},
|
|
{"ecdhx25519", R_EC_X25519},
|
|
{NULL}
|
|
};
|
|
diff -up openssl-1.1.0e/crypto/ec/ecp_smpl.c.curves openssl-1.1.0e/crypto/ec/ecp_smpl.c
|
|
--- openssl-1.1.0e/crypto/ec/ecp_smpl.c.curves 2017-02-16 12:58:21.000000000 +0100
|
|
+++ openssl-1.1.0e/crypto/ec/ecp_smpl.c 2017-02-16 15:46:22.264504188 +0100
|
|
@@ -144,6 +144,11 @@ int ec_GFp_simple_group_set_curve(EC_GRO
|
|
return 0;
|
|
}
|
|
|
|
+ if (BN_num_bits(p) < 224) {
|
|
+ ECerr(EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE, EC_R_UNSUPPORTED_FIELD);
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
if (ctx == NULL) {
|
|
ctx = new_ctx = BN_CTX_new();
|
|
if (ctx == NULL)
|
|
diff -up openssl-1.1.0e/test/ecdsatest.c.curves openssl-1.1.0e/test/ecdsatest.c
|
|
--- openssl-1.1.0e/test/ecdsatest.c.curves 2017-02-16 12:58:24.000000000 +0100
|
|
+++ openssl-1.1.0e/test/ecdsatest.c 2017-02-16 15:46:22.250503857 +0100
|
|
@@ -216,6 +216,7 @@ int x9_62_tests(BIO *out)
|
|
if (!change_rand())
|
|
goto x962_err;
|
|
|
|
+#if 0
|
|
if (!x9_62_test_internal(out, NID_X9_62_prime192v1,
|
|
"3342403536405981729393488334694600415596881826869351677613",
|
|
"5735822328888155254683894997897571951568553642892029982342"))
|
|
@@ -226,6 +227,7 @@ int x9_62_tests(BIO *out)
|
|
"3238135532097973577080787768312505059318910517550078427819"
|
|
"78505179448783"))
|
|
goto x962_err;
|
|
+#endif
|
|
# ifndef OPENSSL_NO_EC2M
|
|
if (!x9_62_test_internal(out, NID_X9_62_c2tnb191v1,
|
|
"87194383164871543355722284926904419997237591535066528048",
|