You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
124 lines
5.4 KiB
124 lines
5.4 KiB
diff -up openssl-1.0.1e/apps/speed.c.suiteb openssl-1.0.1e/apps/speed.c |
|
--- openssl-1.0.1e/apps/speed.c.suiteb 2013-11-08 18:02:53.815229706 +0100 |
|
+++ openssl-1.0.1e/apps/speed.c 2013-11-08 18:04:47.016724297 +0100 |
|
@@ -966,49 +966,23 @@ int MAIN(int argc, char **argv) |
|
else |
|
#endif |
|
#ifndef OPENSSL_NO_ECDSA |
|
- if (strcmp(*argv,"ecdsap160") == 0) ecdsa_doit[R_EC_P160]=2; |
|
- else if (strcmp(*argv,"ecdsap192") == 0) ecdsa_doit[R_EC_P192]=2; |
|
- else if (strcmp(*argv,"ecdsap224") == 0) ecdsa_doit[R_EC_P224]=2; |
|
- else if (strcmp(*argv,"ecdsap256") == 0) ecdsa_doit[R_EC_P256]=2; |
|
+ if (strcmp(*argv,"ecdsap256") == 0) ecdsa_doit[R_EC_P256]=2; |
|
else if (strcmp(*argv,"ecdsap384") == 0) ecdsa_doit[R_EC_P384]=2; |
|
else if (strcmp(*argv,"ecdsap521") == 0) ecdsa_doit[R_EC_P521]=2; |
|
- else if (strcmp(*argv,"ecdsak163") == 0) ecdsa_doit[R_EC_K163]=2; |
|
- else if (strcmp(*argv,"ecdsak233") == 0) ecdsa_doit[R_EC_K233]=2; |
|
- else if (strcmp(*argv,"ecdsak283") == 0) ecdsa_doit[R_EC_K283]=2; |
|
- else if (strcmp(*argv,"ecdsak409") == 0) ecdsa_doit[R_EC_K409]=2; |
|
- else if (strcmp(*argv,"ecdsak571") == 0) ecdsa_doit[R_EC_K571]=2; |
|
- else if (strcmp(*argv,"ecdsab163") == 0) ecdsa_doit[R_EC_B163]=2; |
|
- else if (strcmp(*argv,"ecdsab233") == 0) ecdsa_doit[R_EC_B233]=2; |
|
- else if (strcmp(*argv,"ecdsab283") == 0) ecdsa_doit[R_EC_B283]=2; |
|
- else if (strcmp(*argv,"ecdsab409") == 0) ecdsa_doit[R_EC_B409]=2; |
|
- else if (strcmp(*argv,"ecdsab571") == 0) ecdsa_doit[R_EC_B571]=2; |
|
else if (strcmp(*argv,"ecdsa") == 0) |
|
{ |
|
- for (i=0; i < EC_NUM; i++) |
|
+ for (i=R_EC_P256; i <= R_EC_P521; i++) |
|
ecdsa_doit[i]=1; |
|
} |
|
else |
|
#endif |
|
#ifndef OPENSSL_NO_ECDH |
|
- if (strcmp(*argv,"ecdhp160") == 0) ecdh_doit[R_EC_P160]=2; |
|
- else if (strcmp(*argv,"ecdhp192") == 0) ecdh_doit[R_EC_P192]=2; |
|
- else if (strcmp(*argv,"ecdhp224") == 0) ecdh_doit[R_EC_P224]=2; |
|
- else if (strcmp(*argv,"ecdhp256") == 0) ecdh_doit[R_EC_P256]=2; |
|
+ if (strcmp(*argv,"ecdhp256") == 0) ecdh_doit[R_EC_P256]=2; |
|
else if (strcmp(*argv,"ecdhp384") == 0) ecdh_doit[R_EC_P384]=2; |
|
else if (strcmp(*argv,"ecdhp521") == 0) ecdh_doit[R_EC_P521]=2; |
|
- else if (strcmp(*argv,"ecdhk163") == 0) ecdh_doit[R_EC_K163]=2; |
|
- else if (strcmp(*argv,"ecdhk233") == 0) ecdh_doit[R_EC_K233]=2; |
|
- else if (strcmp(*argv,"ecdhk283") == 0) ecdh_doit[R_EC_K283]=2; |
|
- else if (strcmp(*argv,"ecdhk409") == 0) ecdh_doit[R_EC_K409]=2; |
|
- else if (strcmp(*argv,"ecdhk571") == 0) ecdh_doit[R_EC_K571]=2; |
|
- else if (strcmp(*argv,"ecdhb163") == 0) ecdh_doit[R_EC_B163]=2; |
|
- else if (strcmp(*argv,"ecdhb233") == 0) ecdh_doit[R_EC_B233]=2; |
|
- else if (strcmp(*argv,"ecdhb283") == 0) ecdh_doit[R_EC_B283]=2; |
|
- else if (strcmp(*argv,"ecdhb409") == 0) ecdh_doit[R_EC_B409]=2; |
|
- else if (strcmp(*argv,"ecdhb571") == 0) ecdh_doit[R_EC_B571]=2; |
|
else if (strcmp(*argv,"ecdh") == 0) |
|
{ |
|
- for (i=0; i < EC_NUM; i++) |
|
+ for (i=R_EC_P256; i <= R_EC_P521; i++) |
|
ecdh_doit[i]=1; |
|
} |
|
else |
|
@@ -1097,15 +1071,11 @@ int MAIN(int argc, char **argv) |
|
BIO_printf(bio_err,"dsa512 dsa1024 dsa2048\n"); |
|
#endif |
|
#ifndef OPENSSL_NO_ECDSA |
|
- BIO_printf(bio_err,"ecdsap160 ecdsap192 ecdsap224 ecdsap256 ecdsap384 ecdsap521\n"); |
|
- BIO_printf(bio_err,"ecdsak163 ecdsak233 ecdsak283 ecdsak409 ecdsak571\n"); |
|
- BIO_printf(bio_err,"ecdsab163 ecdsab233 ecdsab283 ecdsab409 ecdsab571\n"); |
|
+ BIO_printf(bio_err,"ecdsap256 ecdsap384 ecdsap521\n"); |
|
BIO_printf(bio_err,"ecdsa\n"); |
|
#endif |
|
#ifndef OPENSSL_NO_ECDH |
|
- BIO_printf(bio_err,"ecdhp160 ecdhp192 ecdhp224 ecdhp256 ecdhp384 ecdhp521\n"); |
|
- BIO_printf(bio_err,"ecdhk163 ecdhk233 ecdhk283 ecdhk409 ecdhk571\n"); |
|
- BIO_printf(bio_err,"ecdhb163 ecdhb233 ecdhb283 ecdhb409 ecdhb571\n"); |
|
+ BIO_printf(bio_err,"ecdhp256 ecdhp384 ecdhp521\n"); |
|
BIO_printf(bio_err,"ecdh\n"); |
|
#endif |
|
|
|
@@ -1184,11 +1154,11 @@ int MAIN(int argc, char **argv) |
|
if (!FIPS_mode() || i != R_DSA_512) |
|
dsa_doit[i]=1; |
|
#ifndef OPENSSL_NO_ECDSA |
|
- for (i=0; i<EC_NUM; i++) |
|
+ for (i=R_EC_P256; i <= R_EC_P521; i++) |
|
ecdsa_doit[i]=1; |
|
#endif |
|
#ifndef OPENSSL_NO_ECDH |
|
- for (i=0; i<EC_NUM; i++) |
|
+ for (i=R_EC_P256; i <= R_EC_P521; i++) |
|
ecdh_doit[i]=1; |
|
#endif |
|
} |
|
diff -up openssl-1.0.1e/ssl/t1_lib.c.suiteb openssl-1.0.1e/ssl/t1_lib.c |
|
--- openssl-1.0.1e/ssl/t1_lib.c.suiteb 2013-02-11 16:26:04.000000000 +0100 |
|
+++ openssl-1.0.1e/ssl/t1_lib.c 2013-11-08 18:05:27.551617554 +0100 |
|
@@ -204,31 +204,9 @@ static int nid_list[] = |
|
|
|
static int pref_list[] = |
|
{ |
|
- NID_sect571r1, /* sect571r1 (14) */ |
|
- NID_sect571k1, /* sect571k1 (13) */ |
|
NID_secp521r1, /* secp521r1 (25) */ |
|
- NID_sect409k1, /* sect409k1 (11) */ |
|
- NID_sect409r1, /* sect409r1 (12) */ |
|
NID_secp384r1, /* secp384r1 (24) */ |
|
- NID_sect283k1, /* sect283k1 (9) */ |
|
- NID_sect283r1, /* sect283r1 (10) */ |
|
- NID_secp256k1, /* secp256k1 (22) */ |
|
NID_X9_62_prime256v1, /* secp256r1 (23) */ |
|
- NID_sect239k1, /* sect239k1 (8) */ |
|
- NID_sect233k1, /* sect233k1 (6) */ |
|
- NID_sect233r1, /* sect233r1 (7) */ |
|
- NID_secp224k1, /* secp224k1 (20) */ |
|
- NID_secp224r1, /* secp224r1 (21) */ |
|
- NID_sect193r1, /* sect193r1 (4) */ |
|
- NID_sect193r2, /* sect193r2 (5) */ |
|
- NID_secp192k1, /* secp192k1 (18) */ |
|
- NID_X9_62_prime192v1, /* secp192r1 (19) */ |
|
- NID_sect163k1, /* sect163k1 (1) */ |
|
- NID_sect163r1, /* sect163r1 (2) */ |
|
- NID_sect163r2, /* sect163r2 (3) */ |
|
- NID_secp160k1, /* secp160k1 (15) */ |
|
- NID_secp160r1, /* secp160r1 (16) */ |
|
- NID_secp160r2, /* secp160r2 (17) */ |
|
}; |
|
|
|
int tls1_ec_curve_id2nid(int curve_id)
|
|
|