From: Jeroen Ruigrok/asmodai <asmodai@dragonflybsd.org>
Date: Sat, 18 Dec 2004 20:53:19 +0000 (+0000)
Subject: Switch from OpenSSL 0.9.7d to 0.9.7e.
X-Git-Tag: v2.0.1~9478
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/48720e0e032d0c49482848ffd963415a954db687

Switch from OpenSSL 0.9.7d to 0.9.7e.
---

diff --git a/etc/Makefile b/etc/Makefile
index 1a90bb1b44..6666d4a8aa 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,6 +1,6 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
 # $FreeBSD: src/etc/Makefile,v 1.219.2.38 2003/03/04 09:49:00 ru Exp $
-# $DragonFly: src/etc/Makefile,v 1.33 2004/11/23 06:32:36 dillon Exp $
+# $DragonFly: src/etc/Makefile,v 1.34 2004/12/18 20:53:19 asmodai Exp $
 
 .if !defined(NO_SENDMAIL)
 SUBDIR=	sendmail
@@ -38,7 +38,7 @@ SSH=	lib/libssh \
 	usr.bin/ssh \
 	usr.sbin/sshd
 .endif
-SSL=	${.CURDIR}/../crypto/openssl-0.9.7d/apps/openssl.cnf
+SSL=	${.CURDIR}/../crypto/openssl-0.9.7e/apps/openssl.cnf
 .endif
 
 # Files that should be installed read-only-executable (555) root:wheel
diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc
index b25f56ef32..48529fe046 100644
--- a/secure/lib/libcrypto/Makefile.inc
+++ b/secure/lib/libcrypto/Makefile.inc
@@ -1,7 +1,7 @@
 # $FreeBSD: src/secure/lib/libcrypto/Makefile.inc,v 1.7.2.11 2003/02/20 15:07:32 nectar Exp $
-# $DragonFly: src/secure/lib/libcrypto/Makefile.inc,v 1.6 2004/09/02 08:57:05 asmodai Exp $
+# $DragonFly: src/secure/lib/libcrypto/Makefile.inc,v 1.7 2004/12/18 20:53:19 asmodai Exp $
 
-OSSLVERSION=	0.9.7d
+OSSLVERSION=	0.9.7e
 LCRYPTO_SRC=	${.CURDIR}/../../../crypto/openssl-${OSSLVERSION}
 LCRYPTO_DOC=	${.CURDIR}/../../../crypto/openssl-${OSSLVERSION}/doc
 
@@ -48,6 +48,7 @@ HDRS+=	\
 	engine/hw_ncipher_err.h engine/hw_nuron_err.h engine/hw_sureware_err.h \
 	engine/hw_ubsec_err.h \
 	err/err.h \
+	../fips/fips.h ../fips/rand/fips_rand.h \
 	hmac/hmac.h \
 	${_idea_h} \
 	krb5/krb5_asn.h \
@@ -130,7 +131,7 @@ man-update:
 
 man-makefile-update:
 	rm -f ${.CURDIR}/Makefile.man
-	echo '# $$DragonFly: src/secure/lib/libcrypto/Makefile.inc,v 1.6 2004/09/02 08:57:05 asmodai Exp $$' >> ${.CURDIR}/Makefile.man
+	echo '# $$DragonFly: src/secure/lib/libcrypto/Makefile.inc,v 1.7 2004/12/18 20:53:19 asmodai Exp $$' >> ${.CURDIR}/Makefile.man
 	echo '# DO NOT EDIT: generated from man-makefile-update target' >> \
 	    ${.CURDIR}/Makefile.man
 	for i in ${LCRYPTO_DOC}/${_docs}/*.pod; do \
diff --git a/secure/usr.bin/openssl/Makefile b/secure/usr.bin/openssl/Makefile
index 8a6c6b66da..cf00f7bf75 100644
--- a/secure/usr.bin/openssl/Makefile
+++ b/secure/usr.bin/openssl/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/secure/usr.bin/openssl/Makefile,v 1.11.2.6 2003/02/14 22:38:22 nectar Exp $
-# $DragonFly: src/secure/usr.bin/openssl/Makefile,v 1.4 2004/02/10 13:46:07 rob Exp $
+# $DragonFly: src/secure/usr.bin/openssl/Makefile,v 1.5 2004/12/18 20:53:19 asmodai Exp $
 
 PROG=	xopenssl
 PROGNAME=	openssl
@@ -20,7 +20,7 @@ CFLAGS+= -DMONOLITH -I${.CURDIR}
 SRCS+=	app_rand.c apps.c asn1pars.c ca.c ciphers.c crl.c crl2p7.c \
 	dgst.c dh.c dhparam.c dsa.c dsaparam.c enc.c engine.c errstr.c \
 	gendh.c gendsa.c genrsa.c nseq.c ocsp.c openssl.c passwd.c \
-	pkcs12.c pkcs7.c pkcs8.c rand.c req.c rsa.c rsautl.c s_cb.c \
+	pkcs12.c pkcs7.c pkcs8.c prime.c rand.c req.c rsa.c rsautl.c s_cb.c \
 	s_client.c s_server.c s_socket.c s_time.c sess_id.c smime.c \
 	speed.c spkac.c verify.c version.c x509.c