openssl 0.9.4

3 files changed, 92 insertions, 43 deletions

diff --git a/lib/libssl/Makefile.bsd-wrapper b/lib/libssl/Makefile.bsd-wrapper
index 282912514d7..2759c969461 100644
--- a/lib/libssl/Makefile.bsd-wrapper
+++ b/lib/libssl/Makefile.bsd-wrapper
@@ -1,34 +1,33 @@
-# Build wrapper for SSLeay.
-# $OpenBSD: Makefile.bsd-wrapper,v 1.9 1999/03/17 18:25:56 deraadt Exp $
+# Build wrapper for OpenSSL
+# $OpenBSD: Makefile.bsd-wrapper,v 1.10 1999/09/29 05:55:59 beck Exp $
 
 # Our lndir is hacked; specify a full path to avoid potential conflicts
 # with the one installed with X11.
 LNDIR=          /usr/bin/lndir
 
-
-# Figure out what flag we use to SSLeay's configure. This
+# Figure out what flag we use to OpenSSL's configure. This
 # needs to be tested on all architectures.
 
 .if ${MACHINE_ARCH} == "i386"
-SSLCONF=	OpenBSD-x86
+SSLCONF=	--openssldir=/etc/ssl OpenBSD-x86
 .else
-.if ${MACHINE_ARCH} == "pmax"
-SSLCONF=	OpenBSD-pmax
+.if ${MACHINE} == "pmax"
+SSLCONF=	--openssldir=/etc/ssl OpenBSD-pmax
 .else
-.if ${MACHINE_ARCH} == "arc"
-SSLCONF=	OpenBSD-arc
+.if ${MACHINE} == "arc"
+SSLCONF=	--openssldir=/etc/ssl OpenBSD-arc
 .else
 .if ${MACHINE_ARCH} == "alpha"
-SSLCONF=	OpenBSD-alpha
+SSLCONF=	--openssldir=/etc/ssl OpenBSD-alpha
 .else
 .if ${MACHINE_ARCH} == "sparc"
-SSLCONF=	OpenBSD-bigendian
+SSLCONF=	--openssldir=/etc/ssl OpenBSD-bigendian
 .else
 .if ${MACHINE_ARCH} == "m88k"
-SSLCONF=	OpenBSD-bigendian
+SSLCONF=	--openssldir=/etc/ssl OpenBSD-bigendian
 .else
 ##UNTESTED!	
-SSLCONF=	OpenBSD-bigendian
+SSLCONF=	--openssldir=/etc/ssl OpenBSD-bigendian
 .endif
 .endif
 .endif
@@ -36,15 +35,7 @@ SSLCONF=	OpenBSD-bigendian
 .endif
 .endif
 
-MUNGEDFILES =  	${.OBJDIR}/${SSL_SRC}/crypto/bf/bf_locl.h \
-		${.OBJDIR}/${SSL_SRC}/crypto/bn/bn.h \
-		${.OBJDIR}/${SSL_SRC}/crypto/des/des.h \
-		${.OBJDIR}/${SSL_SRC}/crypto/des/des_locl.h \
-		${.OBJDIR}/${SSL_SRC}/crypto/idea/idea.h \
-		${.OBJDIR}/${SSL_SRC}/crypto/md2/md2.h \
-		${.OBJDIR}/${SSL_SRC}/crypto/rc2/rc2.h \
-		${.OBJDIR}/${SSL_SRC}/crypto/rc4/rc4.h \
-		${.OBJDIR}/${SSL_SRC}/crypto/rc4/rc4_locl.h
+MUNGEDFILES =  	${.OBJDIR}/${SSL_SRC}/crypto/opensslconf.h ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h ${.OBJDIR}/${SSL_SRC}/Makefile.ssl ${.OBJDIR}/${SSL_SRC}/Makefile ${.OBJDIR}/${SSL_SRC}/apps/der_chop ${.OBJDIR}/${SSL_SRC}/tools/c_rehash
 
 
 .include <bsd.own.mk>
@@ -61,29 +52,32 @@ all: 	prereq
 includes: prereq
 	cd ${.OBJDIR} && ${MAKE} includes
 
-prereq:	${.OBJDIR}/${SSL_SRC}/crypto/md2/md2.h
+prereq:	${.OBJDIR}/${SSL_SRC}/Makefile.ssl ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h
 
 install:
 	cd ${.OBJDIR} && ${MAKE} install
 
-${.OBJDIR}/${SSL_SRC}/crypto/md2/md2.h : ${.OBJDIR}/${SSL_SRC}/Makefile.ssl
+${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h: ${.OBJDIR}/${SSL_SRC}/crypto/objects/objects.h
+	/usr/bin/perl ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.pl < ${.OBJDIR}/${SSL_SRC}/crypto/objects/objects.h > ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h
+
+${.OBJDIR}/${SSL_SRC}/Makefile.ssl : ${.OBJDIR}/${SSL_SRC}/Makefile.org
 	cd ${.OBJDIR}/${SSL_SRC} && /usr/bin/perl Configure ${SSLCONF}
 
-.if !exists(${.OBJDIR}/${SSL_SRC}/Makefile.ssl)
-${.OBJDIR}/${SSL_SRC}/Makefile.ssl: ${.CURDIR}/${SSL_SRC}/Makefile.ssl
-	${LNDIR} -s -e obj -e obj.${MACHINE_ARCH} -e Makefile.bsd-wrapper -e Makefile.ssl ${.CURDIR} && cp ${.CURDIR}/${SSL_SRC}/Makefile.ssl ${.OBJDIR}/${SSL_SRC}
+.if !exists(${.OBJDIR}/${SSL_SRC}/Makefile.org)
+${.OBJDIR}/${SSL_SRC}/Makefile.org: ${.CURDIR}/${SSL_SRC}/Makefile.org
+	${LNDIR} -s -e obj -e obj.${MACHINE_ARCH} -e Makefile.bsd-wrapper ${.CURDIR}
 .endif
 
-clean:	${.OBJDIR}/${SSL_SRC}/Makefile.ssl
+clean:
 	cd ${.OBJDIR} && ${MAKE} clean
 
-cleandir: ${.OBJDIR}/${SSL_SRC}/Makefile.ssl
-	cd ${.OBJDIR} && rm -f ${MUNGEDFILES} && ${MAKE} cleandir
+cleandir: clean
+	cd ${.OBJDIR} && rm -f ${MUNGEDFILES}
 
 test:
 	# Nothing here so far...
 
-depend:
+depend: prereq
 	# Nothing here so far...
 
 lint:
@@ -94,7 +88,7 @@ tags:
 
 distribution:
 	${INSTALL} ${INSTALL_COPY} -g ${BINGRP} -m 444 \
-	   ${.CURDIR}/ssleay.cnf ${DESTDIR}/etc/ssl/lib/ssleay.cnf
+	   ${.CURDIR}/openssl.cnf ${DESTDIR}/etc/ssl/openssl.cnf
 
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>
diff --git a/lib/libssl/README.OPENBSD b/lib/libssl/README.OPENBSD
index 7cc3d0d424a..063259deb74 100644
--- a/lib/libssl/README.OPENBSD
+++ b/lib/libssl/README.OPENBSD
@@ -1,18 +1,8 @@
 
-	This is an SSLeay-0.9.0b (the b means the PKCS#1 bug is fixed) tree.
+	This is based on an OpenSSL-0.9.4
 	
 	It has the following modifcations made to it.
 
-	0) util/perlpath.pl has been run to change perlpath to /usr/bin
-	   util/ssldir.pl has been run to change the ssl dir to /usr/ssl
-	   Null check added to crypto/err/err.c (mailed to Eric Young)
-	   to avoid problems in error handling.  Includes install into
-           /usr/include/ssl, certs and configs are expected to be in
-           /etc/ssl.
-
-	1) Changes for openbsd compilation to have been made to
-	   config and Configure (these have been sent to Eric Young)
-
 NOTES:
 
 	Many tests will fail miserably, since most of them start
diff --git a/lib/libssl/openssl.cnf b/lib/libssl/openssl.cnf
new file mode 100644
index 00000000000..bb97b155b8d
--- /dev/null
+++ b/lib/libssl/openssl.cnf
@@ -0,0 +1,65 @@
+#
+# OpenSSL example configuration file.
+# This is mostly being used for generation of certificate requests.
+#
+
+RANDFILE		= /dev/arandom
+
+####################################################################
+[ req ]
+default_bits		= 1024
+default_keyfile 	= privkey.pem
+distinguished_name	= req_distinguished_name
+attributes		= req_attributes
+
+[ req_distinguished_name ]
+countryName			= Country Name (2 letter code)
+#countryName_default		= AU
+countryName_min			= 2
+countryName_max			= 2
+
+stateOrProvinceName		= State or Province Name (full name)
+#stateOrProvinceName_default	= Some-State
+
+localityName			= Locality Name (eg, city)
+
+0.organizationName		= Organization Name (eg, company)
+#0.organizationName_default	= Internet Widgits Pty Ltd
+
+# we can do this but it is not needed normally :-)
+#1.organizationName		= Second Organization Name (eg, company)
+#1.organizationName_default	= CryptSoft Pty Ltd
+
+organizationalUnitName		= Organizational Unit Name (eg, section)
+#organizationalUnitName_default	=
+
+commonName			= Common Name (eg, fully qualified host name)
+commonName_max			= 64
+
+emailAddress			= Email Address
+emailAddress_max		= 64
+
+[ req_attributes ]
+challengePassword		= A challenge password
+challengePassword_min		= 4
+challengePassword_max		= 20
+
+unstructuredName		= An optional company name
+
+[ x509v3_extensions ]
+
+nsCaRevocationUrl		= http://www.cryptsoft.com/ca-crl.pem
+nsComment			= "This is a comment"
+
+# under ASN.1, the 0 bit would be encoded as 80
+nsCertType			= 0x40
+
+#nsBaseUrl
+#nsRevocationUrl
+#nsRenewalUrl
+#nsCaPolicyUrl
+#nsSslServerName
+#nsCertSequence
+#nsCertExt
+#nsDataType
+