|
 |
fd2893 |
diff -up openssl-1.0.2c/apps/speed.c.suiteb openssl-1.0.2c/apps/speed.c
|
|
|
fd2893 |
--- openssl-1.0.2c/apps/speed.c.suiteb 2015-06-15 17:37:06.285083685 +0200
|
|
|
fd2893 |
+++ openssl-1.0.2c/apps/speed.c 2015-06-15 17:37:06.335084836 +0200
|
|
|
fd2893 |
@@ -996,78 +996,26 @@ int MAIN(int argc, char **argv)
|
|
|
fd2893 |
} else
|
|
|
fd2893 |
# endif
|
|
|
fd2893 |
# ifndef OPENSSL_NO_ECDSA
|
|
|
fd2893 |
- if (strcmp(*argv, "ecdsap160") == 0)
|
|
|
fd2893 |
- ecdsa_doit[R_EC_P160] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdsap192") == 0)
|
|
|
fd2893 |
- ecdsa_doit[R_EC_P192] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdsap224") == 0)
|
|
|
fd2893 |
- ecdsa_doit[R_EC_P224] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdsap256") == 0)
|
|
|
fd2893 |
+ if (strcmp(*argv, "ecdsap256") == 0)
|
|
|
fd2893 |
ecdsa_doit[R_EC_P256] = 2;
|
|
|
fd2893 |
else if (strcmp(*argv, "ecdsap384") == 0)
|
|
|
fd2893 |
ecdsa_doit[R_EC_P384] = 2;
|
|
|
fd2893 |
else if (strcmp(*argv, "ecdsap521") == 0)
|
|
|
fd2893 |
ecdsa_doit[R_EC_P521] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdsak163") == 0)
|
|
|
fd2893 |
- ecdsa_doit[R_EC_K163] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdsak233") == 0)
|
|
|
fd2893 |
- ecdsa_doit[R_EC_K233] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdsak283") == 0)
|
|
|
fd2893 |
- ecdsa_doit[R_EC_K283] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdsak409") == 0)
|
|
|
fd2893 |
- ecdsa_doit[R_EC_K409] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdsak571") == 0)
|
|
|
fd2893 |
- ecdsa_doit[R_EC_K571] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdsab163") == 0)
|
|
|
fd2893 |
- ecdsa_doit[R_EC_B163] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdsab233") == 0)
|
|
|
fd2893 |
- ecdsa_doit[R_EC_B233] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdsab283") == 0)
|
|
|
fd2893 |
- ecdsa_doit[R_EC_B283] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdsab409") == 0)
|
|
|
fd2893 |
- ecdsa_doit[R_EC_B409] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdsab571") == 0)
|
|
|
fd2893 |
- ecdsa_doit[R_EC_B571] = 2;
|
|
|
fd2893 |
else if (strcmp(*argv, "ecdsa") == 0) {
|
|
|
fd2893 |
- for (i = 0; i < EC_NUM; i++)
|
|
|
fd2893 |
+ for (i = R_EC_P256; i <= R_EC_P521; i++)
|
|
|
fd2893 |
ecdsa_doit[i] = 1;
|
|
|
fd2893 |
} else
|
|
|
fd2893 |
# endif
|
|
|
fd2893 |
# ifndef OPENSSL_NO_ECDH
|
|
|
fd2893 |
- if (strcmp(*argv, "ecdhp160") == 0)
|
|
|
fd2893 |
- ecdh_doit[R_EC_P160] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdhp192") == 0)
|
|
|
fd2893 |
- ecdh_doit[R_EC_P192] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdhp224") == 0)
|
|
|
fd2893 |
- ecdh_doit[R_EC_P224] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdhp256") == 0)
|
|
|
fd2893 |
+ if (strcmp(*argv, "ecdhp256") == 0)
|
|
|
fd2893 |
ecdh_doit[R_EC_P256] = 2;
|
|
|
fd2893 |
else if (strcmp(*argv, "ecdhp384") == 0)
|
|
|
fd2893 |
ecdh_doit[R_EC_P384] = 2;
|
|
|
fd2893 |
else if (strcmp(*argv, "ecdhp521") == 0)
|
|
|
fd2893 |
ecdh_doit[R_EC_P521] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdhk163") == 0)
|
|
|
fd2893 |
- ecdh_doit[R_EC_K163] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdhk233") == 0)
|
|
|
fd2893 |
- ecdh_doit[R_EC_K233] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdhk283") == 0)
|
|
|
fd2893 |
- ecdh_doit[R_EC_K283] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdhk409") == 0)
|
|
|
fd2893 |
- ecdh_doit[R_EC_K409] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdhk571") == 0)
|
|
|
fd2893 |
- ecdh_doit[R_EC_K571] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdhb163") == 0)
|
|
|
fd2893 |
- ecdh_doit[R_EC_B163] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdhb233") == 0)
|
|
|
fd2893 |
- ecdh_doit[R_EC_B233] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdhb283") == 0)
|
|
|
fd2893 |
- ecdh_doit[R_EC_B283] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdhb409") == 0)
|
|
|
fd2893 |
- ecdh_doit[R_EC_B409] = 2;
|
|
|
fd2893 |
- else if (strcmp(*argv, "ecdhb571") == 0)
|
|
|
fd2893 |
- ecdh_doit[R_EC_B571] = 2;
|
|
|
fd2893 |
else if (strcmp(*argv, "ecdh") == 0) {
|
|
|
fd2893 |
- for (i = 0; i < EC_NUM; i++)
|
|
|
fd2893 |
+ for (i = R_EC_P256; i <= R_EC_P521; i++)
|
|
|
fd2893 |
ecdh_doit[i] = 1;
|
|
|
fd2893 |
} else
|
|
|
fd2893 |
# endif
|
|
|
fd2893 |
@@ -1156,21 +1104,11 @@ int MAIN(int argc, char **argv)
|
|
|
fd2893 |
BIO_printf(bio_err, "dsa512 dsa1024 dsa2048\n");
|
|
|
fd2893 |
# endif
|
|
|
fd2893 |
# ifndef OPENSSL_NO_ECDSA
|
|
|
fd2893 |
- BIO_printf(bio_err, "ecdsap160 ecdsap192 ecdsap224 "
|
|
|
fd2893 |
- "ecdsap256 ecdsap384 ecdsap521\n");
|
|
|
fd2893 |
- BIO_printf(bio_err,
|
|
|
fd2893 |
- "ecdsak163 ecdsak233 ecdsak283 ecdsak409 ecdsak571\n");
|
|
|
fd2893 |
- BIO_printf(bio_err,
|
|
|
fd2893 |
- "ecdsab163 ecdsab233 ecdsab283 ecdsab409 ecdsab571\n");
|
|
|
fd2893 |
+ BIO_printf(bio_err, "ecdsap256 ecdsap384 ecdsap521\n");
|
|
|
fd2893 |
BIO_printf(bio_err, "ecdsa\n");
|
|
|
fd2893 |
# endif
|
|
|
fd2893 |
# ifndef OPENSSL_NO_ECDH
|
|
|
fd2893 |
- BIO_printf(bio_err, "ecdhp160 ecdhp192 ecdhp224 "
|
|
|
fd2893 |
- "ecdhp256 ecdhp384 ecdhp521\n");
|
|
|
fd2893 |
- BIO_printf(bio_err,
|
|
|
fd2893 |
- "ecdhk163 ecdhk233 ecdhk283 ecdhk409 ecdhk571\n");
|
|
|
fd2893 |
- BIO_printf(bio_err,
|
|
|
fd2893 |
- "ecdhb163 ecdhb233 ecdhb283 ecdhb409 ecdhb571\n");
|
|
|
fd2893 |
+ BIO_printf(bio_err, "ecdhp256 ecdhp384 ecdhp521\n");
|
|
|
fd2893 |
BIO_printf(bio_err, "ecdh\n");
|
|
|
fd2893 |
# endif
|
|
|
fd2893 |
|
|
|
fd2893 |
@@ -1255,11 +1193,11 @@ int MAIN(int argc, char **argv)
|
|
|
fd2893 |
if (!FIPS_mode() || i != R_DSA_512)
|
|
|
fd2893 |
dsa_doit[i] = 1;
|
|
|
fd2893 |
# ifndef OPENSSL_NO_ECDSA
|
|
|
fd2893 |
- for (i = 0; i < EC_NUM; i++)
|
|
|
fd2893 |
+ for (i = R_EC_P256; i <= R_EC_P521; i++)
|
|
|
fd2893 |
ecdsa_doit[i] = 1;
|
|
|
fd2893 |
# endif
|
|
|
fd2893 |
# ifndef OPENSSL_NO_ECDH
|
|
|
fd2893 |
- for (i = 0; i < EC_NUM; i++)
|
|
|
fd2893 |
+ for (i = R_EC_P256; i <= R_EC_P521; i++)
|
|
|
fd2893 |
ecdh_doit[i] = 1;
|
|
|
fd2893 |
# endif
|
|
|
fd2893 |
}
|
|
|
fd2893 |
diff -up openssl-1.0.2c/ssl/t1_lib.c.suiteb openssl-1.0.2c/ssl/t1_lib.c
|
|
|
fd2893 |
--- openssl-1.0.2c/ssl/t1_lib.c.suiteb 2015-06-12 16:51:27.000000000 +0200
|
|
|
fd2893 |
+++ openssl-1.0.2c/ssl/t1_lib.c 2015-06-15 17:44:03.578681271 +0200
|
|
|
fd2893 |
@@ -268,11 +268,7 @@ static const unsigned char eccurves_auto
|
|
|
fd2893 |
0, 23, /* secp256r1 (23) */
|
|
|
fd2893 |
/* Other >= 256-bit prime curves. */
|
|
|
fd2893 |
0, 25, /* secp521r1 (25) */
|
|
|
fd2893 |
- 0, 28, /* brainpool512r1 (28) */
|
|
|
fd2893 |
- 0, 27, /* brainpoolP384r1 (27) */
|
|
|
fd2893 |
0, 24, /* secp384r1 (24) */
|
|
|
fd2893 |
- 0, 26, /* brainpoolP256r1 (26) */
|
|
|
fd2893 |
- 0, 22, /* secp256k1 (22) */
|
|
|
fd2893 |
# ifndef OPENSSL_NO_EC2M
|
|
|
fd2893 |
/* >= 256-bit binary curves. */
|
|
|
fd2893 |
0, 14, /* sect571r1 (14) */
|
|
|
fd2893 |
@@ -289,11 +285,7 @@ static const unsigned char eccurves_all[
|
|
|
fd2893 |
0, 23, /* secp256r1 (23) */
|
|
|
fd2893 |
/* Other >= 256-bit prime curves. */
|
|
|
fd2893 |
0, 25, /* secp521r1 (25) */
|
|
|
fd2893 |
- 0, 28, /* brainpool512r1 (28) */
|
|
|
fd2893 |
- 0, 27, /* brainpoolP384r1 (27) */
|
|
|
fd2893 |
0, 24, /* secp384r1 (24) */
|
|
|
fd2893 |
- 0, 26, /* brainpoolP256r1 (26) */
|
|
|
fd2893 |
- 0, 22, /* secp256k1 (22) */
|
|
|
fd2893 |
# ifndef OPENSSL_NO_EC2M
|
|
|
fd2893 |
/* >= 256-bit binary curves. */
|
|
|
fd2893 |
0, 14, /* sect571r1 (14) */
|
|
|
fd2893 |
@@ -307,13 +299,6 @@ static const unsigned char eccurves_all[
|
|
|
fd2893 |
* Remaining curves disabled by default but still permitted if set
|
|
|
fd2893 |
* via an explicit callback or parameters.
|
|
|
fd2893 |
*/
|
|
|
fd2893 |
- 0, 20, /* secp224k1 (20) */
|
|
|
fd2893 |
- 0, 21, /* secp224r1 (21) */
|
|
|
fd2893 |
- 0, 18, /* secp192k1 (18) */
|
|
|
fd2893 |
- 0, 19, /* secp192r1 (19) */
|
|
|
fd2893 |
- 0, 15, /* secp160k1 (15) */
|
|
|
fd2893 |
- 0, 16, /* secp160r1 (16) */
|
|
|
fd2893 |
- 0, 17, /* secp160r2 (17) */
|
|
|
fd2893 |
# ifndef OPENSSL_NO_EC2M
|
|
|
fd2893 |
0, 8, /* sect239k1 (8) */
|
|
|
fd2893 |
0, 6, /* sect233k1 (6) */
|
|
|
fd2893 |
@@ -348,29 +333,21 @@ static const unsigned char fips_curves_d
|
|
|
fd2893 |
0, 9, /* sect283k1 (9) */
|
|
|
fd2893 |
0, 10, /* sect283r1 (10) */
|
|
|
fd2893 |
# endif
|
|
|
fd2893 |
- 0, 22, /* secp256k1 (22) */
|
|
|
fd2893 |
0, 23, /* secp256r1 (23) */
|
|
|
fd2893 |
# ifndef OPENSSL_NO_EC2M
|
|
|
fd2893 |
0, 8, /* sect239k1 (8) */
|
|
|
fd2893 |
0, 6, /* sect233k1 (6) */
|
|
|
fd2893 |
0, 7, /* sect233r1 (7) */
|
|
|
fd2893 |
# endif
|
|
|
fd2893 |
- 0, 20, /* secp224k1 (20) */
|
|
|
fd2893 |
- 0, 21, /* secp224r1 (21) */
|
|
|
fd2893 |
# ifndef OPENSSL_NO_EC2M
|
|
|
fd2893 |
0, 4, /* sect193r1 (4) */
|
|
|
fd2893 |
0, 5, /* sect193r2 (5) */
|
|
|
fd2893 |
# endif
|
|
|
fd2893 |
- 0, 18, /* secp192k1 (18) */
|
|
|
fd2893 |
- 0, 19, /* secp192r1 (19) */
|
|
|
fd2893 |
# ifndef OPENSSL_NO_EC2M
|
|
|
fd2893 |
0, 1, /* sect163k1 (1) */
|
|
|
fd2893 |
0, 2, /* sect163r1 (2) */
|
|
|
fd2893 |
0, 3, /* sect163r2 (3) */
|
|
|
fd2893 |
# endif
|
|
|
fd2893 |
- 0, 15, /* secp160k1 (15) */
|
|
|
fd2893 |
- 0, 16, /* secp160r1 (16) */
|
|
|
fd2893 |
- 0, 17, /* secp160r2 (17) */
|
|
|
fd2893 |
};
|
|
|
fd2893 |
# endif
|
|
|
fd2893 |
|