From: Andy Polyakov Date: Mon, 23 Oct 2006 07:38:30 +0000 (+0000) Subject: Switch Win32/64 targets to Winsock2. Updates to ISNTALL.W32 cover even X-Git-Tag: OpenSSL_0_9_8k^2~1095 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3189772e07dafe359f84ada71001515127bc396d;p=oweals%2Fopenssl.git Switch Win32/64 targets to Winsock2. Updates to ISNTALL.W32 cover even recent mingw modifications. --- diff --git a/CHANGES b/CHANGES index ec05bca41b..41efec4a88 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,9 @@ Changes between 0.9.8e and 0.9.9 [xx XXX xxxx] + *) Win32/64 targets are linked with Winsock2. + [Andy Polyakov] + *) Add an X509_CRL_METHOD structure to allow CRL processing to be redirected to external functions. This can be used to increase CRL handling efficiency especially when CRLs are very large by (for example) storing diff --git a/Configure b/Configure index 5715b2ce67..2eba60da82 100755 --- a/Configure +++ b/Configure @@ -477,7 +477,7 @@ my %table=( "BC-32","bcc32::::WIN32::BN_LLONG DES_PTR RC4_INDEX EXPORT_VAR_AS_FN:${no_asm}:win32", # MinGW -"mingw", "gcc:-mno-cygwin -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall -D_WIN32_WINNT=0x333:::MINGW32:-lwsock32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_coff_asm}:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:-mno-cygwin -shared:.dll.a", +"mingw", "gcc:-mno-cygwin -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::MINGW32:-lws2_32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_coff_asm}:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:-mno-cygwin -shared:.dll.a", # UWIN "UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall:::UWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32", diff --git a/INSTALL.W32 b/INSTALL.W32 index 868bb23dc9..76beee3182 100644 --- a/INSTALL.W32 +++ b/INSTALL.W32 @@ -5,19 +5,30 @@ [Instructions for building for Windows CE can be found in INSTALL.WCE] [Instructions for building for Win64 can be found in INSTALL.W64] - Heres a few comments about building OpenSSL in Windows environments. Most - of this is tested on Win32 but it may also work in Win 3.1 with some - modification. + Here are a few comments about building OpenSSL for Win32 environments, + such as Windows NT and Windows 9x. It should be noted though that + Windows 9x are not ordinarily tested. Its mention merely means that we + attempt to maintain certain programming discipline and pay attention + to backward compatibility issues, in other words it's kind of expected + to work on Windows 9x, but no regression tests are actually performed. - You need Perl for Win32. Unless you will build on Cygwin, you will need - ActiveState Perl, available from http://www.activestate.com/ActivePerl. + On additional note newer OpenSSL versions are compiled and linked with + Winsock 2. This means that minimum OS requirement was elevated to NT 4 + and Windows 98 [there is Winsock 2 update for Windows 95 though]. - and one of the following C compilers: + - you need Perl for Win32. Unless you will build on Cygwin, you will need + ActiveState Perl, available from http://www.activestate.com/ActivePerl. + + - one of the following C compilers: * Visual C++ * Borland C * GNU C (Cygwin or MinGW) +- even though optional for non-gcc builds, Netwide Assembler, a.k.a. + NASM, available from http://sourceforge.net/projects/nasm is + recommended. + If you are compiling from a tarball or a CVS snapshot then the Win32 files may well be not up to date. This may mean that some "tweaking" is required to get it all to work. See the trouble shooting section later on for if (when?) @@ -26,22 +37,18 @@ Visual C++ ---------- - If you want to compile in the assembly language routines with Visual C++ then - you will need an assembler. This is worth doing because it will result in - faster code: for example it will typically result in a 2 times speedup in the - RSA routines. Assembler choice is limited to Free Netwise Assember, NASM, - available for download from http://sourceforge.net/projects/nasm/, even in - binary form. The NASM binary, nasmw.exe needs to be installed anywhere on - your %PATH%. + If you want to compile in the assembly language routines with Visual + C++, then you will need already mentioned Netwide Assembler binary, + nasmw.exe, to be available on your %PATH%. Firstly you should run Configure: > perl Configure VC-WIN32 --prefix=c:/some/openssl/dir -Where the prefix argument specifies where OpenSSL will be installed to. + Where the prefix argument specifies where OpenSSL will be installed to. - Next you need to build the Makefiles and optionally the assembly language - files: + Next you need to build the Makefiles and optionally the assembly + language files: - If you are using NASM then run: @@ -59,36 +66,37 @@ Where the prefix argument specifies where OpenSSL will be installed to. > nmake -f ms\ntdll.mak - If all is well it should compile and you will have some DLLs and executables - in out32dll. If you want to try the tests then do: + If all is well it should compile and you will have some DLLs and + executables in out32dll. If you want to try the tests then do: > nmake -f ms\ntdll.mak test -To install OpenSSL to the specified location do: + To install OpenSSL to the specified location do: -> nmake -f ms\ntdll.mak install + > nmake -f ms\ntdll.mak install Tweaks: - There are various changes you can make to the Win32 compile environment. By - default the library is not compiled with debugging symbols. If you add 'debug' - to the mk1mf.pl lines in the do_* batch file then debugging symbols will be - compiled in. Note that mk1mf.pl expects the platform to be the last argument - on the command line, so 'debug' must appear before that, as all other options. + There are various changes you can make to the Win32 compile + environment. By default the library is not compiled with debugging + symbols. If you add 'debug' to the mk1mf.pl lines in the do_* batch + file then debugging symbols will be compiled in. Note that mk1mf.pl + expects the platform to be the last argument on the command line, so + 'debug' must appear before that, as all other options. - By default in 0.9.8 OpenSSL will compile builtin ENGINES into the libeay32.dll - shared library. If you specify the "no-static-engine" option on the command - line to Configure the shared library build (ms\ntdll.mak) will compile the - engines as separate DLLs. + By default in 0.9.8 OpenSSL will compile builtin ENGINES into the + libeay32.dll shared library. If you specify the "no-static-engine" + option on the command line to Configure the shared library build + (ms\ntdll.mak) will compile the engines as separate DLLs. The default Win32 environment is to leave out any Windows NT specific features. - If you want to enable the NT specific features of OpenSSL (currently only the - logging BIO) follow the instructions above but call the batch file do_nt.bat - instead of do_ms.bat. + If you want to enable the NT specific features of OpenSSL (currently + only the logging BIO) follow the instructions above but call the batch + file do_nt.bat instead of do_ms.bat. You can also build a static version of the library using the Makefile ms\nt.mak @@ -120,17 +128,13 @@ To install OpenSSL to the specified location do: GNU C (Cygwin) -------------- - Cygwin provides a bash shell and GNU tools environment running - on NT 4.0, Windows 9x, Windows ME, Windows 2000, and Windows XP. - Consequently, a make of OpenSSL with Cygwin is closer to a GNU - bash environment such as Linux than to other the other Win32 - makes. - - Cygwin implements a Posix/Unix runtime system (cygwin1.dll). - It is also possible to create Win32 binaries that only use the - Microsoft C runtime system (msvcrt.dll or crtdll.dll) using - MinGW. MinGW can be used in the Cygwin development environment - or in a standalone setup as described in the following section. + Cygwin implements a Posix/Unix runtime system (cygwin1.dll) on top of + Win32 subsystem and provides a bash shell and GNU tools environment. + Consequently, a make of OpenSSL with Cygwin is virtually identical to + Unix procedure. It is also possible to create Win32 binaries that only + use the Microsoft C runtime system (msvcrt.dll or crtdll.dll) using + MinGW. MinGW can be used in the Cygwin development environment or in a + standalone setup as described in the following section. To build OpenSSL using Cygwin: @@ -175,35 +179,35 @@ To install OpenSSL to the specified location do: non-fatal error in "make test" but is otherwise harmless. If desired and needed, GNU bc can be built with Cygwin without change. - GNU C (MinGW) + GNU C (MinGW/MSYS) ------------- - * Compiler installation: + * Compiler and shell environment installation: - MinGW is available from http://www.mingw.org. Run the installer and - set the MinGW bin directory to the PATH in "System Properties" or - autoexec.bat. + MinGW and MSYS are available from http://www.mingw.org/, both are + required. Run the installers and do whatever magic they say it takes + to start MSYS bash shell with GNU tools on its PATH. * Compile OpenSSL: - > ms\mingw32 + $ ./config + [...] + $ make + [...] + $ make test + + This will create the library and binaries in root source directory + and openssl.exe application in apps directory. - This will create the library and binaries in out. In case any problems - occur, try - > ms\mingw32 no-asm - instead. + It is also possible to cross-compile it on Linux by configuring + with './Configure --cross-compile-prefix=i386-mingw32- mingw ...'. + 'make test' is naturally not applicable then. libcrypto.a and libssl.a are the static libraries. To use the DLLs, link with libeay32.a and libssl32.a instead. - See troubleshooting if you get error messages about functions not having - a number assigned. - - * You can now try the tests: - - > cd out - > ..\ms\test - + See troubleshooting if you get error messages about functions not + having a number assigned. Installation ------------ @@ -290,13 +294,13 @@ To install OpenSSL to the specified location do: If you link with static OpenSSL libraries [those built with ms/nt.mak], then you're expected to additionally link your application with - WSOCK32.LIB, ADVAPI32.LIB, GDI32.LIB and USER32.LIB. Those developing + WS2_32.LIB, ADVAPI32.LIB, GDI32.LIB and USER32.LIB. Those developing non-interactive service applications might feel concerned about linking - with latter two, as they are justly associated with interactive desktop, - which is not available to service processes. The toolkit is designed - to detect in which context it's currently executed, GUI, console app - or service, and act accordingly, namely whether or not to actually make - GUI calls. + with the latter two, as they are justly associated with interactive + desktop, which is not available to service processes. The toolkit is + designed to detect in which context it's currently executed, GUI, + console app or service, and act accordingly, namely whether or not to + actually make GUI calls. If you link with OpenSSL .DLLs, then you're expected to include into your application code small "shim" snippet, which provides glue between diff --git a/TABLE b/TABLE index 4e97ed4233..e840a0f2b6 100644 --- a/TABLE +++ b/TABLE @@ -3194,11 +3194,11 @@ $arflags = *** mingw $cc = gcc -$cflags = -mno-cygwin -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall -D_WIN32_WINNT=0x333 +$cflags = -mno-cygwin -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall $unistd = $thread_cflag = $sys_id = MINGW32 -$lflags = -lwsock32 -lgdi32 +$lflags = -lws2_32 -lgdi32 $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT EXPORT_VAR_AS_FN $cpuid_obj = x86cpuid-cof.o $bn_obj = bn86-cof.o co86-cof.o mo86-cof.o diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl index f24b9f62f0..1140cfb0c5 100644 --- a/util/pl/VC-32.pl +++ b/util/pl/VC-32.pl @@ -127,7 +127,7 @@ $efile="/out:"; $exep='.exe'; if ($no_sock) { $ex_libs=''; } elsif ($FLAVOR =~ /CE/) { $ex_libs='winsock.lib'; } -else { $ex_libs='wsock32.lib'; } +else { $ex_libs='ws2_32.lib'; } if ($FLAVOR =~ /CE/) { @@ -280,7 +280,7 @@ sub do_lib_rule else { $ex.=' unicows.lib' if ($FLAVOR =~ /NT/); - $ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib'; + $ex.=' ws2_32.lib gdi32.lib advapi32.lib user32.lib'; $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/); } $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;