summaryrefslogtreecommitdiffstats
path: root/install-win32/openssl/openssl097.patch
blob: 1a041cfe74419430a8dd8c8cc1b9b43221a64db1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
[in msys bash window]
cd /c/src/openssl-0.9.7m
patch -p1 <../21/install-win32/openssl.patch

[open command prompt window]
cd \src\openssl-0.9.7m
ms\mw

diff -wur openssl-0.9.7m.orig/ms/mw.bat openssl-0.9.7m/ms/mw.bat
--- openssl-0.9.7m.orig/ms/mw.bat	Sat Feb 22 11:02:46 2003
+++ openssl-0.9.7m/ms/mw.bat	Mon Jan 21 23:12:34 2008
@@ -1,17 +1,23 @@
 @rem OpenSSL with Mingw32
 @rem --------------------
 
+@rem Include MinGW, MSYS, and ActiveState Perl in path
+set PATH=c:\perl\bin;c:\MinGW\bin;c:\msys\1.0\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem
+
 @rem Makefile
 perl util\mkfiles.pl >MINFO
-perl util\mk1mf.pl Mingw32 >ms\mingw32.mak

+perl util\mk1mf.pl no-idea no-mdc2 no-rc5 Mingw32 >ms\mingw32.mak
+
 @rem DLL definition files
-perl util\mkdef.pl 32 libeay >ms\libeay32.def

+perl util\mkdef.pl no-idea no-mdc2 no-rc5 32 libeay >ms\libeay32.def
 if errorlevel 1 goto end
-perl util\mkdef.pl 32 ssleay >ms\ssleay32.def

+perl util\mkdef.pl no-idea no-mdc2 no-rc5 32 ssleay >ms\ssleay32.def
 if errorlevel 1 goto end
 
 @rem Build the libraries
-make -f ms/mingw32.mak

+
+@rem JY added --win32 flag
+make --win32 -f ms/mingw32.mak
 if errorlevel 1 goto end
 
 @rem Generate the DLLs and input libraries
@@ -20,7 +26,9 @@
 dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a
 if errorlevel 1 goto end
 
+@rem JY added openssl.exe linked to DLL
+gcc -o openssl  tmp\verify.o tmp\asn1pars.o tmp\req.o tmp\dgst.o tmp\dh.o tmp\dhparam.o tmp\enc.o tmp\passwd.o tmp\gendh.o tmp\errstr.o tmp\ca.o tmp\pkcs7.o tmp\crl2p7.o tmp\crl.o tmp\rsa.o tmp\rsautl.o tmp\dsa.o tmp\dsaparam.o tmp\x509.o tmp\genrsa.o tmp\gendsa.o tmp\s_server.o tmp\s_client.o tmp\speed.o tmp\s_time.o tmp\apps.o tmp\s_cb.o tmp\s_socket.o tmp\app_rand.o tmp\version.o tmp\sess_id.o tmp\ciphers.o tmp\nseq.o tmp\pkcs12.o tmp\pkcs8.o tmp\spkac.o tmp\smime.o tmp\rand.o tmp\engine.o tmp\ocsp.o tmp\prime.o tmp\openssl.o -leay32 -lssl32 -L. -lwsock32 -lgdi32
+
 echo Done compiling OpenSSL
 
 :end
-

diff -wur openssl-0.9.7m.orig/util/pl/Mingw32.pl openssl-0.9.7m/util/pl/Mingw32.pl
--- openssl-0.9.7m.orig/util/pl/Mingw32.pl	Sun May 16 23:28:32 2004
+++ openssl-0.9.7m/util/pl/Mingw32.pl	Mon Jan 21 17:52:36 2008
@@ -99,10 +99,10 @@
 	$n=&bname($target);
 	$ret.="$target: $files $dep_libs\n";
 	$ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n";
-	if (defined $sha1file)
-		{
-		$ret.="\t$openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
-		}
+#	if (defined $sha1file)
+#		{
+#		$ret.="\t$openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
+#		}
 	$ret.="\n";
 	return($ret);
 	}