Skip to content

Commit

Permalink
updated openssl to build for all flavors; updated README; removed scr…
Browse files Browse the repository at this point in the history
…ipt prepare_for_clamav that is now handled in clamav directly
  • Loading branch information
fdechelle committed Jun 16, 2016
1 parent a5b7091 commit e3005aa
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 26 deletions.
2 changes: 1 addition & 1 deletion openssl/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Instructions

You need to Python 2.7 or 3.5 installed and on your PATH. Same for Perl (ActivePerl has been tested).

Download openssl sources tarball tar.gz file in C:\\<...>\\armadito-windows-dependencies\\openssl\\src.
Download openssl sources tarball tar.gz file in C:\\<...>\\armadito-windeps\\openssl\\src.

Note: It has been tested with 1.0.1<N> actually. You are free to try other versions anyway.
If you want to compile openssl versions 1.0.2X, you need to uncomment following line multiple times in rebuild_*.cmd file : "call ms\do_nasm.bat".
Expand Down
15 changes: 0 additions & 15 deletions openssl/build_openssl/prepare_for_clamav_vs2013.bat

This file was deleted.

20 changes: 10 additions & 10 deletions openssl/build_openssl/rebuild_openssl_vs2013.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,27 @@ ren openssl-%OPENSSL_VERSION% openssl-src-win64-VS2013
CALL %VS2013%

cd \openssl-src-win32-VS2013
perl Configure VC-WIN32 --prefix=T:\openssl-%OPENSSL_VERSION%-32bit-release-DLL-VS2013
perl Configure VC-WIN32 --prefix=T:\openssl-%OPENSSL_VERSION%-32bit-Release-DLL-VS2013
call ms\do_ms.bat
REM call ms\do_nasm.bat
nmake -f ms\ntdll.mak
nmake -f ms\ntdll.mak install

REM perl Configure debug-VC-WIN32 --prefix=T:\openssl-%OPENSSL_VERSION%-32bit-debug-DLL-VS2013
REM call ms\do_ms.bat
perl Configure debug-VC-WIN32 --prefix=T:\openssl-%OPENSSL_VERSION%-32bit-Debug-DLL-VS2013
call ms\do_ms.bat
REM call ms\do_nasm.bat
REM nmake -f ms\ntdll.mak
REM nmake -f ms\ntdll.mak install
nmake -f ms\ntdll.mak
nmake -f ms\ntdll.mak install

CALL %VS2013_AMD64%

cd \openssl-src-win64-VS2013
perl Configure VC-WIN64A --prefix=T:\openssl-%OPENSSL_VERSION%-64bit-release-DLL-VS2013
perl Configure VC-WIN64A --prefix=T:\openssl-%OPENSSL_VERSION%-64bit-Release-DLL-VS2013
call ms\do_win64a.bat
nmake -f ms\ntdll.mak
nmake -f ms\ntdll.mak install

REM perl Configure debug-VC-WIN64A --prefix=T:\openssl-%OPENSSL_VERSION%-64bit-debug-DLL-VS2013
REM call ms\do_win64a.bat
REM nmake -f ms\ntdll.mak
REM nmake -f ms\ntdll.mak install
perl Configure debug-VC-WIN64A --prefix=T:\openssl-%OPENSSL_VERSION%-64bit-Debug-DLL-VS2013
call ms\do_win64a.bat
nmake -f ms\ntdll.mak
nmake -f ms\ntdll.mak install

0 comments on commit e3005aa

Please sign in to comment.