src - OpenBSD base system

diff options


context:
space:
mode:

author	Damien Miller <djm@cvs.openbsd.org>	2010-10-01 22:59:02 +0000
committer	Damien Miller <djm@cvs.openbsd.org>	2010-10-01 22:59:02 +0000
commit	367b2622e0527401666a65476f4111fdda2e3c12 (patch)
tree	dc507d2394eb3b616bd9eae56d17671899a24a05 /lib/libcrypto/des
parent	ae9cbeba0dc25f0e95e6a0e50b6c161bf6384e17 (diff)

resolve conflicts, fix local changes

Diffstat (limited to 'lib/libcrypto/des')

-rw-r--r--

lib/libcrypto/des/Makefile.ssl

316

-rw-r--r--

lib/libcrypto/des/asm/crypt586.pl

-rw-r--r--

lib/libcrypto/des/asm/des-586.pl

282

-rw-r--r--

lib/libcrypto/des/asm/des686.pl

230

-rw-r--r--

lib/libcrypto/des/des-lib.com

-rw-r--r--

lib/libcrypto/des/des_enc.c

-rw-r--r--

lib/libcrypto/des/des_lib.c

106

-rw-r--r--

lib/libcrypto/des/des_locl.h

-rw-r--r--

lib/libcrypto/des/ecb_enc.c

-rw-r--r--

lib/libcrypto/des/enc_read.c

-rw-r--r--

lib/libcrypto/des/enc_writ.c

-rw-r--r--

lib/libcrypto/des/fcrypt_b.c

-rw-r--r--

lib/libcrypto/des/rpc_des.h

-rw-r--r--

lib/libcrypto/des/set_key.c

-rw-r--r--

lib/libcrypto/des/times/aix.cc

-rw-r--r--

lib/libcrypto/des/xcbc_enc.c

16 files changed, 356 insertions, 767 deletions

diff --git a/lib/libcrypto/des/Makefile.ssl b/lib/libcrypto/des/Makefile.ssl
deleted file mode 100644
index 0d9ba2b42f2..00000000000
--- a/lib/libcrypto/des/Makefile.ssl
+++ /dev/null

@@ -1,316 +0,0 @@

-# SSLeay/crypto/des/Makefile

-DIR= des

-TOP= ../..

-CC= cc

-CPP= $(CC) -E

-INCLUDES=-I$(TOP) -I../../include

-CFLAG=-g

-INSTALL_PREFIX=

-OPENSSLDIR= /usr/local/ssl

-INSTALLTOP=/usr/local/ssl

-MAKE= make -f Makefile.ssl

-MAKEDEPPROG= makedepend

-MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)

-MAKEFILE= Makefile.ssl

-AR= ar r

-RANLIB= ranlib

-DES_ENC= des_enc.o fcrypt_b.o

-# or use

-#DES_ENC= dx86-elf.o yx86-elf.o

-CFLAGS= $(INCLUDES) $(CFLAG)

-ASFLAGS= $(INCLUDES) $(ASFLAG)

-GENERAL=Makefile

-TEST=destest.c

-APPS=

-LIB=$(TOP)/libcrypto.a

-LIBSRC= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \

- ecb3_enc.c ecb_enc.c enc_read.c enc_writ.c \

- fcrypt.c ofb64enc.c ofb_enc.c pcbc_enc.c \

- qud_cksm.c rand_key.c rpc_enc.c set_key.c \

- des_enc.c fcrypt_b.c \

- xcbc_enc.c \

- str2key.c cfb64ede.c ofb64ede.c ede_cbcm_enc.c des_old.c des_old2.c \

- read2pwd.c

-LIBOBJ= set_key.o ecb_enc.o cbc_enc.o \

- ecb3_enc.o cfb64enc.o cfb64ede.o cfb_enc.o ofb64ede.o \

- enc_read.o enc_writ.o ofb64enc.o \

- ofb_enc.o str2key.o pcbc_enc.o qud_cksm.o rand_key.o \

- ${DES_ENC} \

- fcrypt.o xcbc_enc.o rpc_enc.o cbc_cksm.o \

- ede_cbcm_enc.o des_old.o des_old2.o read2pwd.o

-SRC= $(LIBSRC)

-EXHEADER= des.h des_old.h

-HEADER= des_locl.h rpc_des.h spr.h des_ver.h $(EXHEADER)

-ALL= $(GENERAL) $(SRC) $(HEADER)

-top:

- (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)

-all: lib

-lib: $(LIBOBJ)

- $(AR) $(LIB) $(LIBOBJ)

- $(RANLIB) $(LIB) || echo Never mind.

- @touch lib

-des: des.o cbc3_enc.o lib

- $(CC) $(CFLAGS) -o des des.o cbc3_enc.o $(LIB)

-# elf

-asm/dx86-elf.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl

- (cd asm; $(PERL) des-586.pl elf $(CFLAGS) > dx86-elf.s)

-asm/yx86-elf.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl

- (cd asm; $(PERL) crypt586.pl elf $(CFLAGS) > yx86-elf.s)

-# a.out

-asm/dx86-out.o: asm/dx86unix.cpp

- $(CPP) -DOUT asm/dx86unix.cpp | as -o asm/dx86-out.o

-asm/yx86-out.o: asm/yx86unix.cpp

- $(CPP) -DOUT asm/yx86unix.cpp | as -o asm/yx86-out.o

-# bsdi

-asm/dx86bsdi.o: asm/dx86unix.cpp

- $(CPP) -DBSDI asm/dx86unix.cpp | sed 's/ :/:/' | as -o asm/dx86bsdi.o

-asm/yx86bsdi.o: asm/yx86unix.cpp

- $(CPP) -DBSDI asm/yx86unix.cpp | sed 's/ :/:/' | as -o asm/yx86bsdi.o

-asm/dx86unix.cpp: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl

- (cd asm; $(PERL) des-586.pl cpp >dx86unix.cpp)

-asm/yx86unix.cpp: asm/crypt586.pl ../perlasm/x86asm.pl

- (cd asm; $(PERL) crypt586.pl cpp >yx86unix.cpp)

-files:

- $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO

-links:

- @sh $(TOP)/util/point.sh Makefile.ssl Makefile

- @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)

- @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)

- @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)

-install: installs

-installs:

- @for i in $(EXHEADER) ; \

- do \

- (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \

- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \

- done;

-tags:

- ctags $(SRC)

-tests:

-lint:

- lint -DLINT $(INCLUDES) $(SRC)>fluff

-depend:

- $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

-dclean:

- $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

- mv -f Makefile.new $(MAKEFILE)

-clean:

- rm -f asm/dx86unix.cpp asm/yx86unix.cpp asm/*-elf.* *.o asm/*.o *.obj des lib tags core .pure .nfs* *.old *.bak fluff

-# DO NOT DELETE THIS LINE -- make depend depends on it.

-cbc_cksm.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

-cbc_cksm.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

-cbc_cksm.o: ../../include/openssl/opensslconf.h

-cbc_cksm.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

-cbc_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

-cbc_cksm.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h

-cbc_cksm.o: cbc_cksm.c des_locl.h

-cbc_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

-cbc_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

-cbc_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

-cbc_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

-cbc_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h

-cbc_enc.o: ../../include/openssl/ui_compat.h cbc_enc.c des_locl.h ncbc_enc.c

-cfb64ede.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

-cfb64ede.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

-cfb64ede.o: ../../include/openssl/opensslconf.h

-cfb64ede.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

-cfb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

-cfb64ede.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h

-cfb64ede.o: cfb64ede.c des_locl.h

-cfb64enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

-cfb64enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

-cfb64enc.o: ../../include/openssl/opensslconf.h

-cfb64enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

-cfb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

-cfb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h

-cfb64enc.o: cfb64enc.c des_locl.h

-cfb_enc.o: ../../e_os.h ../../include/openssl/crypto.h

-cfb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h

-cfb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h

-cfb_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

-cfb_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

-cfb_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h

-cfb_enc.o: cfb_enc.c des_locl.h

-des_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

-des_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

-des_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

-des_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

-des_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h

-des_enc.o: ../../include/openssl/ui_compat.h des_enc.c des_locl.h ncbc_enc.c

-des_old.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

-des_old.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

-des_old.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

-des_old.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h

-des_old.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

-des_old.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h

-des_old.o: ../../include/openssl/ui_compat.h des_old.c

-des_old2.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

-des_old2.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

-des_old2.o: ../../include/openssl/opensslconf.h

-des_old2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

-des_old2.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h

-des_old2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

-des_old2.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h

-des_old2.o: des_old2.c

-ecb3_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

-ecb3_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

-ecb3_enc.o: ../../include/openssl/opensslconf.h

-ecb3_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

-ecb3_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

-ecb3_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h

-ecb3_enc.o: des_locl.h ecb3_enc.c

-ecb_enc.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h

-ecb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h

-ecb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h

-ecb_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

-ecb_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

-ecb_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h

-ecb_enc.o: des_locl.h des_ver.h ecb_enc.c spr.h

-ede_cbcm_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

-ede_cbcm_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

-ede_cbcm_enc.o: ../../include/openssl/opensslconf.h

-ede_cbcm_enc.o: ../../include/openssl/opensslv.h

-ede_cbcm_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

-ede_cbcm_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h

-ede_cbcm_enc.o: ../../include/openssl/ui_compat.h des_locl.h ede_cbcm_enc.c

-enc_read.o: ../../e_os.h ../../include/openssl/bio.h

-enc_read.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

-enc_read.o: ../../include/openssl/des.h ../../include/openssl/des_old.h

-enc_read.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

-enc_read.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h

-enc_read.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

-enc_read.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

-enc_read.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h

-enc_read.o: ../cryptlib.h des_locl.h enc_read.c

-enc_writ.o: ../../e_os.h ../../include/openssl/bio.h

-enc_writ.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

-enc_writ.o: ../../include/openssl/des.h ../../include/openssl/des_old.h

-enc_writ.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

-enc_writ.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h

-enc_writ.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

-enc_writ.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h

-enc_writ.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

-enc_writ.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h

-enc_writ.o: ../cryptlib.h des_locl.h enc_writ.c

-fcrypt.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

-fcrypt.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

-fcrypt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

-fcrypt.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

-fcrypt.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h

-fcrypt.o: ../../include/openssl/ui_compat.h des_locl.h fcrypt.c

-fcrypt_b.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

-fcrypt_b.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

-fcrypt_b.o: ../../include/openssl/opensslconf.h

-fcrypt_b.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

-fcrypt_b.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

-fcrypt_b.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h

-fcrypt_b.o: des_locl.h fcrypt_b.c

-ofb64ede.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

-ofb64ede.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

-ofb64ede.o: ../../include/openssl/opensslconf.h

-ofb64ede.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

-ofb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

-ofb64ede.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h

-ofb64ede.o: des_locl.h ofb64ede.c

-ofb64enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

-ofb64enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

-ofb64enc.o: ../../include/openssl/opensslconf.h

-ofb64enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

-ofb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

-ofb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h

-ofb64enc.o: des_locl.h ofb64enc.c

-ofb_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

-ofb_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

-ofb_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

-ofb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

-ofb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h

-ofb_enc.o: ../../include/openssl/ui_compat.h des_locl.h ofb_enc.c

-pcbc_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

-pcbc_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

-pcbc_enc.o: ../../include/openssl/opensslconf.h

-pcbc_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

-pcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

-pcbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h

-pcbc_enc.o: des_locl.h pcbc_enc.c

-qud_cksm.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

-qud_cksm.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

-qud_cksm.o: ../../include/openssl/opensslconf.h

-qud_cksm.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

-qud_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

-qud_cksm.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h

-qud_cksm.o: des_locl.h qud_cksm.c

-rand_key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

-rand_key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

-rand_key.o: ../../include/openssl/opensslconf.h

-rand_key.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

-rand_key.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h

-rand_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

-rand_key.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h

-rand_key.o: rand_key.c

-read2pwd.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

-read2pwd.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

-read2pwd.o: ../../include/openssl/opensslconf.h

-read2pwd.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

-read2pwd.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

-read2pwd.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h

-read2pwd.o: read2pwd.c

-rpc_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

-rpc_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

-rpc_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

-rpc_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

-rpc_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h

-rpc_enc.o: ../../include/openssl/ui_compat.h des_locl.h des_ver.h rpc_des.h

-rpc_enc.o: rpc_enc.c

-set_key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

-set_key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

-set_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

-set_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

-set_key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h

-set_key.o: ../../include/openssl/ui_compat.h des_locl.h set_key.c

-str2key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

-str2key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

-str2key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

-str2key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

-str2key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h

-str2key.o: ../../include/openssl/ui_compat.h des_locl.h str2key.c

-xcbc_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

-xcbc_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

-xcbc_enc.o: ../../include/openssl/opensslconf.h

-xcbc_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

-xcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

-xcbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h

-xcbc_enc.o: des_locl.h xcbc_enc.c

diff --git a/lib/libcrypto/des/asm/crypt586.pl b/lib/libcrypto/des/asm/crypt586.pl
index 1d04ed6def1..e36f7d44bd7 100644
--- a/lib/libcrypto/des/asm/crypt586.pl
+++ b/lib/libcrypto/des/asm/crypt586.pl

@@ -6,7 +6,8 @@

# things perfect.

-push(@INC,"perlasm","../../perlasm");

+$0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;

+push(@INC,"${dir}","${dir}../../perlasm");

require "x86asm.pl";

&asm_init($ARGV[0],"crypt586.pl");

@@ -22,7 +23,7 @@ sub fcrypt_body

{

local($name,$do_ip)=@_;

- &function_begin($name,"EXTRN _DES_SPtrans:DWORD");

+ &function_begin($name);

&comment("");

&comment("Load the 2 words");

diff --git a/lib/libcrypto/des/asm/des-586.pl b/lib/libcrypto/des/asm/des-586.pl
index 60d577cc8d5..5b5f39cebd1 100644
--- a/lib/libcrypto/des/asm/des-586.pl
+++ b/lib/libcrypto/des/asm/des-586.pl

@@ -4,7 +4,8 @@

# Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>

-push(@INC,"perlasm","../../perlasm");

+$0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;

+push(@INC,"${dir}","${dir}../../perlasm");

require "x86asm.pl";

require "cbc.pl";

require "desboth.pl";

@@ -18,33 +19,110 @@ require "desboth.pl";

$L="edi";

$R="esi";

+$trans="ebp";

+$small_footprint=1 if (grep(/\-DOPENSSL_SMALL_FOOTPRINT/,@ARGV));

+# one can discuss setting this variable to 1 unconditionally, as

+# the folded loop is only 3% slower than unrolled, but >7 times smaller

-&external_label("DES_SPtrans");

+&public_label("DES_SPtrans");

+&DES_encrypt_internal();

+&DES_decrypt_internal();

&DES_encrypt("DES_encrypt1",1);

&DES_encrypt("DES_encrypt2",0);

+&DES_encrypt3("DES_encrypt3",1);

+&DES_encrypt3("DES_decrypt3",0);

+&cbc("DES_ncbc_encrypt","DES_encrypt1","DES_encrypt1",0,4,5,3,5,-1);

+&cbc("DES_ede3_cbc_encrypt","DES_encrypt3","DES_decrypt3",0,6,7,3,4,5);

+&DES_SPtrans();

+&asm_finish();

-if (!$main'openbsd)

+sub DES_encrypt_internal()

{

- &DES_encrypt3("DES_encrypt3",1);

- &DES_encrypt3("DES_decrypt3",0);

- &cbc("DES_ncbc_encrypt","DES_encrypt1","DES_encrypt1",0,4,5,3,5,-1);

- &cbc("DES_ede3_cbc_encrypt","DES_encrypt3","DES_decrypt3",0,6,7,3,4,5);

+ &function_begin_B("_x86_DES_encrypt");

+ if ($small_footprint)

+ {

+ &lea("edx",&DWP(128,"ecx"));

+ &push("edx");

+ &push("ecx");

+ &set_label("eloop");

+ &D_ENCRYPT(0,$L,$R,0,$trans,"eax","ebx","ecx","edx",&swtmp(0));

+ &comment("");

+ &D_ENCRYPT(1,$R,$L,2,$trans,"eax","ebx","ecx","edx",&swtmp(0));

+ &comment("");

+ &add("ecx",16);

+ &cmp("ecx",&swtmp(1));

+ &mov(&swtmp(0),"ecx");

+ &jb(&label("eloop"));

+ &add("esp",8);

+ }

+ else

+ {

+ &push("ecx");

+ for ($i=0; $i<16; $i+=2)

+ {

+ &comment("Round $i");

+ &D_ENCRYPT($i,$L,$R,$i*2,$trans,"eax","ebx","ecx","edx",&swtmp(0));

+ &comment("Round ".sprintf("%d",$i+1));

+ &D_ENCRYPT($i+1,$R,$L,($i+1)*2,$trans,"eax","ebx","ecx","edx",&swtmp(0));

+ }

+ &add("esp",4);

}

+ &ret();

-&asm_finish();

+ &function_end_B("_x86_DES_encrypt");

+ }

+sub DES_decrypt_internal()

+ {

+ &function_begin_B("_x86_DES_decrypt");

+ if ($small_footprint)

+ {

+ &push("ecx");

+ &lea("ecx",&DWP(128,"ecx"));

+ &push("ecx");

+ &set_label("dloop");

+ &D_ENCRYPT(0,$L,$R,-2,$trans,"eax","ebx","ecx","edx",&swtmp(0));

+ &comment("");

+ &D_ENCRYPT(1,$R,$L,-4,$trans,"eax","ebx","ecx","edx",&swtmp(0));

+ &comment("");

+ &sub("ecx",16);

+ &cmp("ecx",&swtmp(1));

+ &mov(&swtmp(0),"ecx");

+ &ja(&label("dloop"));

+ &add("esp",8);

+ }

+ else

+ {

+ &push("ecx");

+ for ($i=15; $i>0; $i-=2)

+ {

+ &comment("Round $i");

+ &D_ENCRYPT(15-$i,$L,$R,$i*2,$trans,"eax","ebx","ecx","edx",&swtmp(0));

+ &comment("Round ".sprintf("%d",$i-1));

+ &D_ENCRYPT(15-$i+1,$R,$L,($i-1)*2,$trans,"eax","ebx","ecx","edx",&swtmp(0));

+ }

+ &add("esp",4);

+ }

+ &ret();

+ &function_end_B("_x86_DES_decrypt");

+ }

sub DES_encrypt

{

local($name,$do_ip)=@_;

- &function_begin_B($name,"EXTRN _DES_SPtrans:DWORD");

+ &function_begin_B($name);

&push("esi");

&push("edi");

&comment("");

&comment("Load the 2 words");

- $trans="ebp";

if ($do_ip)

{

@@ -77,39 +155,20 @@ sub DES_encrypt

}

# PIC-ification:-)

- &picmeup($trans,"DES_SPtrans");

- #if ($cpp) { &picmeup($trans,"DES_SPtrans"); }

- #else { &lea($trans,&DWP("DES_SPtrans")); }

+ &call (&label("pic_point"));

+ &set_label("pic_point");

+ &blindpop($trans);

+ &lea ($trans,&DWP(&label("DES_SPtrans")."-".&label("pic_point"),$trans));

&mov( "ecx", &wparam(1) );

- &cmp("ebx","0");

- &je(&label("start_decrypt"));

- for ($i=0; $i<16; $i+=2)

- {

- &comment("");

- &comment("Round $i");

- &D_ENCRYPT($i,$L,$R,$i*2,$trans,"eax","ebx","ecx","edx");

- &comment("");

- &comment("Round ".sprintf("%d",$i+1));

- &D_ENCRYPT($i+1,$R,$L,($i+1)*2,$trans,"eax","ebx","ecx","edx");

- }

- &jmp(&label("end"));

- &set_label("start_decrypt");

- for ($i=15; $i>0; $i-=2)

- {

- &comment("");

- &comment("Round $i");

- &D_ENCRYPT(15-$i,$L,$R,$i*2,$trans,"eax","ebx","ecx","edx");

- &comment("");

- &comment("Round ".sprintf("%d",$i-1));

- &D_ENCRYPT(15-$i+1,$R,$L,($i-1)*2,$trans,"eax","ebx","ecx","edx");

- }

- &set_label("end");

+ &cmp("ebx","0");

+ &je(&label("decrypt"));

+ &call("_x86_DES_encrypt");

+ &jmp(&label("done"));

+ &set_label("decrypt");

+ &call("_x86_DES_decrypt");

+ &set_label("done");

if ($do_ip)

{

@@ -143,7 +202,7 @@ sub DES_encrypt

sub D_ENCRYPT

{

- local($r,$L,$R,$S,$trans,$u,$tmp1,$tmp2,$t)=@_;

+ local($r,$L,$R,$S,$trans,$u,$tmp1,$tmp2,$t,$wp1)=@_;

&mov( $u, &DWP(&n2a($S*4),$tmp2,"",0));

&xor( $tmp1, $tmp1);

@@ -170,7 +229,7 @@ sub D_ENCRYPT

&and( $t, "0xff" );

&xor( $L, &DWP("0x600",$trans,$tmp1,0));

&xor( $L, &DWP("0x700",$trans,$tmp2,0));

- &mov( $tmp2, &wparam(1) );

+ &mov( $tmp2, $wp1 );

&xor( $L, &DWP("0x400",$trans,$u,0));

&xor( $L, &DWP("0x500",$trans,$t,0));

}

@@ -253,3 +312,142 @@ sub FP_new

&rotr($tt , 4);

}

+sub DES_SPtrans

+ {

+ &set_label("DES_SPtrans",64);

+ &data_word(0x02080800, 0x00080000, 0x02000002, 0x02080802);

+ &data_word(0x02000000, 0x00080802, 0x00080002, 0x02000002);

+ &data_word(0x00080802, 0x02080800, 0x02080000, 0x00000802);

+ &data_word(0x02000802, 0x02000000, 0x00000000, 0x00080002);

+ &data_word(0x00080000, 0x00000002, 0x02000800, 0x00080800);

+ &data_word(0x02080802, 0x02080000, 0x00000802, 0x02000800);

+ &data_word(0x00000002, 0x00000800, 0x00080800, 0x02080002);

+ &data_word(0x00000800, 0x02000802, 0x02080002, 0x00000000);

+ &data_word(0x00000000, 0x02080802, 0x02000800, 0x00080002);

+ &data_word(0x02080800, 0x00080000, 0x00000802, 0x02000800);

+ &data_word(0x02080002, 0x00000800, 0x00080800, 0x02000002);

+ &data_word(0x00080802, 0x00000002, 0x02000002, 0x02080000);

+ &data_word(0x02080802, 0x00080800, 0x02080000, 0x02000802);

+ &data_word(0x02000000, 0x00000802, 0x00080002, 0x00000000);

+ &data_word(0x00080000, 0x02000000, 0x02000802, 0x02080800);

+ &data_word(0x00000002, 0x02080002, 0x00000800, 0x00080802);

+ # nibble 1

+ &data_word(0x40108010, 0x00000000, 0x00108000, 0x40100000);

+ &data_word(0x40000010, 0x00008010, 0x40008000, 0x00108000);

+ &data_word(0x00008000, 0x40100010, 0x00000010, 0x40008000);

+ &data_word(0x00100010, 0x40108000, 0x40100000, 0x00000010);

+ &data_word(0x00100000, 0x40008010, 0x40100010, 0x00008000);

+ &data_word(0x00108010, 0x40000000, 0x00000000, 0x00100010);

+ &data_word(0x40008010, 0x00108010, 0x40108000, 0x40000010);

+ &data_word(0x40000000, 0x00100000, 0x00008010, 0x40108010);

+ &data_word(0x00100010, 0x40108000, 0x40008000, 0x00108010);

+ &data_word(0x40108010, 0x00100010, 0x40000010, 0x00000000);

+ &data_word(0x40000000, 0x00008010, 0x00100000, 0x40100010);

+ &data_word(0x00008000, 0x40000000, 0x00108010, 0x40008010);

+ &data_word(0x40108000, 0x00008000, 0x00000000, 0x40000010);

+ &data_word(0x00000010, 0x40108010, 0x00108000, 0x40100000);

+ &data_word(0x40100010, 0x00100000, 0x00008010, 0x40008000);

+ &data_word(0x40008010, 0x00000010, 0x40100000, 0x00108000);

+ # nibble 2

+ &data_word(0x04000001, 0x04040100, 0x00000100, 0x04000101);

+ &data_word(0x00040001, 0x04000000, 0x04000101, 0x00040100);

+ &data_word(0x04000100, 0x00040000, 0x04040000, 0x00000001);

+ &data_word(0x04040101, 0x00000101, 0x00000001, 0x04040001);

+ &data_word(0x00000000, 0x00040001, 0x04040100, 0x00000100);

+ &data_word(0x00000101, 0x04040101, 0x00040000, 0x04000001);

+ &data_word(0x04040001, 0x04000100, 0x00040101, 0x04040000);

+ &data_word(0x00040100, 0x00000000, 0x04000000, 0x00040101);

+ &data_word(0x04040100, 0x00000100, 0x00000001, 0x00040000);

+ &data_word(0x00000101, 0x00040001, 0x04040000, 0x04000101);

+ &data_word(0x00000000, 0x04040100, 0x00040100, 0x04040001);

+ &data_word(0x00040001, 0x04000000, 0x04040101, 0x00000001);

+ &data_word(0x00040101, 0x04000001, 0x04000000, 0x04040101);

+ &data_word(0x00040000, 0x04000100, 0x04000101, 0x00040100);

+ &data_word(0x04000100, 0x00000000, 0x04040001, 0x00000101);

+ &data_word(0x04000001, 0x00040101, 0x00000100, 0x04040000);

+ # nibble 3

+ &data_word(0x00401008, 0x10001000, 0x00000008, 0x10401008);

+ &data_word(0x00000000, 0x10400000, 0x10001008, 0x00400008);

+ &data_word(0x10401000, 0x10000008, 0x10000000, 0x00001008);

+ &data_word(0x10000008, 0x00401008, 0x00400000, 0x10000000);

+ &data_word(0x10400008, 0x00401000, 0x00001000, 0x00000008);

+ &data_word(0x00401000, 0x10001008, 0x10400000, 0x00001000);

+ &data_word(0x00001008, 0x00000000, 0x00400008, 0x10401000);

+ &data_word(0x10001000, 0x10400008, 0x10401008, 0x00400000);

+ &data_word(0x10400008, 0x00001008, 0x00400000, 0x10000008);

+ &data_word(0x00401000, 0x10001000, 0x00000008, 0x10400000);

+ &data_word(0x10001008, 0x00000000, 0x00001000, 0x00400008);

+ &data_word(0x00000000, 0x10400008, 0x10401000, 0x00001000);

+ &data_word(0x10000000, 0x10401008, 0x00401008, 0x00400000);

+ &data_word(0x10401008, 0x00000008, 0x10001000, 0x00401008);

+ &data_word(0x00400008, 0x00401000, 0x10400000, 0x10001008);

+ &data_word(0x00001008, 0x10000000, 0x10000008, 0x10401000);

+ # nibble 4

+ &data_word(0x08000000, 0x00010000, 0x00000400, 0x08010420);

+ &data_word(0x08010020, 0x08000400, 0x00010420, 0x08010000);

+ &data_word(0x00010000, 0x00000020, 0x08000020, 0x00010400);

+ &data_word(0x08000420, 0x08010020, 0x08010400, 0x00000000);

+ &data_word(0x00010400, 0x08000000, 0x00010020, 0x00000420);

+ &data_word(0x08000400, 0x00010420, 0x00000000, 0x08000020);

+ &data_word(0x00000020, 0x08000420, 0x08010420, 0x00010020);

+ &data_word(0x08010000, 0x00000400, 0x00000420, 0x08010400);

+ &data_word(0x08010400, 0x08000420, 0x00010020, 0x08010000);

+ &data_word(0x00010000, 0x00000020, 0x08000020, 0x08000400);

+ &data_word(0x08000000, 0x00010400, 0x08010420, 0x00000000);

+ &data_word(0x00010420, 0x08000000, 0x00000400, 0x00010020);

+ &data_word(0x08000420, 0x00000400, 0x00000000, 0x08010420);

+ &data_word(0x08010020, 0x08010400, 0x00000420, 0x00010000);

+ &data_word(0x00010400, 0x08010020, 0x08000400, 0x00000420);

+ &data_word(0x00000020, 0x00010420, 0x08010000, 0x08000020);

+ # nibble 5

+ &data_word(0x80000040, 0x00200040, 0x00000000, 0x80202000);

+ &data_word(0x00200040, 0x00002000, 0x80002040, 0x00200000);

+ &data_word(0x00002040, 0x80202040, 0x00202000, 0x80000000);

+ &data_word(0x80002000, 0x80000040, 0x80200000, 0x00202040);

+ &data_word(0x00200000, 0x80002040, 0x80200040, 0x00000000);

+ &data_word(0x00002000, 0x00000040, 0x80202000, 0x80200040);

+ &data_word(0x80202040, 0x80200000, 0x80000000, 0x00002040);

+ &data_word(0x00000040, 0x00202000, 0x00202040, 0x80002000);

+ &data_word(0x00002040, 0x80000000, 0x80002000, 0x00202040);

+ &data_word(0x80202000, 0x00200040, 0x00000000, 0x80002000);

+ &data_word(0x80000000, 0x00002000, 0x80200040, 0x00200000);

+ &data_word(0x00200040, 0x80202040, 0x00202000, 0x00000040);

+ &data_word(0x80202040, 0x00202000, 0x00200000, 0x80002040);

+ &data_word(0x80000040, 0x80200000, 0x00202040, 0x00000000);

+ &data_word(0x00002000, 0x80000040, 0x80002040, 0x80202000);

+ &data_word(0x80200000, 0x00002040, 0x00000040, 0x80200040);

+ # nibble 6

+ &data_word(0x00004000, 0x00000200, 0x01000200, 0x01000004);

+ &data_word(0x01004204, 0x00004004, 0x00004200, 0x00000000);

+ &data_word(0x01000000, 0x01000204, 0x00000204, 0x01004000);

+ &data_word(0x00000004, 0x01004200, 0x01004000, 0x00000204);

+ &data_word(0x01000204, 0x00004000, 0x00004004, 0x01004204);

+ &data_word(0x00000000, 0x01000200, 0x01000004, 0x00004200);

+ &data_word(0x01004004, 0x00004204, 0x01004200, 0x00000004);

+ &data_word(0x00004204, 0x01004004, 0x00000200, 0x01000000);

+ &data_word(0x00004204, 0x01004000, 0x01004004, 0x00000204);

+ &data_word(0x00004000, 0x00000200, 0x01000000, 0x01004004);

+ &data_word(0x01000204, 0x00004204, 0x00004200, 0x00000000);

+ &data_word(0x00000200, 0x01000004, 0x00000004, 0x01000200);

+ &data_word(0x00000000, 0x01000204, 0x01000200, 0x00004200);

+ &data_word(0x00000204, 0x00004000, 0x01004204, 0x01000000);

+ &data_word(0x01004200, 0x00000004, 0x00004004, 0x01004204);

+ &data_word(0x01000004, 0x01004200, 0x01004000, 0x00004004);

+ # nibble 7

+ &data_word(0x20800080, 0x20820000, 0x00020080, 0x00000000);

+ &data_word(0x20020000, 0x00800080, 0x20800000, 0x20820080);

+ &data_word(0x00000080, 0x20000000, 0x00820000, 0x00020080);

+ &data_word(0x00820080, 0x20020080, 0x20000080, 0x20800000);

+ &data_word(0x00020000, 0x00820080, 0x00800080, 0x20020000);

+ &data_word(0x20820080, 0x20000080, 0x00000000, 0x00820000);

+ &data_word(0x20000000, 0x00800000, 0x20020080, 0x20800080);

+ &data_word(0x00800000, 0x00020000, 0x20820000, 0x00000080);

+ &data_word(0x00800000, 0x00020000, 0x20000080, 0x20820080);

+ &data_word(0x00020080, 0x20000000, 0x00000000, 0x00820000);

+ &data_word(0x20800080, 0x20020080, 0x20020000, 0x00800080);

+ &data_word(0x20820000, 0x00000080, 0x00800080, 0x20020000);

+ &data_word(0x20820080, 0x00800000, 0x20800000, 0x20000080);

+ &data_word(0x00820000, 0x00020080, 0x20020080, 0x20800000);

+ &data_word(0x00000080, 0x20820000, 0x00820080, 0x00000000);

+ &data_word(0x20000000, 0x20800080, 0x00020000, 0x00820080);

+ }

diff --git a/lib/libcrypto/des/asm/des686.pl b/lib/libcrypto/des/asm/des686.pl
deleted file mode 100644
index d3ad5d5edd5..00000000000
--- a/lib/libcrypto/des/asm/des686.pl
+++ /dev/null

@@ -1,230 +0,0 @@

-#!/usr/local/bin/perl

-$prog="des686.pl";

-# base code is in microsft

-# op dest, source

-# format.

-# WILL NOT WORK ANYMORE WITH desboth.pl

-require "desboth.pl";

-if ( ($ARGV[0] eq "elf"))

- { require "x86unix.pl"; }

-elsif ( ($ARGV[0] eq "a.out"))

- { $aout=1; require "x86unix.pl"; }

-elsif ( ($ARGV[0] eq "sol"))

- { $sol=1; require "x86unix.pl"; }

-elsif ( ($ARGV[0] eq "cpp"))

- { $cpp=1; require "x86unix.pl"; }

-elsif ( ($ARGV[0] eq "win32"))

- { require "x86ms.pl"; }

-else

- {

- print STDERR <<"EOF";

-Pick one target type from

- elf - linux, FreeBSD etc

- a.out - old linux

- sol - x86 solaris

- cpp - format so x86unix.cpp can be used

- win32 - Windows 95/Windows NT

-EOF

- exit(1);

- }

-&comment("Don't even think of reading this code");

-&comment("It was automatically generated by $prog");

-&comment("Which is a perl program used to generate the x86 assember for");

-&comment("any of elf, a.out, Win32, or Solaris");

-&comment("It can be found in SSLeay 0.6.5+ or in libdes 3.26+");

-&comment("eric <eay\@cryptsoft.com>");

-&comment("");

-&file("dx86xxxx");

-$L="edi";

-$R="esi";

-&DES_encrypt("DES_encrypt1",1);

-&DES_encrypt("DES_encrypt2",0);

-&DES_encrypt3("DES_encrypt3",1);

-&DES_encrypt3("DES_decrypt3",0);

-&file_end();

-sub DES_encrypt

- {

- local($name,$do_ip)=@_;

- &function_begin($name,"EXTRN _DES_SPtrans:DWORD");

- &comment("");

- &comment("Load the 2 words");

- &mov("eax",&wparam(0));

- &mov($L,&DWP(0,"eax","",0));

- &mov($R,&DWP(4,"eax","",0));

- $ksp=&wparam(1);

- if ($do_ip)

- {

- &comment("");

- &comment("IP");

- &IP_new($L,$R,"eax");

- }

- &comment("");

- &comment("fixup rotate");

- &rotl($R,3);

- &rotl($L,3);

- &exch($L,$R);

- &comment("");

- &comment("load counter, key_schedule and enc flag");

- &mov("eax",&wparam(2)); # get encrypt flag

- &mov("ebp",&wparam(1)); # get ks

- &cmp("eax","0");

- &je(&label("start_decrypt"));

- # encrypting part

- for ($i=0; $i<16; $i+=2)

- {

- &comment("");

- &comment("Round $i");

- &D_ENCRYPT($L,$R,$i*2,"ebp","DES_SPtrans","ecx","edx","eax","ebx");

- &comment("");

- &comment("Round ".sprintf("%d",$i+1));

- &D_ENCRYPT($R,$L,($i+1)*2,"ebp","DES_SPtrans","ecx","edx","eax","ebx");

- }

- &jmp(&label("end"));

- &set_label("start_decrypt");

- for ($i=15; $i>0; $i-=2)

- {

- &comment("");

- &comment("Round $i");

- &D_ENCRYPT($L,$R,$i*2,"ebp","DES_SPtrans","ecx","edx","eax","ebx");

- &comment("");

- &comment("Round ".sprintf("%d",$i-1));

- &D_ENCRYPT($R,$L,($i-1)*2,"ebp","DES_SPtrans","ecx","edx","eax","ebx");

- }

- &set_label("end");

- &comment("");

- &comment("Fixup");

- &rotr($L,3); # r

- &rotr($R,3); # l

- if ($do_ip)

- {

- &comment("");

- &comment("FP");

- &FP_new($R,$L,"eax");

- }

- &mov("eax",&wparam(0));

- &mov(&DWP(0,"eax","",0),$L);

- &mov(&DWP(4,"eax","",0),$R);

- &function_end($name);

- }

-# The logic is to load R into 2 registers and operate on both at the same time.

-# We also load the 2 R's into 2 more registers so we can do the 'move word down a byte'

-# while also masking the other copy and doing a lookup. We then also accumulate the

-# L value in 2 registers then combine them at the end.

-sub D_ENCRYPT

- {

- local($L,$R,$S,$ks,$desSP,$u,$t,$tmp1,$tmp2,$tmp3)=@_;

- &mov( $u, &DWP(&n2a($S*4),$ks,"",0));

- &mov( $t, &DWP(&n2a(($S+1)*4),$ks,"",0));

- &xor( $u, $R );

- &xor( $t, $R );

- &rotr( $t, 4 );

- # the numbers at the end of the line are origional instruction order

- &mov( $tmp2, $u ); # 1 2

- &mov( $tmp1, $t ); # 1 1

- &and( $tmp2, "0xfc" ); # 1 4

- &and( $tmp1, "0xfc" ); # 1 3

- &shr( $t, 8 ); # 1 5

- &xor( $L, &DWP("0x100+$desSP",$tmp1,"",0)); # 1 7

- &shr( $u, 8 ); # 1 6

- &mov( $tmp1, &DWP(" $desSP",$tmp2,"",0)); # 1 8

- &mov( $tmp2, $u ); # 2 2

- &xor( $L, $tmp1 ); # 1 9

- &and( $tmp2, "0xfc" ); # 2 4

- &mov( $tmp1, $t ); # 2 1

- &and( $tmp1, "0xfc" ); # 2 3

- &shr( $t, 8 ); # 2 5

- &xor( $L, &DWP("0x300+$desSP",$tmp1,"",0)); # 2 7

- &shr( $u, 8 ); # 2 6

- &mov( $tmp1, &DWP("0x200+$desSP",$tmp2,"",0)); # 2 8

- &mov( $tmp2, $u ); # 3 2

- &xor( $L, $tmp1 ); # 2 9

- &and( $tmp2, "0xfc" ); # 3 4

- &mov( $tmp1, $t ); # 3 1

- &shr( $u, 8 ); # 3 6

- &and( $tmp1, "0xfc" ); # 3 3

- &shr( $t, 8 ); # 3 5

- &xor( $L, &DWP("0x500+$desSP",$tmp1,"",0)); # 3 7

- &mov( $tmp1, &DWP("0x400+$desSP",$tmp2,"",0)); # 3 8

- &and( $t, "0xfc" ); # 4 1

- &xor( $L, $tmp1 ); # 3 9

- &and( $u, "0xfc" ); # 4 2

- &xor( $L, &DWP("0x700+$desSP",$t,"",0)); # 4 3

- &xor( $L, &DWP("0x600+$desSP",$u,"",0)); # 4 4

- }

-sub PERM_OP

- {

- local($a,$b,$tt,$shift,$mask)=@_;

- &mov( $tt, $a );

- &shr( $tt, $shift );

- &xor( $tt, $b );

- &and( $tt, $mask );

- &xor( $b, $tt );

- &shl( $tt, $shift );

- &xor( $a, $tt );

- }

-sub IP_new

- {

- local($l,$r,$tt)=@_;

- &PERM_OP($r,$l,$tt, 4,"0x0f0f0f0f");

- &PERM_OP($l,$r,$tt,16,"0x0000ffff");

- &PERM_OP($r,$l,$tt, 2,"0x33333333");

- &PERM_OP($l,$r,$tt, 8,"0x00ff00ff");

- &PERM_OP($r,$l,$tt, 1,"0x55555555");

- }

-sub FP_new

- {

- local($l,$r,$tt)=@_;

- &PERM_OP($l,$r,$tt, 1,"0x55555555");

- &PERM_OP($r,$l,$tt, 8,"0x00ff00ff");

- &PERM_OP($l,$r,$tt, 2,"0x33333333");

- &PERM_OP($r,$l,$tt,16,"0x0000ffff");

- &PERM_OP($l,$r,$tt, 4,"0x0f0f0f0f");

- }

-sub n2a

- {

- sprintf("%d",$_[0]);

- }

diff --git a/lib/libcrypto/des/des-lib.com b/lib/libcrypto/des/des-lib.com
index fc2c35a1ce8..348f1c04709 100644
--- a/lib/libcrypto/des/des-lib.com
+++ b/lib/libcrypto/des/des-lib.com

@@ -9,7 +9,7 @@ $! Changes by Richard Levitte <richard@levitte.org>

$! This command files compiles and creates the

$! "[.xxx.EXE.CRYPTO.DES]LIBDES.OLB" library. The "xxx" denotes the machine

-$! architecture of AXP or VAX.

+$! architecture of ALPHA, IA64 or VAX.

$! It was re-written to try to determine which "C" compiler to try to use

$! or the user can specify a compiler in P3.

@@ -45,25 +45,34 @@ $!

$! Check Which Architecture We Are Using.

-$ IF (F$GETSYI("CPU").GE.128)

+$ IF (F$GETSYI("CPU").LT.128)

$ THEN

-$! The Architecture Is AXP.

+$! The Architecture Is VAX

-$ ARCH := AXP

+$ ARCH := VAX

$! Else...

$ ELSE

-$! The Architecture Is VAX.

+$! The Architecture Is Alpha, IA64 or whatever comes in the future.

-$ ARCH := VAX

+$ ARCH = F$EDIT( F$GETSYI( "ARCH_NAME"), "UPCASE")

+$ IF (ARCH .EQS. "") THEN ARCH = "UNK"

$! End The Architecture Check.

$ ENDIF

+$! Define The OBJ Directory Name.

+$!

+$ OBJ_DIR := SYS$DISK:[--.'ARCH'.OBJ.CRYPTO.DES]

+$!

+$! Define The EXE Directory Name.

+$!

+$ EXE_DIR :== SYS$DISK:[--.'ARCH'.EXE.CRYPTO.DES]

+$!

$! Check To Make Sure We Have Valid Command Line Parameters.

$ GOSUB CHECK_OPTIONS

@@ -72,10 +81,6 @@ $! Tell The User What Kind of Machine We Run On.

$ WRITE SYS$OUTPUT "Compiling On A ",ARCH," Machine."

-$! Define The OBJ Directory Name.

-$!

-$ OBJ_DIR := SYS$DISK:[--.'ARCH'.OBJ.CRYPTO.DES]

-$!

$! Check To See If The Architecture Specific OBJ Directory Exists.

$ IF (F$PARSE(OBJ_DIR).EQS."")

@@ -89,10 +94,6 @@ $! End The Architecture Specific OBJ Directory Check.

$ ENDIF

-$! Define The EXE Directory Name.

-$!

-$ EXE_DIR :== SYS$DISK:[--.'ARCH'.EXE.CRYPTO.DES]

-$!

$! Check To See If The Architecture Specific Directory Exists.

$ IF (F$PARSE(EXE_DIR).EQS."")

@@ -564,7 +565,7 @@ $!

$ IF (F$SEARCH(OPT_FILE).EQS."")

$ THEN

-$! Figure Out If We Need An AXP Or A VAX Linker Option File.

+$! Figure Out If We Need An non-VAX Or A VAX Linker Option File.

$ IF (F$GETSYI("CPU").LT.128)

$ THEN

@@ -584,19 +585,19 @@ $! Else...

$ ELSE

-$! Create The AXP Linker Option File.

+$! Create The non-VAX Linker Option File.

$ CREATE 'OPT_FILE'

$DECK

-! Default System Options File For AXP To Link Agianst

+! Default System Options File For non-VAX To Link Agianst

! The Sharable C Runtime Library.

SYS$SHARE:CMA$OPEN_LIB_SHR/SHARE

SYS$SHARE:CMA$OPEN_RTL/SHARE

$EOD

-$! End The VAX/AXP DEC C Option File Check.

+$! End The DEC C Option File Check.

$ ENDIF

@@ -658,13 +659,13 @@ $! Else...

$ ELSE

-$! Else, Check To See If P1 Has A Valid Arguement.

+$! Else, Check To See If P1 Has A Valid Argument.

$ IF (P1.EQS."LIBRARY").OR.(P1.EQS."DESTEST").OR.(P1.EQS."SPEED") -

.OR.(P1.EQS."RPW").OR.(P1.EQS."DES").OR.(P1.EQS."DES_OPTS")

$ THEN

-$! A Valid Arguement.

+$! A Valid Argument.

$ BUILDALL = P1

@@ -677,7 +678,7 @@ $!

$ WRITE SYS$OUTPUT ""

$ WRITE SYS$OUTPUT "The Option ",P1," Is Invalid. The Valid Options Are:"

$ WRITE SYS$OUTPUT ""

-$ WRITE SYS$OUTPUT " ALL : Just Build Everything.

+$ WRITE SYS$OUTPUT " ALL : Just Build Everything."

$ WRITE SYS$OUTPUT " LIBRARY : To Compile Just The [.xxx.EXE.CRYPTO.DES]LIBDES.OLB Library."

$ WRITE SYS$OUTPUT " DESTEST : To Compile Just The [.xxx.EXE.CRYPTO.DES]DESTEST.EXE Program."

$ WRITE SYS$OUTPUT " SPEED : To Compile Just The [.xxx.EXE.CRYPTO.DES]SPEED.EXE Program."

@@ -687,15 +688,16 @@ $ WRITE SYS$OUTPUT " DES_OPTS : To Compile Just The [.xxx.EXE.CRYTPO.DES

$ WRITE SYS$OUTPUT ""

$ WRITE SYS$OUTPUT " Where 'xxx' Stands For: "

$ WRITE SYS$OUTPUT ""

-$ WRITE SYS$OUTPUT " AXP : Alpha Architecture."

-$ WRITE SYS$OUTPUT " VAX : VAX Architecture."

+$ WRITE SYS$OUTPUT " ALPHA : Alpha Architecture."

+$ WRITE SYS$OUTPUT " IA64 : IA64 Architecture."

+$ WRITE SYS$OUTPUT " VAX : VAX Architecture."

$ WRITE SYS$OUTPUT ""

$! Time To EXIT.

$ EXIT

-$! End The Valid Arguement Check.

+$! End The Valid Argument Check.

$ ENDIF

@@ -752,7 +754,7 @@ $! Time To EXIT.

$ EXIT

-$! End The Valid Arguement Check.

+$! End The Valid Argument Check.

$ ENDIF

@@ -817,7 +819,7 @@ $ ELSE

$! Check To See If We Have VAXC Or DECC.

-$ IF (ARCH.EQS."AXP").OR.(F$TRNLNM("DECC$CC_DEFAULT").NES."")

+$ IF (ARCH.NES."VAX").OR.(F$TRNLNM("DECC$CC_DEFAULT").NES."")

$ THEN

$! Looks Like DECC, Set To Use DECC.

@@ -882,7 +884,7 @@ $ CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89" + -

$! Define The Linker Options File Name.

-$ OPT_FILE = "SYS$DISK:[]VAX_DECC_OPTIONS.OPT"

+$ OPT_FILE = "''EXE_DIR'VAX_DECC_OPTIONS.OPT"

$! End DECC Check.

@@ -904,9 +906,9 @@ $!

$! Compile Using VAXC.

$ CC = "CC"

-$ IF ARCH.EQS."AXP"

+$ IF ARCH.NES."VAX"

$ THEN

-$ WRITE SYS$OUTPUT "There is no VAX C on Alpha!"

+$ WRITE SYS$OUTPUT "There is no VAX C on ''ARCH'!"

$ EXIT

$ ENDIF

$ IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC/VAXC"

@@ -919,7 +921,7 @@ $ DEFINE/NOLOG SYS SYS$COMMON:[SYSLIB]

$! Define The Linker Options File Name.

-$ OPT_FILE = "SYS$DISK:[]VAX_VAXC_OPTIONS.OPT"

+$ OPT_FILE = "''EXE_DIR'VAX_VAXC_OPTIONS.OPT"

$! End VAXC Check

@@ -944,7 +946,7 @@ $ CC = "GCC/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + CCEXTRAFLAGS

$! Define The Linker Options File Name.

-$ OPT_FILE = "SYS$DISK:[]VAX_GNUC_OPTIONS.OPT"

+$ OPT_FILE = "''EXE_DIR'VAX_GNUC_OPTIONS.OPT"

$! End The GNU C Check.

@@ -976,7 +978,7 @@ $! Show user the result

$ WRITE SYS$OUTPUT "Main Compiling Command: ",CC

-$! Else The User Entered An Invalid Arguement.

+$! Else The User Entered An Invalid Argument.

$ ELSE

diff --git a/lib/libcrypto/des/des_enc.c b/lib/libcrypto/des/des_enc.c
index 22701e06693..5c47553a5ae 100644
--- a/lib/libcrypto/des/des_enc.c
+++ b/lib/libcrypto/des/des_enc.c

@@ -57,6 +57,7 @@

#include "des_locl.h"

+#include "spr.h"

#ifndef OPENBSD_DES_ASM

@@ -109,12 +110,10 @@ void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc)

D_ENCRYPT(l,r,28); /* 15 */

D_ENCRYPT(r,l,30); /* 16 */

#else

- for (i=0; i<32; i+=8)

+ for (i=0; i<32; i+=4)

{

D_ENCRYPT(l,r,i+0); /* 1 */

D_ENCRYPT(r,l,i+2); /* 2 */

- D_ENCRYPT(l,r,i+4); /* 3 */

- D_ENCRYPT(r,l,i+6); /* 4 */

}

#endif

}

@@ -138,12 +137,10 @@ void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc)

D_ENCRYPT(l,r, 2); /* 2 */

D_ENCRYPT(r,l, 0); /* 1 */

#else

- for (i=30; i>0; i-=8)

+ for (i=30; i>0; i-=4)

{

D_ENCRYPT(l,r,i-0); /* 16 */

D_ENCRYPT(r,l,i-2); /* 15 */

- D_ENCRYPT(l,r,i-4); /* 14 */

- D_ENCRYPT(r,l,i-6); /* 13 */

}

#endif

}

@@ -205,12 +202,10 @@ void DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc)

D_ENCRYPT(l,r,28); /* 15 */

D_ENCRYPT(r,l,30); /* 16 */

#else

- for (i=0; i<32; i+=8)

+ for (i=0; i<32; i+=4)

{

D_ENCRYPT(l,r,i+0); /* 1 */

D_ENCRYPT(r,l,i+2); /* 2 */

- D_ENCRYPT(l,r,i+4); /* 3 */

- D_ENCRYPT(r,l,i+6); /* 4 */

}

#endif

}

@@ -234,12 +229,10 @@ void DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc)

D_ENCRYPT(l,r, 2); /* 2 */

D_ENCRYPT(r,l, 0); /* 1 */

#else

- for (i=30; i>0; i-=8)

+ for (i=30; i>0; i-=4)

{

D_ENCRYPT(l,r,i-0); /* 16 */

D_ENCRYPT(r,l,i-2); /* 15 */

- D_ENCRYPT(l,r,i-4); /* 14 */

- D_ENCRYPT(r,l,i-6); /* 13 */

}

#endif

}

@@ -293,8 +286,6 @@ void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1,

#ifndef DES_DEFAULT_OPTIONS

-#if !defined(OPENSSL_FIPS_DES_ASM)

#undef CBC_ENC_C__DONT_UPDATE_IV

#include "ncbc_enc.c" /* DES_ncbc_encrypt */

@@ -410,6 +401,4 @@ void DES_ede3_cbc_encrypt(const unsigned char *input, unsigned char *output,

tin[0]=tin[1]=0;

}

-#endif

#endif /* DES_DEFAULT_OPTIONS */

diff --git a/lib/libcrypto/des/des_lib.c b/lib/libcrypto/des/des_lib.c
deleted file mode 100644
index d4b30479327..00000000000
--- a/lib/libcrypto/des/des_lib.c
+++ /dev/null

@@ -1,106 +0,0 @@

-/* crypto/des/ecb_enc.c */

- *

- * This package is an SSL implementation written

- * by Eric Young (eay@cryptsoft.com).

- * The implementation was written so as to conform with Netscapes SSL.

- *

- * This library is free for commercial and non-commercial use as long as

- * the following conditions are aheared to. The following conditions

- * apply to all code found in this distribution, be it the RC4, RSA,

- * lhash, DES, etc., code; not just the SSL code. The SSL documentation

- * included with this distribution is covered by the same copyright terms

- * except that the holder is Tim Hudson (tjh@cryptsoft.com).

- *

- * Copyright remains Eric Young's, and as such any Copyright notices in

- * the code are not to be removed.

- * If this package is used in a product, Eric Young should be given attribution

- * as the author of the parts of the library used.

- * This can be in the form of a textual message at program startup or

- * in documentation (online or textual) provided with the package.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- * 1. Redistributions of source code must retain the copyright

- * notice, this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright

- * notice, this list of conditions and the following disclaimer in the

- * documentation and/or other materials provided with the distribution.

- * 3. All advertising materials mentioning features or use of this software

- * must display the following acknowledgement:

- * "This product includes cryptographic software written by

- * Eric Young (eay@cryptsoft.com)"

- * The word 'cryptographic' can be left out if the rouines from the library

- * being used are not cryptographic related :-).

- * 4. If you include any Windows specific code (or a derivative thereof) from

- * the apps directory (application code) you must include an acknowledgement:

- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"

- *

- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND

- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE

- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

- * SUCH DAMAGE.

- *

- * The licence and distribution terms for any publically available version or

- * derivative of this code cannot be changed. i.e. this code cannot simply be

- * copied and put under another distribution licence

- * [including the GNU Public Licence.]

- */

-#include "des_locl.h"

-#include "des_ver.h"

-#include <openssl/opensslv.h>

-#include <openssl/bio.h>

-OPENSSL_GLOBAL const char libdes_version[]="libdes" OPENSSL_VERSION_PTEXT;

-OPENSSL_GLOBAL const char DES_version[]="DES" OPENSSL_VERSION_PTEXT;

-const char *DES_options(void)

- {

- static int init=1;

- static char buf[32];

- if (init)

- {

- const char *ptr,*unroll,*risc,*size;

-#ifdef DES_PTR

- ptr="ptr";

-#else

- ptr="idx";

-#endif

-#if defined(DES_RISC1) || defined(DES_RISC2)

-#ifdef DES_RISC1

- risc="risc1";

-#endif

-#ifdef DES_RISC2

- risc="risc2";

-#endif

-#else

- risc="cisc";

-#endif

-#ifdef DES_UNROLL

- unroll="16";

-#else

- unroll="4";

-#endif

- if (sizeof(DES_LONG) != sizeof(long))

- size="int";

- else

- size="long";

- BIO_snprintf(buf,sizeof buf,"des(%s,%s,%s,%s)",ptr,risc,unroll,

- size);

- init=0;

- }

- return(buf);

- }

diff --git a/lib/libcrypto/des/des_locl.h b/lib/libcrypto/des/des_locl.h
index 4b9ecff2339..a3b512e9b04 100644
--- a/lib/libcrypto/des/des_locl.h
+++ b/lib/libcrypto/des/des_locl.h

@@ -61,7 +61,7 @@

#include <openssl/e_os2.h>

-#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16)

+#if defined(OPENSSL_SYS_WIN32)

#ifndef OPENSSL_SYS_MSDOS

#define OPENSSL_SYS_MSDOS

#endif

@@ -425,4 +425,8 @@ extern const DES_LONG DES_SPtrans[8][64];

void fcrypt_body(DES_LONG *out,DES_key_schedule *ks,

DES_LONG Eswap0, DES_LONG Eswap1);

+#ifdef OPENSSL_SMALL_FOOTPRINT

+#undef DES_UNROLL

+#endif

#endif

diff --git a/lib/libcrypto/des/ecb_enc.c b/lib/libcrypto/des/ecb_enc.c
index 75ae6cf8bb6..0684e769b3e 100644
--- a/lib/libcrypto/des/ecb_enc.c
+++ b/lib/libcrypto/des/ecb_enc.c

@@ -57,7 +57,53 @@

#include "des_locl.h"

-#include "spr.h"

+#include "des_ver.h"

+#include <openssl/opensslv.h>

+#include <openssl/bio.h>

+OPENSSL_GLOBAL const char libdes_version[]="libdes" OPENSSL_VERSION_PTEXT;

+OPENSSL_GLOBAL const char DES_version[]="DES" OPENSSL_VERSION_PTEXT;

+const char *DES_options(void)

+ {

+ static int init=1;

+ static char buf[32];

+ if (init)

+ {

+ const char *ptr,*unroll,*risc,*size;

+#ifdef DES_PTR

+ ptr="ptr";

+#else

+ ptr="idx";

+#endif

+#if defined(DES_RISC1) || defined(DES_RISC2)

+#ifdef DES_RISC1

+ risc="risc1";

+#endif

+#ifdef DES_RISC2

+ risc="risc2";

+#endif

+#else

+ risc="cisc";

+#endif

+#ifdef DES_UNROLL

+ unroll="16";

+#else

+ unroll="2";

+#endif

+ if (sizeof(DES_LONG) != sizeof(long))

+ size="int";

+ else

+ size="long";

+ BIO_snprintf(buf,sizeof buf,"des(%s,%s,%s,%s)",ptr,risc,unroll,

+ size);

+ init=0;

+ }

+ return(buf);

+ }

void DES_ecb_encrypt(const_DES_cblock *input, DES_cblock *output,

DES_key_schedule *ks, int enc)

diff --git a/lib/libcrypto/des/enc_read.c b/lib/libcrypto/des/enc_read.c
index e7da2ec66b0..edb6620d085 100644
--- a/lib/libcrypto/des/enc_read.c
+++ b/lib/libcrypto/des/enc_read.c

@@ -63,7 +63,7 @@

/* This has some uglies in it but it works - even over sockets. */

/*extern int errno;*/

-OPENSSL_IMPLEMENT_GLOBAL(int,DES_rw_mode)=DES_PCBC_MODE;

+OPENSSL_IMPLEMENT_GLOBAL(int,DES_rw_mode,DES_PCBC_MODE)

@@ -87,6 +87,9 @@ OPENSSL_IMPLEMENT_GLOBAL(int,DES_rw_mode)=DES_PCBC_MODE;

int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched,

DES_cblock *iv)

{

+#if defined(OPENSSL_NO_POSIX_IO)

+ return(0);

+#else

/* data to be unencrypted */

int net_num=0;

static unsigned char *net=NULL;

@@ -147,7 +150,7 @@ int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched,

/* first - get the length */

while (net_num < HDRSIZE)

{

-#ifndef _WIN32

+#ifndef OPENSSL_SYS_WIN32

i=read(fd,(void *)&(net[net_num]),HDRSIZE-net_num);

#else

i=_read(fd,(void *)&(net[net_num]),HDRSIZE-net_num);

@@ -173,7 +176,11 @@ int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched,

net_num=0;

while (net_num < rnum)

{

+#ifndef OPENSSL_SYS_WIN32

i=read(fd,(void *)&(net[net_num]),rnum-net_num);

+#else

+ i=_read(fd,(void *)&(net[net_num]),rnum-net_num);

+#endif

#ifdef EINTR

if ((i == -1) && (errno == EINTR)) continue;

#endif

@@ -228,5 +235,6 @@ int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched,

}

return num;

+#endif /* OPENSSL_NO_POSIX_IO */

}

diff --git a/lib/libcrypto/des/enc_writ.c b/lib/libcrypto/des/enc_writ.c
index c2f032c9a6a..2353ac1e892 100644
--- a/lib/libcrypto/des/enc_writ.c
+++ b/lib/libcrypto/des/enc_writ.c

@@ -80,6 +80,9 @@

int DES_enc_write(int fd, const void *_buf, int len,

DES_key_schedule *sched, DES_cblock *iv)

{

+#if defined(OPENSSL_NO_POSIX_IO)

+ return (-1);

+#else

#ifdef _LIBC

extern unsigned long time();

extern int write();

@@ -172,4 +175,5 @@ int DES_enc_write(int fd, const void *_buf, int len,

}

return(len);

+#endif /* OPENSSL_NO_POSIX_IO */

}

diff --git a/lib/libcrypto/des/fcrypt_b.c b/lib/libcrypto/des/fcrypt_b.c
index c56b461e91b..87fc71eb264 100644
--- a/lib/libcrypto/des/fcrypt_b.c
+++ b/lib/libcrypto/des/fcrypt_b.c

@@ -102,12 +102,10 @@ void fcrypt_body(DES_LONG *out, DES_key_schedule *ks, DES_LONG Eswap0,

#ifndef DES_UNROLL

- for (i=0; i<32; i+=8)

+ for (i=0; i<32; i+=4)

{

D_ENCRYPT(l,r,i+0); /* 1 */

D_ENCRYPT(r,l,i+2); /* 2 */

- D_ENCRYPT(l,r,i+4); /* 1 */

- D_ENCRYPT(r,l,i+6); /* 2 */

}

#else

D_ENCRYPT(l,r, 0); /* 1 */

diff --git a/lib/libcrypto/des/rpc_des.h b/lib/libcrypto/des/rpc_des.h
index efc474f00e0..8263c512ab6 100644
--- a/lib/libcrypto/des/rpc_des.h
+++ b/lib/libcrypto/des/rpc_des.h

@@ -124,10 +124,10 @@ struct desparams {

* Encrypt an arbitrary sized buffer

-#define DESIOCBLOCK _IOWR(d, 6, struct desparams)

+#define DESIOCBLOCK _IOWR('d', 6, struct desparams)

* Encrypt of small amount of data, quickly

-#define DESIOCQUICK _IOWR(d, 7, struct desparams)

+#define DESIOCQUICK _IOWR('d', 7, struct desparams)

diff --git a/lib/libcrypto/des/set_key.c b/lib/libcrypto/des/set_key.c
index c0806d593c1..3004cc3ab3c 100644
--- a/lib/libcrypto/des/set_key.c
+++ b/lib/libcrypto/des/set_key.c

@@ -64,12 +64,8 @@

* 1.0 First working version

#include "des_locl.h"

-#ifdef OPENSSL_FIPS

-#include <openssl/fips.h>

-#endif

-OPENSSL_IMPLEMENT_GLOBAL(int,DES_check_key); /* defaults to false */

+OPENSSL_IMPLEMENT_GLOBAL(int,DES_check_key,0) /* defaults to false */

static const unsigned char odd_parity[256]={

1, 1, 2, 2, 4, 4, 7, 7, 8, 8, 11, 11, 13, 13, 14, 14,

@@ -340,7 +336,7 @@ int DES_set_key_checked(const_DES_cblock *key, DES_key_schedule *schedule)

void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule)

{

- static int shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0};

+ static const int shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0};

@@ -353,10 +349,6 @@ void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule)

k = &schedule->ks->deslong[0];

in = &(*key)[0];

-#ifdef OPENSSL_FIPS

- FIPS_selftest_check();

-#endif

c2l(in,c);

c2l(in,d);

@@ -413,4 +405,3 @@ void des_fixup_key_parity(des_cblock *key)

des_set_odd_parity(key);

}

diff --git a/lib/libcrypto/des/times/aix.cc b/lib/libcrypto/des/times/aix.cc
index e9b2e457515..d96b74e2ced 100644
--- a/lib/libcrypto/des/times/aix.cc
+++ b/lib/libcrypto/des/times/aix.cc

@@ -2,10 +2,10 @@ From: Paco Garcia <pgarcia@cam.es>

This machine is a Bull Estrella Minitower Model MT604-100

Processor : PPC604

-P.Speed : 100MHz

+P.Speed : 100Mhz

Data/Instr Cache : 16 K

L2 Cache : 256 K

-PCI BUS Speed : 33 MHz

+PCI BUS Speed : 33 Mhz

TransfRate PCI : 132 MB/s

Memory : 96 MB

diff --git a/lib/libcrypto/des/xcbc_enc.c b/lib/libcrypto/des/xcbc_enc.c
index dc0c761b71f..058cab6bce0 100644
--- a/lib/libcrypto/des/xcbc_enc.c
+++ b/lib/libcrypto/des/xcbc_enc.c

@@ -61,7 +61,7 @@

/* RSA's DESX */

#if 0 /* broken code, preserved just in case anyone specifically looks for this */

-static unsigned char desx_white_in2out[256]={

+static const unsigned char desx_white_in2out[256]={

0xBD,0x56,0xEA,0xF2,0xA2,0xF1,0xAC,0x2A,0xB0,0x93,0xD1,0x9C,0x1B,0x33,0xFD,0xD0,

0x30,0x04,0xB6,0xDC,0x7D,0xDF,0x32,0x4B,0xF7,0xCB,0x45,0x9B,0x31,0xBB,0x21,0x5A,

0x41,0x9F,0xE1,0xD9,0x4A,0x4D,0x9E,0xDA,0xA0,0x68,0x2C,0xC3,0x27,0x5F,0x80,0x36,