summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/des
diff options
context:
space:
mode:
authordjm <>2008-09-06 12:15:54 +0000
committerdjm <>2008-09-06 12:15:54 +0000
commitf1625f274acf5dcd5601f6cb5e29e233b2a441a3 (patch)
tree44899ddfbef8f24aacbea50086c041c1b150f6d6 /src/lib/libcrypto/des
parent4f828b924f54507141fb95ebe49dfcd261945e85 (diff)
downloadopenbsd-f1625f274acf5dcd5601f6cb5e29e233b2a441a3.tar.gz
openbsd-f1625f274acf5dcd5601f6cb5e29e233b2a441a3.tar.bz2
openbsd-f1625f274acf5dcd5601f6cb5e29e233b2a441a3.zip
import of OpenSSL 0.9.8h
Diffstat (limited to 'src/lib/libcrypto/des')
-rw-r--r--src/lib/libcrypto/des/FILES02
-rw-r--r--src/lib/libcrypto/des/INSTALL2
-rw-r--r--src/lib/libcrypto/des/Makefile288
-rw-r--r--src/lib/libcrypto/des/des_old.c4
-rw-r--r--src/lib/libcrypto/des/des_old.h13
-rw-r--r--src/lib/libcrypto/des/des_opts.c4
-rw-r--r--src/lib/libcrypto/des/des_ver.h4
-rw-r--r--src/lib/libcrypto/des/destest.c18
-rw-r--r--src/lib/libcrypto/des/read2pwd.c1
-rw-r--r--src/lib/libcrypto/des/speed.c4
10 files changed, 169 insertions, 171 deletions
diff --git a/src/lib/libcrypto/des/FILES0 b/src/lib/libcrypto/des/FILES0
index 1c2e1f75b9..4c7ea2de7a 100644
--- a/src/lib/libcrypto/des/FILES0
+++ b/src/lib/libcrypto/des/FILES0
@@ -8,7 +8,7 @@ README - What this package is.
8VERSION - Which version this is and what was changed. 8VERSION - Which version this is and what was changed.
9KERBEROS - Kerberos version 4 notes. 9KERBEROS - Kerberos version 4 notes.
10Makefile.PL - An old makefile to build with perl5, not current. 10Makefile.PL - An old makefile to build with perl5, not current.
11Makefile - The SSLeay makefile 11Makefile.ssl - The SSLeay makefile
12Makefile.uni - The normal unix makefile. 12Makefile.uni - The normal unix makefile.
13GNUmakefile - The makefile for use with glibc. 13GNUmakefile - The makefile for use with glibc.
14makefile.bc - A Borland C makefile 14makefile.bc - A Borland C makefile
diff --git a/src/lib/libcrypto/des/INSTALL b/src/lib/libcrypto/des/INSTALL
index 32457d775c..8aebdfe110 100644
--- a/src/lib/libcrypto/des/INSTALL
+++ b/src/lib/libcrypto/des/INSTALL
@@ -25,7 +25,7 @@ and then you can use the 'DES_PTR' option.
25 25
26The file options.txt has the options listed for best speed on quite a 26The file options.txt has the options listed for best speed on quite a
27few systems. Look and the options (UNROLL, PTR, RISC2 etc) and then 27few systems. Look and the options (UNROLL, PTR, RISC2 etc) and then
28turn on the relevent option in the Makefile 28turn on the relevant option in the Makefile.
29 29
30There are some special Makefile targets that make life easier. 30There are some special Makefile targets that make life easier.
31make cc - standard cc build 31make cc - standard cc build
diff --git a/src/lib/libcrypto/des/Makefile b/src/lib/libcrypto/des/Makefile
index 800af0b123..523dfe38f2 100644
--- a/src/lib/libcrypto/des/Makefile
+++ b/src/lib/libcrypto/des/Makefile
@@ -8,11 +8,6 @@ CC= cc
8CPP= $(CC) -E 8CPP= $(CC) -E
9INCLUDES=-I$(TOP) -I../../include 9INCLUDES=-I$(TOP) -I../../include
10CFLAG=-g 10CFLAG=-g
11INSTALL_PREFIX=
12OPENSSLDIR= /usr/local/ssl
13INSTALLTOP=/usr/local/ssl
14MAKEDEPPROG= makedepend
15MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
16MAKEFILE= Makefile 11MAKEFILE= Makefile
17AR= ar r 12AR= ar r
18RANLIB= ranlib 13RANLIB= ranlib
@@ -22,6 +17,7 @@ DES_ENC= des_enc.o fcrypt_b.o
22 17
23CFLAGS= $(INCLUDES) $(CFLAG) 18CFLAGS= $(INCLUDES) $(CFLAG)
24ASFLAGS= $(INCLUDES) $(ASFLAG) 19ASFLAGS= $(INCLUDES) $(ASFLAG)
20AFLAGS= $(ASFLAGS)
25 21
26GENERAL=Makefile 22GENERAL=Makefile
27TEST=destest.c 23TEST=destest.c
@@ -65,32 +61,24 @@ lib: $(LIBOBJ)
65des: des.o cbc3_enc.o lib 61des: des.o cbc3_enc.o lib
66 $(CC) $(CFLAGS) -o des des.o cbc3_enc.o $(LIB) 62 $(CC) $(CFLAGS) -o des des.o cbc3_enc.o $(LIB)
67 63
68# elf 64des_enc-sparc.S: asm/des_enc.m4
69asm/dx86-elf.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl 65 m4 -B 8192 asm/des_enc.m4 > des_enc-sparc.S
70 (cd asm; $(PERL) des-586.pl elf $(CFLAGS) > dx86-elf.s) 66
71 67# ELF
72asm/yx86-elf.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl 68dx86-elf.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
73 (cd asm; $(PERL) crypt586.pl elf $(CFLAGS) > yx86-elf.s) 69 (cd asm; $(PERL) des-586.pl elf $(CFLAGS) > ../$@)
74 70yx86-elf.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
71 (cd asm; $(PERL) crypt586.pl elf $(CFLAGS) > ../$@)
72# COFF
73dx86-cof.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
74 (cd asm; $(PERL) des-586.pl coff $(CFLAGS) > ../$@)
75yx86-cof.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
76 (cd asm; $(PERL) crypt586.pl coff $(CFLAGS) > ../$@)
75# a.out 77# a.out
76asm/dx86-out.o: asm/dx86unix.cpp 78dx86-out.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
77 $(CPP) -DOUT asm/dx86unix.cpp | as -o asm/dx86-out.o 79 (cd asm; $(PERL) des-586.pl a.out $(CFLAGS) > ../$@)
78 80yx86-out.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
79asm/yx86-out.o: asm/yx86unix.cpp 81 (cd asm; $(PERL) crypt586.pl a.out $(CFLAGS) > ../$@)
80 $(CPP) -DOUT asm/yx86unix.cpp | as -o asm/yx86-out.o
81
82# bsdi
83asm/dx86bsdi.o: asm/dx86unix.cpp
84 $(CPP) -DBSDI asm/dx86unix.cpp | sed 's/ :/:/' | as -o asm/dx86bsdi.o
85
86asm/yx86bsdi.o: asm/yx86unix.cpp
87 $(CPP) -DBSDI asm/yx86unix.cpp | sed 's/ :/:/' | as -o asm/yx86bsdi.o
88
89asm/dx86unix.cpp: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
90 (cd asm; $(PERL) des-586.pl cpp >dx86unix.cpp)
91
92asm/yx86unix.cpp: asm/crypt586.pl ../perlasm/x86asm.pl
93 (cd asm; $(PERL) crypt586.pl cpp >yx86unix.cpp)
94 82
95files: 83files:
96 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO 84 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
@@ -100,9 +88,11 @@ links:
100 @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) 88 @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
101 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 89 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
102 90
103install: installs 91# We need to use force because 'install' matches 'INSTALL' on case
104 92# insensitive systems
105installs: 93FRC.install:
94install: FRC.install
95 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
106 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 96 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
107 do \ 97 do \
108 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 98 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -118,6 +108,7 @@ lint:
118 lint -DLINT $(INCLUDES) $(SRC)>fluff 108 lint -DLINT $(INCLUDES) $(SRC)>fluff
119 109
120depend: 110depend:
111 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
121 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 112 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
122 113
123dclean: 114dclean:
@@ -125,83 +116,77 @@ dclean:
125 mv -f Makefile.new $(MAKEFILE) 116 mv -f Makefile.new $(MAKEFILE)
126 117
127clean: 118clean:
128 rm -f asm/dx86unix.cpp asm/yx86unix.cpp asm/*-elf.* *.o asm/*.o *.obj des lib tags core .pure .nfs* *.old *.bak fluff 119 rm -f *.s *.o *.obj des lib tags core .pure .nfs* *.old *.bak fluff
129 120
130# DO NOT DELETE THIS LINE -- make depend depends on it. 121# DO NOT DELETE THIS LINE -- make depend depends on it.
131 122
132cbc_cksm.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 123cbc_cksm.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
133cbc_cksm.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 124cbc_cksm.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
134cbc_cksm.o: ../../include/openssl/opensslconf.h 125cbc_cksm.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
135cbc_cksm.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
136cbc_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 126cbc_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
137cbc_cksm.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 127cbc_cksm.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
138cbc_cksm.o: cbc_cksm.c des_locl.h 128cbc_cksm.o: cbc_cksm.c des_locl.h
139cbc_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 129cbc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
140cbc_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 130cbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
141cbc_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 131cbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
142cbc_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 132cbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
143cbc_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 133cbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
144cbc_enc.o: ../../include/openssl/ui_compat.h cbc_enc.c des_locl.h ncbc_enc.c 134cbc_enc.o: cbc_enc.c des_locl.h ncbc_enc.c
145cfb64ede.o: ../../e_os.h ../../include/openssl/crypto.h 135cfb64ede.o: ../../e_os.h ../../include/openssl/des.h
146cfb64ede.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 136cfb64ede.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
147cfb64ede.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h 137cfb64ede.o: ../../include/openssl/opensslconf.h
148cfb64ede.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 138cfb64ede.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
149cfb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 139cfb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
150cfb64ede.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 140cfb64ede.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
151cfb64ede.o: cfb64ede.c des_locl.h 141cfb64ede.o: cfb64ede.c des_locl.h
152cfb64enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 142cfb64enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
153cfb64enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 143cfb64enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
154cfb64enc.o: ../../include/openssl/opensslconf.h 144cfb64enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
155cfb64enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
156cfb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 145cfb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
157cfb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 146cfb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
158cfb64enc.o: cfb64enc.c des_locl.h 147cfb64enc.o: cfb64enc.c des_locl.h
159cfb_enc.o: ../../e_os.h ../../include/openssl/crypto.h 148cfb_enc.o: ../../e_os.h ../../include/openssl/des.h
160cfb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 149cfb_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
161cfb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h 150cfb_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/ossl_typ.h
162cfb_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 151cfb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
163cfb_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 152cfb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
164cfb_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 153cfb_enc.o: ../../include/openssl/ui_compat.h cfb_enc.c des_locl.h
165cfb_enc.o: cfb_enc.c des_locl.h 154des_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
166des_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 155des_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
167des_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 156des_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
168des_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 157des_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
169des_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 158des_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
170des_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 159des_enc.o: des_enc.c des_locl.h ncbc_enc.c
171des_enc.o: ../../include/openssl/ui_compat.h des_enc.c des_locl.h ncbc_enc.c 160des_old.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
172des_old.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 161des_old.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
173des_old.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
174des_old.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
175des_old.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h 162des_old.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
176des_old.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 163des_old.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
177des_old.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 164des_old.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
178des_old.o: ../../include/openssl/ui_compat.h des_old.c 165des_old.o: ../../include/openssl/ui_compat.h des_old.c
179des_old2.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 166des_old2.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
180des_old2.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 167des_old2.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
181des_old2.o: ../../include/openssl/opensslconf.h 168des_old2.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
182des_old2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 169des_old2.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
183des_old2.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h 170des_old2.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
184des_old2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 171des_old2.o: ../../include/openssl/ui_compat.h des_old2.c
185des_old2.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 172ecb3_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
186des_old2.o: des_old2.c 173ecb3_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
187ecb3_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 174ecb3_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
188ecb3_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
189ecb3_enc.o: ../../include/openssl/opensslconf.h
190ecb3_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
191ecb3_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 175ecb3_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
192ecb3_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 176ecb3_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
193ecb3_enc.o: des_locl.h ecb3_enc.c 177ecb3_enc.o: des_locl.h ecb3_enc.c
194ecb_enc.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h 178ecb_enc.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
195ecb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 179ecb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
196ecb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h 180ecb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
197ecb_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 181ecb_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
198ecb_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 182ecb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
199ecb_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 183ecb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
200ecb_enc.o: des_locl.h des_ver.h ecb_enc.c spr.h 184ecb_enc.o: ../../include/openssl/ui_compat.h des_locl.h des_ver.h ecb_enc.c
201ede_cbcm_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 185ecb_enc.o: spr.h
202ede_cbcm_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 186ede_cbcm_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
187ede_cbcm_enc.o: ../../include/openssl/e_os2.h
203ede_cbcm_enc.o: ../../include/openssl/opensslconf.h 188ede_cbcm_enc.o: ../../include/openssl/opensslconf.h
204ede_cbcm_enc.o: ../../include/openssl/opensslv.h 189ede_cbcm_enc.o: ../../include/openssl/ossl_typ.h
205ede_cbcm_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 190ede_cbcm_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
206ede_cbcm_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 191ede_cbcm_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
207ede_cbcm_enc.o: ../../include/openssl/ui_compat.h des_locl.h ede_cbcm_enc.c 192ede_cbcm_enc.o: ../../include/openssl/ui_compat.h des_locl.h ede_cbcm_enc.c
@@ -210,10 +195,11 @@ enc_read.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
210enc_read.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 195enc_read.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
211enc_read.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 196enc_read.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
212enc_read.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 197enc_read.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
213enc_read.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 198enc_read.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
214enc_read.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 199enc_read.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
215enc_read.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 200enc_read.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
216enc_read.o: ../cryptlib.h des_locl.h enc_read.c 201enc_read.o: ../../include/openssl/ui_compat.h ../cryptlib.h des_locl.h
202enc_read.o: enc_read.c
217enc_writ.o: ../../e_os.h ../../include/openssl/bio.h 203enc_writ.o: ../../e_os.h ../../include/openssl/bio.h
218enc_writ.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 204enc_writ.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
219enc_writ.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 205enc_writ.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
@@ -224,91 +210,83 @@ enc_writ.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
224enc_writ.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 210enc_writ.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
225enc_writ.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 211enc_writ.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
226enc_writ.o: ../cryptlib.h des_locl.h enc_writ.c 212enc_writ.o: ../cryptlib.h des_locl.h enc_writ.c
227fcrypt.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 213fcrypt.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
228fcrypt.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 214fcrypt.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
229fcrypt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 215fcrypt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
230fcrypt.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 216fcrypt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
231fcrypt.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 217fcrypt.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
232fcrypt.o: ../../include/openssl/ui_compat.h des_locl.h fcrypt.c 218fcrypt.o: des_locl.h fcrypt.c
233fcrypt_b.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 219fcrypt_b.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
234fcrypt_b.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 220fcrypt_b.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
235fcrypt_b.o: ../../include/openssl/opensslconf.h 221fcrypt_b.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
236fcrypt_b.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
237fcrypt_b.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 222fcrypt_b.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
238fcrypt_b.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 223fcrypt_b.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
239fcrypt_b.o: des_locl.h fcrypt_b.c 224fcrypt_b.o: des_locl.h fcrypt_b.c
240ofb64ede.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 225ofb64ede.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
241ofb64ede.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 226ofb64ede.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
242ofb64ede.o: ../../include/openssl/opensslconf.h 227ofb64ede.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
243ofb64ede.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
244ofb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 228ofb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
245ofb64ede.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 229ofb64ede.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
246ofb64ede.o: des_locl.h ofb64ede.c 230ofb64ede.o: des_locl.h ofb64ede.c
247ofb64enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 231ofb64enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
248ofb64enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 232ofb64enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
249ofb64enc.o: ../../include/openssl/opensslconf.h 233ofb64enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
250ofb64enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
251ofb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 234ofb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
252ofb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 235ofb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
253ofb64enc.o: des_locl.h ofb64enc.c 236ofb64enc.o: des_locl.h ofb64enc.c
254ofb_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 237ofb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
255ofb_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 238ofb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
256ofb_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 239ofb_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
257ofb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 240ofb_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
258ofb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 241ofb_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
259ofb_enc.o: ../../include/openssl/ui_compat.h des_locl.h ofb_enc.c 242ofb_enc.o: des_locl.h ofb_enc.c
260pcbc_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 243pcbc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
261pcbc_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 244pcbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
262pcbc_enc.o: ../../include/openssl/opensslconf.h 245pcbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
263pcbc_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
264pcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 246pcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
265pcbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 247pcbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
266pcbc_enc.o: des_locl.h pcbc_enc.c 248pcbc_enc.o: des_locl.h pcbc_enc.c
267qud_cksm.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 249qud_cksm.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
268qud_cksm.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 250qud_cksm.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
269qud_cksm.o: ../../include/openssl/opensslconf.h 251qud_cksm.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
270qud_cksm.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
271qud_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 252qud_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
272qud_cksm.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 253qud_cksm.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
273qud_cksm.o: des_locl.h qud_cksm.c 254qud_cksm.o: des_locl.h qud_cksm.c
274rand_key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 255rand_key.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
275rand_key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 256rand_key.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
276rand_key.o: ../../include/openssl/opensslconf.h 257rand_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
277rand_key.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 258rand_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
278rand_key.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h 259rand_key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
279rand_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 260rand_key.o: ../../include/openssl/ui_compat.h rand_key.c
280rand_key.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
281rand_key.o: rand_key.c
282read2pwd.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 261read2pwd.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
283read2pwd.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 262read2pwd.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
284read2pwd.o: ../../include/openssl/opensslconf.h 263read2pwd.o: ../../include/openssl/opensslconf.h
285read2pwd.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 264read2pwd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
286read2pwd.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 265read2pwd.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
287read2pwd.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 266read2pwd.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
288read2pwd.o: read2pwd.c 267read2pwd.o: ../../include/openssl/ui_compat.h read2pwd.c
289rpc_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 268rpc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
290rpc_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 269rpc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
291rpc_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 270rpc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
292rpc_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 271rpc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
293rpc_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 272rpc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
294rpc_enc.o: ../../include/openssl/ui_compat.h des_locl.h des_ver.h rpc_des.h 273rpc_enc.o: des_locl.h des_ver.h rpc_des.h rpc_enc.c
295rpc_enc.o: rpc_enc.c 274set_key.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
296set_key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 275set_key.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
297set_key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 276set_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
298set_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 277set_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
299set_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 278set_key.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
300set_key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 279set_key.o: des_locl.h set_key.c
301set_key.o: ../../include/openssl/ui_compat.h des_locl.h set_key.c
302str2key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 280str2key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
303str2key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 281str2key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
304str2key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 282str2key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
305str2key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 283str2key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
306str2key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 284str2key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
307str2key.o: ../../include/openssl/ui_compat.h des_locl.h str2key.c 285str2key.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
308xcbc_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 286str2key.o: des_locl.h str2key.c
309xcbc_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 287xcbc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
310xcbc_enc.o: ../../include/openssl/opensslconf.h 288xcbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
311xcbc_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 289xcbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
312xcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 290xcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
313xcbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 291xcbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
314xcbc_enc.o: des_locl.h xcbc_enc.c 292xcbc_enc.o: des_locl.h xcbc_enc.c
diff --git a/src/lib/libcrypto/des/des_old.c b/src/lib/libcrypto/des/des_old.c
index 88e9802aad..7c33ed7a93 100644
--- a/src/lib/libcrypto/des/des_old.c
+++ b/src/lib/libcrypto/des/des_old.c
@@ -84,7 +84,7 @@ void _ossl_old_des_ecb3_encrypt(_ossl_old_des_cblock *input,_ossl_old_des_cblock
84 des_key_schedule ks1,des_key_schedule ks2, 84 des_key_schedule ks1,des_key_schedule ks2,
85 des_key_schedule ks3, int enc) 85 des_key_schedule ks3, int enc)
86 { 86 {
87 DES_ecb3_encrypt((const unsigned char *)input, (unsigned char *)output, 87 DES_ecb3_encrypt((const_DES_cblock *)input, output,
88 (DES_key_schedule *)ks1, (DES_key_schedule *)ks2, 88 (DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
89 (DES_key_schedule *)ks3, enc); 89 (DES_key_schedule *)ks3, enc);
90 } 90 }
@@ -169,11 +169,13 @@ void _ossl_old_des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out,
169 (DES_key_schedule *)ks3, ivec, num); 169 (DES_key_schedule *)ks3, ivec, num);
170 } 170 }
171 171
172#if 0 /* broken code, preserved just in case anyone specifically looks for this */
172void _ossl_old_des_xwhite_in2out(_ossl_old_des_cblock (*des_key), _ossl_old_des_cblock (*in_white), 173void _ossl_old_des_xwhite_in2out(_ossl_old_des_cblock (*des_key), _ossl_old_des_cblock (*in_white),
173 _ossl_old_des_cblock (*out_white)) 174 _ossl_old_des_cblock (*out_white))
174 { 175 {
175 DES_xwhite_in2out(des_key, in_white, out_white); 176 DES_xwhite_in2out(des_key, in_white, out_white);
176 } 177 }
178#endif
177 179
178int _ossl_old_des_enc_read(int fd,char *buf,int len,des_key_schedule sched, 180int _ossl_old_des_enc_read(int fd,char *buf,int len,des_key_schedule sched,
179 _ossl_old_des_cblock *iv) 181 _ossl_old_des_cblock *iv)
diff --git a/src/lib/libcrypto/des/des_old.h b/src/lib/libcrypto/des/des_old.h
index 1d840b474a..2b2c372354 100644
--- a/src/lib/libcrypto/des/des_old.h
+++ b/src/lib/libcrypto/des/des_old.h
@@ -91,6 +91,8 @@
91#ifndef HEADER_DES_H 91#ifndef HEADER_DES_H
92#define HEADER_DES_H 92#define HEADER_DES_H
93 93
94#include <openssl/e_os2.h> /* OPENSSL_EXTERN, OPENSSL_NO_DES, DES_LONG */
95
94#ifdef OPENSSL_NO_DES 96#ifdef OPENSSL_NO_DES
95#error DES is disabled. 97#error DES is disabled.
96#endif 98#endif
@@ -103,8 +105,6 @@
103#error <openssl/des_old.h> replaces <kerberos/des.h>. 105#error <openssl/des_old.h> replaces <kerberos/des.h>.
104#endif 106#endif
105 107
106#include <openssl/opensslconf.h> /* DES_LONG */
107#include <openssl/e_os2.h> /* OPENSSL_EXTERN */
108#include <openssl/symhacks.h> 108#include <openssl/symhacks.h>
109 109
110#ifdef OPENSSL_BUILD_SHLIBCRYPTO 110#ifdef OPENSSL_BUILD_SHLIBCRYPTO
@@ -116,6 +116,10 @@
116extern "C" { 116extern "C" {
117#endif 117#endif
118 118
119#ifdef _
120#undef _
121#endif
122
119typedef unsigned char _ossl_old_des_cblock[8]; 123typedef unsigned char _ossl_old_des_cblock[8];
120typedef struct _ossl_old_des_ks_struct 124typedef struct _ossl_old_des_ks_struct
121 { 125 {
@@ -171,9 +175,9 @@ typedef struct _ossl_old_des_ks_struct
171 DES_enc_write((f),(b),(l),&(k),(iv)) 175 DES_enc_write((f),(b),(l),&(k),(iv))
172#define des_fcrypt(b,s,r)\ 176#define des_fcrypt(b,s,r)\
173 DES_fcrypt((b),(s),(r)) 177 DES_fcrypt((b),(s),(r))
178#if 0
174#define des_crypt(b,s)\ 179#define des_crypt(b,s)\
175 DES_crypt((b),(s)) 180 DES_crypt((b),(s))
176#if 0
177#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) 181#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__)
178#define crypt(b,s)\ 182#define crypt(b,s)\
179 DES_crypt((b),(s)) 183 DES_crypt((b),(s))
@@ -360,9 +364,10 @@ void _ossl_old_des_ede3_cfb64_encrypt(unsigned char *in, unsigned char *out,
360void _ossl_old_des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out, 364void _ossl_old_des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out,
361 long length, _ossl_old_des_key_schedule ks1, _ossl_old_des_key_schedule ks2, 365 long length, _ossl_old_des_key_schedule ks1, _ossl_old_des_key_schedule ks2,
362 _ossl_old_des_key_schedule ks3, _ossl_old_des_cblock *ivec, int *num); 366 _ossl_old_des_key_schedule ks3, _ossl_old_des_cblock *ivec, int *num);
363 367#if 0
364void _ossl_old_des_xwhite_in2out(_ossl_old_des_cblock (*des_key), _ossl_old_des_cblock (*in_white), 368void _ossl_old_des_xwhite_in2out(_ossl_old_des_cblock (*des_key), _ossl_old_des_cblock (*in_white),
365 _ossl_old_des_cblock (*out_white)); 369 _ossl_old_des_cblock (*out_white));
370#endif
366 371
367int _ossl_old_des_enc_read(int fd,char *buf,int len,_ossl_old_des_key_schedule sched, 372int _ossl_old_des_enc_read(int fd,char *buf,int len,_ossl_old_des_key_schedule sched,
368 _ossl_old_des_cblock *iv); 373 _ossl_old_des_cblock *iv);
diff --git a/src/lib/libcrypto/des/des_opts.c b/src/lib/libcrypto/des/des_opts.c
index 79278b920e..2df82962c5 100644
--- a/src/lib/libcrypto/des/des_opts.c
+++ b/src/lib/libcrypto/des/des_opts.c
@@ -71,7 +71,11 @@
71#include <io.h> 71#include <io.h>
72extern void exit(); 72extern void exit();
73#endif 73#endif
74
75#ifndef OPENSSL_SYS_NETWARE
74#include <signal.h> 76#include <signal.h>
77#endif
78
75#ifndef _IRIX 79#ifndef _IRIX
76#include <time.h> 80#include <time.h>
77#endif 81#endif
diff --git a/src/lib/libcrypto/des/des_ver.h b/src/lib/libcrypto/des/des_ver.h
index 379bbadda2..d1ada258a6 100644
--- a/src/lib/libcrypto/des/des_ver.h
+++ b/src/lib/libcrypto/des/des_ver.h
@@ -67,5 +67,5 @@
67#define DES_version OSSL_DES_version 67#define DES_version OSSL_DES_version
68#define libdes_version OSSL_libdes_version 68#define libdes_version OSSL_libdes_version
69 69
70OPENSSL_EXTERN const char *OSSL_DES_version; /* SSLeay version string */ 70OPENSSL_EXTERN const char OSSL_DES_version[]; /* SSLeay version string */
71OPENSSL_EXTERN const char *OSSL_libdes_version; /* old libdes version string */ 71OPENSSL_EXTERN const char OSSL_libdes_version[]; /* old libdes version string */
diff --git a/src/lib/libcrypto/des/destest.c b/src/lib/libcrypto/des/destest.c
index e3e9d77f14..64b92a34fe 100644
--- a/src/lib/libcrypto/des/destest.c
+++ b/src/lib/libcrypto/des/destest.c
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
84#else 84#else
85#include <openssl/des.h> 85#include <openssl/des.h>
86 86
87#define crypt(c,s) (des_crypt((c),(s))) 87#define crypt(c,s) (DES_crypt((c),(s)))
88 88
89/* tisk tisk - the test keys don't all have odd parity :-( */ 89/* tisk tisk - the test keys don't all have odd parity :-( */
90/* test data */ 90/* test data */
@@ -333,7 +333,8 @@ static int cfb64_test(unsigned char *cfb_cipher);
333static int ede_cfb64_test(unsigned char *cfb_cipher); 333static int ede_cfb64_test(unsigned char *cfb_cipher);
334int main(int argc, char *argv[]) 334int main(int argc, char *argv[])
335 { 335 {
336 int i,j,err=0; 336 int j,err=0;
337 unsigned int i;
337 des_cblock in,out,outin,iv3,iv2; 338 des_cblock in,out,outin,iv3,iv2;
338 des_key_schedule ks,ks2,ks3; 339 des_key_schedule ks,ks2,ks3;
339 unsigned char cbc_in[40]; 340 unsigned char cbc_in[40];
@@ -391,7 +392,7 @@ int main(int argc, char *argv[])
391 DES_ede3_cbcm_encrypt(cbc_out,cbc_in,i,&ks,&ks2,&ks3,&iv3,&iv2,DES_DECRYPT); 392 DES_ede3_cbcm_encrypt(cbc_out,cbc_in,i,&ks,&ks2,&ks3,&iv3,&iv2,DES_DECRYPT);
392 if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0) 393 if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0)
393 { 394 {
394 int n; 395 unsigned int n;
395 396
396 printf("des_ede3_cbcm_encrypt decrypt error\n"); 397 printf("des_ede3_cbcm_encrypt decrypt error\n");
397 for(n=0 ; n < i ; ++n) 398 for(n=0 ; n < i ; ++n)
@@ -439,8 +440,8 @@ int main(int argc, char *argv[])
439 memcpy(in,plain_data[i],8); 440 memcpy(in,plain_data[i],8);
440 memset(out,0,8); 441 memset(out,0,8);
441 memset(outin,0,8); 442 memset(outin,0,8);
442 des_ecb2_encrypt(in,out,ks,ks2,DES_ENCRYPT); 443 des_ecb2_encrypt(&in,&out,ks,ks2,DES_ENCRYPT);
443 des_ecb2_encrypt(out,outin,ks,ks2,DES_DECRYPT); 444 des_ecb2_encrypt(&out,&outin,ks,ks2,DES_DECRYPT);
444 445
445 if (memcmp(out,cipher_ecb2[i],8) != 0) 446 if (memcmp(out,cipher_ecb2[i],8) != 0)
446 { 447 {
@@ -540,7 +541,7 @@ int main(int argc, char *argv[])
540 if (memcmp(cbc_out,cbc3_ok, 541 if (memcmp(cbc_out,cbc3_ok,
541 (unsigned int)(strlen((char *)cbc_data)+1+7)/8*8) != 0) 542 (unsigned int)(strlen((char *)cbc_data)+1+7)/8*8) != 0)
542 { 543 {
543 int n; 544 unsigned int n;
544 545
545 printf("des_ede3_cbc_encrypt encrypt error\n"); 546 printf("des_ede3_cbc_encrypt encrypt error\n");
546 for(n=0 ; n < i ; ++n) 547 for(n=0 ; n < i ; ++n)
@@ -556,7 +557,7 @@ int main(int argc, char *argv[])
556 des_ede3_cbc_encrypt(cbc_out,cbc_in,i,ks,ks2,ks3,&iv3,DES_DECRYPT); 557 des_ede3_cbc_encrypt(cbc_out,cbc_in,i,ks,ks2,ks3,&iv3,DES_DECRYPT);
557 if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0) 558 if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0)
558 { 559 {
559 int n; 560 unsigned int n;
560 561
561 printf("des_ede3_cbc_encrypt decrypt error\n"); 562 printf("des_ede3_cbc_encrypt decrypt error\n");
562 for(n=0 ; n < i ; ++n) 563 for(n=0 ; n < i ; ++n)
@@ -820,6 +821,9 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
820 printf("fast crypt error, %s should be yA1Rp/1hZXIJk\n",str); 821 printf("fast crypt error, %s should be yA1Rp/1hZXIJk\n",str);
821 err=1; 822 err=1;
822 } 823 }
824#ifdef OPENSSL_SYS_NETWARE
825 if (err) printf("ERROR: %d\n", err);
826#endif
823 printf("\n"); 827 printf("\n");
824 return(err); 828 return(err);
825 } 829 }
diff --git a/src/lib/libcrypto/des/read2pwd.c b/src/lib/libcrypto/des/read2pwd.c
index 3a63c4016c..ee6969f76e 100644
--- a/src/lib/libcrypto/des/read2pwd.c
+++ b/src/lib/libcrypto/des/read2pwd.c
@@ -112,6 +112,7 @@
112#include <string.h> 112#include <string.h>
113#include <openssl/des.h> 113#include <openssl/des.h>
114#include <openssl/ui.h> 114#include <openssl/ui.h>
115#include <openssl/crypto.h>
115 116
116int DES_read_password(DES_cblock *key, const char *prompt, int verify) 117int DES_read_password(DES_cblock *key, const char *prompt, int verify)
117 { 118 {
diff --git a/src/lib/libcrypto/des/speed.c b/src/lib/libcrypto/des/speed.c
index 48fc1d49fc..1616f4b7c9 100644
--- a/src/lib/libcrypto/des/speed.c
+++ b/src/lib/libcrypto/des/speed.c
@@ -69,7 +69,11 @@
69#include OPENSSL_UNISTD_IO 69#include OPENSSL_UNISTD_IO
70OPENSSL_DECLARE_EXIT 70OPENSSL_DECLARE_EXIT
71 71
72#ifndef OPENSSL_SYS_NETWARE
72#include <signal.h> 73#include <signal.h>
74#define crypt(c,s) (des_crypt((c),(s)))
75#endif
76
73#ifndef _IRIX 77#ifndef _IRIX
74#include <time.h> 78#include <time.h>
75#endif 79#endif