Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/crypto/dist/openssl OpenSSL 0.9.6e. includes major security...
details: https://anonhg.NetBSD.org/src/rev/69300f8626eb
branches: trunk
changeset: 534621:69300f8626eb
user: itojun <itojun%NetBSD.org@localhost>
date: Tue Jul 30 23:57:34 2002 +0000
description:
OpenSSL 0.9.6e. includes major security fixes (already applied)
diffstat:
crypto/dist/openssl/Configure | 29 +++-
crypto/dist/openssl/INSTALL | 10 +-
crypto/dist/openssl/INSTALL.W32 | 12 +
crypto/dist/openssl/Makefile.org | 34 +++-
crypto/dist/openssl/Makefile.ssl | 38 +++--
crypto/dist/openssl/NEWS | 2 +-
crypto/dist/openssl/PROBLEMS | 34 ++++
crypto/dist/openssl/README | 19 ++-
crypto/dist/openssl/apps/CA.pl | 2 +-
crypto/dist/openssl/apps/Makefile.ssl | 6 +-
crypto/dist/openssl/apps/apps.c | 20 ++-
crypto/dist/openssl/apps/asn1pars.c | 3 +-
crypto/dist/openssl/apps/ca.c | 2 +-
crypto/dist/openssl/apps/der_chop | 2 +-
crypto/dist/openssl/apps/pkcs7.c | 2 +-
crypto/dist/openssl/apps/x509.c | 2 +-
crypto/dist/openssl/config | 38 ++++-
crypto/dist/openssl/crypto/Makefile.ssl | 10 +-
crypto/dist/openssl/crypto/asn1/a_bitstr.c | 6 +-
crypto/dist/openssl/crypto/asn1/a_enum.c | 13 +-
crypto/dist/openssl/crypto/asn1/a_int.c | 11 +-
crypto/dist/openssl/crypto/asn1/a_set.c | 4 +-
crypto/dist/openssl/crypto/asn1/a_utctm.c | 6 +-
crypto/dist/openssl/crypto/asn1/d2i_dhp.c | 1 +
crypto/dist/openssl/crypto/asn1/d2i_dsap.c | 1 +
crypto/dist/openssl/crypto/asn1/d2i_r_pr.c | 1 +
crypto/dist/openssl/crypto/asn1/t_pkey.c | 88 +++++++++---
crypto/dist/openssl/crypto/asn1/x_pubkey.c | 2 +-
crypto/dist/openssl/crypto/bio/b_print.c | 7 +
crypto/dist/openssl/crypto/bio/bf_nbio.c | 2 +-
crypto/dist/openssl/crypto/bio/bss_bio.c | 13 +-
crypto/dist/openssl/crypto/bn/bn_div.c | 8 +-
crypto/dist/openssl/crypto/bn/bn_gcd.c | 4 +-
crypto/dist/openssl/crypto/bn/bn_mont.c | 46 +++--
crypto/dist/openssl/crypto/bn/bn_mul.c | 18 +-
crypto/dist/openssl/crypto/conf/Makefile.ssl | 10 +-
crypto/dist/openssl/crypto/crypto-lib.com | 1 +
crypto/dist/openssl/crypto/dsa/dsa_asn1.c | 1 +
crypto/dist/openssl/crypto/dso/dso_dlfcn.c | 2 +-
crypto/dist/openssl/crypto/evp/bio_enc.c | 2 +-
crypto/dist/openssl/crypto/evp/c_allc.c | 4 +
crypto/dist/openssl/crypto/objects/o_names.c | 3 +
crypto/dist/openssl/crypto/opensslv.h | 4 +-
crypto/dist/openssl/crypto/pem/pem2.h | 2 +
crypto/dist/openssl/crypto/pem/pem_lib.c | 1 +
crypto/dist/openssl/crypto/perlasm/x86nasm.pl | 2 +-
crypto/dist/openssl/crypto/pkcs12/pkcs12.h | 4 +-
crypto/dist/openssl/crypto/pkcs7/pk7_doit.c | 4 +-
crypto/dist/openssl/crypto/pkcs7/verify.c | 5 +-
crypto/dist/openssl/crypto/rsa/rsa_eay.c | 2 +-
crypto/dist/openssl/crypto/txt_db/txt_db.c | 2 +-
crypto/dist/openssl/crypto/x509v3/v3_ia5.c | 2 +-
crypto/dist/openssl/demos/maurice/loadkeys.c | 4 +-
crypto/dist/openssl/doc/apps/crl2pkcs7.pod | 5 +-
crypto/dist/openssl/doc/crypto/DH_get_ex_new_index.pod | 2 +-
crypto/dist/openssl/doc/crypto/RSA_check_key.pod | 11 +-
crypto/dist/openssl/doc/ssl/SSL_CTX_sess_set_cache_size.pod | 4 +-
crypto/dist/openssl/doc/ssl/SSL_CTX_sess_set_get_cb.pod | 2 +-
crypto/dist/openssl/doc/ssl/SSL_CTX_set_cert_store.pod | 2 +-
crypto/dist/openssl/doc/ssl/SSL_CTX_set_client_cert_cb.pod | 48 +++---
crypto/dist/openssl/doc/ssl/SSL_CTX_set_options.pod | 19 ++-
crypto/dist/openssl/doc/ssl/SSL_accept.pod | 1 +
crypto/dist/openssl/doc/ssl/SSL_connect.pod | 1 +
crypto/dist/openssl/doc/ssl/SSL_do_handshake.pod | 75 ++++++++++
crypto/dist/openssl/doc/ssl/SSL_set_connect_state.pod | 1 +
crypto/dist/openssl/doc/ssl/SSL_write.pod | 3 +
crypto/dist/openssl/include/openssl/bn.h | 2 +-
crypto/dist/openssl/include/openssl/des.h | 2 +-
crypto/dist/openssl/include/openssl/e_os.h | 9 +-
crypto/dist/openssl/include/openssl/evp.h | 2 +-
crypto/dist/openssl/include/openssl/opensslv.h | 4 +-
crypto/dist/openssl/include/openssl/pem2.h | 2 +
crypto/dist/openssl/include/openssl/pkcs12.h | 4 +-
crypto/dist/openssl/include/openssl/ssl.h | 22 ++-
crypto/dist/openssl/ms/do_masm.bat | 20 +-
crypto/dist/openssl/ms/do_nasm.bat | 21 +-
crypto/dist/openssl/shlib/svr5-shared-gcc.sh | 4 +-
crypto/dist/openssl/ssl/Makefile.ssl | 91 +++++++------
crypto/dist/openssl/ssl/s3_enc.c | 21 ++-
crypto/dist/openssl/ssl/ssl-lib.com | 2 +
crypto/dist/openssl/ssl/t1_enc.c | 21 ++-
crypto/dist/openssl/test/Makefile.ssl | 6 +-
crypto/dist/openssl/tools/c_rehash | 2 +-
crypto/dist/openssl/util/dirname.pl | 18 ++
crypto/dist/openssl/util/domd | 2 +-
crypto/dist/openssl/util/mk1mf.pl | 2 +-
crypto/dist/openssl/util/pl/BC-32.pl | 36 ++--
crypto/dist/openssl/util/pl/VC-32.pl | 36 ++--
crypto/dist/openssl/util/pod2mantest | 53 +++++++
crypto/dist/openssl/util/pod2mantest.pod | 15 ++
90 files changed, 802 insertions(+), 320 deletions(-)
diffs (truncated from 2682 to 300 lines):
diff -r bb49d11d7c85 -r 69300f8626eb crypto/dist/openssl/Configure
--- a/crypto/dist/openssl/Configure Tue Jul 30 23:27:15 2002 +0000
+++ b/crypto/dist/openssl/Configure Tue Jul 30 23:57:34 2002 +0000
@@ -144,6 +144,7 @@
"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::.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::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris64-sparcv9-gcc31","gcc:-mcpu=ultrasparc -m64 -O3 -fomit-frame-pointer -Wall -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:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
# gcc pre-2.8 doesn't understand -mcpu=ultrasparc, so fall down to -mv8
# 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::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -169,10 +170,10 @@
"linux-sparcv7","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::",
# Ray Miller <ray.miller%computing-services.oxford.ac.uk@localhost> has patiently
# assisted with debugging of following two configs.
-"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o::::",
+"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL
BF_PTR:asm/sparcv8.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
# it's a real mess with -mcpu=ultrasparc option under Linux, but
# -Wa,-Av8plus should do the trick no matter what.
-"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL
BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL
BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
# !!!Folowing can't be even tested yet!!!
# We have to wait till 64-bit glibc for SPARC is operational!!!
#"linux64-sparcv9","sparc64-linux-gcc:-m64 -mcpu=v9 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL
BF_PTR::::asm/md5-sparcv9.o:",
@@ -228,6 +229,7 @@
"hpux-parisc-cc-o4","cc:-Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"hpux-parisc-gcc","gcc:-O3 -DB_ENDIAN -DBN_DIV2W:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"hpux64-parisc-cc","cc:-Ae +DD64 +O3 +ESlit -z -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1
DES_INT::::::::::dlfcn:hpux64-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"hpux64-parisc-gcc","gcc:-DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1
DES_INT::::::::::dlfcn:hpux64-shared:-fpic::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
# More attempts at unified 10.X and 11.X targets for HP C compiler.
#
@@ -335,7 +337,7 @@
# 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.
"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: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:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"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-mipsel", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::BN_LLONG:::",
@@ -435,7 +437,7 @@
"sco5-cc-pentium", "cc:-Kpentium::(unknown):-lsocket:${x86_gcc_des} ${x86_gcc_opts}:::", # des options?
"sco5-gcc", "gcc:-O3 -fomit-frame-pointer::(unknown):-lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", # the SCO assembler doesn't seem to like our assembler files ...
"sco5-cc-shared","cc:-belf:::-lsocket -lresolv -lnsl:MD2_CHAR RC4_INDEX ${x86_gcc_des}::::::::::dlfcn:svr3-shared:-Kpic",
-"sco5-gcc-shared","gcc:-O3 -DFILIO_H -fomit-frame-pointer:::-lsocket -lresolv -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:svr3-shared:-fPIC", # the SCO assembler doesn't seem to
like our assembler files ...
+"sco5-gcc-shared","gcc:-O3 -fomit-frame-pointer:::-lsocket -lresolv -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:svr3-shared:-fPIC", # the SCO assembler doesn't seem to like our
assembler files ...
# Sinix/ReliantUNIX RM400
# NOTE: The CDS++ Compiler up to V2.0Bsomething has the IRIX_CC_BUG optimizer problem. Better use -g */
@@ -470,6 +472,9 @@
# and its library files in util/pl/*)
"Mingw32", "gcc:-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",
+# UWIN
+"UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",
+
# Cygwin
"Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",
"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -m486 -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32:cygwin-shared:::.dll",
@@ -488,7 +493,7 @@
##### MacOS X (a.k.a. Rhapsody or Darwin) setup
"rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",
-"darwin-ppc-cc","cc:-O3 -D_DARWIN -DB_ENDIAN::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::darwin-shared:-fPIC:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+"darwin-ppc-cc","cc:-O3 -D_DARWIN -DB_ENDIAN -fno-common::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::darwin-shared:-fPIC::.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
##### Sony NEWS-OS 4.x
"newsos4-gcc","gcc:-O -DB_ENDIAN -DNEWS4::(unknown):-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::",
@@ -899,6 +904,10 @@
$cflags.=" -DRMD160_ASM";
}
+# "Stringify" the C flags string. This permits it to be made part of a string
+# and works as well on command lines.
+$cflags =~ s/([\\\"])/\\\1/g;
+
my $version = "unknown";
my $major = "unknown";
my $minor = "unknown";
@@ -981,13 +990,21 @@
if ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*$/)
{
my $sotmp = $1;
- s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/
+ s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/;
+ }
+ elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.dylib$/)
+ {
+ s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.dylib/;
}
elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
{
my $sotmp = $1;
s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
}
+ elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
+ {
+ s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.\$(SHLIB_MAJOR).dylib .dylib/;
+ }
s/^SHARED_LDFLAGS=.*/SHARED_LDFLAGS=$shared_ldflag/;
print OUT $_."\n";
}
diff -r bb49d11d7c85 -r 69300f8626eb crypto/dist/openssl/INSTALL
--- a/crypto/dist/openssl/INSTALL Tue Jul 30 23:27:15 2002 +0000
+++ b/crypto/dist/openssl/INSTALL Tue Jul 30 23:57:34 2002 +0000
@@ -128,8 +128,11 @@
the failure that aren't problems in OpenSSL itself (like missing
standard headers). If it is a problem with OpenSSL itself, please
report the problem to <openssl-bugs%openssl.org@localhost> (note that your
- message will be forwarded to a public mailing list). Include the
- output of "make report" in your message.
+ message will be recorded in the request tracker publicly readable
+ via http://www.openssl.org/rt2.html and will be forwarded to a public
+ mailing list). Include the output of "make report" in your message.
+ Please check out the request tracker. Maybe the bug was already
+ reported or has already been fixed.
[If you encounter assembler error messages, try the "no-asm"
configuration option as an immediate fix.]
@@ -147,7 +150,8 @@
try removing any compiler optimization flags from the CFLAGS line
in Makefile.ssl and run "make clean; make". Please send a bug
report to <openssl-bugs%openssl.org@localhost>, including the output of
- "make report".
+ "make report" in order to be added to the request tracker at
+ http://www.openssl.org/rt2.html.
4. If everything tests ok, install OpenSSL with
diff -r bb49d11d7c85 -r 69300f8626eb crypto/dist/openssl/INSTALL.W32
--- a/crypto/dist/openssl/INSTALL.W32 Tue Jul 30 23:27:15 2002 +0000
+++ b/crypto/dist/openssl/INSTALL.W32 Tue Jul 30 23:57:34 2002 +0000
@@ -94,6 +94,18 @@
You can also build a static version of the library using the Makefile
ms\nt.mak
+ Borland C++ builder 5
+ ---------------------
+
+ * Configure for building with Borland Builder:
+ > perl Configure BC-32
+
+ * Create the appropriate makefile
+ > ms\do_nasm
+
+ * Build
+ > make -f ms\bcb.mak
+
Borland C++ builder 3 and 4
---------------------------
diff -r bb49d11d7c85 -r 69300f8626eb crypto/dist/openssl/Makefile.org
--- a/crypto/dist/openssl/Makefile.org Tue Jul 30 23:27:15 2002 +0000
+++ b/crypto/dist/openssl/Makefile.org Tue Jul 30 23:57:34 2002 +0000
@@ -420,6 +420,7 @@
-b -z -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-Fl lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \
+ chmod a=rx lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} ; \
libs="$$libs -L. -l$$i"; \
done
@@ -430,6 +431,7 @@
-b -z -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+forceload lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \
+ chmod a=rx lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} ; \
libs="$$libs -L. -l$$i"; \
done
@@ -545,7 +547,7 @@
tests: rehash
@(cd test && echo "testing..." && \
- $(MAKE) CC='${CC}' 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}' SDIRS='${SDIRS}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PERL='${PERL}'
EXE_EXT='${EXE_EXT}' tests );
+ $(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}' TESTS='${TESTS}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}'
OPENSSL_DEBUG_MEMORY=on tests );
@apps/openssl version -a
report:
@@ -556,7 +558,7 @@
do \
if [ -d "$$i" ]; then \
(cd $$i && echo "making dependencies $$i..." && \
- $(MAKE) SDIRS='${SDIRS}' DEPFLAG='${DEPFLAG}' depend ) || exit 1; \
+ $(MAKE) SDIRS='${SDIRS}' DEPFLAG='${DEPFLAG}' PERL='${PERL}' depend ) || exit 1; \
fi; \
done;
@@ -601,20 +603,26 @@
update: depend errors stacks util/libeay.num util/ssleay.num crypto/objects/obj_dat.h TABLE
+# Build distribution tar-file. As the list of files returned by "find" is
+# pretty long, on several platforms a "too many arguments" error or similar
+# would occur. Therefore the list of files is temporarily stored into a file
+# and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal
+# tar does not support the --files-from option.
tar:
- @$(TAR) $(TARFLAGS) -cvf - \
- `find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort` |\
+ find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort > ../$(TARFILE).list; \
+ $(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \
tardy --user_number=0 --user_name=openssl \
--group_number=0 --group_name=openssl \
--prefix=openssl-$(VERSION) - |\
gzip --best >../$(TARFILE).gz; \
+ rm -f ../$(TARFILE).list; \
ls -l ../$(TARFILE).gz
dist:
$(PERL) Configure dist
@$(MAKE) dist_pem_h
@$(MAKE) SDIRS='${SDIRS}' clean
- @$(MAKE) tar
+ @$(MAKE) TAR='${TAR}' TARFLAGS='${TARFLAGS}' tar
dist_pem_h:
(cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
@@ -656,7 +664,7 @@
( echo installing $$i; \
if [ "$(PLATFORM)" != "Cygwin" ]; then \
cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
+ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
else \
c=`echo $$i | sed 's/^lib/cyg/'`; \
cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \
@@ -681,18 +689,20 @@
fn=`basename $$i .pod`; \
if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \
echo "installing man$$sec/`basename $$i .pod`.$$sec"; \
- (cd `dirname $$i`; \
- $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
- --release=$(VERSION) `basename $$i`) \
+ (cd `$(PERL) util/dirname.pl $$i`; \
+ sh -c "$(PERL) `cd ../../util; ./pod2mantest ignore` \
+ --section=$$sec --center=OpenSSL \
+ --release=$(VERSION) `basename $$i`") \
> $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \
done
@for i in doc/crypto/*.pod doc/ssl/*.pod; do \
fn=`basename $$i .pod`; \
if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \
echo "installing man$$sec/`basename $$i .pod`.$$sec"; \
- (cd `dirname $$i`; \
- $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
- --release=$(VERSION) `basename $$i`) \
+ (cd `$(PERL) util/dirname.pl $$i`; \
+ sh -c "$(PERL) `cd ../../util; ./pod2mantest ignore` \
+ --section=$$sec --center=OpenSSL \
+ --release=$(VERSION) `basename $$i`") \
> $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \
done
diff -r bb49d11d7c85 -r 69300f8626eb crypto/dist/openssl/Makefile.ssl
--- a/crypto/dist/openssl/Makefile.ssl Tue Jul 30 23:27:15 2002 +0000
+++ b/crypto/dist/openssl/Makefile.ssl Tue Jul 30 23:57:34 2002 +0000
@@ -4,7 +4,7 @@
## Makefile for OpenSSL
##
-VERSION=0.9.6d
+VERSION=0.9.6e
MAJOR=0
MINOR=9.6
SHLIB_VERSION_NUMBER=0.9.6
@@ -64,7 +64,7 @@
EXE_EXT=
AR=ar r
RANLIB= /usr/bin/ranlib
-PERL= /usr/local/bin/perl
+PERL= /usr/local/bin/perl5
TAR= tar
TARFLAGS= --no-recursion
@@ -422,6 +422,7 @@
-b -z -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-Fl lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \
+ chmod a=rx lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} ; \
libs="$$libs -L. -l$$i"; \
done
@@ -432,6 +433,7 @@
-b -z -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+forceload lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \
+ chmod a=rx lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} ; \
libs="$$libs -L. -l$$i"; \
done
@@ -547,7 +549,7 @@
tests: rehash
@(cd test && echo "testing..." && \
- $(MAKE) CC='${CC}' 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}' SDIRS='${SDIRS}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PERL='${PERL}'
EXE_EXT='${EXE_EXT}' tests );
+ $(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}' TESTS='${TESTS}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}'
OPENSSL_DEBUG_MEMORY=on tests );
@apps/openssl version -a
Home |
Main Index |
Thread Index |
Old Index