 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.3 2011/05/26 12:56:25 joerg Exp $
+#	$NetBSD: Makefile,v 1.4 2011/06/06 06:44:57 spz Exp $
 # RCSid:
 #	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
+#
 #	@(#) Copyright (c) 1994 Simon J. Gerraty
+#
 #	This file is provided in the hope that it will
 #	be of use.  There is absolutely NO WARRANTY.
 #	Permission to copy, redistribute or otherwise
 #	use this file is hereby granted provided that
 #	the above copyright notice and this notice are
 #	left intact.
+#
 @@ -50,32 +50,32 @@ OS_VERSION!= ${HOST_SH} ${NETBSDSRCDIR}/
 ${SRCS}: buildinf.h
 buildinf.h: Makefile
 	@echo "#ifndef MK1MF_BUILD" >buildinf.h
 	@echo "#define CFLAGS \"`${CC} -v 2>&1 | grep version`\"" >>buildinf.h
 	@echo "#define PLATFORM \"NetBSD-${MACHINE_ARCH}\"" >>buildinf.h
 	@echo "#define DATE \"NetBSD ${OS_VERSION}\"" >>buildinf.h
 	@echo "#endif" >>buildinf.h
 CLEANFILES+= buildinf.h
 # This list is built from the contents of the include/openssl
 # directory in the OpenSSL source distribution.
 INCS+=	aes.h asn1.h asn1_mac.h asn1t.h bio.h blowfish.h bn.h \
-	buffer.h cast.h cms.h comp.h conf.h conf_api.h crypto.h des.h \
+	buffer.h cast.h cmac.h cms.h comp.h conf.h conf_api.h crypto.h des.h \
 	dh.h dsa.h dso.h e_os2.h ebcdic.h ec.h ecdh.h ecdsa.h engine.h \
 	err.h evp.h hmac.h krb5_asn.h lhash.h md2.h md4.h md5.h modes.h \
 	obj_mac.h objects.h ocsp.h opensslconf.h opensslv.h ossl_typ.h \
 	pem.h pem2.h pkcs12.h pkcs7.h rand.h rc2.h rc4.h ripemd.h \
-	rsa.h safestack.h sha.h stack.h store.h symhacks.h ts.h txt_db.h \
+	rsa.h safestack.h sha.h srp.h stack.h store.h symhacks.h ts.h txt_db.h \
 	ui.h ui_compat.h x509.h x509_vfy.h x509v3.h pqueue.h camellia.h
 #	des_old.h
 # IDEA - patented, but we install the header anyways
 INCS+=	idea.h
 # RC5 - patented, but we install the header anyways
 INCS+=	rc5.h
 # MDC2 - patented, but we install the header anyways
 INCS+=	mdc2.h
 .if (${USE_FIPS} != "no")

 @@ -1,23 +1,23 @@
-#	$NetBSD: bn.inc,v 1.1 2009/07/19 23:30:43 christos Exp $
+#	$NetBSD: bn.inc,v 1.2 2011/06/06 06:44:57 spz Exp $
+#
 #	@(#) Copyright (c) 1995 Simon J. Gerraty
+#
 #	SRCS extracted from src/crypto/dist/openssl/crypto/bn/Makefile
+#
 .PATH:	${OPENSSLSRC}/crypto/bn
 .if !defined(BN_SRCS)
 BN_SRCS = bn_asm.c
 .endif
 BN_SRCS += bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mod.c \
 	bn_print.c bn_rand.c bn_shift.c bn_word.c bn_blind.c bn_mul.c \
 	bn_kron.c bn_sqrt.c bn_gcd.c bn_prime.c bn_err.c bn_sqr.c \
 	bn_recp.c bn_mont.c bn_mpi.c bn_exp2.c bn_nist.c bn_gf2m.c bn_depr.c \
-	bn_const.c
+	bn_const.c bn_x931p.c
 SRCS += ${BN_SRCS}
 .for cryptosrc in ${BN_SRCS}
 CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/bn
 .endfor

	@@ -1,16 +1,16 @@		@@ -1,16 +1,16 @@
1	# $NetBSD: buffer.inc,v 1.1 2009/07/19 23:30:43 christos Exp $	1	# $NetBSD: buffer.inc,v 1.2 2011/06/06 06:44:57 spz Exp $
2	#	2	#
3	# @(#) Copyright (c) 1995 Simon J. Gerraty	3	# @(#) Copyright (c) 1995 Simon J. Gerraty
4	#	4	#
5	# SRCS extracted from src/crypto/dist/openssl/crypto/buffer/Makefile	5	# SRCS extracted from src/crypto/dist/openssl/crypto/buffer/Makefile
6	#	6	#
7		7
8	.PATH: ${OPENSSLSRC}/crypto/buffer	8	.PATH: ${OPENSSLSRC}/crypto/buffer
9		9
10		10
11	BUFFER_SRCS = buffer.c buf_err.c	11	BUFFER_SRCS = buffer.c buf_err.c buf_str.c
12	SRCS += ${BUFFER_SRCS}	12	SRCS += ${BUFFER_SRCS}
13		13
14	.for cryptosrc in ${BUFFER_SRCS}	14	.for cryptosrc in ${BUFFER_SRCS}
15	CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/buffer	15	CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/buffer
16	.endfor	16	.endfor

 @@ -1,26 +1,26 @@
-#	$NetBSD: evp.inc,v 1.1 2009/07/19 23:30:43 christos Exp $
+#	$NetBSD: evp.inc,v 1.2 2011/06/06 06:44:57 spz Exp $
+#
 #	@(#) Copyright (c) 1995 Simon J. Gerraty
+#
 #	SRCS extracted from src/crypto/dist/openssl/crypto/evp/Makefile
+#
 .PATH:	${OPENSSLSRC}/crypto/evp
 EVP_SRCS = encode.c digest.c evp_enc.c evp_key.c evp_acnf.c \
 	e_des.c e_bf.c e_idea.c e_des3.c \
 	e_rc4.c e_aes.c names.c e_camellia.c \
 	e_xcbc_d.c e_rc2.c e_cast.c e_rc5.c \
 	m_null.c m_md2.c m_md4.c m_md5.c m_sha.c m_sha1.c \
 	m_dss.c m_dss1.c m_mdc2.c m_ripemd.c \
 	p_open.c p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c p_dec.c \
 	bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c \
 	c_all.c c_allc.c c_alld.c evp_lib.c bio_ok.c \
 	evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c m_ecdsa.c pmeth_lib.c \
-	pmeth_fn.c m_sigver.c m_wp.c pmeth_gn.c
+	pmeth_fn.c m_sigver.c m_wp.c pmeth_gn.c evp_fips.c
 SRCS += ${EVP_SRCS}
 .for cryptosrc in ${EVP_SRCS}
 CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/evp
 .endfor

 @@ -1,24 +1,24 @@
-#	$NetBSD: srcs.inc,v 1.2 2010/03/30 07:23:51 mrg Exp $
+#	$NetBSD: srcs.inc,v 1.3 2011/06/06 06:44:57 spz Exp $
 CRYPTOINCS= \
-	aes.inc asn1.inc bf.inc bio.inc bn.inc buffer.inc cast.inc \
+	aes.inc asn1.inc bf.inc bio.inc bn.inc buffer.inc cast.inc cmac.inc \
 	cms.inc comp.inc conf.inc crypto.inc des.inc dh.inc dsa.inc dso.inc \
 	ec.inc ecdh.inc ecdsa.inc engine.inc err.inc evp.inc hmac.inc \
 	krb5.inc lhash.inc modes.inc camellia.inc \
 	md2.inc md4.inc md5.inc objects.inc ocsp.inc pem.inc \
 	pkcs12.inc pkcs7.inc pqueue.inc rand.inc rc2.inc rc4.inc ripemd.inc \
-	rsa.inc sha.inc stack.inc store.inc txt_db.inc ts.inc ui.inc x509.inc \
+	rsa.inc sha.inc srp.inc stack.inc store.inc txt_db.inc ts.inc \
-	x509v3.inc
+	ui.inc x509.inc x509v3.inc
 # patented algorithms - see ../libcrypto_*
 CRYPTOINCS+=	idea.inc
 CRYPTOINCS+=	rc5.inc
 CRYPTOINCS+=	mdc2.inc
 CRYPTOINCS+=	man.inc
 .if exists(${.CURDIR}/arch/${MACHINE_ARCH})
 CRYPTO_MACHINE_CPU?=    ${MACHINE_ARCH}
 .else
 CRYPTO_MACHINE_CPU?=    ${MACHINE_CPU}
 .endif