diff options
author | djm <> | 2008-09-06 12:15:54 +0000 |
---|---|---|
committer | djm <> | 2008-09-06 12:15:54 +0000 |
commit | f1625f274acf5dcd5601f6cb5e29e233b2a441a3 (patch) | |
tree | 44899ddfbef8f24aacbea50086c041c1b150f6d6 /src/lib/libcrypto/des | |
parent | 4f828b924f54507141fb95ebe49dfcd261945e85 (diff) | |
download | openbsd-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/FILES0 | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/des/INSTALL | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/des/Makefile | 288 | ||||
-rw-r--r-- | src/lib/libcrypto/des/des_old.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/des/des_old.h | 13 | ||||
-rw-r--r-- | src/lib/libcrypto/des/des_opts.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/des/des_ver.h | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/des/destest.c | 18 | ||||
-rw-r--r-- | src/lib/libcrypto/des/read2pwd.c | 1 | ||||
-rw-r--r-- | src/lib/libcrypto/des/speed.c | 4 |
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. | |||
8 | VERSION - Which version this is and what was changed. | 8 | VERSION - Which version this is and what was changed. |
9 | KERBEROS - Kerberos version 4 notes. | 9 | KERBEROS - Kerberos version 4 notes. |
10 | Makefile.PL - An old makefile to build with perl5, not current. | 10 | Makefile.PL - An old makefile to build with perl5, not current. |
11 | Makefile - The SSLeay makefile | 11 | Makefile.ssl - The SSLeay makefile |
12 | Makefile.uni - The normal unix makefile. | 12 | Makefile.uni - The normal unix makefile. |
13 | GNUmakefile - The makefile for use with glibc. | 13 | GNUmakefile - The makefile for use with glibc. |
14 | makefile.bc - A Borland C makefile | 14 | makefile.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 | ||
26 | The file options.txt has the options listed for best speed on quite a | 26 | The file options.txt has the options listed for best speed on quite a |
27 | few systems. Look and the options (UNROLL, PTR, RISC2 etc) and then | 27 | few systems. Look and the options (UNROLL, PTR, RISC2 etc) and then |
28 | turn on the relevent option in the Makefile | 28 | turn on the relevant option in the Makefile. |
29 | 29 | ||
30 | There are some special Makefile targets that make life easier. | 30 | There are some special Makefile targets that make life easier. |
31 | make cc - standard cc build | 31 | make 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 | |||
8 | CPP= $(CC) -E | 8 | CPP= $(CC) -E |
9 | INCLUDES=-I$(TOP) -I../../include | 9 | INCLUDES=-I$(TOP) -I../../include |
10 | CFLAG=-g | 10 | CFLAG=-g |
11 | INSTALL_PREFIX= | ||
12 | OPENSSLDIR= /usr/local/ssl | ||
13 | INSTALLTOP=/usr/local/ssl | ||
14 | MAKEDEPPROG= makedepend | ||
15 | MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) | ||
16 | MAKEFILE= Makefile | 11 | MAKEFILE= Makefile |
17 | AR= ar r | 12 | AR= ar r |
18 | RANLIB= ranlib | 13 | RANLIB= ranlib |
@@ -22,6 +17,7 @@ DES_ENC= des_enc.o fcrypt_b.o | |||
22 | 17 | ||
23 | CFLAGS= $(INCLUDES) $(CFLAG) | 18 | CFLAGS= $(INCLUDES) $(CFLAG) |
24 | ASFLAGS= $(INCLUDES) $(ASFLAG) | 19 | ASFLAGS= $(INCLUDES) $(ASFLAG) |
20 | AFLAGS= $(ASFLAGS) | ||
25 | 21 | ||
26 | GENERAL=Makefile | 22 | GENERAL=Makefile |
27 | TEST=destest.c | 23 | TEST=destest.c |
@@ -65,32 +61,24 @@ lib: $(LIBOBJ) | |||
65 | des: des.o cbc3_enc.o lib | 61 | des: 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 | 64 | des_enc-sparc.S: asm/des_enc.m4 |
69 | asm/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 | |
72 | asm/yx86-elf.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl | 68 | dx86-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 | 70 | yx86-elf.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl | |
71 | (cd asm; $(PERL) crypt586.pl elf $(CFLAGS) > ../$@) | ||
72 | # COFF | ||
73 | dx86-cof.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl | ||
74 | (cd asm; $(PERL) des-586.pl coff $(CFLAGS) > ../$@) | ||
75 | yx86-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 |
76 | asm/dx86-out.o: asm/dx86unix.cpp | 78 | dx86-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 | 80 | yx86-out.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl | |
79 | asm/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 | ||
83 | asm/dx86bsdi.o: asm/dx86unix.cpp | ||
84 | $(CPP) -DBSDI asm/dx86unix.cpp | sed 's/ :/:/' | as -o asm/dx86bsdi.o | ||
85 | |||
86 | asm/yx86bsdi.o: asm/yx86unix.cpp | ||
87 | $(CPP) -DBSDI asm/yx86unix.cpp | sed 's/ :/:/' | as -o asm/yx86bsdi.o | ||
88 | |||
89 | asm/dx86unix.cpp: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl | ||
90 | (cd asm; $(PERL) des-586.pl cpp >dx86unix.cpp) | ||
91 | |||
92 | asm/yx86unix.cpp: asm/crypt586.pl ../perlasm/x86asm.pl | ||
93 | (cd asm; $(PERL) crypt586.pl cpp >yx86unix.cpp) | ||
94 | 82 | ||
95 | files: | 83 | files: |
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 | ||
103 | install: installs | 91 | # We need to use force because 'install' matches 'INSTALL' on case |
104 | 92 | # insensitive systems | |
105 | installs: | 93 | FRC.install: |
94 | install: 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 | ||
120 | depend: | 110 | depend: |
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 | ||
123 | dclean: | 114 | dclean: |
@@ -125,83 +116,77 @@ dclean: | |||
125 | mv -f Makefile.new $(MAKEFILE) | 116 | mv -f Makefile.new $(MAKEFILE) |
126 | 117 | ||
127 | clean: | 118 | clean: |
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 | ||
132 | cbc_cksm.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | 123 | cbc_cksm.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
133 | cbc_cksm.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | 124 | cbc_cksm.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h |
134 | cbc_cksm.o: ../../include/openssl/opensslconf.h | 125 | cbc_cksm.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h |
135 | cbc_cksm.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | ||
136 | cbc_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 126 | cbc_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
137 | cbc_cksm.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | 127 | cbc_cksm.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
138 | cbc_cksm.o: cbc_cksm.c des_locl.h | 128 | cbc_cksm.o: cbc_cksm.c des_locl.h |
139 | cbc_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | 129 | cbc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
140 | cbc_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | 130 | cbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h |
141 | cbc_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | 131 | cbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h |
142 | cbc_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 132 | cbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
143 | cbc_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | 133 | cbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
144 | cbc_enc.o: ../../include/openssl/ui_compat.h cbc_enc.c des_locl.h ncbc_enc.c | 134 | cbc_enc.o: cbc_enc.c des_locl.h ncbc_enc.c |
145 | cfb64ede.o: ../../e_os.h ../../include/openssl/crypto.h | 135 | cfb64ede.o: ../../e_os.h ../../include/openssl/des.h |
146 | cfb64ede.o: ../../include/openssl/des.h ../../include/openssl/des_old.h | 136 | cfb64ede.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h |
147 | cfb64ede.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h | 137 | cfb64ede.o: ../../include/openssl/opensslconf.h |
148 | cfb64ede.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | 138 | cfb64ede.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h |
149 | cfb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 139 | cfb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
150 | cfb64ede.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | 140 | cfb64ede.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
151 | cfb64ede.o: cfb64ede.c des_locl.h | 141 | cfb64ede.o: cfb64ede.c des_locl.h |
152 | cfb64enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | 142 | cfb64enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
153 | cfb64enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | 143 | cfb64enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h |
154 | cfb64enc.o: ../../include/openssl/opensslconf.h | 144 | cfb64enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h |
155 | cfb64enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | ||
156 | cfb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 145 | cfb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
157 | cfb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | 146 | cfb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
158 | cfb64enc.o: cfb64enc.c des_locl.h | 147 | cfb64enc.o: cfb64enc.c des_locl.h |
159 | cfb_enc.o: ../../e_os.h ../../include/openssl/crypto.h | 148 | cfb_enc.o: ../../e_os.h ../../include/openssl/des.h |
160 | cfb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h | 149 | cfb_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h |
161 | cfb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h | 150 | cfb_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/ossl_typ.h |
162 | cfb_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | 151 | cfb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h |
163 | cfb_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 152 | cfb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h |
164 | cfb_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | 153 | cfb_enc.o: ../../include/openssl/ui_compat.h cfb_enc.c des_locl.h |
165 | cfb_enc.o: cfb_enc.c des_locl.h | 154 | des_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
166 | des_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | 155 | des_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h |
167 | des_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | 156 | des_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h |
168 | des_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | 157 | des_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
169 | des_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 158 | des_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
170 | des_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | 159 | des_enc.o: des_enc.c des_locl.h ncbc_enc.c |
171 | des_enc.o: ../../include/openssl/ui_compat.h des_enc.c des_locl.h ncbc_enc.c | 160 | des_old.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
172 | des_old.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | 161 | des_old.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h |
173 | des_old.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | ||
174 | des_old.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | ||
175 | des_old.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h | 162 | des_old.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h |
176 | des_old.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 163 | des_old.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h |
177 | des_old.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | 164 | des_old.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h |
178 | des_old.o: ../../include/openssl/ui_compat.h des_old.c | 165 | des_old.o: ../../include/openssl/ui_compat.h des_old.c |
179 | des_old2.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | 166 | des_old2.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
180 | des_old2.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | 167 | des_old2.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h |
181 | des_old2.o: ../../include/openssl/opensslconf.h | 168 | des_old2.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h |
182 | des_old2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | 169 | des_old2.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h |
183 | des_old2.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h | 170 | des_old2.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h |
184 | des_old2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 171 | des_old2.o: ../../include/openssl/ui_compat.h des_old2.c |
185 | des_old2.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | 172 | ecb3_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
186 | des_old2.o: des_old2.c | 173 | ecb3_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h |
187 | ecb3_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | 174 | ecb3_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h |
188 | ecb3_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | ||
189 | ecb3_enc.o: ../../include/openssl/opensslconf.h | ||
190 | ecb3_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | ||
191 | ecb3_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 175 | ecb3_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
192 | ecb3_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | 176 | ecb3_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
193 | ecb3_enc.o: des_locl.h ecb3_enc.c | 177 | ecb3_enc.o: des_locl.h ecb3_enc.c |
194 | ecb_enc.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h | 178 | ecb_enc.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h |
195 | ecb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h | 179 | ecb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
196 | ecb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h | 180 | ecb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h |
197 | ecb_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | 181 | ecb_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
198 | ecb_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 182 | ecb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h |
199 | ecb_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | 183 | ecb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h |
200 | ecb_enc.o: des_locl.h des_ver.h ecb_enc.c spr.h | 184 | ecb_enc.o: ../../include/openssl/ui_compat.h des_locl.h des_ver.h ecb_enc.c |
201 | ede_cbcm_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | 185 | ecb_enc.o: spr.h |
202 | ede_cbcm_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | 186 | ede_cbcm_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
187 | ede_cbcm_enc.o: ../../include/openssl/e_os2.h | ||
203 | ede_cbcm_enc.o: ../../include/openssl/opensslconf.h | 188 | ede_cbcm_enc.o: ../../include/openssl/opensslconf.h |
204 | ede_cbcm_enc.o: ../../include/openssl/opensslv.h | 189 | ede_cbcm_enc.o: ../../include/openssl/ossl_typ.h |
205 | ede_cbcm_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 190 | ede_cbcm_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h |
206 | ede_cbcm_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | 191 | ede_cbcm_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h |
207 | ede_cbcm_enc.o: ../../include/openssl/ui_compat.h des_locl.h ede_cbcm_enc.c | 192 | ede_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 | |||
210 | enc_read.o: ../../include/openssl/des.h ../../include/openssl/des_old.h | 195 | enc_read.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
211 | enc_read.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | 196 | enc_read.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h |
212 | enc_read.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h | 197 | enc_read.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h |
213 | enc_read.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | 198 | enc_read.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
214 | enc_read.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 199 | enc_read.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h |
215 | enc_read.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | 200 | enc_read.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h |
216 | enc_read.o: ../cryptlib.h des_locl.h enc_read.c | 201 | enc_read.o: ../../include/openssl/ui_compat.h ../cryptlib.h des_locl.h |
202 | enc_read.o: enc_read.c | ||
217 | enc_writ.o: ../../e_os.h ../../include/openssl/bio.h | 203 | enc_writ.o: ../../e_os.h ../../include/openssl/bio.h |
218 | enc_writ.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | 204 | enc_writ.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h |
219 | enc_writ.o: ../../include/openssl/des.h ../../include/openssl/des_old.h | 205 | enc_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 | |||
224 | enc_writ.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 210 | enc_writ.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
225 | enc_writ.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | 211 | enc_writ.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
226 | enc_writ.o: ../cryptlib.h des_locl.h enc_writ.c | 212 | enc_writ.o: ../cryptlib.h des_locl.h enc_writ.c |
227 | fcrypt.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | 213 | fcrypt.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
228 | fcrypt.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | 214 | fcrypt.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h |
229 | fcrypt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | 215 | fcrypt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h |
230 | fcrypt.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 216 | fcrypt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
231 | fcrypt.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | 217 | fcrypt.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
232 | fcrypt.o: ../../include/openssl/ui_compat.h des_locl.h fcrypt.c | 218 | fcrypt.o: des_locl.h fcrypt.c |
233 | fcrypt_b.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | 219 | fcrypt_b.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
234 | fcrypt_b.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | 220 | fcrypt_b.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h |
235 | fcrypt_b.o: ../../include/openssl/opensslconf.h | 221 | fcrypt_b.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h |
236 | fcrypt_b.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | ||
237 | fcrypt_b.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 222 | fcrypt_b.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
238 | fcrypt_b.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | 223 | fcrypt_b.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
239 | fcrypt_b.o: des_locl.h fcrypt_b.c | 224 | fcrypt_b.o: des_locl.h fcrypt_b.c |
240 | ofb64ede.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | 225 | ofb64ede.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
241 | ofb64ede.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | 226 | ofb64ede.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h |
242 | ofb64ede.o: ../../include/openssl/opensslconf.h | 227 | ofb64ede.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h |
243 | ofb64ede.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | ||
244 | ofb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 228 | ofb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
245 | ofb64ede.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | 229 | ofb64ede.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
246 | ofb64ede.o: des_locl.h ofb64ede.c | 230 | ofb64ede.o: des_locl.h ofb64ede.c |
247 | ofb64enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | 231 | ofb64enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
248 | ofb64enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | 232 | ofb64enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h |
249 | ofb64enc.o: ../../include/openssl/opensslconf.h | 233 | ofb64enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h |
250 | ofb64enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | ||
251 | ofb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 234 | ofb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
252 | ofb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | 235 | ofb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
253 | ofb64enc.o: des_locl.h ofb64enc.c | 236 | ofb64enc.o: des_locl.h ofb64enc.c |
254 | ofb_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | 237 | ofb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
255 | ofb_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | 238 | ofb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h |
256 | ofb_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | 239 | ofb_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h |
257 | ofb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 240 | ofb_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
258 | ofb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | 241 | ofb_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
259 | ofb_enc.o: ../../include/openssl/ui_compat.h des_locl.h ofb_enc.c | 242 | ofb_enc.o: des_locl.h ofb_enc.c |
260 | pcbc_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | 243 | pcbc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
261 | pcbc_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | 244 | pcbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h |
262 | pcbc_enc.o: ../../include/openssl/opensslconf.h | 245 | pcbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h |
263 | pcbc_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | ||
264 | pcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 246 | pcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
265 | pcbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | 247 | pcbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
266 | pcbc_enc.o: des_locl.h pcbc_enc.c | 248 | pcbc_enc.o: des_locl.h pcbc_enc.c |
267 | qud_cksm.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | 249 | qud_cksm.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
268 | qud_cksm.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | 250 | qud_cksm.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h |
269 | qud_cksm.o: ../../include/openssl/opensslconf.h | 251 | qud_cksm.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h |
270 | qud_cksm.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | ||
271 | qud_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 252 | qud_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
272 | qud_cksm.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | 253 | qud_cksm.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
273 | qud_cksm.o: des_locl.h qud_cksm.c | 254 | qud_cksm.o: des_locl.h qud_cksm.c |
274 | rand_key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | 255 | rand_key.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
275 | rand_key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | 256 | rand_key.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h |
276 | rand_key.o: ../../include/openssl/opensslconf.h | 257 | rand_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h |
277 | rand_key.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | 258 | rand_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h |
278 | rand_key.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h | 259 | rand_key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h |
279 | rand_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 260 | rand_key.o: ../../include/openssl/ui_compat.h rand_key.c |
280 | rand_key.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | ||
281 | rand_key.o: rand_key.c | ||
282 | read2pwd.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | 261 | read2pwd.o: ../../include/openssl/crypto.h ../../include/openssl/des.h |
283 | read2pwd.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | 262 | read2pwd.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h |
284 | read2pwd.o: ../../include/openssl/opensslconf.h | 263 | read2pwd.o: ../../include/openssl/opensslconf.h |
285 | read2pwd.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | 264 | read2pwd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
286 | read2pwd.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 265 | read2pwd.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h |
287 | read2pwd.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | 266 | read2pwd.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h |
288 | read2pwd.o: read2pwd.c | 267 | read2pwd.o: ../../include/openssl/ui_compat.h read2pwd.c |
289 | rpc_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | 268 | rpc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
290 | rpc_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | 269 | rpc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h |
291 | rpc_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | 270 | rpc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h |
292 | rpc_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 271 | rpc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
293 | rpc_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | 272 | rpc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
294 | rpc_enc.o: ../../include/openssl/ui_compat.h des_locl.h des_ver.h rpc_des.h | 273 | rpc_enc.o: des_locl.h des_ver.h rpc_des.h rpc_enc.c |
295 | rpc_enc.o: rpc_enc.c | 274 | set_key.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
296 | set_key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | 275 | set_key.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h |
297 | set_key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | 276 | set_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h |
298 | set_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | 277 | set_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
299 | set_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 278 | set_key.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
300 | set_key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | 279 | set_key.o: des_locl.h set_key.c |
301 | set_key.o: ../../include/openssl/ui_compat.h des_locl.h set_key.c | ||
302 | str2key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | 280 | str2key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h |
303 | str2key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | 281 | str2key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h |
304 | str2key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | 282 | str2key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h |
305 | str2key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 283 | str2key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h |
306 | str2key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | 284 | str2key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
307 | str2key.o: ../../include/openssl/ui_compat.h des_locl.h str2key.c | 285 | str2key.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
308 | xcbc_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | 286 | str2key.o: des_locl.h str2key.c |
309 | xcbc_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | 287 | xcbc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
310 | xcbc_enc.o: ../../include/openssl/opensslconf.h | 288 | xcbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h |
311 | xcbc_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | 289 | xcbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h |
312 | xcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 290 | xcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
313 | xcbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | 291 | xcbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
314 | xcbc_enc.o: des_locl.h xcbc_enc.c | 292 | xcbc_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 */ | ||
172 | void _ossl_old_des_xwhite_in2out(_ossl_old_des_cblock (*des_key), _ossl_old_des_cblock (*in_white), | 173 | void _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 | ||
178 | int _ossl_old_des_enc_read(int fd,char *buf,int len,des_key_schedule sched, | 180 | int _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 @@ | |||
116 | extern "C" { | 116 | extern "C" { |
117 | #endif | 117 | #endif |
118 | 118 | ||
119 | #ifdef _ | ||
120 | #undef _ | ||
121 | #endif | ||
122 | |||
119 | typedef unsigned char _ossl_old_des_cblock[8]; | 123 | typedef unsigned char _ossl_old_des_cblock[8]; |
120 | typedef struct _ossl_old_des_ks_struct | 124 | typedef 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, | |||
360 | void _ossl_old_des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out, | 364 | void _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 | |
364 | void _ossl_old_des_xwhite_in2out(_ossl_old_des_cblock (*des_key), _ossl_old_des_cblock (*in_white), | 368 | void _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 | ||
367 | int _ossl_old_des_enc_read(int fd,char *buf,int len,_ossl_old_des_key_schedule sched, | 372 | int _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> |
72 | extern void exit(); | 72 | extern 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 | ||
70 | OPENSSL_EXTERN const char *OSSL_DES_version; /* SSLeay version string */ | 70 | OPENSSL_EXTERN const char OSSL_DES_version[]; /* SSLeay version string */ |
71 | OPENSSL_EXTERN const char *OSSL_libdes_version; /* old libdes version string */ | 71 | OPENSSL_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); | |||
333 | static int ede_cfb64_test(unsigned char *cfb_cipher); | 333 | static int ede_cfb64_test(unsigned char *cfb_cipher); |
334 | int main(int argc, char *argv[]) | 334 | int 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 | ||
116 | int DES_read_password(DES_cblock *key, const char *prompt, int verify) | 117 | int 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 |
70 | OPENSSL_DECLARE_EXIT | 70 | OPENSSL_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 |