generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge from main trunk, conflicts resolved.

Browse Source
This commit is contained in:
Richard Levitte 2000-10-14 21:15:41 +00:00
parent 868af8e4be
commit 757ab9b506
25 changed files with 457 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CHANGES
View File

@ -5,6 +5,28 @@
Changes between 0.9.6 and 0.9.7 [xx XXX 2000] Changes between 0.9.6 and 0.9.7 [xx XXX 2000]
*) Rework the system to generate shared libraries:
- Make note of the expected extension for the shared libraries and
if there is a need for symbolic links from for example libcrypto.so.0
to libcrypto.so.0.9.7. There is extended info in Configure for
that.
- Make as few rebuilds of the shared libraries as possible.
- Still avoid linking the OpenSSL programs with the shared libraries.
- When installing, install the shared libraries separately from the
static ones.
[Richard Levitte]
*) Fix for non blocking accept BIOs. Added new I/O special reason
BIO_RR_ACCEPT to cover this case. Previously use of accept BIOs
with non blocking I/O was not possible because no retry code was
implemented. Also added new SSL code SSL_WANT_ACCEPT to cover
this case.
[Steve Henson]
*) Added the beginnings of Rijndael support. *) Added the beginnings of Rijndael support.
[Ben Laurie] [Ben Laurie]

92
Configure
View File

@ -136,32 +136,32 @@ my %table=(
# surrounds it with #APP #NO_APP comment pair which (at least Solaris # surrounds it with #APP #NO_APP comment pair which (at least Solaris
# 7_x86) /usr/ccs/bin/as fails to assemble with "Illegal mnemonic" # 7_x86) /usr/ccs/bin/as fails to assemble with "Illegal mnemonic"
# error message. # error message.
"solaris-x86-gcc","gcc:-O3 -fomit-frame-pointer -m486 -Wall -DL_ENDIAN -DNO_INLINE_ASM::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_sol_asm}:dlfcn:solaris-shared:-fPIC", "solaris-x86-gcc","gcc:-O3 -fomit-frame-pointer -m486 -Wall -DL_ENDIAN -DNO_INLINE_ASM::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_sol_asm}:dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
#### SPARC Solaris with GNU C setups #### SPARC Solaris with GNU C setups
"solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-fPIC", "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC", "solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"solaris-sparcv9-gcc","gcc:-mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-fPIC", "solaris-sparcv9-gcc","gcc:-mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
# gcc pre-2.8 doesn't understand -mcpu=ultrasparc, so fall down to -mv8 # gcc pre-2.8 doesn't understand -mcpu=ultrasparc, so fall down to -mv8
# but keep the assembler modules. # but keep the assembler modules.
"solaris-sparcv9-gcc27","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus-gcc27.o:::asm/md5-sparcv8plus-gcc27.o::::::dlfcn:solaris-shared:-fPIC", "solaris-sparcv9-gcc27","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus-gcc27.o:::asm/md5-sparcv8plus-gcc27.o::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
#### ####
"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC", "debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mcpu=ultrasparc -Wall -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::::::::dlfcn:solaris-shared:-fPIC", "debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mcpu=ultrasparc -Wall -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
#### SPARC Solaris with Sun C setups #### SPARC Solaris with Sun C setups
# DO NOT use /xO[34] on sparc with SC3.0. It is broken, and will not pass the tests # DO NOT use /xO[34] on sparc with SC3.0. It is broken, and will not pass the tests
"solaris-sparc-sc3","cc:-fast -O -Xa -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC", "solaris-sparc-sc3","cc:-fast -O -Xa -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
# SC4.0 doesn't pass 'make test', upgrade to SC5.0 or SC4.2. # SC4.0 doesn't pass 'make test', upgrade to SC5.0 or SC4.2.
# SC4.2 is ok, better than gcc even on bn as long as you tell it -xarch=v8 # SC4.2 is ok, better than gcc even on bn as long as you tell it -xarch=v8
# SC5.0 note: Compiler common patch 107357-01 or later is required! # SC5.0 note: Compiler common patch 107357-01 or later is required!
"solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC", "solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-KPIC", "solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC", "solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:solaris-shared:-KPIC", "solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
#### ####
"debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-KPIC", "debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC", "debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
#### SPARC Linux setups #### SPARC Linux setups
"linux-sparcv7","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::", "linux-sparcv7","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::",
@ -271,10 +271,10 @@ my %table=(
# Dec Alpha, OSF/1 - the alpha164-cc is the flags for a 21164A with # Dec Alpha, OSF/1 - the alpha164-cc is the flags for a 21164A with
# the new compiler # the new compiler
# For gcc, the following gave a %50 speedup on a 164 over the 'DES_INT' version # For gcc, the following gave a %50 speedup on a 164 over the 'DES_INT' version
"alpha-gcc","gcc:-O3::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:asm/alpha.o:::::::::dlfcn:true64-shared", "alpha-gcc","gcc:-O3::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:asm/alpha.o:::::::::dlfcn:true64-shared::.so",
"alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:asm/alpha.o:::::::::dlfcn:true64-shared", "alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:asm/alpha.o:::::::::dlfcn:true64-shared::.so",
"alpha164-cc", "cc:-std1 -tune host -fast -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:asm/alpha.o:::::::::dlfcn:true64-shared", "alpha164-cc", "cc:-std1 -tune host -fast -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:asm/alpha.o:::::::::dlfcn:true64-shared::.so",
"FreeBSD-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2:::", "FreeBSD-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
#### Alpha Linux with GNU C and Compaq C setups #### Alpha Linux with GNU C and Compaq C setups
# Special notes: # Special notes:
@ -289,8 +289,8 @@ my %table=(
# #
# <appro@fy.chalmers.se> # <appro@fy.chalmers.se>
# #
"linux-alpha-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:asm/alpha.o:dlfcn:linux-shared:-fPIC", "linux-alpha-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:asm/alpha.o:::::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/alpha.o:dlfcn:linux-shared:-fPIC", "linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/alpha.o:::::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:asm/alpha.o::", "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:asm/alpha.o::",
"linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:asm/alpha.o::", "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:asm/alpha.o::",
@ -299,7 +299,7 @@ my %table=(
# The intel boxes :-), It would be worth seeing if bsdi-gcc can use the # The intel boxes :-), It would be worth seeing if bsdi-gcc can use the
# bn86-elf.o file file since it is hand tweaked assembler. # bn86-elf.o file file since it is hand tweaked assembler.
"linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC", "linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", "debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
"debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", "debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
"linux-aout", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}", "linux-aout", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
@ -307,13 +307,13 @@ my %table=(
"linux-ppc", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::", "linux-ppc", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::",
"linux-m68k", "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::", "linux-m68k", "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::",
"linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::SIXTY_FOUR_BIT_LONG::", "linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::SIXTY_FOUR_BIT_LONG::",
"NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", "NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", "NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"NetBSD-x86", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:", "NetBSD-x86", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"FreeBSD-elf", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}", "FreeBSD-elf", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}", "FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
"bsdi-gcc", "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown)::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}", "bsdi-gcc", "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown)::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}",
"bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}", "bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"nextstep", "cc:-O -Wall:<libc.h>:(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", "nextstep", "cc:-O -Wall:<libc.h>:(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
"nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", "nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
# NCR MP-RAS UNIX ver 02.03.01 # NCR MP-RAS UNIX ver 02.03.01
@ -323,7 +323,7 @@ my %table=(
"qnx4", "cc:-DL_ENDIAN -DTERMIO::(unknown)::${x86_gcc_des} ${x86_gcc_opts}:", "qnx4", "cc:-DL_ENDIAN -DTERMIO::(unknown)::${x86_gcc_des} ${x86_gcc_opts}:",
# Linux on ARM # Linux on ARM
"linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::::::::::dlfcn:linux-shared:-fPIC", "linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::::::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
# UnixWare 2.0 # UnixWare 2.0
"unixware-2.0","cc:-O -DFILIO_H::(unknown):-lsocket -lnsl:${x86_gcc_des} ${x86_gcc_opts}:::", "unixware-2.0","cc:-O -DFILIO_H::(unknown):-lsocket -lnsl:${x86_gcc_des} ${x86_gcc_opts}:::",
@ -406,10 +406,10 @@ my %table=(
##"ultrix","cc:-O2 -DNOPROTO -DNOCONST -DL_ENDIAN::(unknown)::::::", ##"ultrix","cc:-O2 -DNOPROTO -DNOCONST -DL_ENDIAN::(unknown)::::::",
# Some OpenBSD from Bob Beck <beck@obtuse.com> # Some OpenBSD from Bob Beck <beck@obtuse.com>
"OpenBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:::", "OpenBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"OpenBSD-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn", "OpenBSD-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"OpenBSD", "gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::BN_LLONG RC2_CHAR RC4_INDEX DES_UNROLL:::", "OpenBSD", "gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::BN_LLONG RC2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"OpenBSD-mips","gcc:-O2 -DL_ENDIAN::(unknown):BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR::::", "OpenBSD-mips","gcc:-O2 -DL_ENDIAN::(unknown):BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
##### MacOS X (a.k.a. Rhapsody) setup ##### MacOS X (a.k.a. Rhapsody) setup
"rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::", "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",
@ -653,8 +653,8 @@ $openssldir=$prefix . "/" . $openssldir if $openssldir !~ /^\//;
print "IsWindows=$IsWindows\n"; print "IsWindows=$IsWindows\n";
(my $cc,my $cflags,my $unistd,my $thread_cflag,my $lflags,my $bn_ops,my $bn_obj,my $des_obj,my $bf_obj, (my $cc,my $cflags,my $unistd,my $thread_cflag,my $lflags,my $bn_ops,my $bn_obj,my $des_obj,my $bf_obj,
$md5_obj,$sha1_obj,my $cast_obj,my $rc4_obj,$rmd160_obj,my $rc5_obj,my $dso_scheme,my $shared_target,my $shared_cflag)= $md5_obj,$sha1_obj,my $cast_obj,my $rc4_obj,$rmd160_obj,my $rc5_obj,my $dso_scheme,my $shared_target,my $shared_cflag,my $shared_extension)=
split(/\s*:\s*/,$table{$target} . ":" x 22 , -1); split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);
$cflags="$flags$cflags" if ($flags ne ""); $cflags="$flags$cflags" if ($flags ne "");
# The DSO code currently always implements all functions so that no # The DSO code currently always implements all functions so that no
@ -729,15 +729,16 @@ if ($threads)
} }
# You will find shlib_mark1 and shlib_mark2 explained in Makefile.org # You will find shlib_mark1 and shlib_mark2 explained in Makefile.org
my $shared_mark1 = ""; my $shared_mark = "";
my $shared_mark2 = ""; if ($shared_target ne "")
if ($shared_cflag ne "")
{ {
$cflags = "$shared_cflag $cflags"; if ($shared_cflag ne "")
{
$cflags = "$shared_cflag $cflags";
}
if (!$no_shared) if (!$no_shared)
{ {
$shared_mark1 = ".shlib-clean."; #$shared_mark = "\$(SHARED_LIBS)";
$shared_mark2 = ".shlib.";
} }
} }
else else
@ -825,6 +826,7 @@ while (<IN>)
s/^SHLIB_VERSION_HISTORY=.*/SHLIB_VERSION_HISTORY=$shlib_version_history/; s/^SHLIB_VERSION_HISTORY=.*/SHLIB_VERSION_HISTORY=$shlib_version_history/;
s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=$shlib_major/; s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=$shlib_major/;
s/^SHLIB_MINOR=.*/SHLIB_MINOR=$shlib_minor/; s/^SHLIB_MINOR=.*/SHLIB_MINOR=$shlib_minor/;
s/^SHLIB_EXT=.*/SHLIB_EXT=$shared_extension/;
s/^INSTALLTOP=.*$/INSTALLTOP=$prefix/; s/^INSTALLTOP=.*$/INSTALLTOP=$prefix/;
s/^OPENSSLDIR=.*$/OPENSSLDIR=$openssldir/; s/^OPENSSLDIR=.*$/OPENSSLDIR=$openssldir/;
s/^INSTALL_PREFIX=.*$/INSTALL_PREFIX=$install_prefix/; s/^INSTALL_PREFIX=.*$/INSTALL_PREFIX=$install_prefix/;
@ -848,9 +850,9 @@ while (<IN>)
s/^RANLIB=.*/RANLIB= $ranlib/; s/^RANLIB=.*/RANLIB= $ranlib/;
s/^PERL=.*/PERL= $perl/; s/^PERL=.*/PERL= $perl/;
s/^SHLIB_TARGET=.*/SHLIB_TARGET=$shared_target/; s/^SHLIB_TARGET=.*/SHLIB_TARGET=$shared_target/;
s/^SHLIB_MARK1=.*/SHLIB_MARK1=$shared_mark1/; s/^SHLIB_MARK=.*/SHLIB_MARK=$shared_mark/;
s/^SHLIB_MARK2=.*/SHLIB_MARK2=$shared_mark2/; s/^SHARED_LIBS=.*/SHARED_LIBS=\$(SHARED_CRYPTO) \$(SHARED_SSL)/ if (!$no_shared);
s/^LIBS=.*/LIBS=libcrypto\.so\* libssl\.so\*/ if (!$no_shared); s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.so.\$(SHLIB_MAJOR) .so/ if ($shared_extension ne "" && $shared_extension !~ /^\.s[ol]$/);
print OUT $_."\n"; print OUT $_."\n";
} }
close(IN); close(IN);
@ -1137,8 +1139,9 @@ sub print_table_entry
(my $cc,my $cflags,my $unistd,my $thread_cflag,my $lflags,my $bn_ops, (my $cc,my $cflags,my $unistd,my $thread_cflag,my $lflags,my $bn_ops,
my $bn_obj,my $des_obj,my $bf_obj, my $bn_obj,my $des_obj,my $bf_obj,
my $md5_obj,my $sha1_obj,my $cast_obj,my $rc4_obj,my $rmd160_obj, my $md5_obj,my $sha1_obj,my $cast_obj,my $rc4_obj,my $rmd160_obj,
my $rc5_obj,my $dso_scheme,my $shared_target,my $shared_cflag)= my $rc5_obj,my $dso_scheme,my $shared_target,my $shared_cflag,
split(/\s*:\s*/,$table{$target} . ":" x 22 , -1); my $shared_extension)=
split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);
print <<EOF print <<EOF
@ -1161,5 +1164,6 @@ sub print_table_entry
\$dso_scheme = $dso_scheme \$dso_scheme = $dso_scheme
\$shared_target= $shared_target \$shared_target= $shared_target
\$shared_cflag = $shared_cflag \$shared_cflag = $shared_cflag
\$shared_extension = $shared_extension
EOF EOF
} }

158
Makefile.org
View File

@ -9,6 +9,7 @@ SHLIB_VERSION_NUMBER=
SHLIB_VERSION_HISTORY= SHLIB_VERSION_HISTORY=
SHLIB_MAJOR= SHLIB_MAJOR=
SHLIB_MINOR= SHLIB_MINOR=
SHLIB_EXT=
PLATFORM=dist PLATFORM=dist
OPTIONS= OPTIONS=
CONFIGURE_ARGS= CONFIGURE_ARGS=
@ -149,22 +150,19 @@ RMD160_ASM_OBJ= asm/rm86-out.o
#RMD160_ASM_OBJ= asm/rm86-out.o # a.out, FreeBSD #RMD160_ASM_OBJ= asm/rm86-out.o # a.out, FreeBSD
#RMD160_ASM_OBJ= asm/rm86bsdi.o # bsdi #RMD160_ASM_OBJ= asm/rm86bsdi.o # bsdi
# To do special treatment, use "directory names" starting with a period.
# When we're prepared to use shared libraries in the programs we link here # When we're prepared to use shared libraries in the programs we link here
# we might have SHLIB_MARK1 get the value ".shlib." and SHLIB_MARK2 be empty, # we might set SHLIB_MARK to '$(SHARED_LIBS)'.
# or have that configurable. SHLIB_MARK=
SHLIB_MARK1=.shlib-clean.
SHLIB_MARK2=.shlib.
DIRS= crypto ssl rsaref $(SHLIB_MARK1) apps test tools $(SHLIB_MARK2) DIRS= crypto ssl rsaref $(SHLIB_MARK) apps test tools
SHLIBDIRS= crypto ssl SHLIBDIRS= crypto ssl
# dirs in crypto to build # dirs in crypto to build
SDIRS= objects \ SDIRS= \
md2 md4 md5 sha mdc2 hmac ripemd \ md2 md4 md5 sha mdc2 hmac ripemd \
des rc2 rc4 rc5 idea bf cast \ des rc2 rc4 rc5 idea bf cast \
bn rsa dsa dh dso engine rijndael \ bn rsa dsa dh dso engine rijndael \
buffer bio stack lhash rand err \ buffer bio stack lhash rand err objects \
evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp
MAKEFILE= Makefile.ssl MAKEFILE= Makefile.ssl
@ -180,7 +178,10 @@ ONEDIRS=out tmp
EDIRS= times doc bugs util include certs ms shlib mt demos perl sf dep VMS EDIRS= times doc bugs util include certs ms shlib mt demos perl sf dep VMS
WDIRS= windows WDIRS= windows
LIBS= libcrypto.a libssl.a LIBS= libcrypto.a libssl.a
SHARED_LIBS=libcrypto.so libssl.so SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
SHARED_SSL=libssl$(SHLIB_EXT)
SHARED_LIBS=
SHARED_LIBS_LINK_EXTS=
GENERAL= Makefile GENERAL= Makefile
BASENAME= openssl BASENAME= openssl
@ -190,88 +191,77 @@ WTARFILE= $(NAME)-win.tar
EXHEADER= e_os.h e_os2.h EXHEADER= e_os.h e_os2.h
HEADER= e_os.h HEADER= e_os.h
all: Makefile.ssl # When we're prepared to use shared libraries in the programs we link here
@need_shlib=true; \ # we might remove 'clean-shared' from the targets to perform at this stage
for i in $(DIRS) ;\
do \ all: clean-shared Makefile.ssl sub_all
if [ "$$i" = ".shlib-clean." ]; then \
if [ "$(SHLIB_TARGET)" != "" ]; then \
$(MAKE) clean-shared; \
fi; \
elif [ "$$i" = ".shlib." ]; then \
if [ "$(SHLIB_TARGET)" != "" ]; then \
$(MAKE) $(SHARED_LIBS); \
fi; \
need_shlib=false; \
else \
(cd $$i && echo "making all in $$i..." && \
$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' SDIRS='${SDIRS}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \
fi; \
done; \
if $$need_shlib && [ "$(SHLIB_MARK1)" != "" -o "$(SHLIB_MARK1)" != "" ]; then \
$(MAKE) $(SHARED_LIBS); \
fi
sub_all: sub_all:
@need_shlib=true; \ @for i in $(DIRS); \
for i in $(DIRS) ;\
do \ do \
if [ "$$i" = ".shlib-clean." ]; then \ if [ -d "$$i" ]; then \
if [ "$(SHLIB_TARGET)" != "" ]; then \
$(MAKE) clean-shared; \
fi; \
elif [ "$$i" = ".shlib." ]; then \
if [ "$(SHLIB_TARGET)" != "" ]; then \
$(MAKE) $(SHARED_LIBS); \
fi; \
need_shlib=false; \
else \
(cd $$i && echo "making all in $$i..." && \ (cd $$i && echo "making all in $$i..." && \
$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \ $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \
else \
$(MAKE) $$i; \
fi; \ fi; \
done; \ done; \
if $$need_shlib && [ "$(SHLIB_MARK1)" != "" -o "$(SHLIB_MARK1)" != "" ]; then \ if echo "$(DIRS)" | \
grep '\(^\| \)\(crypto\|ssl\)\( \|$$\)' > /dev/null 2>&1 && \
[ -n "$(SHARED_LIBS)" ]; then \
$(MAKE) $(SHARED_LIBS); \ $(MAKE) $(SHARED_LIBS); \
fi fi
libcrypto.so: libcrypto.a libcrypto$(SHLIB_EXT): libcrypto.a
@if [ "$(SHLIB_TARGET)" != "" ]; then \ @if [ "$(SHLIB_TARGET)" != "" ]; then \
$(MAKE) SHLIBDIRS=crypto $(SHLIB_TARGET); \ $(MAKE) SHLIBDIRS=crypto build-shared; \
else \ else \
echo "There's no support for shared libraries on this platform" >&2; \ echo "There's no support for shared libraries on this platform" >&2; \
fi fi
libssl.so: libcrypto.so libssl.a libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a
@if [ "$(SHLIB_TARGET)" != "" ]; then \ @if [ "$(SHLIB_TARGET)" != "" ]; then \
$(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-L. -lcrypto' $(SHLIB_TARGET); \ $(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-L. -lcrypto' build-shared; \
else \ else \
echo "There's no support for shared libraries on this platform" >&2; \ echo "There's no support for shared libraries on this platform" >&2; \
fi fi
clean-shared: clean-shared:
for i in ${SHLIBDIRS}; do \ @for i in $(SHLIBDIRS); do \
rm -f lib$$i.so \ if [ -n "$(SHARED_LIBS_LINK_EXTS)" ]; then \
lib$$i.so.${SHLIB_MAJOR} \ tmp="$(SHARED_LIBS_LINK_EXTS)"; \
lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR}; \ for j in $${tmp:-x}; do \
( set -x; rm -f lib$$i$$j ); \
done; \
fi; \
( set -x; rm -f lib$$i$(SHLIB_EXT) ); \
done done
linux-shared: link-shared:
@for i in $(SHLIBDIRS); do \
prev=lib$$i$(SHLIB_EXT); \
if [ -n "$(SHARED_LIBS_LINK_EXTS)" ]; then \
tmp="$(SHARED_LIBS_LINK_EXTS)"; \
for j in $${tmp:-x}; do \
( set -x; ln -s -f $$prev lib$$i$$j ); \
prev=lib$$i$$j; \
done; \
fi; \
done
build-shared: clean-shared do_$(SHLIB_TARGET) link-shared
do_bsd-gcc-shared: linux-shared
do_linux-shared:
libs='${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \ libs='${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
rm -f lib$$i.so \
lib$$i.so.${SHLIB_MAJOR} \
lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR}; \
( set -x; ${CC} -shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ ( set -x; ${CC} -shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-Wl,-S,-soname=lib$$i.so.${SHLIB_MAJOR} \ -Wl,-S,-soname=lib$$i.so.${SHLIB_MAJOR} \
-Wl,--whole-archive lib$$i.a \ -Wl,--whole-archive lib$$i.a \
-Wl,--no-whole-archive $$libs ${EX_LIBS} -lc ) || exit 1; \ -Wl,--no-whole-archive $$libs ${EX_LIBS} -lc ) || exit 1; \
libs="$$libs -L. -l$$i"; \ libs="$$libs -L. -l$$i"; \
( set -x; \
ln -s lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
lib$$i.so.${SHLIB_MAJOR}; \
ln -s lib$$i.so.${SHLIB_MAJOR} lib$$i.so ); \
done done
# This assumes that GNU utilities are *not* used # This assumes that GNU utilities are *not* used
true64-shared: do_true64-shared:
libs='${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \ libs='${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
( set -x; ${CC} -shared -no_archive -o lib$$i.so \ ( set -x; ${CC} -shared -no_archive -o lib$$i.so \
-set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}" \ -set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}" \
@ -280,18 +270,12 @@ true64-shared:
done done
# This assumes that GNU utilities are *not* used # This assumes that GNU utilities are *not* used
solaris-shared: do_solaris-shared:
libs='${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \ libs='${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
rm -f lib$$i.so \
lib$$i.so.${SHLIB_MAJOR} \
lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR}; \
( set -x; ${CC} -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ ( set -x; ${CC} -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-h lib$$i.so.${SHLIB_MAJOR} \ -h lib$$i.so.${SHLIB_MAJOR} \
-z allextract lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \ -z allextract lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \
libs="$$libs -L. -l$$i"; \ libs="$$libs -L. -l$$i"; \
ln -s lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
lib$$i.so.${SHLIB_MAJOR}; \
ln -s lib$$i.so.${SHLIB_MAJOR} lib$$i.so; \
done done
Makefile.ssl: Makefile.org Makefile.ssl: Makefile.org
@ -306,7 +290,7 @@ clean:
rm -f shlib/*.o *.o core a.out fluff *.map rehash.time testlog make.log cctest cctest.c rm -f shlib/*.o *.o core a.out fluff *.map rehash.time testlog make.log cctest cctest.c
@for i in $(DIRS) ;\ @for i in $(DIRS) ;\
do \ do \
if echo "$$i" | grep -v '^\.'; then \ if [ -d "$$i" ]; then \
(cd $$i && echo "making clean in $$i..." && \ (cd $$i && echo "making clean in $$i..." && \
$(MAKE) SDIRS='${SDIRS}' clean ) || exit 1; \ $(MAKE) SDIRS='${SDIRS}' clean ) || exit 1; \
rm -f $(LIBS); \ rm -f $(LIBS); \
@ -327,7 +311,7 @@ files:
$(PERL) $(TOP)/util/files.pl Makefile.ssl > $(TOP)/MINFO $(PERL) $(TOP)/util/files.pl Makefile.ssl > $(TOP)/MINFO
@for i in $(DIRS) ;\ @for i in $(DIRS) ;\
do \ do \
if echo "$$i" | grep -v '^\.'; then \ if [ -d "$$i" ]; then \
(cd $$i && echo "making 'files' in $$i..." && \ (cd $$i && echo "making 'files' in $$i..." && \
$(MAKE) SDIRS='${SDIRS}' PERL='${PERL}' files ) || exit 1; \ $(MAKE) SDIRS='${SDIRS}' PERL='${PERL}' files ) || exit 1; \
fi; \ fi; \
@ -338,7 +322,7 @@ links:
@$(PERL) $(TOP)/util/mkdir-p.pl include/openssl @$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
@$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER) @$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
@for i in $(DIRS); do \ @for i in $(DIRS); do \
if echo "$$i" | grep -v '^\.'; then \ if [ -d "$$i" ]; then \
(cd $$i && echo "making links in $$i..." && \ (cd $$i && echo "making links in $$i..." && \
$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PERL='${PERL}' links ) || exit 1; \ $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PERL='${PERL}' links ) || exit 1; \
fi; \ fi; \
@ -348,7 +332,7 @@ dclean:
rm -f *.bak rm -f *.bak
@for i in $(DIRS) ;\ @for i in $(DIRS) ;\
do \ do \
if echo "$$i" | grep -v '^\.'; then \ if [ -d "$$i" ]; then \
(cd $$i && echo "making dclean in $$i..." && \ (cd $$i && echo "making dclean in $$i..." && \
$(MAKE) SDIRS='${SDIRS}' PERL='${PERL}' dclean ) || exit 1; \ $(MAKE) SDIRS='${SDIRS}' PERL='${PERL}' dclean ) || exit 1; \
fi; \ fi; \
@ -372,7 +356,7 @@ report:
depend: depend:
@for i in $(DIRS) ;\ @for i in $(DIRS) ;\
do \ do \
if echo "$$i" | grep -v '^\.'; then \ if [ -d "$$i" ]; then \
(cd $$i && echo "making dependencies $$i..." && \ (cd $$i && echo "making dependencies $$i..." && \
$(MAKE) SDIRS='${SDIRS}' DEPFLAG='${DEPFLAG}' depend ) || exit 1; \ $(MAKE) SDIRS='${SDIRS}' DEPFLAG='${DEPFLAG}' depend ) || exit 1; \
fi; \ fi; \
@ -381,7 +365,7 @@ depend:
lint: lint:
@for i in $(DIRS) ;\ @for i in $(DIRS) ;\
do \ do \
if echo "$$i" | grep -v '^\.'; then \ if [ -d "$$i" ]; then \
(cd $$i && echo "making lint $$i..." && \ (cd $$i && echo "making lint $$i..." && \
$(MAKE) SDIRS='${SDIRS}' lint ) || exit 1; \ $(MAKE) SDIRS='${SDIRS}' lint ) || exit 1; \
fi; \ fi; \
@ -390,7 +374,7 @@ lint:
tags: tags:
@for i in $(DIRS) ;\ @for i in $(DIRS) ;\
do \ do \
if echo "$$i" | grep -v '^\.'; then \ if [ -d "$$i" ]; then \
(cd $$i && echo "making tags $$i..." && \ (cd $$i && echo "making tags $$i..." && \
$(MAKE) SDIRS='${SDIRS}' tags ) || exit 1; \ $(MAKE) SDIRS='${SDIRS}' tags ) || exit 1; \
fi; \ fi; \
@ -452,7 +436,7 @@ install: all install_docs
done; done;
@for i in $(DIRS) ;\ @for i in $(DIRS) ;\
do \ do \
if echo "$$i" | grep -v '^\.'; then \ if [ -d "$$i" ]; then \
(cd $$i; echo "installing $$i..."; \ (cd $$i; echo "installing $$i..."; \
$(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}' INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}' EX_LIBS='${EX_LIBS}' SDIRS='${SDIRS}' RANLIB='${RANLIB}' install ); \ $(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}' INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}' EX_LIBS='${EX_LIBS}' SDIRS='${SDIRS}' RANLIB='${RANLIB}' install ); \
fi; \ fi; \
@ -462,11 +446,24 @@ install: all install_docs
if [ -f "$$i" ]; then \ if [ -f "$$i" ]; then \
( echo installing $$i; \ ( echo installing $$i; \
cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \ cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
(echo $$i | grep '\\.a$$' > /dev/null 2>&1) \ $(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
&& $(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
fi \ fi \
done done
@if [ -n "$(SHARED_LIBS)" ]; then \
tmp="$(SHARED_LIBS)"; \
for i in $${tmp:-x}; \
do \
if [ -f "$$i" ]; then \
( echo installing $$i; \
cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
fi \
done; \
( here="`pwd`"; \
cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
make -f $$here/Makefile link-shared ); \
fi
install_docs: install_docs:
@$(PERL) $(TOP)/util/mkdir-p.pl \ @$(PERL) $(TOP)/util/mkdir-p.pl \
@ -493,11 +490,4 @@ install_docs:
> $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \ > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \
done done
shlib: all
if [ ! -d shlib_dir ] ; then mkdir shlib_dir ; else rm -f shlib_dir/* ; fi
cd shlib_dir ; ar -x ../libcrypto.a && $(CC) -shared ./*.o -Wl,-soname -Wl,libcrypto.so.0.9 \
-o ./libcrypto.so.0.9.4 && rm *.o
cd shlib_dir ; ar -x ../libssl.a && $(CC) -shared ./*.o -Wl,-soname -Wl,libssl.so.0.9 \
-o ./libssl.so.0.9.4 && rm *.o
# DO NOT DELETE THIS LINE -- make depend depends on it. # DO NOT DELETE THIS LINE -- make depend depends on it.

189
TABLE
View File

@ -19,6 +19,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** BC-32 *** BC-32
$cc = bcc32 $cc = bcc32
@ -39,6 +40,7 @@ $rc5_obj =
$dso_scheme = win32 $dso_scheme = win32
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** BS2000-OSD *** BS2000-OSD
$cc = c89 $cc = c89
@ -59,6 +61,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** CygWin32 *** CygWin32
$cc = gcc $cc = gcc
@ -79,6 +82,7 @@ $rc5_obj =
$dso_scheme = win32 $dso_scheme = win32
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** FreeBSD *** FreeBSD
$cc = gcc $cc = gcc
@ -99,6 +103,7 @@ $rc5_obj = asm/r586-out.o
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** FreeBSD-alpha *** FreeBSD-alpha
$cc = gcc $cc = gcc
@ -116,9 +121,10 @@ $cast_obj =
$rc4_obj = $rc4_obj =
$rmd160_obj = $rmd160_obj =
$rc5_obj = $rc5_obj =
$dso_scheme = $dso_scheme = dlfcn
$shared_target= $shared_target= bsd-gcc-shared
$shared_cflag = $shared_cflag = -fPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** FreeBSD-elf *** FreeBSD-elf
$cc = gcc $cc = gcc
@ -136,9 +142,10 @@ $cast_obj = asm/cx86-elf.o
$rc4_obj = asm/rx86-elf.o $rc4_obj = asm/rx86-elf.o
$rmd160_obj = asm/rm86-elf.o $rmd160_obj = asm/rm86-elf.o
$rc5_obj = asm/r586-elf.o $rc5_obj = asm/r586-elf.o
$dso_scheme = $dso_scheme = dlfcn
$shared_target= $shared_target= bsd-gcc-shared
$shared_cflag = $shared_cflag = -fPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** MPE/iX-gcc *** MPE/iX-gcc
$cc = gcc $cc = gcc
@ -159,6 +166,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** Mingw32 *** Mingw32
$cc = gcc $cc = gcc
@ -179,6 +187,7 @@ $rc5_obj =
$dso_scheme = win32 $dso_scheme = win32
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** NetBSD-m68 *** NetBSD-m68
$cc = gcc $cc = gcc
@ -196,9 +205,10 @@ $cast_obj =
$rc4_obj = $rc4_obj =
$rmd160_obj = $rmd160_obj =
$rc5_obj = $rc5_obj =
$dso_scheme = $dso_scheme = dlfcn
$shared_target= $shared_target= bsd-gcc-shared
$shared_cflag = $shared_cflag = -fPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** NetBSD-sparc *** NetBSD-sparc
$cc = gcc $cc = gcc
@ -216,9 +226,10 @@ $cast_obj =
$rc4_obj = $rc4_obj =
$rmd160_obj = $rmd160_obj =
$rc5_obj = $rc5_obj =
$dso_scheme = $dso_scheme = dlfcn
$shared_target= $shared_target= bsd-gcc-shared
$shared_cflag = $shared_cflag = -fPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** NetBSD-x86 *** NetBSD-x86
$cc = gcc $cc = gcc
@ -236,9 +247,10 @@ $cast_obj =
$rc4_obj = $rc4_obj =
$rmd160_obj = $rmd160_obj =
$rc5_obj = $rc5_obj =
$dso_scheme = $dso_scheme = dlfcn
$shared_target= $shared_target= bsd-gcc-shared
$shared_cflag = $shared_cflag = -fPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** OpenBSD *** OpenBSD
$cc = gcc $cc = gcc
@ -256,9 +268,10 @@ $cast_obj =
$rc4_obj = $rc4_obj =
$rmd160_obj = $rmd160_obj =
$rc5_obj = $rc5_obj =
$dso_scheme = $dso_scheme = dlfcn
$shared_target= $shared_target= bsd-gcc-shared
$shared_cflag = $shared_cflag = -fPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** OpenBSD-alpha *** OpenBSD-alpha
$cc = gcc $cc = gcc
@ -276,9 +289,10 @@ $cast_obj =
$rc4_obj = $rc4_obj =
$rmd160_obj = $rmd160_obj =
$rc5_obj = $rc5_obj =
$dso_scheme = $dso_scheme = dlfcn
$shared_target= $shared_target= bsd-gcc-shared
$shared_cflag = $shared_cflag = -fPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** OpenBSD-mips *** OpenBSD-mips
$cc = gcc $cc = gcc
@ -296,9 +310,10 @@ $cast_obj =
$rc4_obj = $rc4_obj =
$rmd160_obj = $rmd160_obj =
$rc5_obj = $rc5_obj =
$dso_scheme = $dso_scheme = dlfcn
$shared_target= $shared_target= bsd-gcc-shared
$shared_cflag = $shared_cflag = -fPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** OpenBSD-x86 *** OpenBSD-x86
$cc = gcc $cc = gcc
@ -317,8 +332,9 @@ $rc4_obj = asm/rx86-out.o
$rmd160_obj = asm/rm86-out.o $rmd160_obj = asm/rm86-out.o
$rc5_obj = asm/r586-out.o $rc5_obj = asm/r586-out.o
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= $shared_target= bsd-gcc-shared
$shared_cflag = $shared_cflag = -fPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** ReliantUNIX *** ReliantUNIX
$cc = cc $cc = cc
@ -339,6 +355,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** SINIX *** SINIX
$cc = cc $cc = cc
@ -359,6 +376,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** SINIX-N *** SINIX-N
$cc = /usr/ucb/cc $cc = /usr/ucb/cc
@ -379,6 +397,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** VC-MSDOS *** VC-MSDOS
$cc = cl $cc = cl
@ -399,6 +418,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** VC-NT *** VC-NT
$cc = cl $cc = cl
@ -419,6 +439,7 @@ $rc5_obj =
$dso_scheme = win32 $dso_scheme = win32
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** VC-W31-16 *** VC-W31-16
$cc = cl $cc = cl
@ -439,6 +460,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** VC-W31-32 *** VC-W31-32
$cc = cl $cc = cl
@ -459,6 +481,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** VC-WIN16 *** VC-WIN16
$cc = cl $cc = cl
@ -479,6 +502,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** VC-WIN32 *** VC-WIN32
$cc = cl $cc = cl
@ -499,6 +523,7 @@ $rc5_obj =
$dso_scheme = win32 $dso_scheme = win32
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** aix-cc *** aix-cc
$cc = cc $cc = cc
@ -519,6 +544,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** aix-gcc *** aix-gcc
$cc = gcc $cc = gcc
@ -539,6 +565,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** alpha-cc *** alpha-cc
$cc = cc $cc = cc
@ -559,6 +586,7 @@ $rc5_obj =
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= true64-shared $shared_target= true64-shared
$shared_cflag = $shared_cflag =
$shared_extension = .so
*** alpha-gcc *** alpha-gcc
$cc = gcc $cc = gcc
@ -579,6 +607,7 @@ $rc5_obj =
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= true64-shared $shared_target= true64-shared
$shared_cflag = $shared_cflag =
$shared_extension = .so
*** alpha164-cc *** alpha164-cc
$cc = cc $cc = cc
@ -599,6 +628,7 @@ $rc5_obj =
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= true64-shared $shared_target= true64-shared
$shared_cflag = $shared_cflag =
$shared_extension = .so
*** bsdi-elf-gcc *** bsdi-elf-gcc
$cc = gcc $cc = gcc
@ -616,9 +646,10 @@ $cast_obj = asm/cx86-elf.o
$rc4_obj = asm/rx86-elf.o $rc4_obj = asm/rx86-elf.o
$rmd160_obj = asm/rm86-elf.o $rmd160_obj = asm/rm86-elf.o
$rc5_obj = asm/r586-elf.o $rc5_obj = asm/r586-elf.o
$dso_scheme = $dso_scheme = dlfcn
$shared_target= $shared_target= bsd-gcc-shared
$shared_cflag = $shared_cflag = -fPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** bsdi-gcc *** bsdi-gcc
$cc = gcc $cc = gcc
@ -639,6 +670,7 @@ $rc5_obj = asm/r586bsdi.o
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** cc *** cc
$cc = cc $cc = cc
@ -659,6 +691,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** cray-t3e *** cray-t3e
$cc = cc $cc = cc
@ -679,6 +712,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** cray-t90-cc *** cray-t90-cc
$cc = cc $cc = cc
@ -699,6 +733,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** debug *** debug
$cc = gcc $cc = gcc
@ -719,6 +754,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** debug-ben *** debug-ben
$cc = gcc $cc = gcc
@ -739,6 +775,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** debug-ben-debug *** debug-ben-debug
$cc = gcc $cc = gcc
@ -759,6 +796,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** debug-ben-strict *** debug-ben-strict
$cc = gcc $cc = gcc
@ -779,6 +817,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** debug-bodo *** debug-bodo
$cc = gcc $cc = gcc
@ -799,6 +838,7 @@ $rc5_obj = asm/r586-elf.o
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** debug-levitte-linux-elf *** debug-levitte-linux-elf
$cc = gcc $cc = gcc
@ -819,6 +859,7 @@ $rc5_obj =
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** debug-linux-elf *** debug-linux-elf
$cc = gcc $cc = gcc
@ -839,6 +880,7 @@ $rc5_obj = asm/r586-elf.o
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** debug-linux-elf-noefence *** debug-linux-elf-noefence
$cc = gcc $cc = gcc
@ -859,6 +901,7 @@ $rc5_obj = asm/r586-elf.o
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** debug-rse *** debug-rse
$cc = cc $cc = cc
@ -879,6 +922,7 @@ $rc5_obj = asm/r586-elf.o
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** debug-solaris-sparcv8-cc *** debug-solaris-sparcv8-cc
$cc = cc $cc = cc
@ -899,6 +943,7 @@ $rc5_obj =
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= solaris-shared $shared_target= solaris-shared
$shared_cflag = -KPIC $shared_cflag = -KPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** debug-solaris-sparcv8-gcc *** debug-solaris-sparcv8-gcc
$cc = gcc $cc = gcc
@ -919,6 +964,7 @@ $rc5_obj =
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= solaris-shared $shared_target= solaris-shared
$shared_cflag = -fPIC $shared_cflag = -fPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** debug-solaris-sparcv9-cc *** debug-solaris-sparcv9-cc
$cc = cc $cc = cc
@ -939,6 +985,7 @@ $rc5_obj =
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= solaris-shared $shared_target= solaris-shared
$shared_cflag = -KPIC $shared_cflag = -KPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** debug-solaris-sparcv9-gcc *** debug-solaris-sparcv9-gcc
$cc = gcc $cc = gcc
@ -959,6 +1006,7 @@ $rc5_obj =
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= solaris-shared $shared_target= solaris-shared
$shared_cflag = -fPIC $shared_cflag = -fPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** debug-steve *** debug-steve
$cc = gcc $cc = gcc
@ -979,6 +1027,7 @@ $rc5_obj = asm/r586-elf.o
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** debug-ulf *** debug-ulf
$cc = gcc $cc = gcc
@ -999,6 +1048,7 @@ $rc5_obj = asm/r586-elf.o
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** dgux-R3-gcc *** dgux-R3-gcc
$cc = gcc $cc = gcc
@ -1019,6 +1069,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** dgux-R4-gcc *** dgux-R4-gcc
$cc = gcc $cc = gcc
@ -1039,6 +1090,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** dgux-R4-x86-gcc *** dgux-R4-x86-gcc
$cc = gcc $cc = gcc
@ -1059,6 +1111,7 @@ $rc5_obj = asm/r586-elf.o
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** dist *** dist
$cc = cc $cc = cc
@ -1079,6 +1132,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** gcc *** gcc
$cc = gcc $cc = gcc
@ -1099,6 +1153,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** hpux-brokencc *** hpux-brokencc
$cc = cc $cc = cc
@ -1119,6 +1174,7 @@ $rc5_obj =
$dso_scheme = dl $dso_scheme = dl
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** hpux-brokengcc *** hpux-brokengcc
$cc = gcc $cc = gcc
@ -1139,6 +1195,7 @@ $rc5_obj =
$dso_scheme = dl $dso_scheme = dl
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** hpux-cc *** hpux-cc
$cc = cc $cc = cc
@ -1159,6 +1216,7 @@ $rc5_obj =
$dso_scheme = dl $dso_scheme = dl
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** hpux-gcc *** hpux-gcc
$cc = gcc $cc = gcc
@ -1179,6 +1237,7 @@ $rc5_obj =
$dso_scheme = dl $dso_scheme = dl
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** hpux-parisc-cc *** hpux-parisc-cc
$cc = cc $cc = cc
@ -1199,6 +1258,7 @@ $rc5_obj =
$dso_scheme = dl $dso_scheme = dl
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** hpux-parisc-cc-o4 *** hpux-parisc-cc-o4
$cc = cc $cc = cc
@ -1219,6 +1279,7 @@ $rc5_obj =
$dso_scheme = dl $dso_scheme = dl
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** hpux-parisc-gcc *** hpux-parisc-gcc
$cc = gcc $cc = gcc
@ -1239,6 +1300,7 @@ $rc5_obj =
$dso_scheme = dl $dso_scheme = dl
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** hpux-parisc1_1-cc *** hpux-parisc1_1-cc
$cc = cc $cc = cc
@ -1259,6 +1321,7 @@ $rc5_obj =
$dso_scheme = dl $dso_scheme = dl
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** hpux-parisc2-cc *** hpux-parisc2-cc
$cc = cc $cc = cc
@ -1279,6 +1342,7 @@ $rc5_obj =
$dso_scheme = dl $dso_scheme = dl
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** hpux10-brokencc *** hpux10-brokencc
$cc = cc $cc = cc
@ -1299,6 +1363,7 @@ $rc5_obj =
$dso_scheme = dl $dso_scheme = dl
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** hpux10-brokengcc *** hpux10-brokengcc
$cc = gcc $cc = gcc
@ -1319,6 +1384,7 @@ $rc5_obj =
$dso_scheme = dl $dso_scheme = dl
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** hpux10-cc *** hpux10-cc
$cc = cc $cc = cc
@ -1339,6 +1405,7 @@ $rc5_obj =
$dso_scheme = dl $dso_scheme = dl
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** hpux10-gcc *** hpux10-gcc
$cc = gcc $cc = gcc
@ -1359,6 +1426,7 @@ $rc5_obj =
$dso_scheme = dl $dso_scheme = dl
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** hpux64-parisc-cc *** hpux64-parisc-cc
$cc = cc $cc = cc
@ -1379,6 +1447,7 @@ $rc5_obj =
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** hpux64-parisc2-cc *** hpux64-parisc2-cc
$cc = cc $cc = cc
@ -1399,6 +1468,7 @@ $rc5_obj =
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** irix-cc *** irix-cc
$cc = cc $cc = cc
@ -1419,6 +1489,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** irix-gcc *** irix-gcc
$cc = gcc $cc = gcc
@ -1439,6 +1510,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** irix-mips3-cc *** irix-mips3-cc
$cc = cc $cc = cc
@ -1459,6 +1531,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** irix-mips3-gcc *** irix-mips3-gcc
$cc = gcc $cc = gcc
@ -1479,6 +1552,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** irix64-mips4-cc *** irix64-mips4-cc
$cc = cc $cc = cc
@ -1499,6 +1573,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** irix64-mips4-gcc *** irix64-mips4-gcc
$cc = gcc $cc = gcc
@ -1519,6 +1594,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** linux-alpha+bwx-ccc *** linux-alpha+bwx-ccc
$cc = ccc $cc = ccc
@ -1539,13 +1615,14 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** linux-alpha+bwx-gcc *** linux-alpha+bwx-gcc
$cc = gcc $cc = gcc
$cflags = -O3 -DL_ENDIAN -DTERMIO $cflags = -O3 -DL_ENDIAN -DTERMIO
$unistd = $unistd =
$thread_cflag = -D_REENTRANT $thread_cflag = -D_REENTRANT
$lflags = $lflags = -ldl
$bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL $bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL
$bn_obj = asm/alpha.o $bn_obj = asm/alpha.o
$des_obj = $des_obj =
@ -1556,9 +1633,10 @@ $cast_obj =
$rc4_obj = $rc4_obj =
$rmd160_obj = $rmd160_obj =
$rc5_obj = $rc5_obj =
$dso_scheme = $dso_scheme = dlfcn
$shared_target= $shared_target= linux-shared
$shared_cflag = $shared_cflag = -fPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** linux-alpha-ccc *** linux-alpha-ccc
$cc = ccc $cc = ccc
@ -1579,13 +1657,14 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** linux-alpha-gcc *** linux-alpha-gcc
$cc = gcc $cc = gcc
$cflags = -O3 -DL_ENDIAN -DTERMIO $cflags = -O3 -DL_ENDIAN -DTERMIO
$unistd = $unistd =
$thread_cflag = -D_REENTRANT $thread_cflag = -D_REENTRANT
$lflags = $lflags = -ldl
$bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL $bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL
$bn_obj = asm/alpha.o $bn_obj = asm/alpha.o
$des_obj = $des_obj =
@ -1596,9 +1675,10 @@ $cast_obj =
$rc4_obj = $rc4_obj =
$rmd160_obj = $rmd160_obj =
$rc5_obj = $rc5_obj =
$dso_scheme = $dso_scheme = dlfcn
$shared_target= $shared_target= linux-shared
$shared_cflag = $shared_cflag = -fPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** linux-aout *** linux-aout
$cc = gcc $cc = gcc
@ -1619,6 +1699,7 @@ $rc5_obj = asm/r586-out.o
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** linux-elf *** linux-elf
$cc = gcc $cc = gcc
@ -1639,6 +1720,7 @@ $rc5_obj = asm/r586-elf.o
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= linux-shared $shared_target= linux-shared
$shared_cflag = -fPIC $shared_cflag = -fPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** linux-elf-arm *** linux-elf-arm
$cc = gcc $cc = gcc
@ -1659,6 +1741,7 @@ $rc5_obj =
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= linux-shared $shared_target= linux-shared
$shared_cflag = -fPIC $shared_cflag = -fPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** linux-ia64 *** linux-ia64
$cc = gcc $cc = gcc
@ -1679,6 +1762,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** linux-m68k *** linux-m68k
$cc = gcc $cc = gcc
@ -1699,6 +1783,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** linux-mips *** linux-mips
$cc = gcc $cc = gcc
@ -1719,6 +1804,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** linux-ppc *** linux-ppc
$cc = gcc $cc = gcc
@ -1739,6 +1825,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** linux-sparcv7 *** linux-sparcv7
$cc = gcc $cc = gcc
@ -1759,6 +1846,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** linux-sparcv8 *** linux-sparcv8
$cc = gcc $cc = gcc
@ -1779,6 +1867,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** linux-sparcv9 *** linux-sparcv9
$cc = gcc $cc = gcc
@ -1799,6 +1888,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** ncr-scde *** ncr-scde
$cc = cc $cc = cc
@ -1819,6 +1909,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** newsos4-gcc *** newsos4-gcc
$cc = gcc $cc = gcc
@ -1839,6 +1930,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** nextstep *** nextstep
$cc = cc $cc = cc
@ -1859,6 +1951,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** nextstep3.3 *** nextstep3.3
$cc = cc $cc = cc
@ -1879,6 +1972,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** purify *** purify
$cc = purify gcc $cc = purify gcc
@ -1899,6 +1993,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** qnx4 *** qnx4
$cc = cc $cc = cc
@ -1919,6 +2014,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** rhapsody-ppc-cc *** rhapsody-ppc-cc
$cc = cc $cc = cc
@ -1939,6 +2035,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** sco5-cc *** sco5-cc
$cc = cc $cc = cc
@ -1959,6 +2056,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** sco5-gcc *** sco5-gcc
$cc = gcc $cc = gcc
@ -1979,6 +2077,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** solaris-sparc-sc3 *** solaris-sparc-sc3
$cc = cc $cc = cc
@ -1999,6 +2098,7 @@ $rc5_obj =
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= solaris-shared $shared_target= solaris-shared
$shared_cflag = -KPIC $shared_cflag = -KPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** solaris-sparcv7-cc *** solaris-sparcv7-cc
$cc = cc $cc = cc
@ -2019,6 +2119,7 @@ $rc5_obj =
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= solaris-shared $shared_target= solaris-shared
$shared_cflag = -KPIC $shared_cflag = -KPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** solaris-sparcv7-gcc *** solaris-sparcv7-gcc
$cc = gcc $cc = gcc
@ -2039,6 +2140,7 @@ $rc5_obj =
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= solaris-shared $shared_target= solaris-shared
$shared_cflag = -fPIC $shared_cflag = -fPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** solaris-sparcv8-cc *** solaris-sparcv8-cc
$cc = cc $cc = cc
@ -2059,6 +2161,7 @@ $rc5_obj =
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= solaris-shared $shared_target= solaris-shared
$shared_cflag = -KPIC $shared_cflag = -KPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** solaris-sparcv8-gcc *** solaris-sparcv8-gcc
$cc = gcc $cc = gcc
@ -2079,6 +2182,7 @@ $rc5_obj =
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= solaris-shared $shared_target= solaris-shared
$shared_cflag = -fPIC $shared_cflag = -fPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** solaris-sparcv9-cc *** solaris-sparcv9-cc
$cc = cc $cc = cc
@ -2099,6 +2203,7 @@ $rc5_obj =
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= solaris-shared $shared_target= solaris-shared
$shared_cflag = -KPIC $shared_cflag = -KPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** solaris-sparcv9-gcc *** solaris-sparcv9-gcc
$cc = gcc $cc = gcc
@ -2119,6 +2224,7 @@ $rc5_obj =
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= solaris-shared $shared_target= solaris-shared
$shared_cflag = -fPIC $shared_cflag = -fPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** solaris-sparcv9-gcc27 *** solaris-sparcv9-gcc27
$cc = gcc $cc = gcc
@ -2139,6 +2245,7 @@ $rc5_obj =
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= solaris-shared $shared_target= solaris-shared
$shared_cflag = -fPIC $shared_cflag = -fPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** solaris-x86-gcc *** solaris-x86-gcc
$cc = gcc $cc = gcc
@ -2159,6 +2266,7 @@ $rc5_obj = asm/r586-sol.o
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= solaris-shared $shared_target= solaris-shared
$shared_cflag = -fPIC $shared_cflag = -fPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** solaris64-sparcv9-cc *** solaris64-sparcv9-cc
$cc = cc $cc = cc
@ -2179,6 +2287,7 @@ $rc5_obj =
$dso_scheme = dlfcn $dso_scheme = dlfcn
$shared_target= solaris-shared $shared_target= solaris-shared
$shared_cflag = -KPIC $shared_cflag = -KPIC
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
*** sunos-gcc *** sunos-gcc
$cc = gcc $cc = gcc
@ -2199,6 +2308,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** ultrix-cc *** ultrix-cc
$cc = cc $cc = cc
@ -2219,6 +2329,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** ultrix-gcc *** ultrix-gcc
$cc = gcc $cc = gcc
@ -2239,6 +2350,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** unixware-2.0 *** unixware-2.0
$cc = cc $cc = cc
@ -2259,6 +2371,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** unixware-2.0-pentium *** unixware-2.0-pentium
$cc = cc $cc = cc
@ -2279,6 +2392,7 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =
*** unixware-7 *** unixware-7
$cc = cc $cc = cc
@ -2299,3 +2413,4 @@ $rc5_obj =
$dso_scheme = $dso_scheme =
$shared_target= $shared_target=
$shared_cflag = $shared_cflag =
$shared_extension =

2
config
View File

@ -573,7 +573,7 @@ OUT="$PREFIX$OUT"
$PERL ./Configure LIST | grep "$OUT" > /dev/null $PERL ./Configure LIST | grep "$OUT" > /dev/null
if [ $? = "0" ]; then if [ $? = "0" ]; then
#echo Configuring for $OUT echo Configuring for $OUT
if [ "$TEST" = "true" ]; then if [ "$TEST" = "true" ]; then
echo $PERL ./Configure $OUT $options echo $PERL ./Configure $OUT $options

1
crypto/bio/b_sock.c
View File

@ -661,6 +661,7 @@ int BIO_accept(int sock, char **addr)
ret=accept(sock,(struct sockaddr *)&from,(void *)&len); ret=accept(sock,(struct sockaddr *)&from,(void *)&len);
if (ret == INVALID_SOCKET) if (ret == INVALID_SOCKET)
{ {
if(BIO_sock_should_retry(ret)) return -2;
SYSerr(SYS_F_ACCEPT,get_last_socket_error()); SYSerr(SYS_F_ACCEPT,get_last_socket_error());
BIOerr(BIO_F_BIO_ACCEPT,BIO_R_ACCEPT_ERROR); BIOerr(BIO_F_BIO_ACCEPT,BIO_R_ACCEPT_ERROR);
goto end; goto end;

4
crypto/bio/bio.h
View File

@ -179,7 +179,7 @@ extern "C" {
#define BIO_retry_type(a) ((a)->flags & BIO_FLAGS_RWS) #define BIO_retry_type(a) ((a)->flags & BIO_FLAGS_RWS)
#define BIO_should_retry(a) ((a)->flags & BIO_FLAGS_SHOULD_RETRY) #define BIO_should_retry(a) ((a)->flags & BIO_FLAGS_SHOULD_RETRY)
/* The next two are used in conjunction with the /* The next three are used in conjunction with the
* BIO_should_io_special() condition. After this returns true, * BIO_should_io_special() condition. After this returns true,
* BIO *BIO_get_retry_BIO(BIO *bio, int *reason); will walk the BIO * BIO *BIO_get_retry_BIO(BIO *bio, int *reason); will walk the BIO
* stack and return the 'reason' for the special and the offending BIO. * stack and return the 'reason' for the special and the offending BIO.
@ -188,6 +188,8 @@ extern "C" {
#define BIO_RR_SSL_X509_LOOKUP 0x01 #define BIO_RR_SSL_X509_LOOKUP 0x01
/* Returned from the connect BIO when a connect would have blocked */ /* Returned from the connect BIO when a connect would have blocked */
#define BIO_RR_CONNECT 0x02 #define BIO_RR_CONNECT 0x02
/* Returned from the accept BIO when an accept would have blocked */
#define BIO_RR_ACCEPT 0x03
/* These are passed by the BIO callback */ /* These are passed by the BIO callback */
#define BIO_CB_FREE 0x01 #define BIO_CB_FREE 0x01

12
crypto/bio/bss_acpt.c
View File

@ -236,8 +236,20 @@ again:
c->state=ACPT_S_OK; c->state=ACPT_S_OK;
goto again; goto again;
} }
BIO_clear_retry_flags(b);
b->retry_reason=0;
i=BIO_accept(c->accept_sock,&(c->addr)); i=BIO_accept(c->accept_sock,&(c->addr));
/* -2 return means we should retry */
if(i == -2)
{
BIO_set_retry_special(b);
b->retry_reason=BIO_RR_ACCEPT;
return -1;
}
if (i < 0) return(i); if (i < 0) return(i);
bio=BIO_new_socket(i,BIO_CLOSE); bio=BIO_new_socket(i,BIO_CLOSE);
if (bio == NULL) goto err; if (bio == NULL) goto err;

2
crypto/conf/conf.h
View File

@ -167,6 +167,8 @@ int NCONF_dump_bio(CONF *conf, BIO *out);
#define CONF_R_MISSING_EQUAL_SIGN 101 #define CONF_R_MISSING_EQUAL_SIGN 101
#define CONF_R_NO_CLOSE_BRACE 102 #define CONF_R_NO_CLOSE_BRACE 102
#define CONF_R_NO_CONF 105 #define CONF_R_NO_CONF 105
#define CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE 106
#define CONF_R_NO_SECTION 107
#define CONF_R_UNABLE_TO_CREATE_NEW_SECTION 103 #define CONF_R_UNABLE_TO_CREATE_NEW_SECTION 103
#define CONF_R_VARIABLE_HAS_NO_VALUE 104 #define CONF_R_VARIABLE_HAS_NO_VALUE 104

2
crypto/conf/conf_err.c
View File

@ -87,6 +87,8 @@ static ERR_STRING_DATA CONF_str_reasons[]=
{CONF_R_MISSING_EQUAL_SIGN ,"missing equal sign"}, {CONF_R_MISSING_EQUAL_SIGN ,"missing equal sign"},
{CONF_R_NO_CLOSE_BRACE ,"no close brace"}, {CONF_R_NO_CLOSE_BRACE ,"no close brace"},
{CONF_R_NO_CONF ,"no conf"}, {CONF_R_NO_CONF ,"no conf"},
{CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE ,"no conf or environment variable"},
{CONF_R_NO_SECTION ,"no section"},
{CONF_R_UNABLE_TO_CREATE_NEW_SECTION ,"unable to create new section"}, {CONF_R_UNABLE_TO_CREATE_NEW_SECTION ,"unable to create new section"},
{CONF_R_VARIABLE_HAS_NO_VALUE ,"variable has no value"}, {CONF_R_VARIABLE_HAS_NO_VALUE ,"variable has no value"},
{0,NULL} {0,NULL}

25
crypto/conf/conf_lib.c
View File

@ -299,27 +299,46 @@ STACK_OF(CONF_VALUE) *NCONF_get_section(CONF *conf,char *section)
return NULL; return NULL;
} }
if (section == NULL)
{
CONFerr(CONF_F_NCONF_GET_SECTION,CONF_R_NO_SECTION);
return NULL;
}
return _CONF_get_section_values(conf, section); return _CONF_get_section_values(conf, section);
} }
char *NCONF_get_string(CONF *conf,char *group,char *name) char *NCONF_get_string(CONF *conf,char *group,char *name)
{ {
char *s = _CONF_get_string(conf, group, name);
/* Since we may get a value from an environment variable even
if conf is NULL, let's check the value first */
if (s) return s;
if (conf == NULL) if (conf == NULL)
{ {
CONFerr(CONF_F_NCONF_GET_STRING,CONF_R_NO_CONF); CONFerr(CONF_F_NCONF_GET_STRING,
CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE);
return NULL; return NULL;
} }
return _CONF_get_string(conf, group, name);
} }
long NCONF_get_number(CONF *conf,char *group,char *name) long NCONF_get_number(CONF *conf,char *group,char *name)
{ {
#if 0 /* As with _CONF_get_string(), we rely on the possibility of finding
an environment variable with a suitable name. Unfortunately, there's
no way with the current API to see if we found one or not...
The meaning of this is that if a number is not found anywhere, it
will always default to 0. */
if (conf == NULL) if (conf == NULL)
{ {
CONFerr(CONF_F_NCONF_GET_NUMBER,CONF_R_NO_CONF); CONFerr(CONF_F_NCONF_GET_NUMBER,
CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE);
return 0; return 0;
} }
#endif
return _CONF_get_number(conf, group, name); return _CONF_get_number(conf, group, name);
} }

2
crypto/opensslv.h
View File

@ -79,7 +79,7 @@
* should only keep the versions that are binary compatible with the current. * should only keep the versions that are binary compatible with the current.
*/ */
#define SHLIB_VERSION_HISTORY "" #define SHLIB_VERSION_HISTORY ""
#define SHLIB_VERSION_NUMBER "0.9.6" #define SHLIB_VERSION_NUMBER "0.9.7"
#endif /* HEADER_OPENSSLV_H */ #endif /* HEADER_OPENSSLV_H */

9
crypto/rand/randtest.c
View File

@ -73,7 +73,13 @@ int main()
/*double d; */ /*double d; */
long d; long d;
RAND_pseudo_bytes(buf,2500); i = RAND_pseudo_bytes(buf,2500);
if (i < 0)
{
printf ("init failed, the rand method is not properly installed\n");
err++;
goto err;
}
n1=0; n1=0;
for (i=0; i<16; i++) n2[i]=0; for (i=0; i<16; i++) n2[i]=0;
@ -201,6 +207,7 @@ int main()
err++; err++;
} }
printf("test 4 done\n"); printf("test 4 done\n");
err:
err=((err)?1:0); err=((err)?1:0);
exit(err); exit(err);
return(err); return(err);

9
doc/crypto/BIO_s_accept.pod
View File

@ -92,7 +92,7 @@ BIO_do_accept() serves two functions. When it is first
called, after the accept BIO has been setup, it will attempt called, after the accept BIO has been setup, it will attempt
to create the accept socket and bind an address to it. Second to create the accept socket and bind an address to it. Second
and subsequent calls to BIO_do_accept() will await an incoming and subsequent calls to BIO_do_accept() will await an incoming
connection. connection, or request a retry in non blocking mode.
=head1 NOTES =head1 NOTES
@ -130,6 +130,13 @@ however because the accept BIO will still accept additional incoming
connections. This can be resolved by using BIO_pop() (see above) connections. This can be resolved by using BIO_pop() (see above)
and freeing up the accept BIO after the initial connection. and freeing up the accept BIO after the initial connection.
If the underlying accept socket is non blocking and BIO_do_accept() is
called to await an incoming connection it is possible for
BIO_should_io_special() with the reason BIO_RR_ACCEPT. If this happens
then it is an indication that an accept attempt would block: the application
should take appropriate action to wait until the underlying socket has
accepted a connection and retry the call.
=head1 RETURN VALUES =head1 RETURN VALUES
TBA TBA

24
doc/ssl/SSL_CTX_load_verify_locations.pod
View File

@ -40,6 +40,10 @@ as available CAs during the TLS/SSL handshake.
If B<CApath> is not NULL, it points to a directory containing CA certificates If B<CApath> is not NULL, it points to a directory containing CA certificates
in PEM format. The files each contain one CA certificate. The files are in PEM format. The files each contain one CA certificate. The files are
looked up by the CA subject name hash value, which must hence be available. looked up by the CA subject name hash value, which must hence be available.
If more than one CA certificate with the same name hash value exist, the
extension must be different (e.g. 9d66eef0.0, 9d66eef0.1 etc). The search
is performed in the ordering of the extension number, regardless of other
properties of the certificates.
Use the B<c_rehash> utility to create the necessary links. Use the B<c_rehash> utility to create the necessary links.
The certificates in B<CAfile> are only looked up when required, e.g. when The certificates in B<CAfile> are only looked up when required, e.g. when
@ -49,6 +53,24 @@ of a peer certificate.
On a server, the certificates in B<CApath> are not listed as available On a server, the certificates in B<CApath> are not listed as available
CA certificates to a client during a TLS/SSL handshake. CA certificates to a client during a TLS/SSL handshake.
When looking up CA certificates, the OpenSSL library will first search the
certificates in B<CAfile>, then those in B<CApath>. Certificate matching
is done based on the subject name, the key identifier (if present), and the
serial number as taken from the certificate to be verified. If these data
do not match, the next certificate will be tried. If a first certificate
matching the parameters is found, the verification process will be performed;
no other certificates for the same parameters will be searched in case of
failure.
=head1 WARNINGS
If several CA certificates matching the name, key identifier, and serial
number condition are available, only the first one will be examined. This
may lead to unexpected results if the same CA certificate is available
with different expiration dates. If a "certificate expired" verification
error occurs, no other certificate will be searched. Make sure to not
have expired certificates mixed with valid ones.
=head1 EXAMPLES =head1 EXAMPLES
Generate a CA certificate file with descriptive text from the CA certificates Generate a CA certificate file with descriptive text from the CA certificates
@ -64,7 +86,7 @@ Prepare the directory /some/where/certs containing several CA certificates
for use as B<CApath>: for use as B<CApath>:
cd /some/where/certs cd /some/where/certs
c_rehash c_rehash .
=head1 RETURN VALUES =head1 RETURN VALUES

2
doc/ssl/SSL_accept.pod
View File

@ -54,7 +54,7 @@ The TLS/SSL handshake was not successful but was shut down controlled and
by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
return value B<ret> to find out the reason. return value B<ret> to find out the reason.
=item -1 =item E<lt>0
The TLS/SSL handshake was not successful because a fatal error occurred either The TLS/SSL handshake was not successful because a fatal error occurred either
at the protocol level or a connection failure occurred. The shutdown was at the protocol level or a connection failure occurred. The shutdown was

2
doc/ssl/SSL_connect.pod
View File

@ -51,7 +51,7 @@ The TLS/SSL handshake was not successful but was shut down controlled and
by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
return value B<ret> to find out the reason. return value B<ret> to find out the reason.
=item -1 =item E<lt>0
The TLS/SSL handshake was not successful, because a fatal error occurred either The TLS/SSL handshake was not successful, because a fatal error occurred either
at the protocol level or a connection failure occurred. The shutdown was at the protocol level or a connection failure occurred. The shutdown was

2
doc/ssl/SSL_read.pod
View File

@ -61,7 +61,7 @@ The read operation was not successful, probably because no data was
available. Call SSL_get_error() with the return value B<ret> to find out, available. Call SSL_get_error() with the return value B<ret> to find out,
whether an error occurred. whether an error occurred.
=item -1 =item E<lt>0
The read operation was not successful, because either an error occurred The read operation was not successful, because either an error occurred
or action must be taken by the calling process. Call SSL_get_error() with the or action must be taken by the calling process. Call SSL_get_error() with the

2
doc/ssl/SSL_write.pod
View File

@ -60,7 +60,7 @@ bytes actually written to the TLS/SSL connection.
The write operation was not successful. Call SSL_get_error() with the return The write operation was not successful. Call SSL_get_error() with the return
value B<ret> to find out, whether an error occurred. value B<ret> to find out, whether an error occurred.
=item -1 =item E<lt>0
The read operation was not successful, because either an error occurred The read operation was not successful, because either an error occurred
or action must be taken by the calling process. Call SSL_get_error() with the or action must be taken by the calling process. Call SSL_get_error() with the

3
doc/ssl/ssl.pod
View File

@ -626,10 +626,13 @@ connection defined in the B<SSL> structure.
L<openssl(1)|openssl(1)>, L<crypto(3)|crypto(3)>, L<openssl(1)|openssl(1)>, L<crypto(3)|crypto(3)>,
L<SSL_accept(3)|SSL_accept(3)>, L<SSL_clear(3)|SSL_clear(3)>, L<SSL_accept(3)|SSL_accept(3)>, L<SSL_clear(3)|SSL_clear(3)>,
L<SSL_connect(3)|SSL_connect(3)>, L<SSL_connect(3)|SSL_connect(3)>,
L<SSL_CIPHER_get_name(3)|SSL_CIPHER_get_name(3)>,
L<SSL_CTX_get_verify_mode(3)|SSL_CTX_get_verify_mode(3)>,
L<SSL_CTX_load_verify_locations(3)|SSL_CTX_load_verify_locations(3)> L<SSL_CTX_load_verify_locations(3)|SSL_CTX_load_verify_locations(3)>
L<SSL_CTX_new(3)|SSL_CTX_new(3)>, L<SSL_CTX_new(3)|SSL_CTX_new(3)>,
L<SSL_CTX_set_client_CA_list(3)|SSL_CTX_set_client_CA_list(3)> L<SSL_CTX_set_client_CA_list(3)|SSL_CTX_set_client_CA_list(3)>
L<SSL_CTX_set_ssl_version(3)|SSL_CTX_set_ssl_version(3)>, L<SSL_CTX_set_ssl_version(3)|SSL_CTX_set_ssl_version(3)>,
L<SSL_CTX_set_verify(3)|SSL_CTX_set_verify(3)>,
L<SSL_get_ciphers(3)|SSL_get_ciphers(3)>, L<SSL_get_ciphers(3)|SSL_get_ciphers(3)>,
L<SSL_get_client_CA_list(3)|SSL_get_client_CA_list(3)>, L<SSL_get_client_CA_list(3)|SSL_get_client_CA_list(3)>,
L<SSL_get_error(3)|SSL_get_error(3)>, L<SSL_get_fd(3)|SSL_get_fd(3)>, L<SSL_get_error(3)|SSL_get_error(3)>, L<SSL_get_fd(3)|SSL_get_fd(3)>,

4
ssl/bio_ssl.c
View File

@ -206,6 +206,10 @@ static int ssl_read(BIO *b, char *out, int outl)
BIO_set_retry_special(b); BIO_set_retry_special(b);
retry_reason=BIO_RR_SSL_X509_LOOKUP; retry_reason=BIO_RR_SSL_X509_LOOKUP;
break; break;
case SSL_ERROR_WANT_ACCEPT:
BIO_set_retry_special(b);
retry_reason=BIO_RR_ACCEPT;
break;
case SSL_ERROR_WANT_CONNECT: case SSL_ERROR_WANT_CONNECT:
BIO_set_retry_special(b); BIO_set_retry_special(b);
retry_reason=BIO_RR_CONNECT; retry_reason=BIO_RR_CONNECT;

1
ssl/ssl.h
View File

@ -831,6 +831,7 @@ size_t SSL_get_peer_finished(SSL *s, void *buf, size_t count);
#define SSL_ERROR_SYSCALL 5 /* look at error stack/return value/errno */ #define SSL_ERROR_SYSCALL 5 /* look at error stack/return value/errno */
#define SSL_ERROR_ZERO_RETURN 6 #define SSL_ERROR_ZERO_RETURN 6
#define SSL_ERROR_WANT_CONNECT 7 #define SSL_ERROR_WANT_CONNECT 7
#define SSL_ERROR_WANT_ACCEPT 8
#define SSL_CTRL_NEED_TMP_RSA 1 #define SSL_CTRL_NEED_TMP_RSA 1
#define SSL_CTRL_SET_TMP_RSA 2 #define SSL_CTRL_SET_TMP_RSA 2

4
ssl/ssl_lib.c
View File

@ -1543,6 +1543,8 @@ int SSL_get_error(SSL *s,int i)
reason=BIO_get_retry_reason(bio); reason=BIO_get_retry_reason(bio);
if (reason == BIO_RR_CONNECT) if (reason == BIO_RR_CONNECT)
return(SSL_ERROR_WANT_CONNECT); return(SSL_ERROR_WANT_CONNECT);
else if (reason == BIO_RR_ACCEPT)
return(SSL_ERROR_WANT_ACCEPT);
else else
return(SSL_ERROR_SYSCALL); /* unknown */ return(SSL_ERROR_SYSCALL); /* unknown */
} }
@ -1561,6 +1563,8 @@ int SSL_get_error(SSL *s,int i)
reason=BIO_get_retry_reason(bio); reason=BIO_get_retry_reason(bio);
if (reason == BIO_RR_CONNECT) if (reason == BIO_RR_CONNECT)
return(SSL_ERROR_WANT_CONNECT); return(SSL_ERROR_WANT_CONNECT);
else if (reason == BIO_RR_ACCEPT)
return(SSL_ERROR_WANT_ACCEPT);
else else
return(SSL_ERROR_SYSCALL); return(SSL_ERROR_SYSCALL);
} }

119
util/libeay.num
View File

@ -1870,61 +1870,64 @@ X509_keyid_set1 2460 EXIST::FUNCTION:
BIO_next 2461 EXIST::FUNCTION: BIO_next 2461 EXIST::FUNCTION:
DSO_METHOD_vms 2462 EXIST::FUNCTION: DSO_METHOD_vms 2462 EXIST::FUNCTION:
BIO_f_linebuffer 2463 EXIST:VMS:FUNCTION: BIO_f_linebuffer 2463 EXIST:VMS:FUNCTION:
ERR_load_ENGINE_strings 2464 EXIST::FUNCTION: X509_print_ex 2464 EXIST::FUNCTION:
ENGINE_set_DSA 2465 EXIST::FUNCTION: X509_print_ex_fp 2465 EXIST::FUNCTION:FP_API
ENGINE_get_finish_function 2466 EXIST::FUNCTION: EVP_rijndael_ecb 2466 EXIST::FUNCTION:
ENGINE_get_default_RSA 2467 EXIST::FUNCTION: ERR_load_ENGINE_strings 2467 EXIST::FUNCTION:
ENGINE_get_BN_mod_exp 2468 EXIST::FUNCTION: ENGINE_set_DSA 2468 EXIST::FUNCTION:
DSA_get_default_openssl_method 2469 EXIST::FUNCTION:DSA ENGINE_get_finish_function 2469 EXIST::FUNCTION:
ENGINE_set_DH 2470 EXIST::FUNCTION: ENGINE_get_default_RSA 2470 EXIST::FUNCTION:
ENGINE_set_default_BN_mod_exp_crt 2471 EXIST:!VMS:FUNCTION: ENGINE_get_BN_mod_exp 2471 EXIST::FUNCTION:
ENGINE_set_def_BN_mod_exp_crt 2471 EXIST:VMS:FUNCTION: DSA_get_default_openssl_method 2472 EXIST::FUNCTION:DSA
ENGINE_init 2472 EXIST::FUNCTION: ENGINE_set_DH 2473 EXIST::FUNCTION:
DH_get_default_openssl_method 2473 EXIST::FUNCTION:DH ENGINE_set_default_BN_mod_exp_crt 2474 EXIST:!VMS:FUNCTION:
RSA_set_default_openssl_method 2474 EXIST::FUNCTION:RSA ENGINE_set_def_BN_mod_exp_crt 2474 EXIST:VMS:FUNCTION:
ENGINE_finish 2475 EXIST::FUNCTION: ENGINE_init 2475 EXIST::FUNCTION:
ENGINE_load_public_key 2476 EXIST::FUNCTION: DH_get_default_openssl_method 2476 EXIST::FUNCTION:DH
ENGINE_get_DH 2477 EXIST::FUNCTION: RSA_set_default_openssl_method 2477 EXIST::FUNCTION:RSA
ENGINE_ctrl 2478 EXIST::FUNCTION: ENGINE_finish 2478 EXIST::FUNCTION:
ENGINE_get_init_function 2479 EXIST::FUNCTION: ENGINE_load_public_key 2479 EXIST::FUNCTION:
ENGINE_set_init_function 2480 EXIST::FUNCTION: ENGINE_get_DH 2480 EXIST::FUNCTION:
ENGINE_set_default_DSA 2481 EXIST::FUNCTION: ENGINE_ctrl 2481 EXIST::FUNCTION:
ENGINE_get_name 2482 EXIST::FUNCTION: ENGINE_get_init_function 2482 EXIST::FUNCTION:
ENGINE_get_last 2483 EXIST::FUNCTION: ENGINE_set_init_function 2483 EXIST::FUNCTION:
ENGINE_get_prev 2484 EXIST::FUNCTION: ENGINE_set_default_DSA 2484 EXIST::FUNCTION:
ENGINE_get_default_DH 2485 EXIST::FUNCTION: ENGINE_get_name 2485 EXIST::FUNCTION:
ENGINE_get_RSA 2486 EXIST::FUNCTION: ENGINE_get_last 2486 EXIST::FUNCTION:
ENGINE_set_default 2487 EXIST::FUNCTION: ENGINE_get_prev 2487 EXIST::FUNCTION:
ENGINE_get_RAND 2488 EXIST::FUNCTION: ENGINE_get_default_DH 2488 EXIST::FUNCTION:
ENGINE_get_first 2489 EXIST::FUNCTION: ENGINE_get_RSA 2489 EXIST::FUNCTION:
ENGINE_by_id 2490 EXIST::FUNCTION: ENGINE_set_default 2490 EXIST::FUNCTION:
ENGINE_set_finish_function 2491 EXIST::FUNCTION: ENGINE_get_RAND 2491 EXIST::FUNCTION:
ENGINE_get_default_BN_mod_exp_crt 2492 EXIST:!VMS:FUNCTION: ENGINE_get_first 2492 EXIST::FUNCTION:
ENGINE_get_def_BN_mod_exp_crt 2492 EXIST:VMS:FUNCTION: ENGINE_by_id 2493 EXIST::FUNCTION:
RSA_get_default_openssl_method 2493 EXIST::FUNCTION:RSA ENGINE_set_finish_function 2494 EXIST::FUNCTION:
ENGINE_set_RSA 2494 EXIST::FUNCTION: ENGINE_get_default_BN_mod_exp_crt 2495 EXIST:!VMS:FUNCTION:
ENGINE_load_private_key 2495 EXIST::FUNCTION: ENGINE_get_def_BN_mod_exp_crt 2495 EXIST:VMS:FUNCTION:
ENGINE_set_default_RAND 2496 EXIST::FUNCTION: RSA_get_default_openssl_method 2496 EXIST::FUNCTION:RSA
ENGINE_set_BN_mod_exp 2497 EXIST::FUNCTION: ENGINE_set_RSA 2497 EXIST::FUNCTION:
ENGINE_remove 2498 EXIST::FUNCTION: ENGINE_load_private_key 2498 EXIST::FUNCTION:
ENGINE_free 2499 EXIST::FUNCTION: ENGINE_set_default_RAND 2499 EXIST::FUNCTION:
ENGINE_get_BN_mod_exp_crt 2500 EXIST::FUNCTION: ENGINE_set_BN_mod_exp 2500 EXIST::FUNCTION:
ENGINE_get_next 2501 EXIST::FUNCTION: ENGINE_remove 2501 EXIST::FUNCTION:
ENGINE_set_name 2502 EXIST::FUNCTION: ENGINE_free 2502 EXIST::FUNCTION:
ENGINE_get_default_DSA 2503 EXIST::FUNCTION: ENGINE_get_BN_mod_exp_crt 2503 EXIST::FUNCTION:
ENGINE_set_default_BN_mod_exp 2504 EXIST::FUNCTION: ENGINE_get_next 2504 EXIST::FUNCTION:
ENGINE_set_default_RSA 2505 EXIST::FUNCTION: ENGINE_set_name 2505 EXIST::FUNCTION:
ENGINE_get_default_RAND 2506 EXIST::FUNCTION: ENGINE_get_default_DSA 2506 EXIST::FUNCTION:
ENGINE_get_default_BN_mod_exp 2507 EXIST::FUNCTION: ENGINE_set_default_BN_mod_exp 2507 EXIST::FUNCTION:
ENGINE_set_RAND 2508 EXIST::FUNCTION: ENGINE_set_default_RSA 2508 EXIST::FUNCTION:
ENGINE_set_id 2509 EXIST::FUNCTION: ENGINE_get_default_RAND 2509 EXIST::FUNCTION:
ENGINE_set_BN_mod_exp_crt 2510 EXIST::FUNCTION: ENGINE_get_default_BN_mod_exp 2510 EXIST::FUNCTION:
ENGINE_set_default_DH 2511 EXIST::FUNCTION: ENGINE_set_RAND 2511 EXIST::FUNCTION:
ENGINE_new 2512 EXIST::FUNCTION: ENGINE_set_id 2512 EXIST::FUNCTION:
ENGINE_get_id 2513 EXIST::FUNCTION: ENGINE_set_BN_mod_exp_crt 2513 EXIST::FUNCTION:
DSA_set_default_openssl_method 2514 EXIST::FUNCTION:DSA ENGINE_set_default_DH 2514 EXIST::FUNCTION:
ENGINE_add 2515 EXIST::FUNCTION: ENGINE_new 2515 EXIST::FUNCTION:
DH_set_default_openssl_method 2516 EXIST::FUNCTION:DH ENGINE_get_id 2516 EXIST::FUNCTION:
ENGINE_get_DSA 2517 EXIST::FUNCTION: DSA_set_default_openssl_method 2517 EXIST::FUNCTION:DSA
ENGINE_get_ctrl_function 2518 EXIST::FUNCTION: ENGINE_add 2518 EXIST::FUNCTION:
ENGINE_set_ctrl_function 2519 EXIST::FUNCTION: DH_set_default_openssl_method 2519 EXIST::FUNCTION:DH
ENGINE_get_DSA 2520 EXIST::FUNCTION:
ENGINE_get_ctrl_function 2521 EXIST::FUNCTION:
ENGINE_set_ctrl_function 2522 EXIST::FUNCTION:

1
util/selftest.pl
View File

@ -131,6 +131,7 @@ if (system("make 2>&1 | tee make.log") > 255) {
$_=$options; $_=$options;
s/no-asm//; s/no-asm//;
s/no-shared//;
if (/no-/) if (/no-/)
{ {
print OUT "Test skipped.\n"; print OUT "Test skipped.\n";