Mon Jun 6 06:44:57 2011 UTC ()
add a bunch of files to the lib that we build.


(spz)
diff -r1.3 -r1.4 src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
diff -r1.1 -r1.2 src/crypto/external/bsd/openssl/lib/libcrypto/bn.inc
diff -r1.1 -r1.2 src/crypto/external/bsd/openssl/lib/libcrypto/buffer.inc
diff -r1.1 -r1.2 src/crypto/external/bsd/openssl/lib/libcrypto/evp.inc
diff -r1.2 -r1.3 src/crypto/external/bsd/openssl/lib/libcrypto/srcs.inc
cvs diff -r1.3 -r1.4 src/crypto/external/bsd/openssl/lib/libcrypto/Makefile (switch to unified diff)

--- src/crypto/external/bsd/openssl/lib/libcrypto/Makefile 2011/05/26 12:56:25 1.3
+++ src/crypto/external/bsd/openssl/lib/libcrypto/Makefile 2011/06/06 06:44:57 1.4
@@ -1,117 +1,117 @@ @@ -1,117 +1,117 @@
1# $NetBSD: Makefile,v 1.3 2011/05/26 12:56:25 joerg Exp $ 1# $NetBSD: Makefile,v 1.4 2011/06/06 06:44:57 spz Exp $
2 2
3# RCSid: 3# RCSid:
4# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp 4# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
5# 5#
6# @(#) Copyright (c) 1994 Simon J. Gerraty 6# @(#) Copyright (c) 1994 Simon J. Gerraty
7# 7#
8# This file is provided in the hope that it will 8# This file is provided in the hope that it will
9# be of use. There is absolutely NO WARRANTY. 9# be of use. There is absolutely NO WARRANTY.
10# Permission to copy, redistribute or otherwise 10# Permission to copy, redistribute or otherwise
11# use this file is hereby granted provided that  11# use this file is hereby granted provided that
12# the above copyright notice and this notice are 12# the above copyright notice and this notice are
13# left intact.  13# left intact.
14#  14#
15# Please send copies of changes and bug-fixes to: 15# Please send copies of changes and bug-fixes to:
16# sjg@quick.com.au 16# sjg@quick.com.au
17# 17#
18 18
19LIB= crypto 19LIB= crypto
20USE_FORT?= yes # cryptographic software 20USE_FORT?= yes # cryptographic software
21USE_SHLIBDIR= yes 21USE_SHLIBDIR= yes
22USE_FIPS= no 22USE_FIPS= no
23 23
24.include <bsd.own.mk> 24.include <bsd.own.mk>
25.include <bsd.shlib.mk> 25.include <bsd.shlib.mk>
26.include <bsd.sys.mk> # for HOST_SH 26.include <bsd.sys.mk> # for HOST_SH
27 27
28# XXX There's a bit of work to do before we can enable warnings. 28# XXX There's a bit of work to do before we can enable warnings.
29WARNS=0 29WARNS=0
30CWARNFLAGS.clang+= -Wno-empty-body -Wno-unused-value -Wno-parentheses 30CWARNFLAGS.clang+= -Wno-empty-body -Wno-unused-value -Wno-parentheses
31 31
32CPPFLAGS+= -Dlib${LIB} -I. -I${OPENSSLSRC}/crypto -I${OPENSSLSRC} -I${OPENSSLSRC}/crypto/asn1 -I${OPENSSLSRC}/crypto/evp 32CPPFLAGS+= -Dlib${LIB} -I. -I${OPENSSLSRC}/crypto -I${OPENSSLSRC} -I${OPENSSLSRC}/crypto/asn1 -I${OPENSSLSRC}/crypto/evp
33 33
34CRYPTODIST= ${NETBSDSRCDIR}/crypto 34CRYPTODIST= ${NETBSDSRCDIR}/crypto
35 35
36.include "${NETBSDSRCDIR}/crypto/Makefile.openssl" 36.include "${NETBSDSRCDIR}/crypto/Makefile.openssl"
37.PATH: ${OPENSSLSRC} 37.PATH: ${OPENSSLSRC}
38 38
39.include "srcs.inc" 39.include "srcs.inc"
40 40
41 41
42AFLAGS+=-DELF 42AFLAGS+=-DELF
43LIBDPLIBS+= crypt ${NETBSDSRCDIR}/lib/libcrypt 43LIBDPLIBS+= crypt ${NETBSDSRCDIR}/lib/libcrypt
44 44
45OS_VERSION!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh 45OS_VERSION!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
46 46
47# XXX CFLAGS: While it would be nice to know which compiler flags 47# XXX CFLAGS: While it would be nice to know which compiler flags
48# XXX the library was built with, we don't want pathname information 48# XXX the library was built with, we don't want pathname information
49# XXX for the host toolchain embedded in the image. 49# XXX for the host toolchain embedded in the image.
50${SRCS}: buildinf.h 50${SRCS}: buildinf.h
51buildinf.h: Makefile 51buildinf.h: Makefile
52 @echo "#ifndef MK1MF_BUILD" >buildinf.h 52 @echo "#ifndef MK1MF_BUILD" >buildinf.h
53 @echo "#define CFLAGS \"`${CC} -v 2>&1 | grep version`\"" >>buildinf.h 53 @echo "#define CFLAGS \"`${CC} -v 2>&1 | grep version`\"" >>buildinf.h
54 @echo "#define PLATFORM \"NetBSD-${MACHINE_ARCH}\"" >>buildinf.h 54 @echo "#define PLATFORM \"NetBSD-${MACHINE_ARCH}\"" >>buildinf.h
55 @echo "#define DATE \"NetBSD ${OS_VERSION}\"" >>buildinf.h 55 @echo "#define DATE \"NetBSD ${OS_VERSION}\"" >>buildinf.h
56 @echo "#endif" >>buildinf.h 56 @echo "#endif" >>buildinf.h
57 57
58CLEANFILES+= buildinf.h 58CLEANFILES+= buildinf.h
59 59
60# This list is built from the contents of the include/openssl 60# This list is built from the contents of the include/openssl
61# directory in the OpenSSL source distribution. 61# directory in the OpenSSL source distribution.
62INCS+= aes.h asn1.h asn1_mac.h asn1t.h bio.h blowfish.h bn.h \ 62INCS+= aes.h asn1.h asn1_mac.h asn1t.h bio.h blowfish.h bn.h \
63 buffer.h cast.h cms.h comp.h conf.h conf_api.h crypto.h des.h \ 63 buffer.h cast.h cmac.h cms.h comp.h conf.h conf_api.h crypto.h des.h \
64 dh.h dsa.h dso.h e_os2.h ebcdic.h ec.h ecdh.h ecdsa.h engine.h \ 64 dh.h dsa.h dso.h e_os2.h ebcdic.h ec.h ecdh.h ecdsa.h engine.h \
65 err.h evp.h hmac.h krb5_asn.h lhash.h md2.h md4.h md5.h modes.h \ 65 err.h evp.h hmac.h krb5_asn.h lhash.h md2.h md4.h md5.h modes.h \
66 obj_mac.h objects.h ocsp.h opensslconf.h opensslv.h ossl_typ.h \ 66 obj_mac.h objects.h ocsp.h opensslconf.h opensslv.h ossl_typ.h \
67 pem.h pem2.h pkcs12.h pkcs7.h rand.h rc2.h rc4.h ripemd.h \ 67 pem.h pem2.h pkcs12.h pkcs7.h rand.h rc2.h rc4.h ripemd.h \
68 rsa.h safestack.h sha.h stack.h store.h symhacks.h ts.h txt_db.h \ 68 rsa.h safestack.h sha.h srp.h stack.h store.h symhacks.h ts.h txt_db.h \
69 ui.h ui_compat.h x509.h x509_vfy.h x509v3.h pqueue.h camellia.h 69 ui.h ui_compat.h x509.h x509_vfy.h x509v3.h pqueue.h camellia.h
70# des_old.h  70# des_old.h
71 71
72# IDEA - patented, but we install the header anyways 72# IDEA - patented, but we install the header anyways
73INCS+= idea.h 73INCS+= idea.h
74 74
75# RC5 - patented, but we install the header anyways 75# RC5 - patented, but we install the header anyways
76INCS+= rc5.h 76INCS+= rc5.h
77 77
78# MDC2 - patented, but we install the header anyways 78# MDC2 - patented, but we install the header anyways
79INCS+= mdc2.h 79INCS+= mdc2.h
80 80
81.if (${USE_FIPS} != "no") 81.if (${USE_FIPS} != "no")
82# FIPS 82# FIPS
83# This part is always included, because OpenSSL does not protect 83# This part is always included, because OpenSSL does not protect
84# The FIPS include files 84# The FIPS include files
85.PATH: ${OPENSSLSRC}/fips ${OPENSSLSRC}/fips/rand 85.PATH: ${OPENSSLSRC}/fips ${OPENSSLSRC}/fips/rand
86INCS+= fips.h fips_rand.h 86INCS+= fips.h fips_rand.h
87.endif 87.endif
88 88
89.if (${USE_FIPS} != "no") 89.if (${USE_FIPS} != "no")
90CPPFLAGS+=-DOPENSSL_FIPS 90CPPFLAGS+=-DOPENSSL_FIPS
91.PATH: ${OPENSSLSRC}/fips/aes 91.PATH: ${OPENSSLSRC}/fips/aes
92SRCS+=fips_aes_core.c fips_aes_selftest.c 92SRCS+=fips_aes_core.c fips_aes_selftest.c
93.PATH: ${OPENSSLSRC}/fips/des 93.PATH: ${OPENSSLSRC}/fips/des
94SRCS+=fips_des_enc.c fips_des_selftest.c fips_set_key.c 94SRCS+=fips_des_enc.c fips_des_selftest.c fips_set_key.c
95# asm/fips-dx86-elf.s  95# asm/fips-dx86-elf.s
96.PATH: ${OPENSSLSRC}/fips/dh 96.PATH: ${OPENSSLSRC}/fips/dh
97SRCS+=fips_dh_check.c fips_dh_gen.c fips_dh_key.c 97SRCS+=fips_dh_check.c fips_dh_gen.c fips_dh_key.c
98.PATH: ${OPENSSLSRC}/fips/dsa 98.PATH: ${OPENSSLSRC}/fips/dsa
99SRCS+=fips_dsa_ossl.c fips_dsa_gen.c fips_dsa_selftest.c 99SRCS+=fips_dsa_ossl.c fips_dsa_gen.c fips_dsa_selftest.c
100#.PATH: ${OPENSSLSRC}/fips/rand 100#.PATH: ${OPENSSLSRC}/fips/rand
101SRCS+=fips_rand.c 101SRCS+=fips_rand.c
102.PATH: ${OPENSSLSRC}/fips/rsa 102.PATH: ${OPENSSLSRC}/fips/rsa
103SRCS+=fips_rsa_eay.c fips_rsa_gen.c fips_rsa_selftest.c 103SRCS+=fips_rsa_eay.c fips_rsa_gen.c fips_rsa_selftest.c
104SRCS+=fips_sha1dgst.c fips_sha1_selftest.c 104SRCS+=fips_sha1dgst.c fips_sha1_selftest.c
105# asm/sx86-elf.s 105# asm/sx86-elf.s
106.PATH: ${OPENSSLSRC}/fips/sha1 106.PATH: ${OPENSSLSRC}/fips/sha1
107#.PATH: ${OPENSSLSRC}/fips 107#.PATH: ${OPENSSLSRC}/fips
108SRCS+=fips.c fips_err_wrapper.c 108SRCS+=fips.c fips_err_wrapper.c
109 109
110SRCS+=rc5_skey.c i_skey.c mdc2dgst.c 110SRCS+=rc5_skey.c i_skey.c mdc2dgst.c
111.endif 111.endif
112 112
113COPTS.eng_padlock.c = -Wno-stack-protector 113COPTS.eng_padlock.c = -Wno-stack-protector
114 114
115INCSDIR=/usr/include/openssl 115INCSDIR=/usr/include/openssl
116 116
117.include <bsd.lib.mk> 117.include <bsd.lib.mk>
cvs diff -r1.1 -r1.2 src/crypto/external/bsd/openssl/lib/libcrypto/bn.inc (switch to unified diff)

--- src/crypto/external/bsd/openssl/lib/libcrypto/bn.inc 2009/07/19 23:30:43 1.1
+++ src/crypto/external/bsd/openssl/lib/libcrypto/bn.inc 2011/06/06 06:44:57 1.2
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: bn.inc,v 1.1 2009/07/19 23:30:43 christos Exp $ 1# $NetBSD: bn.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/bn/Makefile 5# SRCS extracted from src/crypto/dist/openssl/crypto/bn/Makefile
6# 6#
7 7
8.PATH: ${OPENSSLSRC}/crypto/bn 8.PATH: ${OPENSSLSRC}/crypto/bn
9 9
10.if !defined(BN_SRCS) 10.if !defined(BN_SRCS)
11BN_SRCS = bn_asm.c 11BN_SRCS = bn_asm.c
12.endif 12.endif
13 13
14BN_SRCS += bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mod.c \ 14BN_SRCS += bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mod.c \
15 bn_print.c bn_rand.c bn_shift.c bn_word.c bn_blind.c bn_mul.c \ 15 bn_print.c bn_rand.c bn_shift.c bn_word.c bn_blind.c bn_mul.c \
16 bn_kron.c bn_sqrt.c bn_gcd.c bn_prime.c bn_err.c bn_sqr.c \ 16 bn_kron.c bn_sqrt.c bn_gcd.c bn_prime.c bn_err.c bn_sqr.c \
17 bn_recp.c bn_mont.c bn_mpi.c bn_exp2.c bn_nist.c bn_gf2m.c bn_depr.c \ 17 bn_recp.c bn_mont.c bn_mpi.c bn_exp2.c bn_nist.c bn_gf2m.c bn_depr.c \
18 bn_const.c 18 bn_const.c bn_x931p.c
19SRCS += ${BN_SRCS} 19SRCS += ${BN_SRCS}
20 20
21.for cryptosrc in ${BN_SRCS} 21.for cryptosrc in ${BN_SRCS}
22CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/bn 22CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/bn
23.endfor 23.endfor
cvs diff -r1.1 -r1.2 src/crypto/external/bsd/openssl/lib/libcrypto/buffer.inc (switch to unified diff)

--- src/crypto/external/bsd/openssl/lib/libcrypto/buffer.inc 2009/07/19 23:30:43 1.1
+++ src/crypto/external/bsd/openssl/lib/libcrypto/buffer.inc 2011/06/06 06:44:57 1.2
@@ -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
11BUFFER_SRCS = buffer.c buf_err.c 11BUFFER_SRCS = buffer.c buf_err.c buf_str.c
12SRCS += ${BUFFER_SRCS} 12SRCS += ${BUFFER_SRCS}
13 13
14.for cryptosrc in ${BUFFER_SRCS} 14.for cryptosrc in ${BUFFER_SRCS}
15CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/buffer 15CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/buffer
16.endfor 16.endfor
cvs diff -r1.1 -r1.2 src/crypto/external/bsd/openssl/lib/libcrypto/evp.inc (switch to unified diff)

--- src/crypto/external/bsd/openssl/lib/libcrypto/evp.inc 2009/07/19 23:30:43 1.1
+++ src/crypto/external/bsd/openssl/lib/libcrypto/evp.inc 2011/06/06 06:44:57 1.2
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: evp.inc,v 1.1 2009/07/19 23:30:43 christos Exp $ 1# $NetBSD: evp.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/evp/Makefile 5# SRCS extracted from src/crypto/dist/openssl/crypto/evp/Makefile
6# 6#
7 7
8.PATH: ${OPENSSLSRC}/crypto/evp 8.PATH: ${OPENSSLSRC}/crypto/evp
9 9
10 10
11EVP_SRCS = encode.c digest.c evp_enc.c evp_key.c evp_acnf.c \ 11EVP_SRCS = encode.c digest.c evp_enc.c evp_key.c evp_acnf.c \
12 e_des.c e_bf.c e_idea.c e_des3.c \ 12 e_des.c e_bf.c e_idea.c e_des3.c \
13 e_rc4.c e_aes.c names.c e_camellia.c \ 13 e_rc4.c e_aes.c names.c e_camellia.c \
14 e_xcbc_d.c e_rc2.c e_cast.c e_rc5.c \ 14 e_xcbc_d.c e_rc2.c e_cast.c e_rc5.c \
15 m_null.c m_md2.c m_md4.c m_md5.c m_sha.c m_sha1.c \ 15 m_null.c m_md2.c m_md4.c m_md5.c m_sha.c m_sha1.c \
16 m_dss.c m_dss1.c m_mdc2.c m_ripemd.c \ 16 m_dss.c m_dss1.c m_mdc2.c m_ripemd.c \
17 p_open.c p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c p_dec.c \ 17 p_open.c p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c p_dec.c \
18 bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c \ 18 bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c \
19 c_all.c c_allc.c c_alld.c evp_lib.c bio_ok.c \ 19 c_all.c c_allc.c c_alld.c evp_lib.c bio_ok.c \
20 evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c m_ecdsa.c pmeth_lib.c \ 20 evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c m_ecdsa.c pmeth_lib.c \
21 pmeth_fn.c m_sigver.c m_wp.c pmeth_gn.c 21 pmeth_fn.c m_sigver.c m_wp.c pmeth_gn.c evp_fips.c
22SRCS += ${EVP_SRCS} 22SRCS += ${EVP_SRCS}
23 23
24.for cryptosrc in ${EVP_SRCS} 24.for cryptosrc in ${EVP_SRCS}
25CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/evp 25CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/evp
26.endfor 26.endfor
cvs diff -r1.2 -r1.3 src/crypto/external/bsd/openssl/lib/libcrypto/srcs.inc (switch to unified diff)

--- src/crypto/external/bsd/openssl/lib/libcrypto/srcs.inc 2010/03/30 07:23:51 1.2
+++ src/crypto/external/bsd/openssl/lib/libcrypto/srcs.inc 2011/06/06 06:44:57 1.3
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: srcs.inc,v 1.2 2010/03/30 07:23:51 mrg Exp $ 1# $NetBSD: srcs.inc,v 1.3 2011/06/06 06:44:57 spz Exp $
2 2
3CRYPTOINCS= \ 3CRYPTOINCS= \
4 aes.inc asn1.inc bf.inc bio.inc bn.inc buffer.inc cast.inc \ 4 aes.inc asn1.inc bf.inc bio.inc bn.inc buffer.inc cast.inc cmac.inc \
5 cms.inc comp.inc conf.inc crypto.inc des.inc dh.inc dsa.inc dso.inc \ 5 cms.inc comp.inc conf.inc crypto.inc des.inc dh.inc dsa.inc dso.inc \
6 ec.inc ecdh.inc ecdsa.inc engine.inc err.inc evp.inc hmac.inc \ 6 ec.inc ecdh.inc ecdsa.inc engine.inc err.inc evp.inc hmac.inc \
7 krb5.inc lhash.inc modes.inc camellia.inc \ 7 krb5.inc lhash.inc modes.inc camellia.inc \
8 md2.inc md4.inc md5.inc objects.inc ocsp.inc pem.inc \ 8 md2.inc md4.inc md5.inc objects.inc ocsp.inc pem.inc \
9 pkcs12.inc pkcs7.inc pqueue.inc rand.inc rc2.inc rc4.inc ripemd.inc \ 9 pkcs12.inc pkcs7.inc pqueue.inc rand.inc rc2.inc rc4.inc ripemd.inc \
10 rsa.inc sha.inc stack.inc store.inc txt_db.inc ts.inc ui.inc x509.inc \ 10 rsa.inc sha.inc srp.inc stack.inc store.inc txt_db.inc ts.inc \
11 x509v3.inc 11 ui.inc x509.inc x509v3.inc
12 12
13# patented algorithms - see ../libcrypto_* 13# patented algorithms - see ../libcrypto_*
14CRYPTOINCS+= idea.inc 14CRYPTOINCS+= idea.inc
15CRYPTOINCS+= rc5.inc 15CRYPTOINCS+= rc5.inc
16CRYPTOINCS+= mdc2.inc 16CRYPTOINCS+= mdc2.inc
17 17
18CRYPTOINCS+= man.inc 18CRYPTOINCS+= man.inc
19 19
20.if exists(${.CURDIR}/arch/${MACHINE_ARCH}) 20.if exists(${.CURDIR}/arch/${MACHINE_ARCH})
21CRYPTO_MACHINE_CPU?= ${MACHINE_ARCH} 21CRYPTO_MACHINE_CPU?= ${MACHINE_ARCH}
22.else 22.else
23CRYPTO_MACHINE_CPU?= ${MACHINE_CPU} 23CRYPTO_MACHINE_CPU?= ${MACHINE_CPU}
24.endif 24.endif
25 25
26.for cryptoinc in ${CRYPTOINCS} 26.for cryptoinc in ${CRYPTOINCS}
27.if exists(${.CURDIR}/arch/${CRYPTO_MACHINE_CPU}/${cryptoinc}) 27.if exists(${.CURDIR}/arch/${CRYPTO_MACHINE_CPU}/${cryptoinc})
28.include "${.CURDIR}/arch/${CRYPTO_MACHINE_CPU}/${cryptoinc}" 28.include "${.CURDIR}/arch/${CRYPTO_MACHINE_CPU}/${cryptoinc}"
29.else 29.else
30.include "${cryptoinc}" 30.include "${cryptoinc}"
31.endif 31.endif
32.endfor 32.endfor