Mon Jun 6 13:43:49 2011 UTC ()
more missing file mentions, kudos Kurt Schreiner (ks at ub.uni-mainz.de)


(spz)
diff -r1.2 -r1.3 src/crypto/external/bsd/openssl/bin/Makefile
diff -r1.2 -r1.3 src/crypto/external/bsd/openssl/lib/libssl/ssl.inc
diff -r1.1628 -r1.1629 src/distrib/sets/lists/comp/mi
cvs diff -r1.2 -r1.3 src/crypto/external/bsd/openssl/bin/Makefile (expand / switch to unified diff)

--- src/crypto/external/bsd/openssl/bin/Makefile 2009/07/19 23:33:34 1.2
+++ src/crypto/external/bsd/openssl/bin/Makefile 2011/06/06 13:43:48 1.3
@@ -1,51 +1,51 @@ @@ -1,51 +1,51 @@
1# $NetBSD: Makefile,v 1.2 2009/07/19 23:33:34 christos Exp $ 1# $NetBSD: Makefile,v 1.3 2011/06/06 13:43:48 spz Exp $
2 2
3WARNS?= 2 # XXX -Wcast-qual 3WARNS?= 2 # XXX -Wcast-qual
4 4
5NOMAN= # defined 5NOMAN= # defined
6BINDIR=/usr/bin 6BINDIR=/usr/bin
7 7
8.include <bsd.own.mk> 8.include <bsd.own.mk>
9 9
10USE_FORT?= yes # cryptographic software 10USE_FORT?= yes # cryptographic software
11 11
12# RCSid: 12# RCSid:
13# $Id: Makefile,v 1.2 2009/07/19 23:33:34 christos Exp $ 13# $Id: Makefile,v 1.3 2011/06/06 13:43:48 spz Exp $
14# 14#
15# @(#) Copyright (c) 1995 Simon J. Gerraty 15# @(#) Copyright (c) 1995 Simon J. Gerraty
16# 16#
17# This file is provided in the hope that it will 17# This file is provided in the hope that it will
18# be of use. There is absolutely NO WARRANTY. 18# be of use. There is absolutely NO WARRANTY.
19# Permission to copy, redistribute or otherwise 19# Permission to copy, redistribute or otherwise
20# use this file is hereby granted provided that  20# use this file is hereby granted provided that
21# the above copyright notice and this notice are 21# the above copyright notice and this notice are
22# left intact.  22# left intact.
23#  23#
24# Please send copies of changes and bug-fixes to: 24# Please send copies of changes and bug-fixes to:
25# sjg@quick.com.au 25# sjg@quick.com.au
26# 26#
27 27
28PROG= openssl 28PROG= openssl
29 29
30SRCS= openssl.c 30SRCS= openssl.c
31SRCS+= apps.c ecparam.c ec.c pkeyparam.c genpkey.c pkey.c pkeyutl.c ts.c cms.c 31SRCS+= apps.c ecparam.c ec.c pkeyparam.c genpkey.c pkey.c pkeyutl.c ts.c cms.c
32SRCS+= s_cb.c s_socket.c 32SRCS+= s_cb.c s_socket.c
33SRCS+= app_rand.c 33SRCS+= app_rand.c
34SRCS+= verify.c asn1pars.c req.c dgst.c dh.c dhparam.c enc.c passwd.c gendh.c errstr.c ca.c \ 34SRCS+= verify.c asn1pars.c req.c dgst.c dh.c dhparam.c enc.c passwd.c gendh.c errstr.c ca.c \
35 pkcs7.c crl2p7.c crl.c \ 35 pkcs7.c crl2p7.c crl.c \
36 rsa.c rsautl.c dsa.c dsaparam.c \ 36 rsa.c rsautl.c dsa.c dsaparam.c \
37 x509.c genrsa.c gendsa.c prime.c s_server.c s_client.c speed.c \ 37 x509.c genrsa.c gendsa.c prime.c s_server.c s_client.c speed.c \
38 s_time.c version.c sess_id.c \ 38 s_time.c version.c sess_id.c srp.c \
39 ciphers.c nseq.c pkcs12.c pkcs8.c spkac.c smime.c rand.c engine.c ocsp.c 39 ciphers.c nseq.c pkcs12.c pkcs8.c spkac.c smime.c rand.c engine.c ocsp.c
40 40
41CPPFLAGS+= -DMONOLITH -DUSE_SSL -I${OPENSSLSRC} 41CPPFLAGS+= -DMONOLITH -DUSE_SSL -I${OPENSSLSRC}
42 42
43# with normal OpenSSL, OPENSSL_NO_{IDEA,MDC2,RC5} changes ABI due to change in 43# with normal OpenSSL, OPENSSL_NO_{IDEA,MDC2,RC5} changes ABI due to change in
44# struct/union. we nuked all of them in our header files and it is now safe. 44# struct/union. we nuked all of them in our header files and it is now safe.
45.if ${MKCRYPTO_IDEA} == "no" 45.if ${MKCRYPTO_IDEA} == "no"
46CPPFLAGS+= -DOPENSSL_NO_IDEA 46CPPFLAGS+= -DOPENSSL_NO_IDEA
47.else 47.else
48LDADD+= -lcrypto_idea 48LDADD+= -lcrypto_idea
49DPADD+= ${LIBCRYPTO_IDEA} 49DPADD+= ${LIBCRYPTO_IDEA}
50.endif 50.endif
51.if ${MKCRYPTO_MDC2} == "no" 51.if ${MKCRYPTO_MDC2} == "no"
cvs diff -r1.2 -r1.3 src/crypto/external/bsd/openssl/lib/libssl/ssl.inc (expand / switch to unified diff)

--- src/crypto/external/bsd/openssl/lib/libssl/ssl.inc 2009/12/27 00:48:56 1.2
+++ src/crypto/external/bsd/openssl/lib/libssl/ssl.inc 2011/06/06 13:43:48 1.3
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1# $NetBSD: ssl.inc,v 1.2 2009/12/27 00:48:56 christos Exp $ 1# $NetBSD: ssl.inc,v 1.3 2011/06/06 13:43:48 spz Exp $
2# 2#
3# @(#) Copyright (c) 1995 Simon J. Gerraty 3# @(#) Copyright (c) 1995 Simon J. Gerraty
4# 4#
5# SRCS extracted from ../../dist/openssl/ssl/Makefile.ssl 5# SRCS extracted from ../../dist/openssl/ssl/Makefile.ssl
6# 6#
7 7
8.PATH: ${OPENSSLSRC}/ssl 8.PATH: ${OPENSSLSRC}/ssl
9 9
10CPPFLAGS+= -I${OPENSSLSRC}/ssl 10CPPFLAGS+= -I${OPENSSLSRC}/ssl
11 11
12.if !defined(USELESS_CRYPTO) 12.if !defined(USELESS_CRYPTO)
13SRCS+= s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c 13SRCS+= s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c
14.else 14.else
15CPPFLAGS+= -DNO_SSL2 15CPPFLAGS+= -DNO_SSL2
16.endif 16.endif
17 17
18SRCS+= s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c \ 18SRCS+= s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c \
19 s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c \ 19 s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c \
20 t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c t1_reneg.c \ 20 t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c t1_reneg.c \
 21 tls_srp.c \
21 ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c \ 22 ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c \
22 ssl_ciph.c ssl_stat.c ssl_rsa.c \ 23 ssl_ciph.c ssl_stat.c ssl_rsa.c \
23 ssl_asn1.c ssl_txt.c ssl_algs.c \ 24 ssl_asn1.c ssl_txt.c ssl_algs.c \
24 bio_ssl.c ssl_err.c kssl.c d1_clnt.c d1_srvr.c d1_lib.c d1_both.c \ 25 bio_ssl.c ssl_err.c kssl.c d1_clnt.c d1_srvr.c d1_lib.c d1_both.c \
25 d1_pkt.c d1_enc.c 26 d1_pkt.c d1_enc.c
cvs diff -r1.1628 -r1.1629 src/distrib/sets/lists/comp/mi (expand / switch to unified diff)

--- src/distrib/sets/lists/comp/mi 2011/06/03 18:43:38 1.1628
+++ src/distrib/sets/lists/comp/mi 2011/06/06 13:43:48 1.1629
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mi,v 1.1628 2011/06/03 18:43:38 rmind Exp $ 1# $NetBSD: mi,v 1.1629 2011/06/06 13:43:48 spz Exp $
2# 2#
3# Note: don't delete entries from here - mark them as "obsolete" instead. 3# Note: don't delete entries from here - mark them as "obsolete" instead.
4# 4#
5./etc/mtree/set.comp comp-sys-root 5./etc/mtree/set.comp comp-sys-root
6./usr/bin/addr2line comp-debug-bin binutils 6./usr/bin/addr2line comp-debug-bin binutils
7./usr/bin/ar comp-util-bin binutils 7./usr/bin/ar comp-util-bin binutils
8./usr/bin/as comp-util-bin binutils 8./usr/bin/as comp-util-bin binutils
9./usr/bin/asa comp-fortran-bin 9./usr/bin/asa comp-fortran-bin
10./usr/bin/atf-compile comp-obsolete obsolete 10./usr/bin/atf-compile comp-obsolete obsolete
11./usr/bin/c++ comp-cxx-bin gcccmds 11./usr/bin/c++ comp-cxx-bin gcccmds
12./usr/bin/c++filt comp-cxx-bin binutils 12./usr/bin/c++filt comp-cxx-bin binutils
13./usr/bin/c89 comp-c-bin 13./usr/bin/c89 comp-c-bin
14./usr/bin/c99 comp-c-bin 14./usr/bin/c99 comp-c-bin
@@ -1777,26 +1777,27 @@ @@ -1777,26 +1777,27 @@
1777./usr/include/openpgpsdk/version.h comp-obsolete obsolete 1777./usr/include/openpgpsdk/version.h comp-obsolete obsolete
1778./usr/include/openpgpsdk/writer.h comp-obsolete obsolete 1778./usr/include/openpgpsdk/writer.h comp-obsolete obsolete
1779./usr/include/openpgpsdk/writer_armoured.h comp-obsolete obsolete 1779./usr/include/openpgpsdk/writer_armoured.h comp-obsolete obsolete
1780./usr/include/openssl/aes.h comp-c-include crypto 1780./usr/include/openssl/aes.h comp-c-include crypto
1781./usr/include/openssl/asn1.h comp-c-include crypto 1781./usr/include/openssl/asn1.h comp-c-include crypto
1782./usr/include/openssl/asn1_mac.h comp-c-include crypto 1782./usr/include/openssl/asn1_mac.h comp-c-include crypto
1783./usr/include/openssl/asn1t.h comp-c-include crypto 1783./usr/include/openssl/asn1t.h comp-c-include crypto
1784./usr/include/openssl/bio.h comp-c-include crypto 1784./usr/include/openssl/bio.h comp-c-include crypto
1785./usr/include/openssl/blowfish.h comp-c-include crypto 1785./usr/include/openssl/blowfish.h comp-c-include crypto
1786./usr/include/openssl/bn.h comp-c-include crypto 1786./usr/include/openssl/bn.h comp-c-include crypto
1787./usr/include/openssl/buffer.h comp-c-include crypto 1787./usr/include/openssl/buffer.h comp-c-include crypto
1788./usr/include/openssl/camellia.h comp-c-include crypto 1788./usr/include/openssl/camellia.h comp-c-include crypto
1789./usr/include/openssl/cast.h comp-c-include crypto 1789./usr/include/openssl/cast.h comp-c-include crypto
 1790./usr/include/openssl/cmac.h comp-c-include crypto
1790./usr/include/openssl/cms.h comp-c-include crypto 1791./usr/include/openssl/cms.h comp-c-include crypto
1791./usr/include/openssl/comp.h comp-c-include crypto 1792./usr/include/openssl/comp.h comp-c-include crypto
1792./usr/include/openssl/conf.h comp-c-include crypto 1793./usr/include/openssl/conf.h comp-c-include crypto
1793./usr/include/openssl/conf_api.h comp-c-include crypto 1794./usr/include/openssl/conf_api.h comp-c-include crypto
1794./usr/include/openssl/crypto.h comp-c-include crypto 1795./usr/include/openssl/crypto.h comp-c-include crypto
1795./usr/include/openssl/des.h comp-c-include crypto 1796./usr/include/openssl/des.h comp-c-include crypto
1796./usr/include/openssl/dh.h comp-c-include crypto 1797./usr/include/openssl/dh.h comp-c-include crypto
1797./usr/include/openssl/dsa.h comp-c-include crypto 1798./usr/include/openssl/dsa.h comp-c-include crypto
1798./usr/include/openssl/dso.h comp-c-include crypto 1799./usr/include/openssl/dso.h comp-c-include crypto
1799./usr/include/openssl/dtls1.h comp-c-include crypto 1800./usr/include/openssl/dtls1.h comp-c-include crypto
1800./usr/include/openssl/e_os.h comp-obsolete obsolete 1801./usr/include/openssl/e_os.h comp-obsolete obsolete
1801./usr/include/openssl/e_os2.h comp-c-include crypto 1802./usr/include/openssl/e_os2.h comp-c-include crypto
1802./usr/include/openssl/ebcdic.h comp-c-include crypto 1803./usr/include/openssl/ebcdic.h comp-c-include crypto
@@ -1829,26 +1830,27 @@ @@ -1829,26 +1830,27 @@
1829./usr/include/openssl/pkcs12.h comp-c-include crypto 1830./usr/include/openssl/pkcs12.h comp-c-include crypto
1830./usr/include/openssl/pkcs7.h comp-c-include crypto 1831./usr/include/openssl/pkcs7.h comp-c-include crypto
1831./usr/include/openssl/pq_compat.h comp-obsolete obsolete 1832./usr/include/openssl/pq_compat.h comp-obsolete obsolete
1832./usr/include/openssl/pqueue.h comp-c-include crypto 1833./usr/include/openssl/pqueue.h comp-c-include crypto
1833./usr/include/openssl/rand.h comp-c-include crypto 1834./usr/include/openssl/rand.h comp-c-include crypto
1834./usr/include/openssl/rc2.h comp-c-include crypto 1835./usr/include/openssl/rc2.h comp-c-include crypto
1835./usr/include/openssl/rc4.h comp-c-include crypto 1836./usr/include/openssl/rc4.h comp-c-include crypto
1836./usr/include/openssl/rc5.h comp-c-include crypto 1837./usr/include/openssl/rc5.h comp-c-include crypto
1837./usr/include/openssl/ripemd.h comp-c-include crypto 1838./usr/include/openssl/ripemd.h comp-c-include crypto
1838./usr/include/openssl/rsa.h comp-c-include crypto 1839./usr/include/openssl/rsa.h comp-c-include crypto
1839./usr/include/openssl/rsaref.h comp-obsolete obsolete 1840./usr/include/openssl/rsaref.h comp-obsolete obsolete
1840./usr/include/openssl/safestack.h comp-c-include crypto 1841./usr/include/openssl/safestack.h comp-c-include crypto
1841./usr/include/openssl/sha.h comp-c-include crypto 1842./usr/include/openssl/sha.h comp-c-include crypto
 1843./usr/include/openssl/srp.h comp-c-include crypto
1842./usr/include/openssl/ssl.h comp-c-include crypto 1844./usr/include/openssl/ssl.h comp-c-include crypto
1843./usr/include/openssl/ssl2.h comp-c-include crypto 1845./usr/include/openssl/ssl2.h comp-c-include crypto
1844./usr/include/openssl/ssl23.h comp-c-include crypto 1846./usr/include/openssl/ssl23.h comp-c-include crypto
1845./usr/include/openssl/ssl3.h comp-c-include crypto 1847./usr/include/openssl/ssl3.h comp-c-include crypto
1846./usr/include/openssl/stack.h comp-c-include crypto 1848./usr/include/openssl/stack.h comp-c-include crypto
1847./usr/include/openssl/store.h comp-c-include crypto 1849./usr/include/openssl/store.h comp-c-include crypto
1848./usr/include/openssl/symhacks.h comp-c-include crypto 1850./usr/include/openssl/symhacks.h comp-c-include crypto
1849./usr/include/openssl/tls1.h comp-c-include crypto 1851./usr/include/openssl/tls1.h comp-c-include crypto
1850./usr/include/openssl/tmdiff.h comp-obsolete obsolete 1852./usr/include/openssl/tmdiff.h comp-obsolete obsolete
1851./usr/include/openssl/ts.h comp-c-include crypto 1853./usr/include/openssl/ts.h comp-c-include crypto
1852./usr/include/openssl/txt_db.h comp-c-include crypto 1854./usr/include/openssl/txt_db.h comp-c-include crypto
1853./usr/include/openssl/ui.h comp-c-include crypto 1855./usr/include/openssl/ui.h comp-c-include crypto
1854./usr/include/openssl/ui_compat.h comp-c-include crypto 1856./usr/include/openssl/ui_compat.h comp-c-include crypto