summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormarkus <>2003-11-11 21:15:49 +0000
committermarkus <>2003-11-11 21:15:49 +0000
commitfa83f11e2dbd07a1d276b24e79917327f6eef094 (patch)
tree70451477a5018af519252d1818179daf533872f4 /src
parentd8796e3ff9f4d4ef299e84e2d0d2391314ecd811 (diff)
downloadopenbsd-fa83f11e2dbd07a1d276b24e79917327f6eef094.tar.gz
openbsd-fa83f11e2dbd07a1d276b24e79917327f6eef094.tar.bz2
openbsd-fa83f11e2dbd07a1d276b24e79917327f6eef094.zip
import 0.9.7c
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/bn/Makefile.ssl1
-rw-r--r--src/lib/libcrypto/evp/Makefile.ssl15
-rw-r--r--src/lib/libcrypto/md5/Makefile.ssl3
-rw-r--r--src/lib/libssl/src/Makefile.ssl26
-rw-r--r--src/lib/libssl/src/apps/der_chop2
-rw-r--r--src/lib/libssl/src/crypto/bn/Makefile.ssl1
-rw-r--r--src/lib/libssl/src/crypto/evp/Makefile.ssl15
-rw-r--r--src/lib/libssl/src/crypto/md5/Makefile.ssl3
8 files changed, 37 insertions, 29 deletions
diff --git a/src/lib/libcrypto/bn/Makefile.ssl b/src/lib/libcrypto/bn/Makefile.ssl
index c1547a8e6d..090fccdf7d 100644
--- a/src/lib/libcrypto/bn/Makefile.ssl
+++ b/src/lib/libcrypto/bn/Makefile.ssl
@@ -22,6 +22,7 @@ BN_ASM= bn_asm.o
22#BN_ASM= bn86-elf.o 22#BN_ASM= bn86-elf.o
23 23
24CFLAGS= $(INCLUDES) $(CFLAG) 24CFLAGS= $(INCLUDES) $(CFLAG)
25ASFLAGS= $(INCLUDES) $(ASFLAG)
25 26
26GENERAL=Makefile 27GENERAL=Makefile
27TEST=bntest.c exptest.c 28TEST=bntest.c exptest.c
diff --git a/src/lib/libcrypto/evp/Makefile.ssl b/src/lib/libcrypto/evp/Makefile.ssl
index 3279be5bda..772afd71f5 100644
--- a/src/lib/libcrypto/evp/Makefile.ssl
+++ b/src/lib/libcrypto/evp/Makefile.ssl
@@ -185,13 +185,14 @@ c_all.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
185c_all.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 185c_all.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
186c_all.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 186c_all.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
187c_all.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 187c_all.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
188c_all.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 188c_all.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
189c_all.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 189c_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h
190c_all.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 190c_all.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
191c_all.o: ../../include/openssl/md4.h ../../include/openssl/md5.h 191c_all.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
192c_all.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h 192c_all.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
193c_all.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 193c_all.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
194c_all.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 194c_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
195c_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
195c_all.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 196c_all.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
196c_all.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 197c_all.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
197c_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 198c_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
diff --git a/src/lib/libcrypto/md5/Makefile.ssl b/src/lib/libcrypto/md5/Makefile.ssl
index 56cab5d882..2d4df972ff 100644
--- a/src/lib/libcrypto/md5/Makefile.ssl
+++ b/src/lib/libcrypto/md5/Makefile.ssl
@@ -6,7 +6,7 @@ DIR= md5
6TOP= ../.. 6TOP= ../..
7CC= cc 7CC= cc
8CPP= $(CC) -E 8CPP= $(CC) -E
9INCLUDES= 9INCLUDES=-I.. -I$(TOP) -I../../include
10CFLAG=-g 10CFLAG=-g
11INSTALL_PREFIX= 11INSTALL_PREFIX=
12OPENSSLDIR= /usr/local/ssl 12OPENSSLDIR= /usr/local/ssl
@@ -20,6 +20,7 @@ AR= ar r
20MD5_ASM_OBJ= 20MD5_ASM_OBJ=
21 21
22CFLAGS= $(INCLUDES) $(CFLAG) 22CFLAGS= $(INCLUDES) $(CFLAG)
23ASFLAGS= $(INCLUDES) $(ASFLAG)
23 24
24GENERAL=Makefile 25GENERAL=Makefile
25TEST=md5test.c 26TEST=md5test.c
diff --git a/src/lib/libssl/src/Makefile.ssl b/src/lib/libssl/src/Makefile.ssl
index 0b1c2f659c..58f39965a9 100644
--- a/src/lib/libssl/src/Makefile.ssl
+++ b/src/lib/libssl/src/Makefile.ssl
@@ -4,7 +4,7 @@
4## Makefile for OpenSSL 4## Makefile for OpenSSL
5## 5##
6 6
7VERSION=0.9.7b 7VERSION=0.9.7c
8MAJOR=0 8MAJOR=0
9MINOR=9.7 9MINOR=9.7
10SHLIB_VERSION_NUMBER=0.9.7 10SHLIB_VERSION_NUMBER=0.9.7
@@ -69,7 +69,7 @@ EXE_EXT=
69ARFLAGS= 69ARFLAGS=
70AR=ar $(ARFLAGS) r 70AR=ar $(ARFLAGS) r
71RANLIB= /usr/bin/ranlib 71RANLIB= /usr/bin/ranlib
72PERL= /usr/local/bin/perl 72PERL= /usr/bin/perl
73TAR= tar 73TAR= tar
74TARFLAGS= --no-recursion 74TARFLAGS= --no-recursion
75MAKEDEPPROG=makedepend 75MAKEDEPPROG=makedepend
@@ -80,7 +80,7 @@ MAKEDEPPROG=makedepend
80# gcc, then the driver will automatically translate it to -xarch=v8plus 80# gcc, then the driver will automatically translate it to -xarch=v8plus
81# and pass it down to assembler. 81# and pass it down to assembler.
82AS=$(CC) -c 82AS=$(CC) -c
83ASFLAGS=$(CFLAG) 83ASFLAG=$(CFLAG)
84 84
85# Set BN_ASM to bn_asm.o if you want to use the C version 85# Set BN_ASM to bn_asm.o if you want to use the C version
86BN_ASM= bn_asm.o 86BN_ASM= bn_asm.o
@@ -196,6 +196,7 @@ MAKE= make -f Makefile.ssl
196MANDIR=$(OPENSSLDIR)/man 196MANDIR=$(OPENSSLDIR)/man
197MAN1=1 197MAN1=1
198MAN3=3 198MAN3=3
199MANSUFFIX=
199SHELL=/bin/sh 200SHELL=/bin/sh
200 201
201TOP= . 202TOP= .
@@ -227,7 +228,7 @@ sub_all:
227 do \ 228 do \
228 if [ -d "$$i" ]; then \ 229 if [ -d "$$i" ]; then \
229 (cd $$i && echo "making all in $$i..." && \ 230 (cd $$i && echo "making all in $$i..." && \
230 $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' AS='${AS}' ASFLAGS='${ASFLAGS}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' all ) || exit 1; \ 231 $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' AS='${AS}' ASFLAG='${ASFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' all ) || exit 1; \
231 else \ 232 else \
232 $(MAKE) $$i; \ 233 $(MAKE) $$i; \
233 fi; \ 234 fi; \
@@ -412,7 +413,7 @@ do_svr3-shared:
412 find . -name "*.o" -print > allobjs ; \ 413 find . -name "*.o" -print > allobjs ; \
413 OBJS= ; export OBJS ; \ 414 OBJS= ; export OBJS ; \
414 for obj in `ar t lib$$i.a` ; do \ 415 for obj in `ar t lib$$i.a` ; do \
415 OBJS="$${OBJS} `grep $$obj allobjs`" ; \ 416 OBJS="$${OBJS} `grep /$$obj allobjs`" ; \
416 done ; \ 417 done ; \
417 set -x; ${CC} ${SHARED_LDFLAGS} \ 418 set -x; ${CC} ${SHARED_LDFLAGS} \
418 -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ 419 -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
@@ -437,7 +438,7 @@ do_svr5-shared:
437 find . -name "*.o" -print > allobjs ; \ 438 find . -name "*.o" -print > allobjs ; \
438 OBJS= ; export OBJS ; \ 439 OBJS= ; export OBJS ; \
439 for obj in `ar t lib$$i.a` ; do \ 440 for obj in `ar t lib$$i.a` ; do \
440 OBJS="$${OBJS} `grep $$obj allobjs`" ; \ 441 OBJS="$${OBJS} `grep /$$obj allobjs`" ; \
441 done ; \ 442 done ; \
442 set -x; LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \ 443 set -x; LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
443 ${CC} ${SHARED_LDFLAGS} \ 444 ${CC} ${SHARED_LDFLAGS} \
@@ -833,6 +834,7 @@ install: all install_docs
833 fi; \ 834 fi; \
834 fi 835 fi
835 cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig 836 cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
837 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
836 838
837install_docs: 839install_docs:
838 @$(PERL) $(TOP)/util/mkdir-p.pl \ 840 @$(PERL) $(TOP)/util/mkdir-p.pl \
@@ -849,33 +851,33 @@ install_docs:
849 for i in doc/apps/*.pod; do \ 851 for i in doc/apps/*.pod; do \
850 fn=`basename $$i .pod`; \ 852 fn=`basename $$i .pod`; \
851 if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \ 853 if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \
852 echo "installing man$$sec/$$fn.$$sec"; \ 854 echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
853 (cd `$(PERL) util/dirname.pl $$i`; \ 855 (cd `$(PERL) util/dirname.pl $$i`; \
854 sh -c "$$pod2man \ 856 sh -c "$$pod2man \
855 --section=$$sec --center=OpenSSL \ 857 --section=$$sec --center=OpenSSL \
856 --release=$(VERSION) `basename $$i`") \ 858 --release=$(VERSION) `basename $$i`") \
857 > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$$sec; \ 859 > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
858 $(PERL) util/extract-names.pl < $$i | \ 860 $(PERL) util/extract-names.pl < $$i | \
859 grep -v $$filecase "^$$fn\$$" | \ 861 grep -v $$filecase "^$$fn\$$" | \
860 (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \ 862 (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
861 while read n; do \ 863 while read n; do \
862 $$here/util/point.sh $$fn.$$sec $$n.$$sec; \ 864 $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
863 done); \ 865 done); \
864 done; \ 866 done; \
865 for i in doc/crypto/*.pod doc/ssl/*.pod; do \ 867 for i in doc/crypto/*.pod doc/ssl/*.pod; do \
866 fn=`basename $$i .pod`; \ 868 fn=`basename $$i .pod`; \
867 if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \ 869 if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \
868 echo "installing man$$sec/$$fn.$$sec"; \ 870 echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
869 (cd `$(PERL) util/dirname.pl $$i`; \ 871 (cd `$(PERL) util/dirname.pl $$i`; \
870 sh -c "$$pod2man \ 872 sh -c "$$pod2man \
871 --section=$$sec --center=OpenSSL \ 873 --section=$$sec --center=OpenSSL \
872 --release=$(VERSION) `basename $$i`") \ 874 --release=$(VERSION) `basename $$i`") \
873 > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$$sec; \ 875 > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
874 $(PERL) util/extract-names.pl < $$i | \ 876 $(PERL) util/extract-names.pl < $$i | \
875 grep -v $$filecase "^$$fn\$$" | \ 877 grep -v $$filecase "^$$fn\$$" | \
876 (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \ 878 (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
877 while read n; do \ 879 while read n; do \
878 $$here/util/point.sh $$fn.$$sec $$n.$$sec; \ 880 $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
879 done); \ 881 done); \
880 done 882 done
881 883
diff --git a/src/lib/libssl/src/apps/der_chop b/src/lib/libssl/src/apps/der_chop
index 9070b032fc..2ee9d6bfd4 100644
--- a/src/lib/libssl/src/apps/der_chop
+++ b/src/lib/libssl/src/apps/der_chop
@@ -1,4 +1,4 @@
1#!/usr/local/bin/perl 1#!/usr/bin/perl
2# 2#
3# der_chop ... this is one total hack that Eric is really not proud of 3# der_chop ... this is one total hack that Eric is really not proud of
4# so don't look at it and don't ask for support 4# so don't look at it and don't ask for support
diff --git a/src/lib/libssl/src/crypto/bn/Makefile.ssl b/src/lib/libssl/src/crypto/bn/Makefile.ssl
index c1547a8e6d..090fccdf7d 100644
--- a/src/lib/libssl/src/crypto/bn/Makefile.ssl
+++ b/src/lib/libssl/src/crypto/bn/Makefile.ssl
@@ -22,6 +22,7 @@ BN_ASM= bn_asm.o
22#BN_ASM= bn86-elf.o 22#BN_ASM= bn86-elf.o
23 23
24CFLAGS= $(INCLUDES) $(CFLAG) 24CFLAGS= $(INCLUDES) $(CFLAG)
25ASFLAGS= $(INCLUDES) $(ASFLAG)
25 26
26GENERAL=Makefile 27GENERAL=Makefile
27TEST=bntest.c exptest.c 28TEST=bntest.c exptest.c
diff --git a/src/lib/libssl/src/crypto/evp/Makefile.ssl b/src/lib/libssl/src/crypto/evp/Makefile.ssl
index 3279be5bda..772afd71f5 100644
--- a/src/lib/libssl/src/crypto/evp/Makefile.ssl
+++ b/src/lib/libssl/src/crypto/evp/Makefile.ssl
@@ -185,13 +185,14 @@ c_all.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
185c_all.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 185c_all.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
186c_all.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 186c_all.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
187c_all.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 187c_all.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
188c_all.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 188c_all.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
189c_all.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 189c_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h
190c_all.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 190c_all.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
191c_all.o: ../../include/openssl/md4.h ../../include/openssl/md5.h 191c_all.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
192c_all.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h 192c_all.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
193c_all.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 193c_all.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
194c_all.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 194c_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
195c_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
195c_all.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 196c_all.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
196c_all.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 197c_all.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
197c_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 198c_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
diff --git a/src/lib/libssl/src/crypto/md5/Makefile.ssl b/src/lib/libssl/src/crypto/md5/Makefile.ssl
index 56cab5d882..2d4df972ff 100644
--- a/src/lib/libssl/src/crypto/md5/Makefile.ssl
+++ b/src/lib/libssl/src/crypto/md5/Makefile.ssl
@@ -6,7 +6,7 @@ DIR= md5
6TOP= ../.. 6TOP= ../..
7CC= cc 7CC= cc
8CPP= $(CC) -E 8CPP= $(CC) -E
9INCLUDES= 9INCLUDES=-I.. -I$(TOP) -I../../include
10CFLAG=-g 10CFLAG=-g
11INSTALL_PREFIX= 11INSTALL_PREFIX=
12OPENSSLDIR= /usr/local/ssl 12OPENSSLDIR= /usr/local/ssl
@@ -20,6 +20,7 @@ AR= ar r
20MD5_ASM_OBJ= 20MD5_ASM_OBJ=
21 21
22CFLAGS= $(INCLUDES) $(CFLAG) 22CFLAGS= $(INCLUDES) $(CFLAG)
23ASFLAGS= $(INCLUDES) $(ASFLAG)
23 24
24GENERAL=Makefile 25GENERAL=Makefile
25TEST=md5test.c 26TEST=md5test.c
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-21 00:36:35 +0000