51 lines
4.3 KiB
Diff
51 lines
4.3 KiB
Diff
Index: openssl-1.0.2n/Configure
|
|
===================================================================
|
|
--- openssl-1.0.2n.orig/Configure 2018-01-18 15:15:33.392769115 +0800
|
|
+++ openssl-1.0.2n/Configure 2018-01-18 15:38:34.952329761 +0800
|
|
@@ -471,11 +471,11 @@
|
|
"linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
|
|
|
|
# OpenWrt targets
|
|
-"linux-armv4-openwrt","gcc:-DTERMIOS \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-armv4-openwrt","gcc:-DTERMIOS -DZYXEL_HTTPD_SSL_GENKEY \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
"linux-aarch64-openwrt","gcc:-DTERMIOS \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
"linux-x86_64-openwrt", "gcc:-m64 -DL_ENDIAN -DTERMIOS \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
|
|
-"linux-mips-openwrt","gcc:-DTERMIOS \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
-"linux-generic-openwrt","gcc:-DTERMIOS \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-mips-openwrt","gcc:-DTERMIOS -DZYXEL_HTTPD_SSL_GENKEY \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-generic-openwrt","gcc:-DTERMIOS -DZYXEL_HTTPD_SSL_GENKEY \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
|
|
# Android: linux-* but without pointers to headers and libs.
|
|
"android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
@@ -2115,7 +2115,7 @@
|
|
VALUE "ProductVersion", "$version\\0"
|
|
// Optional:
|
|
//VALUE "Comments", "\\0"
|
|
- VALUE "LegalCopyright", "Copyright © 1998-2005 The OpenSSL Project. Copyright © 1995-1998 Eric A. Young, Tim J. Hudson. All rights reserved.\\0"
|
|
+ VALUE "LegalCopyright", "Copyright ?1998-2005 The OpenSSL Project. Copyright ?1995-1998 Eric A. Young, Tim J. Hudson. All rights reserved.\\0"
|
|
//VALUE "LegalTrademarks", "\\0"
|
|
//VALUE "PrivateBuild", "\\0"
|
|
//VALUE "SpecialBuild", "\\0"
|
|
Index: openssl-1.0.2n/apps/req.c
|
|
===================================================================
|
|
--- openssl-1.0.2n.orig/apps/req.c 2017-12-07 21:16:38.000000000 +0800
|
|
+++ openssl-1.0.2n/apps/req.c 2018-01-18 15:36:23.712363703 +0800
|
|
@@ -798,10 +798,17 @@
|
|
|
|
if (!X509_set_issuer_name(x509ss, X509_REQ_get_subject_name(req)))
|
|
goto end;
|
|
+/* __ZyXEL__, Albert, 20151118, Auto generate unique SSH & CA keys */
|
|
+#ifdef ZYXEL_HTTPD_SSL_GENKEY
|
|
+ /* Lets just make it 12:00am GMT, Jan 1 2015 - 2025*/
|
|
+ ASN1_UTCTIME_set_string(X509_get_notBefore(x509ss),"150101120000Z");
|
|
+ ASN1_UTCTIME_set_string(X509_get_notAfter(x509ss) ,"250101120000Z");
|
|
+#else
|
|
if (!X509_gmtime_adj(X509_get_notBefore(x509ss), 0))
|
|
goto end;
|
|
if (!X509_time_adj_ex(X509_get_notAfter(x509ss), days, 0, NULL))
|
|
goto end;
|
|
+#endif
|
|
if (!X509_set_subject_name
|
|
(x509ss, X509_REQ_get_subject_name(req)))
|
|
goto end;
|