summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormarkus <>2002-08-30 10:24:16 +0000
committermarkus <>2002-08-30 10:24:16 +0000
commit733efaaabdf619ef76f1f309e2e78b93dfbbe759 (patch)
treee6b450a5d728490e790ea6d8525e7c7f26eaac31 /src
parentb317bf50a10ff572164977749e56454ad595e904 (diff)
downloadopenbsd-733efaaabdf619ef76f1f309e2e78b93dfbbe759.tar.gz
openbsd-733efaaabdf619ef76f1f309e2e78b93dfbbe759.tar.bz2
openbsd-733efaaabdf619ef76f1f309e2e78b93dfbbe759.zip
remove generated files and generated symlinks (in make clean)
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/Attic/Makefile203
-rw-r--r--src/lib/libssl/Makefile97
-rw-r--r--src/lib/libssl/src/apps/CA.pl173
-rw-r--r--src/lib/libssl/src/crypto/Makefile203
4 files changed, 85 insertions, 591 deletions
diff --git a/src/lib/libcrypto/Attic/Makefile b/src/lib/libcrypto/Attic/Makefile
deleted file mode 100644
index 6759b2e4d0..0000000000
--- a/src/lib/libcrypto/Attic/Makefile
+++ /dev/null
@@ -1,203 +0,0 @@
1#
2# SSLeay/crypto/Makefile
3#
4
5DIR= crypto
6TOP= ..
7CC= cc
8INCLUDE= -I. -I../include
9INCLUDES= -I.. -I../../include
10CFLAG= -g
11INSTALL_PREFIX=
12OPENSSLDIR= /usr/local/ssl
13INSTALLTOP= /usr/local/ssl
14MAKE= make -f Makefile.ssl
15MAKEDEPEND= $(TOP)/util/domd $(TOP)
16MAKEFILE= Makefile.ssl
17RM= rm -f
18AR= ar r
19
20PEX_LIBS=
21EX_LIBS=
22
23CFLAGS= $(INCLUDE) $(CFLAG)
24
25
26LIBS=
27
28SDIRS= md2 md5 sha mdc2 hmac ripemd \
29 des rc2 rc4 rc5 idea bf cast \
30 bn rsa dsa dh dso engine \
31 buffer bio stack lhash rand err objects \
32 evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp
33
34GENERAL=Makefile README crypto-lib.com install.com
35
36LIB= $(TOP)/libcrypto.a
37LIBSRC= cryptlib.c mem.c mem_dbg.c cversion.c ex_data.c tmdiff.c cpt_err.c ebcdic.c uid.c
38LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o tmdiff.o cpt_err.o ebcdic.o uid.o
39
40SRC= $(LIBSRC)
41
42EXHEADER= crypto.h tmdiff.h opensslv.h opensslconf.h ebcdic.h symhacks.h
43HEADER= cryptlib.h buildinf.h md32_common.h $(EXHEADER)
44
45ALL= $(GENERAL) $(SRC) $(HEADER)
46
47top:
48 @(cd ..; $(MAKE) DIRS=$(DIR) all)
49
50all: buildinf.h lib subdirs
51
52buildinf.h: ../Makefile.ssl
53 ( echo "#ifndef MK1MF_BUILD"; \
54 echo " /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */"; \
55 echo " #define CFLAGS \"$(CC) $(CFLAG)\""; \
56 echo " #define PLATFORM \"$(PLATFORM)\""; \
57 echo " #define DATE \"`date`\""; \
58 echo "#endif" ) >buildinf.h
59
60testapps:
61 if echo ${SDIRS} | fgrep ' des '; \
62 then cd des && $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' des; fi
63 cd pkcs7 && $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' testapps
64
65subdirs:
66 @for i in $(SDIRS) ;\
67 do \
68 (cd $$i && echo "making all in crypto/$$i..." && \
69 $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \
70 done;
71
72files:
73 $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
74 @for i in $(SDIRS) ;\
75 do \
76 (cd $$i; echo "making 'files' in crypto/$$i..."; \
77 $(MAKE) PERL='${PERL}' files ); \
78 done;
79
80links:
81 @$(SHELL) $(TOP)/util/point.sh Makefile.ssl Makefile
82 @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
83 @$(PERL) $(TOP)/util/mklink.pl ../test $(TEST)
84 @$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS)
85 @$(SHELL) $(TOP)/util/point.sh Makefile.ssl Makefile
86 @for i in $(SDIRS); do \
87 (cd $$i; echo "making links in crypto/$$i..."; \
88 $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PERL='${PERL}' links ); \
89 done;
90
91lib: $(LIBOBJ)
92 $(AR) $(LIB) $(LIBOBJ)
93 @echo You may get an error following this line. Please ignore.
94 - $(RANLIB) $(LIB)
95 @touch lib
96
97libs:
98 @for i in $(SDIRS) ;\
99 do \
100 (cd $$i; echo "making libs in crypto/$$i..."; \
101 $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' lib ); \
102 done;
103
104tests:
105 @for i in $(SDIRS) ;\
106 do \
107 (cd $$i; echo "making tests in crypto/$$i..."; \
108 $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' tests ); \
109 done;
110
111install:
112 @for i in $(EXHEADER) ;\
113 do \
114 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
115 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
116 done;
117 @for i in $(SDIRS) ;\
118 do \
119 (cd $$i; echo "making install in crypto/$$i..."; \
120 $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' install ); \
121 done;
122
123lint:
124 @for i in $(SDIRS) ;\
125 do \
126 (cd $$i; echo "making lint in crypto/$$i..."; \
127 $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' lint ); \
128 done;
129
130depend:
131 if [ ! -f buildinf.h ]; then touch buildinf.h; fi # fake buildinf.h if it does not exist
132 $(MAKEDEPEND) $(INCLUDE) $(DEPFLAG) $(PROGS) $(LIBSRC)
133 if [ ! -s buildinf.h ]; then rm buildinf.h; fi
134 @for i in $(SDIRS) ;\
135 do \
136 (cd $$i; echo "making depend in crypto/$$i..."; \
137 $(MAKE) MAKEFILE='${MAKEFILE}' INCLUDES='${INCLUDES}' DEPFLAG='${DEPFLAG}' depend ); \
138 done;
139
140clean:
141 rm -f buildinf.h *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
142 @for i in $(SDIRS) ;\
143 do \
144 (cd $$i; echo "making clean in crypto/$$i..."; \
145 $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' clean ); \
146 done;
147
148dclean:
149 $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
150 mv -f Makefile.new $(MAKEFILE)
151 @for i in $(SDIRS) ;\
152 do \
153 (cd $$i; echo "making dclean in crypto/$$i..."; \
154 $(MAKE) PERL='${PERL}' CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' dclean ); \
155 done;
156
157# DO NOT DELETE THIS LINE -- make depend depends on it.
158
159cpt_err.o: ../include/openssl/bio.h ../include/openssl/crypto.h
160cpt_err.o: ../include/openssl/err.h ../include/openssl/lhash.h
161cpt_err.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
162cpt_err.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
163cryptlib.o: ../include/openssl/bio.h ../include/openssl/buffer.h
164cryptlib.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
165cryptlib.o: ../include/openssl/e_os2.h ../include/openssl/err.h
166cryptlib.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
167cryptlib.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
168cryptlib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h
169cversion.o: ../include/openssl/bio.h ../include/openssl/buffer.h
170cversion.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
171cversion.o: ../include/openssl/e_os2.h ../include/openssl/err.h
172cversion.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
173cversion.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
174cversion.o: ../include/openssl/stack.h ../include/openssl/symhacks.h buildinf.h
175cversion.o: cryptlib.h
176ex_data.o: ../include/openssl/bio.h ../include/openssl/buffer.h
177ex_data.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
178ex_data.o: ../include/openssl/e_os2.h ../include/openssl/err.h
179ex_data.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
180ex_data.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
181ex_data.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h
182mem.o: ../include/openssl/bio.h ../include/openssl/buffer.h
183mem.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
184mem.o: ../include/openssl/e_os2.h ../include/openssl/err.h
185mem.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
186mem.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
187mem.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h
188mem_dbg.o: ../include/openssl/bio.h ../include/openssl/buffer.h
189mem_dbg.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
190mem_dbg.o: ../include/openssl/e_os2.h ../include/openssl/err.h
191mem_dbg.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
192mem_dbg.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
193mem_dbg.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h
194tmdiff.o: ../include/openssl/bio.h ../include/openssl/buffer.h
195tmdiff.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
196tmdiff.o: ../include/openssl/e_os2.h ../include/openssl/err.h
197tmdiff.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
198tmdiff.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
199tmdiff.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
200tmdiff.o: ../include/openssl/tmdiff.h cryptlib.h
201uid.o: ../include/openssl/crypto.h ../include/openssl/opensslv.h
202uid.o: ../include/openssl/safestack.h ../include/openssl/stack.h
203uid.o: ../include/openssl/symhacks.h
diff --git a/src/lib/libssl/Makefile b/src/lib/libssl/Makefile
index f5306e7fc1..c771ea8b6f 100644
--- a/src/lib/libssl/Makefile
+++ b/src/lib/libssl/Makefile
@@ -1,5 +1,5 @@
1# Build wrapper for OpenSSL 1# Build wrapper for OpenSSL
2# $OpenBSD: Makefile,v 1.10 2002/06/07 06:26:17 beck Exp $ 2# $OpenBSD: Makefile,v 1.11 2002/08/30 10:24:16 markus Exp $
3 3
4# Our lndir is hacked; specify a full path to avoid potential conflicts 4# Our lndir is hacked; specify a full path to avoid potential conflicts
5# with the one installed with X11. 5# with the one installed with X11.
@@ -13,24 +13,95 @@ OPENSSLDIR= /etc/ssl
13SSLCONF= --openssldir="${OPENSSLDIR}" OpenBSD-${MACHINE_ARCH} 13SSLCONF= --openssldir="${OPENSSLDIR}" OpenBSD-${MACHINE_ARCH}
14 14
15MUNGEDFILES= \ 15MUNGEDFILES= \
16 ${.OBJDIR}/${SSL_SRC}/crypto/opensslconf.h \
17 ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h \
18 ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_mac.h \
19 ${.OBJDIR}/${SSL_SRC}/Makefile.ssl \
20 ${.OBJDIR}/${SSL_SRC}/Makefile \ 16 ${.OBJDIR}/${SSL_SRC}/Makefile \
21 ${.OBJDIR}/${SSL_SRC}/apps/der_chop \ 17 ${.OBJDIR}/${SSL_SRC}/Makefile.ssl \
22 ${.OBJDIR}/${SSL_SRC}/tools/c_rehash \
23 ${.OBJDIR}/${SSL_SRC}/apps/CA.pl \ 18 ${.OBJDIR}/${SSL_SRC}/apps/CA.pl \
24 ${.OBJDIR}/${SSL_SRC}/apps/CA.pl.bak \ 19 ${.OBJDIR}/${SSL_SRC}/apps/CA.pl.bak \
25 ${.OBJDIR}/des_random_key.pm \ 20 ${.OBJDIR}/${SSL_SRC}/apps/Makefile \
21 ${.OBJDIR}/${SSL_SRC}/apps/der_chop \
22 ${.OBJDIR}/${SSL_SRC}/crypto/Makefile \
23 ${.OBJDIR}/${SSL_SRC}/crypto/aes/Makefile \
24 ${.OBJDIR}/${SSL_SRC}/crypto/asn1/Makefile \
25 ${.OBJDIR}/${SSL_SRC}/crypto/bf/Makefile \
26 ${.OBJDIR}/${SSL_SRC}/crypto/bio/Makefile \
27 ${.OBJDIR}/${SSL_SRC}/crypto/bn/Makefile \
28 ${.OBJDIR}/${SSL_SRC}/crypto/buffer/Makefile \
29 ${.OBJDIR}/${SSL_SRC}/crypto/cast/Makefile \
30 ${.OBJDIR}/${SSL_SRC}/crypto/comp/Makefile \
31 ${.OBJDIR}/${SSL_SRC}/crypto/conf/Makefile \
32 ${.OBJDIR}/${SSL_SRC}/crypto/des/Makefile \
33 ${.OBJDIR}/${SSL_SRC}/crypto/des/asm/perlasm \
34 ${.OBJDIR}/${SSL_SRC}/crypto/dh/Makefile \
35 ${.OBJDIR}/${SSL_SRC}/crypto/dsa/Makefile \
36 ${.OBJDIR}/${SSL_SRC}/crypto/dso/Makefile \
37 ${.OBJDIR}/${SSL_SRC}/crypto/ec/Makefile \
38 ${.OBJDIR}/${SSL_SRC}/crypto/engine/Makefile \
39 ${.OBJDIR}/${SSL_SRC}/crypto/err/Makefile \
40 ${.OBJDIR}/${SSL_SRC}/crypto/evp/Makefile \
41 ${.OBJDIR}/${SSL_SRC}/crypto/hmac/Makefile \
42 ${.OBJDIR}/${SSL_SRC}/crypto/idea/Makefile \
43 ${.OBJDIR}/${SSL_SRC}/crypto/krb5/Makefile \
44 ${.OBJDIR}/${SSL_SRC}/crypto/lhash/Makefile \
45 ${.OBJDIR}/${SSL_SRC}/crypto/md2/Makefile \
46 ${.OBJDIR}/${SSL_SRC}/crypto/md4/Makefile \
47 ${.OBJDIR}/${SSL_SRC}/crypto/md5/Makefile \
48 ${.OBJDIR}/${SSL_SRC}/crypto/mdc2/Makefile \
49 ${.OBJDIR}/${SSL_SRC}/crypto/objects/Makefile \
50 ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h \
51 ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_mac.h \
52 ${.OBJDIR}/${SSL_SRC}/crypto/ocsp/Makefile \
53 ${.OBJDIR}/${SSL_SRC}/crypto/opensslconf.h \
54 ${.OBJDIR}/${SSL_SRC}/crypto/pem/Makefile \
55 ${.OBJDIR}/${SSL_SRC}/crypto/pkcs12/Makefile \
56 ${.OBJDIR}/${SSL_SRC}/crypto/pkcs7/Makefile \
57 ${.OBJDIR}/${SSL_SRC}/crypto/rand/Makefile \
58 ${.OBJDIR}/${SSL_SRC}/crypto/rc2/Makefile \
59 ${.OBJDIR}/${SSL_SRC}/crypto/rc4/Makefile \
60 ${.OBJDIR}/${SSL_SRC}/crypto/rc5/Makefile \
61 ${.OBJDIR}/${SSL_SRC}/crypto/ripemd/Makefile \
62 ${.OBJDIR}/${SSL_SRC}/crypto/rsa/Makefile \
63 ${.OBJDIR}/${SSL_SRC}/crypto/sha/Makefile \
64 ${.OBJDIR}/${SSL_SRC}/crypto/stack/Makefile \
65 ${.OBJDIR}/${SSL_SRC}/crypto/txt_db/Makefile \
66 ${.OBJDIR}/${SSL_SRC}/crypto/ui/Makefile \
67 ${.OBJDIR}/${SSL_SRC}/crypto/x509/Makefile \
68 ${.OBJDIR}/${SSL_SRC}/crypto/x509v3/Makefile \
69 ${.OBJDIR}/${SSL_SRC}/ssl/Makefile \
70 ${.OBJDIR}/${SSL_SRC}/test/Makefile \
71 ${.OBJDIR}/${SSL_SRC}/test/bftest.c \
72 ${.OBJDIR}/${SSL_SRC}/test/bntest.c \
73 ${.OBJDIR}/${SSL_SRC}/test/casttest.c \
74 ${.OBJDIR}/${SSL_SRC}/test/destest.c \
75 ${.OBJDIR}/${SSL_SRC}/test/dhtest.c \
76 ${.OBJDIR}/${SSL_SRC}/test/dsatest.c \
77 ${.OBJDIR}/${SSL_SRC}/test/ectest.c \
78 ${.OBJDIR}/${SSL_SRC}/test/evp_test.c \
79 ${.OBJDIR}/${SSL_SRC}/test/evptests.txt \
80 ${.OBJDIR}/${SSL_SRC}/test/exptest.c \
81 ${.OBJDIR}/${SSL_SRC}/test/hmactest.c \
82 ${.OBJDIR}/${SSL_SRC}/test/ideatest.c \
83 ${.OBJDIR}/${SSL_SRC}/test/md2test.c \
84 ${.OBJDIR}/${SSL_SRC}/test/md5test.c \
85 ${.OBJDIR}/${SSL_SRC}/test/mdc2test.c \
86 ${.OBJDIR}/${SSL_SRC}/test/randtest.c \
87 ${.OBJDIR}/${SSL_SRC}/test/rc2test.c \
88 ${.OBJDIR}/${SSL_SRC}/test/rc4test.c \
89 ${.OBJDIR}/${SSL_SRC}/test/rc5test.c \
90 ${.OBJDIR}/${SSL_SRC}/test/rmdtest.c \
91 ${.OBJDIR}/${SSL_SRC}/test/sha1test.c \
92 ${.OBJDIR}/${SSL_SRC}/test/shatest.c \
93 ${.OBJDIR}/${SSL_SRC}/test/ssltest.c \
94 ${.OBJDIR}/${SSL_SRC}/tools/Makefile \
95 ${.OBJDIR}/${SSL_SRC}/tools/c_rehash \
96 ${.OBJDIR}/BUF_MEM_new.pm \
97 ${.OBJDIR}/CRYPTO_set_locking_callback.pm \
26 ${.OBJDIR}/HMAC.pm \ 98 ${.OBJDIR}/HMAC.pm \
27 ${.OBJDIR}/MD5.pm \ 99 ${.OBJDIR}/MD5.pm \
28 ${.OBJDIR}/MDC2.pm \ 100 ${.OBJDIR}/MDC2.pm \
29 ${.OBJDIR}/SHA1.pm \
30 ${.OBJDIR}/BUF_MEM_new.pm \
31 ${.OBJDIR}/RC4.pm \ 101 ${.OBJDIR}/RC4.pm \
32 ${.OBJDIR}/RIPEMD160.pm \ 102 ${.OBJDIR}/RIPEMD160.pm \
33 ${.OBJDIR}/CRYPTO_set_locking_callback.pm 103 ${.OBJDIR}/SHA1.pm \
104 ${.OBJDIR}/des_random_key.pm
34 105
35.include <bsd.own.mk> # for NOMAN 106.include <bsd.own.mk> # for NOMAN
36 107
@@ -949,7 +1020,9 @@ ${.OBJDIR}/${SSL_SRC}/Makefile.org: ${.CURDIR}/${SSL_SRC}/Makefile.org
949.if ${.OBJDIR} == ${.CURDIR} 1020.if ${.OBJDIR} == ${.CURDIR}
950clean: prereq 1021clean: prereq
951 @cd ${.OBJDIR}/crypto && ${MAKE} clean 1022 @cd ${.OBJDIR}/crypto && ${MAKE} clean
952 @cd ${.OBJDIR}/ssl && ${MAKE} clean && rm -f ${MUNGEDFILES} 1023 @cd ${.OBJDIR}/ssl && ${MAKE} clean
1024 @rm -f ${MUNGEDFILES}
1025 @rm -rf ${.OBJDIR}/${SSL_SRC}/include
953.else 1026.else
954clean: 1027clean:
955 @cd ${.OBJDIR} && find . \! -type d -print | xargs rm 1028 @cd ${.OBJDIR} && find . \! -type d -print | xargs rm
diff --git a/src/lib/libssl/src/apps/CA.pl b/src/lib/libssl/src/apps/CA.pl
deleted file mode 100644
index 64ad92eb78..0000000000
--- a/src/lib/libssl/src/apps/CA.pl
+++ /dev/null
@@ -1,173 +0,0 @@
1#!/usr/bin/perl
2#
3# CA - wrapper around ca to make it easier to use ... basically ca requires
4# some setup stuff to be done before you can use it and this makes
5# things easier between now and when Eric is convinced to fix it :-)
6#
7# CA -newca ... will setup the right stuff
8# CA -newreq[-nodes] ... will generate a certificate request
9# CA -sign ... will sign the generated request and output
10#
11# At the end of that grab newreq.pem and newcert.pem (one has the key
12# and the other the certificate) and cat them together and that is what
13# you want/need ... I'll make even this a little cleaner later.
14#
15#
16# 12-Jan-96 tjh Added more things ... including CA -signcert which
17# converts a certificate to a request and then signs it.
18# 10-Jan-96 eay Fixed a few more bugs and added the SSLEAY_CONFIG
19# environment variable so this can be driven from
20# a script.
21# 25-Jul-96 eay Cleaned up filenames some more.
22# 11-Jun-96 eay Fixed a few filename missmatches.
23# 03-May-96 eay Modified to use 'ssleay cmd' instead of 'cmd'.
24# 18-Apr-96 tjh Original hacking
25#
26# Tim Hudson
27# tjh@cryptsoft.com
28#
29
30# 27-Apr-98 snh Translation into perl, fix existing CA bug.
31#
32#
33# Steve Henson
34# shenson@bigfoot.com
35
36# default openssl.cnf file has setup as per the following
37# demoCA ... where everything is stored
38
39$SSLEAY_CONFIG=$ENV{"SSLEAY_CONFIG"};
40$DAYS="-days 365";
41$REQ="openssl req $SSLEAY_CONFIG";
42$CA="openssl ca $SSLEAY_CONFIG";
43$VERIFY="openssl verify";
44$X509="openssl x509";
45$PKCS12="openssl pkcs12";
46
47$CATOP="./demoCA";
48$CAKEY="cakey.pem";
49$CACERT="cacert.pem";
50
51$DIRMODE = 0777;
52
53$RET = 0;
54
55foreach (@ARGV) {
56 if ( /^(-\?|-h|-help)$/ ) {
57 print STDERR "usage: CA -newcert|-newreq|newreq-nodes|-newca|-sign|-verify\n";
58 exit 0;
59 } elsif (/^-newcert$/) {
60 # create a certificate
61 system ("$REQ -new -x509 -keyout newreq.pem -out newreq.pem $DAYS");
62 $RET=$?;
63 print "Certificate (and private key) is in newreq.pem\n"
64 } elsif (/^-newreq$/) {
65 # create a certificate request
66 system ("$REQ -new -keyout newreq.pem -out newreq.pem $DAYS");
67 $RET=$?;
68 print "Request (and private key) is in newreq.pem\n";
69 } elsif (/^-newreq-nodes$/) {
70 # create a certificate request
71 system ("$REQ -new -nodes -keyout newreq.pem -out newreq.pem $DAYS");
72 $RET=$?;
73 print "Request (and private key) is in newreq.pem\n";
74 } elsif (/^-newca$/) {
75 # if explicitly asked for or it doesn't exist then setup the
76 # directory structure that Eric likes to manage things
77 $NEW="1";
78 if ( "$NEW" || ! -f "${CATOP}/serial" ) {
79 # create the directory hierarchy
80 mkdir $CATOP, $DIRMODE;
81 mkdir "${CATOP}/certs", $DIRMODE;
82 mkdir "${CATOP}/crl", $DIRMODE ;
83 mkdir "${CATOP}/newcerts", $DIRMODE;
84 mkdir "${CATOP}/private", $DIRMODE;
85 open OUT, ">${CATOP}/serial";
86 print OUT "01\n";
87 close OUT;
88 open OUT, ">${CATOP}/index.txt";
89 close OUT;
90 }
91 if ( ! -f "${CATOP}/private/$CAKEY" ) {
92 print "CA certificate filename (or enter to create)\n";
93 $FILE = <STDIN>;
94
95 chop $FILE;
96
97 # ask user for existing CA certificate
98 if ($FILE) {
99 cp_pem($FILE,"${CATOP}/private/$CAKEY", "PRIVATE");
100 cp_pem($FILE,"${CATOP}/$CACERT", "CERTIFICATE");
101 $RET=$?;
102 } else {
103 print "Making CA certificate ...\n";
104 system ("$REQ -new -x509 -keyout " .
105 "${CATOP}/private/$CAKEY -out ${CATOP}/$CACERT $DAYS");
106 $RET=$?;
107 }
108 }
109 } elsif (/^-pkcs12$/) {
110 my $cname = $ARGV[1];
111 $cname = "My Certificate" unless defined $cname;
112 system ("$PKCS12 -in newcert.pem -inkey newreq.pem " .
113 "-certfile ${CATOP}/$CACERT -out newcert.p12 " .
114 "-export -name \"$cname\"");
115 $RET=$?;
116 exit $RET;
117 } elsif (/^-xsign$/) {
118 system ("$CA -policy policy_anything -infiles newreq.pem");
119 $RET=$?;
120 } elsif (/^(-sign|-signreq)$/) {
121 system ("$CA -policy policy_anything -out newcert.pem " .
122 "-infiles newreq.pem");
123 $RET=$?;
124 print "Signed certificate is in newcert.pem\n";
125 } elsif (/^(-signCA)$/) {
126 system ("$CA -policy policy_anything -out newcert.pem " .
127 "-extensions v3_ca -infiles newreq.pem");
128 $RET=$?;
129 print "Signed CA certificate is in newcert.pem\n";
130 } elsif (/^-signcert$/) {
131 system ("$X509 -x509toreq -in newreq.pem -signkey newreq.pem " .
132 "-out tmp.pem");
133 system ("$CA -policy policy_anything -out newcert.pem " .
134 "-infiles tmp.pem");
135 $RET = $?;
136 print "Signed certificate is in newcert.pem\n";
137 } elsif (/^-verify$/) {
138 if (shift) {
139 foreach $j (@ARGV) {
140 system ("$VERIFY -CAfile $CATOP/$CACERT $j");
141 $RET=$? if ($? != 0);
142 }
143 exit $RET;
144 } else {
145 system ("$VERIFY -CAfile $CATOP/$CACERT newcert.pem");
146 $RET=$?;
147 exit 0;
148 }
149 } else {
150 print STDERR "Unknown arg $_\n";
151 print STDERR "usage: CA -newcert|-newreq|newreq-nodes|-newca|-sign|-verify\n";
152 exit 1;
153 }
154}
155
156exit $RET;
157
158sub cp_pem {
159my ($infile, $outfile, $bound) = @_;
160open IN, $infile;
161open OUT, ">$outfile";
162my $flag = 0;
163while (<IN>) {
164 $flag = 1 if (/^-----BEGIN.*$bound/) ;
165 print OUT $_ if ($flag);
166 if (/^-----END.*$bound/) {
167 close IN;
168 close OUT;
169 return;
170 }
171}
172}
173
diff --git a/src/lib/libssl/src/crypto/Makefile b/src/lib/libssl/src/crypto/Makefile
deleted file mode 100644
index 6759b2e4d0..0000000000
--- a/src/lib/libssl/src/crypto/Makefile
+++ /dev/null
@@ -1,203 +0,0 @@
1#
2# SSLeay/crypto/Makefile
3#
4
5DIR= crypto
6TOP= ..
7CC= cc
8INCLUDE= -I. -I../include
9INCLUDES= -I.. -I../../include
10CFLAG= -g
11INSTALL_PREFIX=
12OPENSSLDIR= /usr/local/ssl
13INSTALLTOP= /usr/local/ssl
14MAKE= make -f Makefile.ssl
15MAKEDEPEND= $(TOP)/util/domd $(TOP)
16MAKEFILE= Makefile.ssl
17RM= rm -f
18AR= ar r
19
20PEX_LIBS=
21EX_LIBS=
22
23CFLAGS= $(INCLUDE) $(CFLAG)
24
25
26LIBS=
27
28SDIRS= md2 md5 sha mdc2 hmac ripemd \
29 des rc2 rc4 rc5 idea bf cast \
30 bn rsa dsa dh dso engine \
31 buffer bio stack lhash rand err objects \
32 evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp
33
34GENERAL=Makefile README crypto-lib.com install.com
35
36LIB= $(TOP)/libcrypto.a
37LIBSRC= cryptlib.c mem.c mem_dbg.c cversion.c ex_data.c tmdiff.c cpt_err.c ebcdic.c uid.c
38LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o tmdiff.o cpt_err.o ebcdic.o uid.o
39
40SRC= $(LIBSRC)
41
42EXHEADER= crypto.h tmdiff.h opensslv.h opensslconf.h ebcdic.h symhacks.h
43HEADER= cryptlib.h buildinf.h md32_common.h $(EXHEADER)
44
45ALL= $(GENERAL) $(SRC) $(HEADER)
46
47top:
48 @(cd ..; $(MAKE) DIRS=$(DIR) all)
49
50all: buildinf.h lib subdirs
51
52buildinf.h: ../Makefile.ssl
53 ( echo "#ifndef MK1MF_BUILD"; \
54 echo " /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */"; \
55 echo " #define CFLAGS \"$(CC) $(CFLAG)\""; \
56 echo " #define PLATFORM \"$(PLATFORM)\""; \
57 echo " #define DATE \"`date`\""; \
58 echo "#endif" ) >buildinf.h
59
60testapps:
61 if echo ${SDIRS} | fgrep ' des '; \
62 then cd des && $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' des; fi
63 cd pkcs7 && $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' testapps
64
65subdirs:
66 @for i in $(SDIRS) ;\
67 do \
68 (cd $$i && echo "making all in crypto/$$i..." && \
69 $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \
70 done;
71
72files:
73 $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
74 @for i in $(SDIRS) ;\
75 do \
76 (cd $$i; echo "making 'files' in crypto/$$i..."; \
77 $(MAKE) PERL='${PERL}' files ); \
78 done;
79
80links:
81 @$(SHELL) $(TOP)/util/point.sh Makefile.ssl Makefile
82 @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
83 @$(PERL) $(TOP)/util/mklink.pl ../test $(TEST)
84 @$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS)
85 @$(SHELL) $(TOP)/util/point.sh Makefile.ssl Makefile
86 @for i in $(SDIRS); do \
87 (cd $$i; echo "making links in crypto/$$i..."; \
88 $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PERL='${PERL}' links ); \
89 done;
90
91lib: $(LIBOBJ)
92 $(AR) $(LIB) $(LIBOBJ)
93 @echo You may get an error following this line. Please ignore.
94 - $(RANLIB) $(LIB)
95 @touch lib
96
97libs:
98 @for i in $(SDIRS) ;\
99 do \
100 (cd $$i; echo "making libs in crypto/$$i..."; \
101 $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' lib ); \
102 done;
103
104tests:
105 @for i in $(SDIRS) ;\
106 do \
107 (cd $$i; echo "making tests in crypto/$$i..."; \
108 $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' tests ); \
109 done;
110
111install:
112 @for i in $(EXHEADER) ;\
113 do \
114 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
115 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
116 done;
117 @for i in $(SDIRS) ;\
118 do \
119 (cd $$i; echo "making install in crypto/$$i..."; \
120 $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' install ); \
121 done;
122
123lint:
124 @for i in $(SDIRS) ;\
125 do \
126 (cd $$i; echo "making lint in crypto/$$i..."; \
127 $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' lint ); \
128 done;
129
130depend:
131 if [ ! -f buildinf.h ]; then touch buildinf.h; fi # fake buildinf.h if it does not exist
132 $(MAKEDEPEND) $(INCLUDE) $(DEPFLAG) $(PROGS) $(LIBSRC)
133 if [ ! -s buildinf.h ]; then rm buildinf.h; fi
134 @for i in $(SDIRS) ;\
135 do \
136 (cd $$i; echo "making depend in crypto/$$i..."; \
137 $(MAKE) MAKEFILE='${MAKEFILE}' INCLUDES='${INCLUDES}' DEPFLAG='${DEPFLAG}' depend ); \
138 done;
139
140clean:
141 rm -f buildinf.h *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
142 @for i in $(SDIRS) ;\
143 do \
144 (cd $$i; echo "making clean in crypto/$$i..."; \
145 $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' clean ); \
146 done;
147
148dclean:
149 $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
150 mv -f Makefile.new $(MAKEFILE)
151 @for i in $(SDIRS) ;\
152 do \
153 (cd $$i; echo "making dclean in crypto/$$i..."; \
154 $(MAKE) PERL='${PERL}' CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' dclean ); \
155 done;
156
157# DO NOT DELETE THIS LINE -- make depend depends on it.
158
159cpt_err.o: ../include/openssl/bio.h ../include/openssl/crypto.h
160cpt_err.o: ../include/openssl/err.h ../include/openssl/lhash.h
161cpt_err.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
162cpt_err.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
163cryptlib.o: ../include/openssl/bio.h ../include/openssl/buffer.h
164cryptlib.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
165cryptlib.o: ../include/openssl/e_os2.h ../include/openssl/err.h
166cryptlib.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
167cryptlib.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
168cryptlib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h
169cversion.o: ../include/openssl/bio.h ../include/openssl/buffer.h
170cversion.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
171cversion.o: ../include/openssl/e_os2.h ../include/openssl/err.h
172cversion.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
173cversion.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
174cversion.o: ../include/openssl/stack.h ../include/openssl/symhacks.h buildinf.h
175cversion.o: cryptlib.h
176ex_data.o: ../include/openssl/bio.h ../include/openssl/buffer.h
177ex_data.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
178ex_data.o: ../include/openssl/e_os2.h ../include/openssl/err.h
179ex_data.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
180ex_data.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
181ex_data.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h
182mem.o: ../include/openssl/bio.h ../include/openssl/buffer.h
183mem.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
184mem.o: ../include/openssl/e_os2.h ../include/openssl/err.h
185mem.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
186mem.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
187mem.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h
188mem_dbg.o: ../include/openssl/bio.h ../include/openssl/buffer.h
189mem_dbg.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
190mem_dbg.o: ../include/openssl/e_os2.h ../include/openssl/err.h
191mem_dbg.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
192mem_dbg.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
193mem_dbg.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h
194tmdiff.o: ../include/openssl/bio.h ../include/openssl/buffer.h
195tmdiff.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
196tmdiff.o: ../include/openssl/e_os2.h ../include/openssl/err.h
197tmdiff.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
198tmdiff.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
199tmdiff.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
200tmdiff.o: ../include/openssl/tmdiff.h cryptlib.h
201uid.o: ../include/openssl/crypto.h ../include/openssl/opensslv.h
202uid.o: ../include/openssl/safestack.h ../include/openssl/stack.h
203uid.o: ../include/openssl/symhacks.h