svn commit: r194116 - in projects/openssl_098_merge_8/secure: lib/libcrypto usr.bin/openssl

[Simon L. Nielsen]

Author: simon
Date: Sat Jun 13 15:00:29 2009
New Revision: 194116
URL: http://svn.freebsd.org/changeset/base/194116

Log:
  Build system updates for OpenSSL 0.9.8k.

Modified:
  projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile
  projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile.inc
  projects/openssl_098_merge_8/secure/usr.bin/openssl/Makefile

Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile
==============================================================================
--- projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile	Sat Jun 13 14:30:08 2009	(r194115)
+++ projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile	Sat Jun 13 15:00:29 2009	(r194116)
@@ -27,7 +27,7 @@ INCS=	crypto.h ebcdic.h opensslv.h ossl_
 
 # aes
 SRCS+=	aes_cbc.c aes_cfb.c aes_core.c aes_ctr.c aes_ecb.c aes_ige.c \
-	aes_misc.c aes_ofb.c
+	aes_misc.c aes_ofb.c aes_wrap.c
 INCS+=	aes.h aes_locl.h
 
 # asn1
@@ -324,6 +324,15 @@ SRCS+=	pcy_cache.c pcy_data.c pcy_lib.c 
 	v3_purp.c v3_skey.c v3_sxnet.c v3_utl.c v3err.c
 INCS+=	x509v3.h
 
+# cms
+SRCS+=	cms_lib.c cms_asn1.c cms_att.c cms_io.c cms_smime.c cms_err.c \
+	cms_sd.c cms_dd.c cms_cd.c cms_env.c cms_enc.c cms_ess.c
+INCS+=	cms.h
+
+# jpake
+SRCS+=	jpake.c jpake_err.c
+INCS+=	jpake.h
+
 SRCS+=	buildinf.h
 INCS+=	opensslconf.h evp.h
 INCSDIR=	${INCLUDEDIR}/openssl
@@ -392,6 +401,7 @@ _ideapath=	${LCRYPTO_SRC}/crypto/idea
 	${LCRYPTO_SRC}/crypto/buffer \
 	${LCRYPTO_SRC}/crypto/cast \
 	${LCRYPTO_SRC}/crypto/camellia \
+	${LCRYPTO_SRC}/crypto/cms \
 	${LCRYPTO_SRC}/crypto/comp \
 	${LCRYPTO_SRC}/crypto/conf \
 	${LCRYPTO_SRC}/crypto/des \
@@ -406,6 +416,7 @@ _ideapath=	${LCRYPTO_SRC}/crypto/idea
 	${LCRYPTO_SRC}/crypto/evp \
 	${LCRYPTO_SRC}/crypto/hmac \
 	${_ideapath} \
+	${LCRYPTO_SRC}/crypto/jpake \
 	${LCRYPTO_SRC}/crypto/krb5 \
 	${LCRYPTO_SRC}/crypto/lhash \
 	${LCRYPTO_SRC}/crypto/md2 \

Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile.inc
==============================================================================
--- projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile.inc	Sat Jun 13 14:30:08 2009	(r194115)
+++ projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile.inc	Sat Jun 13 15:00:29 2009	(r194116)
@@ -34,7 +34,7 @@ man-update:
 	@(sec=${manpage:E}; \
 	pod=${manpage:R}.pod; \
 	cp ${LCRYPTO_DOC}/${_docs}/$$pod .; \
-	pod2man --section=$$sec --release="0.9.8e" --center="OpenSSL" \
+	pod2man --section=$$sec --release="0.9.8k" --center="OpenSSL" \
 	  $$pod > ${.CURDIR}/man/${manpage}; \
 	rm -f $$pod; \
 	${ECHO} ${manpage})

Modified: projects/openssl_098_merge_8/secure/usr.bin/openssl/Makefile
==============================================================================
--- projects/openssl_098_merge_8/secure/usr.bin/openssl/Makefile	Sat Jun 13 14:30:08 2009	(r194115)
+++ projects/openssl_098_merge_8/secure/usr.bin/openssl/Makefile	Sat Jun 13 15:00:29 2009	(r194116)
@@ -12,7 +12,7 @@ LDADD=	-lssl -lcrypto
 
 CFLAGS+= -DMONOLITH -I${.CURDIR}
 
-SRCS+=	app_rand.c apps.c asn1pars.c ca.c ciphers.c crl.c crl2p7.c \
+SRCS+=	app_rand.c apps.c asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c \
 	dgst.c dh.c dhparam.c dsa.c dsaparam.c ec.c ecparam.c enc.c \
 	engine.c errstr.c \
 	gendh.c gendsa.c genrsa.c nseq.c ocsp.c openssl.c passwd.c \