|
 |
510bcc2 |
diff -up openssl-1.1.0b/Configurations/unix-Makefile.tmpl.build openssl-1.1.0b/Configurations/unix-Makefile.tmpl
|
|
|
510bcc2 |
--- openssl-1.1.0b/Configurations/unix-Makefile.tmpl.build 2016-09-26 11:46:04.000000000 +0200
|
|
|
510bcc2 |
+++ openssl-1.1.0b/Configurations/unix-Makefile.tmpl 2016-09-26 15:16:26.935660147 +0200
|
|
|
510bcc2 |
@@ -640,7 +640,7 @@ install_man_docs:
|
|
|
510bcc2 |
@\
|
|
|
510bcc2 |
OUTSUFFIX='.$${SEC}$(MANSUFFIX)'; \
|
|
|
510bcc2 |
OUTTOP="$(DESTDIR)$(MANDIR)"; \
|
|
|
510bcc2 |
- GENERATE='pod2man --name=$$NAME --section=$$SEC --center=OpenSSL --release=$(VERSION)'; \
|
|
|
510bcc2 |
+ GENERATE='TZ=UTC pod2man --name=$$NAME --section=$$SEC --center=OpenSSL --release=$(VERSION)'; \
|
|
|
510bcc2 |
$(PROCESS_PODS)
|
|
|
510bcc2 |
|
|
|
510bcc2 |
uninstall_man_docs:
|
|
|
510bcc2 |
diff -up openssl-1.1.0b/Configurations/10-main.conf.build openssl-1.1.0b/Configurations/10-main.conf
|
|
|
510bcc2 |
--- openssl-1.1.0b/Configurations/10-main.conf.build 2016-09-26 11:46:04.000000000 +0200
|
|
|
510bcc2 |
+++ openssl-1.1.0b/Configurations/10-main.conf 2016-09-26 15:16:26.935660147 +0200
|
|
|
510bcc2 |
@@ -655,6 +655,7 @@ sub vms_info {
|
|
|
510bcc2 |
cflags => add("-m64 -DL_ENDIAN"),
|
|
|
510bcc2 |
perlasm_scheme => "linux64le",
|
|
|
510bcc2 |
shared_ldflag => "-m64",
|
|
|
510bcc2 |
+ multilib => "64",
|
|
|
510bcc2 |
},
|
|
|
510bcc2 |
|
|
|
510bcc2 |
"linux-armv4" => {
|
|
|
510bcc2 |
diff -up openssl-1.1.0b/crypto/ec/ec_lib.c.build openssl-1.1.0b/crypto/ec/ec_lib.c
|
|
|
510bcc2 |
--- openssl-1.1.0b/crypto/ec/ec_lib.c.build 2016-09-26 15:16:26.936660171 +0200
|
|
|
510bcc2 |
+++ openssl-1.1.0b/crypto/ec/ec_lib.c 2016-09-26 15:18:38.351742195 +0200
|
|
|
510bcc2 |
@@ -74,9 +74,6 @@ void EC_pre_comp_free(EC_GROUP *group)
|
|
|
510bcc2 |
break;
|
|
|
510bcc2 |
#endif
|
|
|
510bcc2 |
#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
|
|
|
510bcc2 |
- case PCT_nistp224:
|
|
|
510bcc2 |
- EC_nistp224_pre_comp_free(group->pre_comp.nistp224);
|
|
|
510bcc2 |
- break;
|
|
|
510bcc2 |
case PCT_nistp256:
|
|
|
510bcc2 |
EC_nistp256_pre_comp_free(group->pre_comp.nistp256);
|
|
|
510bcc2 |
break;
|
|
|
510bcc2 |
@@ -152,9 +149,6 @@ int EC_GROUP_copy(EC_GROUP *dest, const
|
|
|
510bcc2 |
break;
|
|
|
510bcc2 |
#endif
|
|
|
510bcc2 |
#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
|
|
|
510bcc2 |
- case PCT_nistp224:
|
|
|
510bcc2 |
- dest->pre_comp.nistp224 = EC_nistp224_pre_comp_dup(src->pre_comp.nistp224);
|
|
|
510bcc2 |
- break;
|
|
|
510bcc2 |
case PCT_nistp256:
|
|
|
510bcc2 |
dest->pre_comp.nistp256 = EC_nistp256_pre_comp_dup(src->pre_comp.nistp256);
|
|
|
510bcc2 |
break;
|
|
|
510bcc2 |
diff -up openssl-1.1.0b/test/ecdhtest_cavs.h.build openssl-1.1.0b/test/ecdhtest_cavs.h
|
|
|
510bcc2 |
--- openssl-1.1.0b/test/ecdhtest_cavs.h.build 2016-09-26 15:16:26.918659749 +0200
|
|
|
510bcc2 |
+++ openssl-1.1.0b/test/ecdhtest_cavs.h 2016-09-26 15:16:26.936660171 +0200
|
|
|
510bcc2 |
@@ -29,6 +29,7 @@ typedef struct {
|
|
|
510bcc2 |
|
|
|
510bcc2 |
static const ecdh_cavs_kat_t ecdh_cavs_kats[] = {
|
|
|
510bcc2 |
/* curves over prime fields go here */
|
|
|
510bcc2 |
+#if 0
|
|
|
510bcc2 |
{ NID_X9_62_prime192v1,
|
|
|
510bcc2 |
"42ea6dd9969dd2a61fea1aac7f8e98edcc896c6e55857cc0",
|
|
|
510bcc2 |
"dfbe5d7c61fac88b11811bde328e8a0d12bf01a9d204b523",
|
|
|
510bcc2 |
@@ -379,6 +380,7 @@ static const ecdh_cavs_kat_t ecdh_cavs_k
|
|
|
510bcc2 |
"a6b29632db94da2125dc1cf80e03702687b2acc1122022fa2174765a",
|
|
|
510bcc2 |
"61723edd73e10daed73775278f1958ba56f1fc9d085ebc2b64c84fe5",
|
|
|
510bcc2 |
"71954e2261e8510be1a060733671d2e9d0a2d012eb4e09556d697d2a" },
|
|
|
510bcc2 |
+#endif
|
|
|
510bcc2 |
{ NID_X9_62_prime256v1,
|
|
|
510bcc2 |
"700c48f77f56584c5cc632ca65640db91b6bacce3a4df6b42ce7cc838833d287",
|
|
|
510bcc2 |
"db71e509e3fd9b060ddb20ba5c51dcc5948d46fbf640dfe0441782cab85fa4ac",
|
|
|
510bcc2 |
diff -up openssl-1.1.0b/test/ecdhtest.c.build openssl-1.1.0b/test/ecdhtest.c
|
|
|
510bcc2 |
--- openssl-1.1.0b/test/ecdhtest.c.build 2016-09-26 11:46:08.000000000 +0200
|
|
|
510bcc2 |
+++ openssl-1.1.0b/test/ecdhtest.c 2016-09-26 15:16:26.936660171 +0200
|
|
|
510bcc2 |
@@ -252,6 +252,7 @@ typedef struct {
|
|
|
510bcc2 |
|
|
|
510bcc2 |
static const ecdh_kat_t ecdh_kats[] = {
|
|
|
510bcc2 |
/* Keys and shared secrets from RFC 5114 */
|
|
|
510bcc2 |
+#if 0
|
|
|
510bcc2 |
{ NID_X9_62_prime192v1,
|
|
|
510bcc2 |
"323FA3169D8E9C6593F59476BC142000AB5BE0E249C43426",
|
|
|
510bcc2 |
"631F95BB4A67632C9C476EEE9AB695AB240A0499307FCF62",
|
|
|
510bcc2 |
@@ -260,6 +261,7 @@ static const ecdh_kat_t ecdh_kats[] = {
|
|
|
510bcc2 |
"B558EB6C288DA707BBB4F8FBAE2AB9E9CB62E3BC5C7573E22E26D37F",
|
|
|
510bcc2 |
"AC3B1ADD3D9770E6F6A708EE9F3B8E0AB3B480E9F27F85C88B5E6D18",
|
|
|
510bcc2 |
"52272F50F46F4EDC9151569092F46DF2D96ECC3B6DC1714A4EA949FA" },
|
|
|
510bcc2 |
+#endif
|
|
|
510bcc2 |
{ NID_X9_62_prime256v1,
|
|
|
510bcc2 |
"814264145F2F56F2E96A8E337A1284993FAF432A5ABCE59E867B7291D507A3AF",
|
|
|
510bcc2 |
"2CE1788EC197E096DB95A200CC0AB26A19CE6BCCAD562B8EEE1B593761CF7F41",
|
|
|
510bcc2 |
@@ -303,6 +305,7 @@ static const ecdh_kat_t ecdh_kats[] = {
|
|
|
510bcc2 |
"01144C7D79AE6956BC8EDB8E7C787C4521CB086FA64407F97894E5E6B2D79B04"
|
|
|
510bcc2 |
"D1427E73CA4BAA240A34786859810C06B3C715A3A8CC3151F2BEE417996D19F3"
|
|
|
510bcc2 |
"DDEA" },
|
|
|
510bcc2 |
+#if 0
|
|
|
510bcc2 |
/* Keys and shared secrets from RFC 7027 */
|
|
|
510bcc2 |
{ NID_brainpoolP256r1,
|
|
|
510bcc2 |
"81DB1EE100150FF2EA338D708271BE38300CB54241D79950F77B063039804F1D",
|
|
|
510bcc2 |
@@ -322,6 +325,7 @@ static const ecdh_kat_t ecdh_kats[] = {
|
|
|
510bcc2 |
"ABBC19963DAB8E2F1EBA00BFFB29E4D72D13F2224562F405CB80503666B25429",
|
|
|
510bcc2 |
"A7927098655F1F9976FA50A9D566865DC530331846381C87256BAF3226244B76"
|
|
|
510bcc2 |
"D36403C024D7BBF0AA0803EAFF405D3D24F11A9B5C0BEF679FE1454B21C4CD1F" }
|
|
|
510bcc2 |
+#endif
|
|
|
510bcc2 |
};
|
|
|
510bcc2 |
|
|
|
510bcc2 |
/* Given private value and NID, create EC_KEY structure */
|
|
|
510bcc2 |
diff -up openssl-1.1.0b/test/ecdsatest.c.build openssl-1.1.0b/test/ecdsatest.c
|
|
|
510bcc2 |
--- openssl-1.1.0b/test/ecdsatest.c.build 2016-09-26 11:46:08.000000000 +0200
|
|
|
510bcc2 |
+++ openssl-1.1.0b/test/ecdsatest.c 2016-09-26 15:16:26.936660171 +0200
|
|
|
510bcc2 |
@@ -216,6 +216,7 @@ int x9_62_tests(BIO *out)
|
|
|
510bcc2 |
if (!change_rand())
|
|
|
510bcc2 |
goto x962_err;
|
|
|
510bcc2 |
|
|
|
510bcc2 |
+#if 0
|
|
|
510bcc2 |
if (!x9_62_test_internal(out, NID_X9_62_prime192v1,
|
|
|
510bcc2 |
"3342403536405981729393488334694600415596881826869351677613",
|
|
|
510bcc2 |
"5735822328888155254683894997897571951568553642892029982342"))
|
|
|
510bcc2 |
@@ -226,6 +227,7 @@ int x9_62_tests(BIO *out)
|
|
|
510bcc2 |
"3238135532097973577080787768312505059318910517550078427819"
|
|
|
510bcc2 |
"78505179448783"))
|
|
|
510bcc2 |
goto x962_err;
|
|
|
510bcc2 |
+#endif
|
|
|
510bcc2 |
# ifndef OPENSSL_NO_EC2M
|
|
|
510bcc2 |
if (!x9_62_test_internal(out, NID_X9_62_c2tnb191v1,
|
|
|
510bcc2 |
"87194383164871543355722284926904419997237591535066528048",
|