18d4c92f7Struckmandiff -ur misc/openssl-1.0.2h/Configure misc/build/openssl-1.0.2h/Configure 28d4c92f7Struckman--- misc/openssl-1.0.2h/Configure 2016-05-03 06:44:42.000000000 -0700 38d4c92f7Struckman+++ misc/build/openssl-1.0.2h/Configure 2016-08-14 23:51:42.672229000 -0700 48d4c92f7Struckman@@ -475,19 +475,20 @@ 58d4c92f7Struckman "android-mips","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -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)", 68d4c92f7Struckman 78d4c92f7Struckman #### *BSD [do see comment about ${BSDthreads} above!] 88d4c92f7Struckman-"BSD-generic32","gcc:-O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 98d4c92f7Struckman-"BSD-x86", "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 108d4c92f7Struckman-"BSD-x86-elf", "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 118d4c92f7Struckman-"debug-BSD-x86-elf", "gcc:-DL_ENDIAN -O3 -Wall -g::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 128d4c92f7Struckman-"BSD-sparcv8", "gcc:-DB_ENDIAN -O3 -mcpu=v8 -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 138d4c92f7Struckman+"BSD-generic32","$ENV{'FREEBSDCC'}:-O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", 148d4c92f7Struckman+"BSD-x86", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)", 158d4c92f7Struckman+"BSD-x86-elf", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)", 168d4c92f7Struckman+"debug-BSD-x86-elf", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -O3 -Wall -g $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)", 178d4c92f7Struckman+"BSD-sparcv8", "$ENV{'FREEBSDCC'}:-DB_ENDIAN -O3 -mcpu=v8 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", 188d4c92f7Struckman 198d4c92f7Struckman-"BSD-generic64","gcc:-O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 208d4c92f7Struckman+"BSD-generic64","$ENV{'FREEBSDCC'}:-O3 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", 218d4c92f7Struckman # -DMD32_REG_T=int doesn't actually belong in sparc64 target, it 228d4c92f7Struckman # simply *happens* to work around a compiler bug in gcc 3.3.3, 238d4c92f7Struckman # triggered by RIPEMD160 code. 248d4c92f7Struckman-"BSD-sparc64", "gcc:-DB_ENDIAN -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:${sparcv9_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 258d4c92f7Struckman-"BSD-ia64", "gcc:-DL_ENDIAN -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 268d4c92f7Struckman-"BSD-x86_64", "cc:-DL_ENDIAN -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 278d4c92f7Struckman+"BSD-sparc64", "$ENV{'FREEBSDCC'}:-DB_ENDIAN -O3 -DMD32_REG_T=int -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:${sparcv9_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", 288d4c92f7Struckman+"BSD-ia64", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -O3 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", 298d4c92f7Struckman+"BSD-x86_64", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -O3 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", 308d4c92f7Struckman+"BSD-alpha", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -O -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)", 318d4c92f7Struckman 328d4c92f7Struckman "bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 338d4c92f7Struckman 348d4c92f7Struckman@@ -2031,10 +2032,12 @@ 358d4c92f7Struckman if ( $perl =~ m@^/@) { 368d4c92f7Struckman &dofile("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";', '^my \$prefix;$', 'my $prefix = "' . $prefix . '";'); 378d4c92f7Struckman &dofile("apps/CA.pl",$perl,'^#!/', '#!%s'); 388d4c92f7Struckman+ &dofile("apps/tsget",$perl,'^#!/', '#!%s'); 398d4c92f7Struckman } else { 408d4c92f7Struckman # No path for Perl known ... 418d4c92f7Struckman &dofile("tools/c_rehash",'/usr/local/bin/perl','^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";', '^my \$prefix;$', 'my $prefix = "' . $prefix . '";'); 428d4c92f7Struckman &dofile("apps/CA.pl",'/usr/local/bin/perl','^#!/', '#!%s'); 438d4c92f7Struckman+ &dofile("apps/tsget",'/usr/local/bin/perl',,'^#!/', '#!%s'); 448d4c92f7Struckman } 458d4c92f7Struckman if ($depflags ne $default_depflags && !$make_depend) { 468d4c92f7Struckman $warn_make_depend++; 478d4c92f7Struckmandiff -ur misc/openssl-1.0.2h/config misc/build/openssl-1.0.2h/config 488d4c92f7Struckman--- misc/openssl-1.0.2h/config 2016-05-03 06:44:42.000000000 -0700 498d4c92f7Struckman+++ misc/build/openssl-1.0.2h/config 2016-08-15 00:25:50.870874000 -0700 508d4c92f7Struckman@@ -753,14 +753,8 @@ 518d4c92f7Struckman sparc64-*-*bsd*) OUT="BSD-sparc64" ;; 528d4c92f7Struckman ia64-*-*bsd*) OUT="BSD-ia64" ;; 538d4c92f7Struckman amd64-*-*bsd*) OUT="BSD-x86_64" ;; 548d4c92f7Struckman- *86*-*-*bsd*) # mimic ld behaviour when it's looking for libc... 558d4c92f7Struckman- if [ -L /usr/lib/libc.so ]; then # [Free|Net]BSD 568d4c92f7Struckman- libc=/usr/lib/libc.so 578d4c92f7Struckman- else # OpenBSD 588d4c92f7Struckman- # ld searches for highest libc.so.* and so do we 598d4c92f7Struckman- libc=`(ls /usr/lib/libc.so.* /lib/libc.so.* | tail -1) 2>/dev/null` 608d4c92f7Struckman- fi 618d4c92f7Struckman- case "`(file -L $libc) 2>/dev/null`" in 628d4c92f7Struckman+ *86*-*-*bsd*) 638d4c92f7Struckman+ case "`(file -L /bin/sh) 2>/dev/null`" in 648d4c92f7Struckman *ELF*) OUT="BSD-x86-elf" ;; 658d4c92f7Struckman *) OUT="BSD-x86"; options="$options no-sse2" ;; 668d4c92f7Struckman esac ;; 678d4c92f7Struckmandiff -ur misc/openssl-1.0.2h/ms/do_ms.bat misc/build/openssl-1.0.2h/ms/do_ms.bat 688d4c92f7Struckman--- misc/openssl-1.0.2h/ms/do_ms.bat 2016-05-03 06:44:42.000000000 -0700 698d4c92f7Struckman+++ misc/build/openssl-1.0.2h/ms/do_ms.bat 2016-08-14 23:49:39.418111000 -0700 70cdf0e10cSrcweir@@ -1,11 +1,11 @@ 71cdf0e10cSrcweir 72cdf0e10cSrcweir-perl util\mkfiles.pl >MINFO 73cdf0e10cSrcweir-perl util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak 74cdf0e10cSrcweir-perl util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak 75cdf0e10cSrcweir+%1 util\mkfiles.pl >MINFO 76cdf0e10cSrcweir+%1 util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak 77cdf0e10cSrcweir+%1 util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak 78cdf0e10cSrcweir if x%OSVERSION% == x goto skipce 79cdf0e10cSrcweir-perl util\mk1mf.pl no-asm VC-CE >ms\ce.mak 80cdf0e10cSrcweir-perl util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak 81cdf0e10cSrcweir+%1 util\mk1mf.pl no-asm VC-CE >ms\ce.mak 82cdf0e10cSrcweir+%1 util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak 83cdf0e10cSrcweir :skipce 84cdf0e10cSrcweir 85cdf0e10cSrcweir-perl util\mkdef.pl 32 libeay > ms\libeay32.def 86cdf0e10cSrcweir-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def 87cdf0e10cSrcweir+%1 util\mkdef.pl 32 libeay > ms\libeay32.def 88cdf0e10cSrcweir+%1 util\mkdef.pl 32 ssleay > ms\ssleay32.def 898d4c92f7Struckmandiff -ur misc/openssl-1.0.2h/util/mk1mf.pl misc/build/openssl-1.0.2h/util/mk1mf.pl 908d4c92f7Struckman--- misc/openssl-1.0.2h/util/mk1mf.pl 2016-05-03 06:44:42.000000000 -0700 918d4c92f7Struckman+++ misc/build/openssl-1.0.2h/util/mk1mf.pl 2016-08-14 23:49:39.419397000 -0700 928d4c92f7Struckman@@ -163,7 +163,7 @@ 93cdf0e10cSrcweir $inc_def="outinc"; 94cdf0e10cSrcweir $tmp_def="tmp"; 95cdf0e10cSrcweir 96cdf0e10cSrcweir-$perl="perl" unless defined $perl; 97cdf0e10cSrcweir+$perl="$ENV{PERL}" unless defined $perl; 98cdf0e10cSrcweir $mkdir="-mkdir" unless defined $mkdir; 99cdf0e10cSrcweir 100cdf0e10cSrcweir ($ssl,$crypto)=("ssl","crypto"); 1018d4c92f7Struckman@@ -345,6 +345,11 @@ 1028d4c92f7Struckman s/\s*$//; # was chop, didn't work in mixture of perls for Windows... 103cdf0e10cSrcweir 104cdf0e10cSrcweir ($key,$val)=/^([^=]+)=(.*)/; 105cdf0e10cSrcweir+ 106cdf0e10cSrcweir+ # On some Windows machines, $val has linefeeds at the end, which confuses 107cdf0e10cSrcweir+ # subsequent code in this file. So we strip all whitespace at the end. 108cdf0e10cSrcweir+ $val =~ s/\s+$//; 109cdf0e10cSrcweir+ 110cdf0e10cSrcweir if ($key eq "RELATIVE_DIRECTORY") 111cdf0e10cSrcweir { 112cdf0e10cSrcweir if ($lib ne "") 1138d4c92f7Struckmandiff -ur misc/openssl-1.0.2h/util/pl/VC-32.pl misc/build/openssl-1.0.2h/util/pl/VC-32.pl 1148d4c92f7Struckman--- misc/openssl-1.0.2h/util/pl/VC-32.pl 2016-05-03 06:44:42.000000000 -0700 1158d4c92f7Struckman+++ misc/build/openssl-1.0.2h/util/pl/VC-32.pl 2016-08-14 23:49:39.420331000 -0700 1168d4c92f7Struckman@@ -30,7 +30,7 @@ 1178d4c92f7Struckman my $ff = ""; 118cdf0e10cSrcweir 119cdf0e10cSrcweir # C compiler stuff 120cdf0e10cSrcweir-$cc='cl'; 121cdf0e10cSrcweir+$cc=$ENV{'CC'}; 122cdf0e10cSrcweir if ($FLAVOR =~ /WIN64/) 123cdf0e10cSrcweir { 124cdf0e10cSrcweir # Note that we currently don't have /WX on Win64! There is a lot of 125*f26b964fSDamjan Jovanovicdiff -Nur misc/build/openssl-1.0.2h/ms/do_win64a.bat misc/build/openssl-1.0.2h/ms/do_win64a.bat 126*f26b964fSDamjan Jovanovic--- misc/build/openssl-1.0.2h/ms/do_win64a.bat 2016-05-03 15:44:42.000000000 +0200 127*f26b964fSDamjan Jovanovic+++ misc/build/openssl-1.0.2h/ms/do_win64a.bat 2018-03-07 07:59:41.870638000 +0200 128*f26b964fSDamjan Jovanovic@@ -1,19 +1,19 @@ 129*f26b964fSDamjan Jovanovic-perl util\mkfiles.pl >MINFO 130*f26b964fSDamjan Jovanovic+%1 util\mkfiles.pl >MINFO 131*f26b964fSDamjan Jovanovic 132*f26b964fSDamjan Jovanovic cmd /c "nasm -f win64 -v" >NUL 2>&1 133*f26b964fSDamjan Jovanovic if %errorlevel% neq 0 goto ml64 134*f26b964fSDamjan Jovanovic 135*f26b964fSDamjan Jovanovic-perl ms\uplink-x86_64.pl nasm > ms\uptable.asm 136*f26b964fSDamjan Jovanovic+%1 ms\uplink-x86_64.pl nasm > ms\uptable.asm 137*f26b964fSDamjan Jovanovic nasm -f win64 -o ms\uptable.obj ms\uptable.asm 138*f26b964fSDamjan Jovanovic goto proceed 139*f26b964fSDamjan Jovanovic 140*f26b964fSDamjan Jovanovic :ml64 141*f26b964fSDamjan Jovanovic-perl ms\uplink-x86_64.pl masm > ms\uptable.asm 142*f26b964fSDamjan Jovanovic+%1 ms/uplink-x86_64.pl masm > ms/uptable.asm 143*f26b964fSDamjan Jovanovic ml64 -c -Foms\uptable.obj ms\uptable.asm 144*f26b964fSDamjan Jovanovic 145*f26b964fSDamjan Jovanovic :proceed 146*f26b964fSDamjan Jovanovic-perl util\mk1mf.pl VC-WIN64A >ms\nt.mak 147*f26b964fSDamjan Jovanovic-perl util\mk1mf.pl dll VC-WIN64A >ms\ntdll.mak 148*f26b964fSDamjan Jovanovic+%1 util\mk1mf.pl VC-WIN64A >ms\nt.mak 149*f26b964fSDamjan Jovanovic+%1 util\mk1mf.pl dll VC-WIN64A >ms\ntdll.mak 150*f26b964fSDamjan Jovanovic 151*f26b964fSDamjan Jovanovic-perl util\mkdef.pl 32 libeay > ms\libeay32.def 152*f26b964fSDamjan Jovanovic-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def 153*f26b964fSDamjan Jovanovic+%1 util\mkdef.pl 32 libeay > ms\libeay32.def 154*f26b964fSDamjan Jovanovic+%1 util\mkdef.pl 32 ssleay > ms\ssleay32.def 155