diff options
Diffstat (limited to 'install-win32/openssl')
| -rw-r--r-- | install-win32/openssl/README.txt | 21 | ||||
| -rw-r--r-- | install-win32/openssl/openssl097.patch | 68 | ||||
| -rw-r--r-- | install-win32/openssl/openssl098.patch | 56 |
3 files changed, 145 insertions, 0 deletions
diff --git a/install-win32/openssl/README.txt b/install-win32/openssl/README.txt new file mode 100644 index 0000000..6a042f4 --- /dev/null +++ b/install-win32/openssl/README.txt @@ -0,0 +1,21 @@ +Rebuild OpenSSL tarball without symbolic links, so +it can be extracted on Windows (run on Unix): + + [download tarball and .asc sig] + gpg --verify openssl-0.9.8k.tar.gz.asc + tar xfz openssl-0.9.8k.tar.gz + tar cfzh openssl-0.9.8k-nolinks.tar.gz openssl-0.9.8k + +To apply patch (in MSYS shell): + + cd /c/src/openssl-0.9.8k + patch -p1 <../21/install-win32/openssl/openssl098.patch + +To build OpenSSL, open a command prompt window, then: + + cd \src\openssl-0.9.8k + ms\mw + +To build a new patch (optional): + + diff -urw openssl-0.9.8k.orig openssl-0.9.8k | grep -v '^Only in' >openssl098.patch diff --git a/install-win32/openssl/openssl097.patch b/install-win32/openssl/openssl097.patch new file mode 100644 index 0000000..ccef40a --- /dev/null +++ b/install-win32/openssl/openssl097.patch @@ -0,0 +1,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); + } diff --git a/install-win32/openssl/openssl098.patch b/install-win32/openssl/openssl098.patch new file mode 100644 index 0000000..653d2fe --- /dev/null +++ b/install-win32/openssl/openssl098.patch @@ -0,0 +1,56 @@ +diff -urw tmp/openssl-0.9.8h/crypto/pqueue/pqueue.c openssl-0.9.8h/crypto/pqueue/pqueue.c +--- tmp/openssl-0.9.8h/crypto/pqueue/pqueue.c Tue Jun 28 06:53:34 2005 ++++ openssl-0.9.8h/crypto/pqueue/pqueue.c Wed Jun 4 02:52:42 2008 +@@ -199,10 +199,10 @@ + return found; + } + +-#if PQ_64BIT_IS_INTEGER + void + pqueue_print(pqueue_s *pq) + { ++#if PQ_64BIT_IS_INTEGER + pitem *item = pq->items; + + while(item != NULL) +@@ -210,8 +210,8 @@ + printf("item\t" PQ_64BIT_PRINT "\n", item->priority); + item = item->next; + } +- } + #endif ++ } + + pitem * + pqueue_iterator(pqueue_s *pq) +diff -urw tmp/openssl-0.9.8h/ms/mw.bat openssl-0.9.8h/ms/mw.bat +--- tmp/openssl-0.9.8h/ms/mw.bat Sat Feb 22 11:00:10 2003 ++++ openssl-0.9.8h/ms/mw.bat Wed Jun 4 02:56:54 2008 +@@ -1,17 +1,23 @@ + @rem OpenSSL with Mingw32 + @rem -------------------- + ++@rem Include MinGW, MSYS, and ActiveState Perl in path ++set PATH=c:\bin;C:\Perl\bin\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;c:\MinGW\bin;c:\msys\1.0\bin ++ + @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 ++make --win32 -f ms/mingw32.mak + if errorlevel 1 goto end + + @rem Generate the DLLs and input libraries |