summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto
diff options
context:
space:
mode:
authordjm <>2008-09-06 12:15:54 +0000
committerdjm <>2008-09-06 12:15:54 +0000
commitf1625f274acf5dcd5601f6cb5e29e233b2a441a3 (patch)
tree44899ddfbef8f24aacbea50086c041c1b150f6d6 /src/lib/libcrypto
parent4f828b924f54507141fb95ebe49dfcd261945e85 (diff)
downloadopenbsd-f1625f274acf5dcd5601f6cb5e29e233b2a441a3.tar.gz
openbsd-f1625f274acf5dcd5601f6cb5e29e233b2a441a3.tar.bz2
openbsd-f1625f274acf5dcd5601f6cb5e29e233b2a441a3.zip
import of OpenSSL 0.9.8h
Diffstat (limited to 'src/lib/libcrypto')
-rw-r--r--src/lib/libcrypto/Attic/Makefile174
-rw-r--r--src/lib/libcrypto/aes/Makefile55
-rw-r--r--src/lib/libcrypto/asn1/Makefile1303
-rw-r--r--src/lib/libcrypto/asn1/a_gentm.c2
-rw-r--r--src/lib/libcrypto/asn1/a_hdr.c6
-rw-r--r--src/lib/libcrypto/asn1/a_meth.c16
-rw-r--r--src/lib/libcrypto/asn1/a_utctm.c2
-rw-r--r--src/lib/libcrypto/bf/Makefile45
-rw-r--r--src/lib/libcrypto/bf/bf_opts.c3
-rw-r--r--src/lib/libcrypto/bf/bfspeed.c3
-rw-r--r--src/lib/libcrypto/bf/bftest.c4
-rw-r--r--src/lib/libcrypto/bio/Makefile123
-rw-r--r--src/lib/libcrypto/bn/Makefile286
-rw-r--r--src/lib/libcrypto/bn/asm/mo-586.pl603
-rw-r--r--src/lib/libcrypto/bn/bntest.c775
-rw-r--r--src/lib/libcrypto/bn/exptest.c3
-rw-r--r--src/lib/libcrypto/buffer/Makefile18
-rw-r--r--src/lib/libcrypto/cast/Makefile41
-rw-r--r--src/lib/libcrypto/cast/cast_spd.c3
-rw-r--r--src/lib/libcrypto/cast/castopts.c3
-rw-r--r--src/lib/libcrypto/cast/casttest.c1
-rw-r--r--src/lib/libcrypto/comp/Makefile47
-rw-r--r--src/lib/libcrypto/conf/Makefile109
-rw-r--r--src/lib/libcrypto/crypto-lib.com68
-rw-r--r--src/lib/libcrypto/des/FILES02
-rw-r--r--src/lib/libcrypto/des/INSTALL2
-rw-r--r--src/lib/libcrypto/des/Makefile288
-rw-r--r--src/lib/libcrypto/des/des_old.c4
-rw-r--r--src/lib/libcrypto/des/des_old.h13
-rw-r--r--src/lib/libcrypto/des/des_opts.c4
-rw-r--r--src/lib/libcrypto/des/des_ver.h4
-rw-r--r--src/lib/libcrypto/des/destest.c18
-rw-r--r--src/lib/libcrypto/des/read2pwd.c1
-rw-r--r--src/lib/libcrypto/des/speed.c4
-rw-r--r--src/lib/libcrypto/dh/Makefile44
-rw-r--r--src/lib/libcrypto/dh/dhtest.c28
-rw-r--r--src/lib/libcrypto/dsa/Makefile103
-rw-r--r--src/lib/libcrypto/dsa/dsatest.c35
-rw-r--r--src/lib/libcrypto/dso/Makefile46
-rw-r--r--src/lib/libcrypto/dso/dso_dl.c102
-rw-r--r--src/lib/libcrypto/dso/dso_vms.c137
-rw-r--r--src/lib/libcrypto/dso/dso_win32.c364
-rw-r--r--src/lib/libcrypto/ebcdic.c15
-rw-r--r--src/lib/libcrypto/ec/Makefile163
-rw-r--r--src/lib/libcrypto/ec/ec2_smpt.c74
-rw-r--r--src/lib/libcrypto/ec/ectest.c815
-rw-r--r--src/lib/libcrypto/engine/Makefile532
-rw-r--r--src/lib/libcrypto/engine/eng_cryptodev.c1133
-rw-r--r--src/lib/libcrypto/engine/enginetest.c2
-rw-r--r--src/lib/libcrypto/err/Makefile57
-rw-r--r--src/lib/libcrypto/evp/Makefile1266
-rw-r--r--src/lib/libcrypto/evp/bio_ok.c60
-rw-r--r--src/lib/libcrypto/evp/c_allc.c37
-rw-r--r--src/lib/libcrypto/evp/c_alld.c5
-rw-r--r--src/lib/libcrypto/evp/e_rc5.c5
-rw-r--r--src/lib/libcrypto/evp/evp_test.c61
-rw-r--r--src/lib/libcrypto/evp/evptests.txt245
-rw-r--r--src/lib/libcrypto/evp/m_md2.c10
-rw-r--r--src/lib/libcrypto/evp/m_mdc2.c8
-rw-r--r--src/lib/libcrypto/evp/m_sha.c13
-rw-r--r--src/lib/libcrypto/hmac/Makefile32
-rw-r--r--src/lib/libcrypto/idea/Makefile14
-rw-r--r--src/lib/libcrypto/idea/ideatest.c3
-rw-r--r--src/lib/libcrypto/install.com23
-rw-r--r--src/lib/libcrypto/krb5/Makefile12
-rw-r--r--src/lib/libcrypto/lhash/Makefile17
-rw-r--r--src/lib/libcrypto/md2/Makefile22
-rw-r--r--src/lib/libcrypto/md2/md2.h12
-rw-r--r--src/lib/libcrypto/md2/md2_dgst.c12
-rw-r--r--src/lib/libcrypto/md2/md2_one.c2
-rw-r--r--src/lib/libcrypto/md2/md2test.c6
-rw-r--r--src/lib/libcrypto/md4/Makefile24
-rw-r--r--src/lib/libcrypto/md4/md4test.c8
-rw-r--r--src/lib/libcrypto/md5/Makefile68
-rw-r--r--src/lib/libcrypto/md5/md5test.c12
-rw-r--r--src/lib/libcrypto/mdc2/Makefile23
-rw-r--r--src/lib/libcrypto/mdc2/mdc2.h10
-rw-r--r--src/lib/libcrypto/mdc2/mdc2test.c3
-rw-r--r--src/lib/libcrypto/mem.c10
-rw-r--r--src/lib/libcrypto/o_str.h1
-rw-r--r--src/lib/libcrypto/objects/Makefile51
-rw-r--r--src/lib/libcrypto/objects/obj_dat.h2850
-rw-r--r--src/lib/libcrypto/objects/obj_mac.h515
-rw-r--r--src/lib/libcrypto/ocsp/Makefile272
-rw-r--r--src/lib/libcrypto/opensslconf.h52
-rw-r--r--src/lib/libcrypto/opensslconf.h.in1
-rw-r--r--src/lib/libcrypto/pem/Makefile318
-rw-r--r--src/lib/libcrypto/perlasm/x86ms.pl122
-rw-r--r--src/lib/libcrypto/perlasm/x86nasm.pl153
-rw-r--r--src/lib/libcrypto/perlasm/x86unix.pl220
-rw-r--r--src/lib/libcrypto/pkcs12/Makefile435
-rw-r--r--src/lib/libcrypto/pkcs7/Makefile188
-rw-r--r--src/lib/libcrypto/pkcs7/bio_ber.c2
-rw-r--r--src/lib/libcrypto/pkcs7/example.c8
-rw-r--r--src/lib/libcrypto/pqueue/pq_compat.h147
-rw-r--r--src/lib/libcrypto/rand/Makefile141
-rw-r--r--src/lib/libcrypto/rand/md_rand.c17
-rw-r--r--src/lib/libcrypto/rand/rand_egd.c2
-rw-r--r--src/lib/libcrypto/rand/rand_unix.c119
-rw-r--r--src/lib/libcrypto/rand/rand_win.c99
-rw-r--r--src/lib/libcrypto/rand/randtest.c5
-rw-r--r--src/lib/libcrypto/rc2/Makefile14
-rw-r--r--src/lib/libcrypto/rc2/rc2speed.c3
-rw-r--r--src/lib/libcrypto/rc2/rc2test.c3
-rw-r--r--src/lib/libcrypto/rc4/Makefile63
-rw-r--r--src/lib/libcrypto/rc4/asm/rc4-ia64.S5
-rw-r--r--src/lib/libcrypto/rc4/rc4.c3
-rw-r--r--src/lib/libcrypto/rc4/rc4speed.c3
-rw-r--r--src/lib/libcrypto/rc4/rc4test.c51
-rw-r--r--src/lib/libcrypto/rc5/Makefile51
-rw-r--r--src/lib/libcrypto/rc5/rc5.h7
-rw-r--r--src/lib/libcrypto/rc5/rc5_locl.h2
-rw-r--r--src/lib/libcrypto/ripemd/Makefile46
-rw-r--r--src/lib/libcrypto/ripemd/rmdtest.c8
-rw-r--r--src/lib/libcrypto/rsa/Makefile126
-rw-r--r--src/lib/libcrypto/rsa/rsa_null.c15
-rw-r--r--src/lib/libcrypto/rsa/rsa_test.c32
-rw-r--r--src/lib/libcrypto/sha/Makefile102
-rw-r--r--src/lib/libcrypto/sha/asm/sha512-sse2.pl404
-rw-r--r--src/lib/libcrypto/sha/sha1test.c12
-rw-r--r--src/lib/libcrypto/sha/sha_dgst.c3
-rw-r--r--src/lib/libcrypto/sha/sha_one.c2
-rw-r--r--src/lib/libcrypto/sha/shatest.c12
-rw-r--r--src/lib/libcrypto/stack/Makefile18
-rw-r--r--src/lib/libcrypto/symhacks.h129
-rw-r--r--src/lib/libcrypto/threads/mttest.c115
-rw-r--r--src/lib/libcrypto/threads/th-lock.c2
-rw-r--r--src/lib/libcrypto/tmdiff.c45
-rw-r--r--src/lib/libcrypto/tmdiff.h22
-rw-r--r--src/lib/libcrypto/txt_db/Makefile14
-rw-r--r--src/lib/libcrypto/ui/Makefile38
-rw-r--r--src/lib/libcrypto/uid.c2
-rw-r--r--src/lib/libcrypto/util/ck_errf.pl13
-rw-r--r--src/lib/libcrypto/util/clean-depend.pl7
-rw-r--r--src/lib/libcrypto/util/cygwin.sh22
-rw-r--r--src/lib/libcrypto/util/domd2
-rw-r--r--src/lib/libcrypto/util/libeay.num915
-rw-r--r--src/lib/libcrypto/util/mk1mf.pl590
-rw-r--r--src/lib/libcrypto/util/mkdef.pl142
-rw-r--r--src/lib/libcrypto/util/mkdir-p.pl1
-rw-r--r--src/lib/libcrypto/util/mkfiles.pl17
-rw-r--r--src/lib/libcrypto/util/mklink.pl1
-rwxr-xr-xsrc/lib/libcrypto/util/opensslwrap.sh4
-rw-r--r--src/lib/libcrypto/util/pl/BC-32.pl13
-rw-r--r--src/lib/libcrypto/util/pl/Mingw32.pl17
-rw-r--r--src/lib/libcrypto/util/pl/OS2-EMX.pl11
-rw-r--r--src/lib/libcrypto/util/pl/VC-32.pl294
-rw-r--r--src/lib/libcrypto/util/pl/linux.pl11
-rw-r--r--src/lib/libcrypto/util/pl/ultrix.pl11
-rw-r--r--src/lib/libcrypto/util/pl/unix.pl9
-rwxr-xr-xsrc/lib/libcrypto/util/shlib_wrap.sh33
-rw-r--r--src/lib/libcrypto/util/ssleay.num28
-rw-r--r--src/lib/libcrypto/x509/Makefile708
-rw-r--r--src/lib/libcrypto/x509v3/Makefile920
154 files changed, 13044 insertions, 7501 deletions
diff --git a/src/lib/libcrypto/Attic/Makefile b/src/lib/libcrypto/Attic/Makefile
index cda9de0ac9..bb8eaa036c 100644
--- a/src/lib/libcrypto/Attic/Makefile
+++ b/src/lib/libcrypto/Attic/Makefile
@@ -6,43 +6,41 @@ DIR= crypto
6TOP= .. 6TOP= ..
7CC= cc 7CC= cc
8INCLUDE= -I. -I$(TOP) -I../include 8INCLUDE= -I. -I$(TOP) -I../include
9# INCLUDES targets sudbirs!
9INCLUDES= -I.. -I../.. -I../../include 10INCLUDES= -I.. -I../.. -I../../include
10CFLAG= -g 11CFLAG= -g
11INSTALL_PREFIX=
12OPENSSLDIR= /usr/local/ssl
13INSTALLTOP= /usr/local/ssl
14MAKEDEPPROG= makedepend 12MAKEDEPPROG= makedepend
15MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) 13MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
16MAKEFILE= Makefile 14MAKEFILE= Makefile
17RM= rm -f 15RM= rm -f
18AR= ar r 16AR= ar r
19 17
18RECURSIVE_MAKE= [ -n "$(SDIRS)" ] && for i in $(SDIRS) ; do \
19 (cd $$i && echo "making $$target in $(DIR)/$$i..." && \
20 $(MAKE) -e TOP=../.. DIR=$$i INCLUDES='${INCLUDES}' $$target ) || exit 1; \
21 done;
22
20PEX_LIBS= 23PEX_LIBS=
21EX_LIBS= 24EX_LIBS=
22 25
23CFLAGS= $(INCLUDE) $(CFLAG) 26CFLAGS= $(INCLUDE) $(CFLAG)
24 27ASFLAGS= $(INCLUDE) $(ASFLAG)
28AFLAGS=$(ASFLAGS)
25 29
26LIBS= 30LIBS=
27 31
28SDIRS= md2 md5 sha mdc2 hmac ripemd \
29 des rc2 rc4 rc5 idea bf cast \
30 bn ec rsa dsa dh dso engine aes \
31 buffer bio stack lhash rand err objects \
32 evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5
33
34GENERAL=Makefile README crypto-lib.com install.com 32GENERAL=Makefile README crypto-lib.com install.com
35 33
36LIB= $(TOP)/libcrypto.a 34LIB= $(TOP)/libcrypto.a
37SHARED_LIB= libcrypto$(SHLIB_EXT) 35SHARED_LIB= libcrypto$(SHLIB_EXT)
38LIBSRC= cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c tmdiff.c cpt_err.c ebcdic.c uid.c o_time.c o_str.c 36LIBSRC= cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c tmdiff.c cpt_err.c ebcdic.c uid.c o_time.c o_str.c o_dir.c
39LIBOBJ= cryptlib.o mem.o mem_clr.o mem_dbg.o cversion.o ex_data.o tmdiff.o cpt_err.o ebcdic.o uid.o o_time.o o_str.o 37LIBOBJ= cryptlib.o mem.o mem_clr.o mem_dbg.o cversion.o ex_data.o tmdiff.o cpt_err.o ebcdic.o uid.o o_time.o o_str.o o_dir.o $(CPUID_OBJ)
40 38
41SRC= $(LIBSRC) 39SRC= $(LIBSRC)
42 40
43EXHEADER= crypto.h tmdiff.h opensslv.h opensslconf.h ebcdic.h symhacks.h \ 41EXHEADER= crypto.h tmdiff.h opensslv.h opensslconf.h ebcdic.h symhacks.h \
44 ossl_typ.h 42 ossl_typ.h
45HEADER= cryptlib.h buildinf.h md32_common.h o_time.h o_str.h $(EXHEADER) 43HEADER= cryptlib.h buildinf.h md32_common.h o_time.h o_str.h o_dir.h $(EXHEADER)
46 44
47ALL= $(GENERAL) $(SRC) $(HEADER) 45ALL= $(GENERAL) $(SRC) $(HEADER)
48 46
@@ -59,148 +57,136 @@ buildinf.h: ../Makefile
59 echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \ 57 echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \
60 echo '#endif' ) >buildinf.h 58 echo '#endif' ) >buildinf.h
61 59
60x86cpuid-elf.s: x86cpuid.pl perlasm/x86asm.pl
61 $(PERL) x86cpuid.pl elf $(CFLAGS) $(PROCESSOR) > $@
62x86cpuid-cof.s: x86cpuid.pl perlasm/x86asm.pl
63 $(PERL) x86cpuid.pl coff $(CFLAGS) $(PROCESSOR) > $@
64x86cpuid-out.s: x86cpuid.pl perlasm/x86asm.pl
65 $(PERL) x86cpuid.pl a.out $(CFLAGS) $(PROCESSOR) > $@
66
67uplink.o: ../ms/uplink.c
68 $(CC) $(CFLAGS) -c -o $@ ../ms/uplink.c
69
70uplink-cof.s: ../ms/uplink.pl
71 $(PERL) ../ms/uplink.pl coff > $@
72
73x86_64cpuid.s: x86_64cpuid.pl
74 $(PERL) x86_64cpuid.pl $@
75ia64cpuid.s: ia64cpuid.S
76 $(CC) $(CFLAGS) -E ia64cpuid.S > $@
77
62testapps: 78testapps:
63 if echo ${SDIRS} | fgrep ' des '; \ 79 [ -z "$(THIS)" ] || ( if echo ${SDIRS} | fgrep ' des '; \
64 then cd des && $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' des; fi 80 then cd des && $(MAKE) -e des; fi )
65 cd pkcs7 && $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' testapps 81 [ -z "$(THIS)" ] || ( cd pkcs7 && $(MAKE) -e testapps );
82 @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
66 83
67subdirs: 84subdirs:
68 @for i in $(SDIRS) ;\ 85 @target=all; $(RECURSIVE_MAKE)
69 do \
70 (cd $$i && echo "making all in crypto/$$i..." && \
71 $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \
72 done;
73 86
74files: 87files:
75 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO 88 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
76 @for i in $(SDIRS) ;\ 89 @target=files; $(RECURSIVE_MAKE)
77 do \
78 (cd $$i && echo "making 'files' in crypto/$$i..." && \
79 $(MAKE) PERL='${PERL}' files ); \
80 done;
81 90
82links: 91links:
83 @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) 92 @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
84 @$(PERL) $(TOP)/util/mklink.pl ../test $(TEST) 93 @$(PERL) $(TOP)/util/mklink.pl ../test $(TEST)
85 @$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS) 94 @$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS)
86 @for i in $(SDIRS); do \ 95 @target=links; $(RECURSIVE_MAKE)
87 (cd $$i && echo "making links in crypto/$$i..." && \
88 $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PERL='${PERL}' links ); \
89 done;
90 96
91lib: $(LIBOBJ) 97# lib: and $(LIB): are splitted to avoid end-less loop
98lib: $(LIB)
99 @touch lib
100$(LIB): $(LIBOBJ)
92 $(AR) $(LIB) $(LIBOBJ) 101 $(AR) $(LIB) $(LIBOBJ)
93 $(RANLIB) $(LIB) || echo Never mind. 102 $(RANLIB) $(LIB) || echo Never mind.
94 @touch lib
95 103
96shared: buildinf.h lib subdirs 104shared: buildinf.h lib subdirs
97 @if [ -n "$(SHARED_LIBS)" ]; then \ 105 if [ -n "$(SHARED_LIBS)" ]; then \
98 egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null || \
99 (cd ..; $(MAKE) $(SHARED_LIB)); \ 106 (cd ..; $(MAKE) $(SHARED_LIB)); \
100 fi 107 fi
101 108
102libs: 109libs:
103 @for i in $(SDIRS) ;\ 110 @target=lib; $(RECURSIVE_MAKE)
104 do \
105 (cd $$i && echo "making libs in crypto/$$i..." && \
106 $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' lib ); \
107 done;
108
109tests:
110 @for i in $(SDIRS) ;\
111 do \
112 (cd $$i && echo "making tests in crypto/$$i..." && \
113 $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' tests ); \
114 done;
115 111
116install: 112install:
113 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
117 @headerlist="$(EXHEADER)"; for i in $$headerlist ;\ 114 @headerlist="$(EXHEADER)"; for i in $$headerlist ;\
118 do \ 115 do \
119 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 116 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
120 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ 117 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
121 done; 118 done;
122 @for i in $(SDIRS) ;\ 119 @target=install; $(RECURSIVE_MAKE)
123 do \
124 (cd $$i && echo "making install in crypto/$$i..." && \
125 $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' install ); \
126 done;
127 120
128lint: 121lint:
129 @for i in $(SDIRS) ;\ 122 @target=lint; $(RECURSIVE_MAKE)
130 do \
131 (cd $$i && echo "making lint in crypto/$$i..." && \
132 $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' lint ); \
133 done;
134 123
135depend: 124depend:
136 if [ ! -f buildinf.h ]; then touch buildinf.h; fi # fake buildinf.h if it does not exist 125 @[ -z "$(THIS)" -o -f buildinf.h ] || touch buildinf.h # fake buildinf.h if it does not exist
137 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDE) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 126 @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDE) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
138 if [ ! -s buildinf.h ]; then rm buildinf.h; fi 127 @[ -z "$(THIS)" -o -s buildinf.h ] || rm buildinf.h
139 @for i in $(SDIRS) ;\ 128 @[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) )
140 do \ 129 @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
141 (cd $$i && echo "making depend in crypto/$$i..." && \
142 $(MAKE) MAKEFILE='${MAKEFILE}' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' DEPFLAG='${DEPFLAG}' MAKEDEPPROG='${MAKEDEPPROG}' KRB5_INCLUDES='${KRB5_INCLUDES}' PERL='${PERL}' depend ); \
143 done;
144 130
145clean: 131clean:
146 rm -f buildinf.h *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff 132 rm -f buildinf.h *.s *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
147 @for i in $(SDIRS) ;\ 133 @target=clean; $(RECURSIVE_MAKE)
148 do \
149 (cd $$i && echo "making clean in crypto/$$i..." && \
150 $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' clean ); \
151 done;
152 134
153dclean: 135dclean:
154 $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new 136 $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
155 mv -f Makefile.new $(MAKEFILE) 137 mv -f Makefile.new $(MAKEFILE)
156 @for i in $(SDIRS) ;\ 138 @target=dclean; $(RECURSIVE_MAKE)
157 do \
158 (cd $$i && echo "making dclean in crypto/$$i..." && \
159 $(MAKE) PERL='${PERL}' CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' dclean ); \
160 done;
161 139
162# DO NOT DELETE THIS LINE -- make depend depends on it. 140# DO NOT DELETE THIS LINE -- make depend depends on it.
163 141
164cpt_err.o: ../include/openssl/bio.h ../include/openssl/crypto.h 142cpt_err.o: ../include/openssl/bio.h ../include/openssl/crypto.h
165cpt_err.o: ../include/openssl/e_os2.h ../include/openssl/err.h 143cpt_err.o: ../include/openssl/e_os2.h ../include/openssl/err.h
166cpt_err.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h 144cpt_err.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
167cpt_err.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h 145cpt_err.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
168cpt_err.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cpt_err.c 146cpt_err.o: ../include/openssl/safestack.h ../include/openssl/stack.h
147cpt_err.o: ../include/openssl/symhacks.h cpt_err.c
169cryptlib.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h 148cryptlib.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h
170cryptlib.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h 149cryptlib.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
171cryptlib.o: ../include/openssl/err.h ../include/openssl/lhash.h 150cryptlib.o: ../include/openssl/err.h ../include/openssl/lhash.h
172cryptlib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h 151cryptlib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
173cryptlib.o: ../include/openssl/safestack.h ../include/openssl/stack.h 152cryptlib.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
174cryptlib.o: ../include/openssl/symhacks.h cryptlib.c cryptlib.h 153cryptlib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.c
154cryptlib.o: cryptlib.h
175cversion.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h 155cversion.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h
176cversion.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h 156cversion.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
177cversion.o: ../include/openssl/err.h ../include/openssl/lhash.h 157cversion.o: ../include/openssl/err.h ../include/openssl/lhash.h
178cversion.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h 158cversion.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
179cversion.o: ../include/openssl/safestack.h ../include/openssl/stack.h 159cversion.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
180cversion.o: ../include/openssl/symhacks.h buildinf.h cryptlib.h cversion.c 160cversion.o: ../include/openssl/stack.h ../include/openssl/symhacks.h buildinf.h
161cversion.o: cryptlib.h cversion.c
181ebcdic.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h ebcdic.c 162ebcdic.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h ebcdic.c
182ex_data.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h 163ex_data.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h
183ex_data.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h 164ex_data.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
184ex_data.o: ../include/openssl/err.h ../include/openssl/lhash.h 165ex_data.o: ../include/openssl/err.h ../include/openssl/lhash.h
185ex_data.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h 166ex_data.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
186ex_data.o: ../include/openssl/safestack.h ../include/openssl/stack.h 167ex_data.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
187ex_data.o: ../include/openssl/symhacks.h cryptlib.h ex_data.c 168ex_data.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h
169ex_data.o: ex_data.c
188mem.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h 170mem.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h
189mem.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h 171mem.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
190mem.o: ../include/openssl/err.h ../include/openssl/lhash.h 172mem.o: ../include/openssl/err.h ../include/openssl/lhash.h
191mem.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h 173mem.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
192mem.o: ../include/openssl/safestack.h ../include/openssl/stack.h 174mem.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
193mem.o: ../include/openssl/symhacks.h cryptlib.h mem.c 175mem.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h
176mem.o: mem.c
194mem_clr.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h 177mem_clr.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
195mem_clr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h 178mem_clr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
196mem_clr.o: ../include/openssl/safestack.h ../include/openssl/stack.h 179mem_clr.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
197mem_clr.o: ../include/openssl/symhacks.h mem_clr.c 180mem_clr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h mem_clr.c
198mem_dbg.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h 181mem_dbg.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h
199mem_dbg.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h 182mem_dbg.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
200mem_dbg.o: ../include/openssl/err.h ../include/openssl/lhash.h 183mem_dbg.o: ../include/openssl/err.h ../include/openssl/lhash.h
201mem_dbg.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h 184mem_dbg.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
202mem_dbg.o: ../include/openssl/safestack.h ../include/openssl/stack.h 185mem_dbg.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
203mem_dbg.o: ../include/openssl/symhacks.h cryptlib.h mem_dbg.c 186mem_dbg.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h
187mem_dbg.o: mem_dbg.c
188o_dir.o: ../e_os.h ../include/openssl/e_os2.h ../include/openssl/opensslconf.h
189o_dir.o: LPdir_unix.c o_dir.c o_dir.h
204o_str.o: ../e_os.h ../include/openssl/e_os2.h ../include/openssl/opensslconf.h 190o_str.o: ../e_os.h ../include/openssl/e_os2.h ../include/openssl/opensslconf.h
205o_str.o: o_str.c o_str.h 191o_str.o: o_str.c o_str.h
206o_time.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h o_time.c 192o_time.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h o_time.c
@@ -209,10 +195,10 @@ tmdiff.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h
209tmdiff.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h 195tmdiff.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
210tmdiff.o: ../include/openssl/err.h ../include/openssl/lhash.h 196tmdiff.o: ../include/openssl/err.h ../include/openssl/lhash.h
211tmdiff.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h 197tmdiff.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
212tmdiff.o: ../include/openssl/safestack.h ../include/openssl/stack.h 198tmdiff.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
213tmdiff.o: ../include/openssl/symhacks.h ../include/openssl/tmdiff.h cryptlib.h 199tmdiff.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
214tmdiff.o: tmdiff.c 200tmdiff.o: ../include/openssl/tmdiff.h cryptlib.h tmdiff.c
215uid.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h 201uid.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
216uid.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h 202uid.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
217uid.o: ../include/openssl/safestack.h ../include/openssl/stack.h 203uid.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
218uid.o: ../include/openssl/symhacks.h uid.c 204uid.o: ../include/openssl/stack.h ../include/openssl/symhacks.h uid.c
diff --git a/src/lib/libcrypto/aes/Makefile b/src/lib/libcrypto/aes/Makefile
index a37c6f66a2..22c7203dbb 100644
--- a/src/lib/libcrypto/aes/Makefile
+++ b/src/lib/libcrypto/aes/Makefile
@@ -8,16 +8,14 @@ CC= cc
8CPP= $(CC) -E 8CPP= $(CC) -E
9INCLUDES= 9INCLUDES=
10CFLAG=-g 10CFLAG=-g
11INSTALL_PREFIX=
12OPENSSLDIR= /usr/local/ssl
13INSTALLTOP= /usr/local/ssl
14MAKEDEPPROG= makedepend
15MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
16MAKEFILE= Makefile 11MAKEFILE= Makefile
17AR= ar r 12AR= ar r
18 13
19# CFLAGS= -mpentiumpro $(INCLUDES) $(CFLAG) -O3 -fexpensive-optimizations -funroll-loops -fforce-addr 14AES_ASM_OBJ=aes_core.o aes_cbc.o
15
20CFLAGS= $(INCLUDES) $(CFLAG) 16CFLAGS= $(INCLUDES) $(CFLAG)
17ASFLAGS= $(INCLUDES) $(ASFLAG)
18AFLAGS= $(ASFLAGS)
21 19
22GENERAL=Makefile 20GENERAL=Makefile
23#TEST=aestest.c 21#TEST=aestest.c
@@ -25,8 +23,10 @@ TEST=
25APPS= 23APPS=
26 24
27LIB=$(TOP)/libcrypto.a 25LIB=$(TOP)/libcrypto.a
28LIBSRC=aes_core.c aes_misc.c aes_ecb.c aes_cbc.c aes_cfb.c aes_ofb.c aes_ctr.c 26LIBSRC=aes_core.c aes_misc.c aes_ecb.c aes_cbc.c aes_cfb.c aes_ofb.c \
29LIBOBJ=aes_core.o aes_misc.o aes_ecb.o aes_cbc.o aes_cfb.o aes_ofb.o aes_ctr.o 27 aes_ctr.c aes_ige.c aes_wrap.c
28LIBOBJ=aes_misc.o aes_ecb.o aes_cfb.o aes_ofb.o aes_ctr.o aes_ige.o aes_wrap.o \
29 $(AES_ASM_OBJ)
30 30
31SRC= $(LIBSRC) 31SRC= $(LIBSRC)
32 32
@@ -47,6 +47,19 @@ lib: $(LIBOBJ)
47 47
48$(LIBOBJ): $(LIBSRC) 48$(LIBOBJ): $(LIBSRC)
49 49
50aes-ia64.s: asm/aes-ia64.S
51 $(CC) $(CFLAGS) -E asm/aes-ia64.S > $@
52
53ax86-elf.s: asm/aes-586.pl ../perlasm/x86asm.pl
54 (cd asm; $(PERL) aes-586.pl elf $(CFLAGS) $(PROCESSOR) > ../$@)
55ax86-cof.s: asm/aes-586.pl ../perlasm/x86asm.pl
56 (cd asm; $(PERL) aes-586.pl coff $(CFLAGS) $(PROCESSOR) > ../$@)
57ax86-out.s: asm/aes-586.pl ../perlasm/x86asm.pl
58 (cd asm; $(PERL) aes-586.pl a.out $(CFLAGS) $(PROCESSOR) > ../$@)
59
60aes-x86_64.s: asm/aes-x86_64.pl
61 $(PERL) asm/aes-x86_64.pl $@
62
50files: 63files:
51 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO 64 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
52 65
@@ -55,9 +68,8 @@ links:
55 @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) 68 @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
56 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 69 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
57 70
58install: installs 71install:
59 72 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
60installs:
61 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 73 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
62 do \ 74 do \
63 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 75 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -73,6 +85,7 @@ lint:
73 lint -DLINT $(INCLUDES) $(SRC)>fluff 85 lint -DLINT $(INCLUDES) $(SRC)>fluff
74 86
75depend: 87depend:
88 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
76 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 89 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
77 90
78dclean: 91dclean:
@@ -80,7 +93,7 @@ dclean:
80 mv -f Makefile.new $(MAKEFILE) 93 mv -f Makefile.new $(MAKEFILE)
81 94
82clean: 95clean:
83 rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff 96 rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
84 97
85# DO NOT DELETE THIS LINE -- make depend depends on it. 98# DO NOT DELETE THIS LINE -- make depend depends on it.
86 99
@@ -90,14 +103,28 @@ aes_cfb.o: ../../e_os.h ../../include/openssl/aes.h
90aes_cfb.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h 103aes_cfb.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
91aes_cfb.o: aes_cfb.c aes_locl.h 104aes_cfb.o: aes_cfb.c aes_locl.h
92aes_core.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h 105aes_core.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h
93aes_core.o: ../../include/openssl/fips.h ../../include/openssl/opensslconf.h 106aes_core.o: ../../include/openssl/opensslconf.h aes_core.c aes_locl.h
94aes_core.o: aes_core.c aes_locl.h
95aes_ctr.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h 107aes_ctr.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h
96aes_ctr.o: ../../include/openssl/opensslconf.h aes_ctr.c aes_locl.h 108aes_ctr.o: ../../include/openssl/opensslconf.h aes_ctr.c aes_locl.h
97aes_ecb.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h 109aes_ecb.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h
98aes_ecb.o: ../../include/openssl/opensslconf.h aes_ecb.c aes_locl.h 110aes_ecb.o: ../../include/openssl/opensslconf.h aes_ecb.c aes_locl.h
111aes_ige.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/bio.h
112aes_ige.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
113aes_ige.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
114aes_ige.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
115aes_ige.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
116aes_ige.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
117aes_ige.o: ../../include/openssl/symhacks.h ../cryptlib.h aes_ige.c aes_locl.h
99aes_misc.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h 118aes_misc.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h
100aes_misc.o: ../../include/openssl/opensslconf.h 119aes_misc.o: ../../include/openssl/opensslconf.h
101aes_misc.o: ../../include/openssl/opensslv.h aes_locl.h aes_misc.c 120aes_misc.o: ../../include/openssl/opensslv.h aes_locl.h aes_misc.c
102aes_ofb.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h 121aes_ofb.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h
103aes_ofb.o: ../../include/openssl/opensslconf.h aes_locl.h aes_ofb.c 122aes_ofb.o: ../../include/openssl/opensslconf.h aes_locl.h aes_ofb.c
123aes_wrap.o: ../../e_os.h ../../include/openssl/aes.h
124aes_wrap.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
125aes_wrap.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
126aes_wrap.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
127aes_wrap.o: ../../include/openssl/opensslconf.h
128aes_wrap.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
129aes_wrap.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
130aes_wrap.o: ../../include/openssl/symhacks.h ../cryptlib.h aes_wrap.c
diff --git a/src/lib/libcrypto/asn1/Makefile b/src/lib/libcrypto/asn1/Makefile
index d1c2d8f490..63066899d0 100644
--- a/src/lib/libcrypto/asn1/Makefile
+++ b/src/lib/libcrypto/asn1/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include 8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -31,8 +26,8 @@ LIBSRC= a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \
31 t_req.c t_x509.c t_x509a.c t_crl.c t_pkey.c t_spki.c t_bitst.c \ 26 t_req.c t_x509.c t_x509a.c t_crl.c t_pkey.c t_spki.c t_bitst.c \
32 tasn_new.c tasn_fre.c tasn_enc.c tasn_dec.c tasn_utl.c tasn_typ.c \ 27 tasn_new.c tasn_fre.c tasn_enc.c tasn_dec.c tasn_utl.c tasn_typ.c \
33 f_int.c f_string.c n_pkey.c \ 28 f_int.c f_string.c n_pkey.c \
34 f_enum.c a_hdr.c x_pkey.c a_bool.c x_exten.c \ 29 f_enum.c a_hdr.c x_pkey.c a_bool.c x_exten.c asn_mime.c \
35 asn1_par.c asn1_lib.c asn1_err.c a_meth.c a_bytes.c a_strnid.c \ 30 asn1_gen.c asn1_par.c asn1_lib.c asn1_err.c a_meth.c a_bytes.c a_strnid.c \
36 evp_asn1.c asn_pack.c p5_pbe.c p5_pbev2.c p8_pkey.c asn_moid.c 31 evp_asn1.c asn_pack.c p5_pbe.c p5_pbev2.c p8_pkey.c asn_moid.c
37LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \ 32LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \
38 a_print.o a_type.o a_set.o a_dup.o a_d2i_fp.o a_i2d_fp.o \ 33 a_print.o a_type.o a_set.o a_dup.o a_d2i_fp.o a_i2d_fp.o \
@@ -43,8 +38,8 @@ LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \
43 t_req.o t_x509.o t_x509a.o t_crl.o t_pkey.o t_spki.o t_bitst.o \ 38 t_req.o t_x509.o t_x509a.o t_crl.o t_pkey.o t_spki.o t_bitst.o \
44 tasn_new.o tasn_fre.o tasn_enc.o tasn_dec.o tasn_utl.o tasn_typ.o \ 39 tasn_new.o tasn_fre.o tasn_enc.o tasn_dec.o tasn_utl.o tasn_typ.o \
45 f_int.o f_string.o n_pkey.o \ 40 f_int.o f_string.o n_pkey.o \
46 f_enum.o a_hdr.o x_pkey.o a_bool.o x_exten.o \ 41 f_enum.o a_hdr.o x_pkey.o a_bool.o x_exten.o asn_mime.o \
47 asn1_par.o asn1_lib.o asn1_err.o a_meth.o a_bytes.o a_strnid.o \ 42 asn1_gen.o asn1_par.o asn1_lib.o asn1_err.o a_meth.o a_bytes.o a_strnid.o \
48 evp_asn1.o asn_pack.o p5_pbe.o p5_pbev2.o p8_pkey.o asn_moid.o 43 evp_asn1.o asn_pack.o p5_pbe.o p5_pbev2.o p8_pkey.o asn_moid.o
49 44
50SRC= $(LIBSRC) 45SRC= $(LIBSRC)
@@ -81,6 +76,7 @@ links:
81 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 76 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
82 77
83install: 78install:
79 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
84 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 80 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
85 do \ 81 do \
86 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 82 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -96,6 +92,7 @@ lint:
96 lint -DLINT $(INCLUDES) $(SRC)>fluff 92 lint -DLINT $(INCLUDES) $(SRC)>fluff
97 93
98depend: 94depend:
95 @[ -n "$(MAKEDEPEND)" ] # should be set by top Makefile...
99 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 96 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
100 97
101dclean: 98dclean:
@@ -109,69 +106,57 @@ clean:
109# DO NOT DELETE THIS LINE -- make depend depends on it. 106# DO NOT DELETE THIS LINE -- make depend depends on it.
110 107
111a_bitstr.o: ../../e_os.h ../../include/openssl/asn1.h 108a_bitstr.o: ../../e_os.h ../../include/openssl/asn1.h
112a_bitstr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 109a_bitstr.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
113a_bitstr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 110a_bitstr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
114a_bitstr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 111a_bitstr.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
115a_bitstr.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 112a_bitstr.o: ../../include/openssl/opensslconf.h
116a_bitstr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 113a_bitstr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
117a_bitstr.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 114a_bitstr.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
118a_bitstr.o: ../../include/openssl/symhacks.h ../cryptlib.h a_bitstr.c 115a_bitstr.o: ../../include/openssl/symhacks.h ../cryptlib.h a_bitstr.c
119a_bool.o: ../../e_os.h ../../include/openssl/asn1.h 116a_bool.o: ../../e_os.h ../../include/openssl/asn1.h
120a_bool.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h 117a_bool.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
121a_bool.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 118a_bool.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
122a_bool.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 119a_bool.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
123a_bool.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 120a_bool.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
124a_bool.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 121a_bool.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
125a_bool.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h 122a_bool.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
126a_bool.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 123a_bool.o: ../../include/openssl/symhacks.h ../cryptlib.h a_bool.c
127a_bool.o: ../cryptlib.h a_bool.c
128a_bytes.o: ../../e_os.h ../../include/openssl/asn1.h 124a_bytes.o: ../../e_os.h ../../include/openssl/asn1.h
129a_bytes.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 125a_bytes.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
130a_bytes.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 126a_bytes.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
131a_bytes.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 127a_bytes.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
132a_bytes.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 128a_bytes.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
133a_bytes.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 129a_bytes.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
134a_bytes.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 130a_bytes.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
135a_bytes.o: ../../include/openssl/symhacks.h ../cryptlib.h a_bytes.c 131a_bytes.o: ../cryptlib.h a_bytes.c
136a_d2i_fp.o: ../../e_os.h ../../include/openssl/asn1.h 132a_d2i_fp.o: ../../e_os.h ../../include/openssl/asn1.h
137a_d2i_fp.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h 133a_d2i_fp.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h
138a_d2i_fp.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 134a_d2i_fp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
139a_d2i_fp.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 135a_d2i_fp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
140a_d2i_fp.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 136a_d2i_fp.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
141a_d2i_fp.o: ../../include/openssl/opensslconf.h
142a_d2i_fp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 137a_d2i_fp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
143a_d2i_fp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 138a_d2i_fp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
144a_d2i_fp.o: ../../include/openssl/symhacks.h ../cryptlib.h a_d2i_fp.c 139a_d2i_fp.o: ../../include/openssl/symhacks.h ../cryptlib.h a_d2i_fp.c
145a_digest.o: ../../e_os.h ../../include/openssl/aes.h 140a_digest.o: ../../e_os.h ../../include/openssl/asn1.h
146a_digest.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 141a_digest.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
147a_digest.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 142a_digest.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
148a_digest.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 143a_digest.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
149a_digest.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 144a_digest.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
150a_digest.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h 145a_digest.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
151a_digest.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
152a_digest.o: ../../include/openssl/err.h ../../include/openssl/evp.h
153a_digest.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
154a_digest.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
155a_digest.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
156a_digest.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 146a_digest.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
157a_digest.o: ../../include/openssl/opensslconf.h 147a_digest.o: ../../include/openssl/opensslconf.h
158a_digest.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 148a_digest.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
159a_digest.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 149a_digest.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
160a_digest.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 150a_digest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
161a_digest.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 151a_digest.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
162a_digest.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 152a_digest.o: ../../include/openssl/x509_vfy.h ../cryptlib.h a_digest.c
163a_digest.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
164a_digest.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
165a_digest.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
166a_digest.o: ../cryptlib.h a_digest.c
167a_dup.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h 153a_dup.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
168a_dup.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 154a_dup.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
169a_dup.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 155a_dup.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
170a_dup.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 156a_dup.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
171a_dup.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 157a_dup.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
172a_dup.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h 158a_dup.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
173a_dup.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 159a_dup.o: ../../include/openssl/symhacks.h ../cryptlib.h a_dup.c
174a_dup.o: ../cryptlib.h a_dup.c
175a_enum.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h 160a_enum.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
176a_enum.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 161a_enum.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
177a_enum.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 162a_enum.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -181,27 +166,26 @@ a_enum.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
181a_enum.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 166a_enum.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
182a_enum.o: ../cryptlib.h a_enum.c 167a_enum.o: ../cryptlib.h a_enum.c
183a_gentm.o: ../../e_os.h ../../include/openssl/asn1.h 168a_gentm.o: ../../e_os.h ../../include/openssl/asn1.h
184a_gentm.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 169a_gentm.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
185a_gentm.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 170a_gentm.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
186a_gentm.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 171a_gentm.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
187a_gentm.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 172a_gentm.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
188a_gentm.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 173a_gentm.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
189a_gentm.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 174a_gentm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
190a_gentm.o: ../../include/openssl/symhacks.h ../cryptlib.h ../o_time.h a_gentm.c 175a_gentm.o: ../cryptlib.h ../o_time.h a_gentm.c
191a_hdr.o: ../../e_os.h ../../include/openssl/asn1.h 176a_hdr.o: ../../e_os.h ../../include/openssl/asn1.h
192a_hdr.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h 177a_hdr.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h
193a_hdr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 178a_hdr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
194a_hdr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 179a_hdr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
195a_hdr.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 180a_hdr.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
196a_hdr.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 181a_hdr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
197a_hdr.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h 182a_hdr.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
198a_hdr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 183a_hdr.o: ../../include/openssl/symhacks.h ../cryptlib.h a_hdr.c
199a_hdr.o: ../cryptlib.h a_hdr.c
200a_i2d_fp.o: ../../e_os.h ../../include/openssl/asn1.h 184a_i2d_fp.o: ../../e_os.h ../../include/openssl/asn1.h
201a_i2d_fp.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 185a_i2d_fp.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
202a_i2d_fp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 186a_i2d_fp.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
203a_i2d_fp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 187a_i2d_fp.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
204a_i2d_fp.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 188a_i2d_fp.o: ../../include/openssl/opensslconf.h
205a_i2d_fp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 189a_i2d_fp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
206a_i2d_fp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 190a_i2d_fp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
207a_i2d_fp.o: ../../include/openssl/symhacks.h ../cryptlib.h a_i2d_fp.c 191a_i2d_fp.o: ../../include/openssl/symhacks.h ../cryptlib.h a_i2d_fp.c
@@ -214,21 +198,20 @@ a_int.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
214a_int.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 198a_int.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
215a_int.o: ../cryptlib.h a_int.c 199a_int.o: ../cryptlib.h a_int.c
216a_mbstr.o: ../../e_os.h ../../include/openssl/asn1.h 200a_mbstr.o: ../../e_os.h ../../include/openssl/asn1.h
217a_mbstr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 201a_mbstr.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
218a_mbstr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 202a_mbstr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
219a_mbstr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 203a_mbstr.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
220a_mbstr.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 204a_mbstr.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
221a_mbstr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 205a_mbstr.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
222a_mbstr.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 206a_mbstr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
223a_mbstr.o: ../../include/openssl/symhacks.h ../cryptlib.h a_mbstr.c 207a_mbstr.o: ../cryptlib.h a_mbstr.c
224a_meth.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h 208a_meth.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
225a_meth.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 209a_meth.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
226a_meth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 210a_meth.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
227a_meth.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 211a_meth.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
228a_meth.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 212a_meth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
229a_meth.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h 213a_meth.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
230a_meth.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 214a_meth.o: ../../include/openssl/symhacks.h ../cryptlib.h a_meth.c
231a_meth.o: ../cryptlib.h a_meth.c
232a_object.o: ../../e_os.h ../../include/openssl/asn1.h 215a_object.o: ../../e_os.h ../../include/openssl/asn1.h
233a_object.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 216a_object.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
234a_object.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 217a_object.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -239,642 +222,492 @@ a_object.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
239a_object.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 222a_object.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
240a_object.o: ../../include/openssl/symhacks.h ../cryptlib.h a_object.c 223a_object.o: ../../include/openssl/symhacks.h ../cryptlib.h a_object.c
241a_octet.o: ../../e_os.h ../../include/openssl/asn1.h 224a_octet.o: ../../e_os.h ../../include/openssl/asn1.h
242a_octet.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 225a_octet.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
243a_octet.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 226a_octet.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
244a_octet.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 227a_octet.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
245a_octet.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 228a_octet.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
246a_octet.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 229a_octet.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
247a_octet.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 230a_octet.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
248a_octet.o: ../../include/openssl/symhacks.h ../cryptlib.h a_octet.c 231a_octet.o: ../cryptlib.h a_octet.c
249a_print.o: ../../e_os.h ../../include/openssl/asn1.h 232a_print.o: ../../e_os.h ../../include/openssl/asn1.h
250a_print.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 233a_print.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
251a_print.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 234a_print.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
252a_print.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 235a_print.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
253a_print.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 236a_print.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
254a_print.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 237a_print.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
255a_print.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 238a_print.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
256a_print.o: ../../include/openssl/symhacks.h ../cryptlib.h a_print.c 239a_print.o: ../cryptlib.h a_print.c
257a_set.o: ../../e_os.h ../../include/openssl/asn1.h 240a_set.o: ../../e_os.h ../../include/openssl/asn1.h
258a_set.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h 241a_set.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h
259a_set.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 242a_set.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
260a_set.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 243a_set.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
261a_set.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 244a_set.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
262a_set.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 245a_set.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
263a_set.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h 246a_set.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
264a_set.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 247a_set.o: ../../include/openssl/symhacks.h ../cryptlib.h a_set.c
265a_set.o: ../cryptlib.h a_set.c 248a_sign.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
266a_sign.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h
267a_sign.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
268a_sign.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 249a_sign.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
269a_sign.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 250a_sign.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
270a_sign.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 251a_sign.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
271a_sign.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 252a_sign.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
272a_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 253a_sign.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
273a_sign.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 254a_sign.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
274a_sign.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 255a_sign.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
275a_sign.o: ../../include/openssl/md4.h ../../include/openssl/md5.h 256a_sign.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
276a_sign.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
277a_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
278a_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
279a_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
280a_sign.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
281a_sign.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
282a_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 257a_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
283a_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 258a_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
284a_sign.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
285a_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 259a_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
286a_sign.o: ../cryptlib.h a_sign.c 260a_sign.o: ../cryptlib.h a_sign.c
287a_strex.o: ../../e_os.h ../../include/openssl/aes.h 261a_strex.o: ../../e_os.h ../../include/openssl/asn1.h
288a_strex.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 262a_strex.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
289a_strex.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 263a_strex.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
290a_strex.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 264a_strex.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
291a_strex.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 265a_strex.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
292a_strex.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h 266a_strex.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
293a_strex.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
294a_strex.o: ../../include/openssl/err.h ../../include/openssl/evp.h
295a_strex.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
296a_strex.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
297a_strex.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
298a_strex.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 267a_strex.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
299a_strex.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 268a_strex.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
300a_strex.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 269a_strex.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
301a_strex.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 270a_strex.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
302a_strex.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 271a_strex.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
303a_strex.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 272a_strex.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
304a_strex.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 273a_strex.o: ../cryptlib.h a_strex.c charmap.h
305a_strex.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
306a_strex.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
307a_strex.o: ../../include/openssl/x509_vfy.h ../cryptlib.h a_strex.c charmap.h
308a_strnid.o: ../../e_os.h ../../include/openssl/asn1.h 274a_strnid.o: ../../e_os.h ../../include/openssl/asn1.h
309a_strnid.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 275a_strnid.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
310a_strnid.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 276a_strnid.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
311a_strnid.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 277a_strnid.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
312a_strnid.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h 278a_strnid.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
313a_strnid.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 279a_strnid.o: ../../include/openssl/opensslconf.h
314a_strnid.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 280a_strnid.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
315a_strnid.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 281a_strnid.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
316a_strnid.o: ../../include/openssl/symhacks.h ../cryptlib.h a_strnid.c 282a_strnid.o: ../../include/openssl/symhacks.h ../cryptlib.h a_strnid.c
317a_time.o: ../../e_os.h ../../include/openssl/asn1.h 283a_time.o: ../../e_os.h ../../include/openssl/asn1.h
318a_time.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h 284a_time.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
319a_time.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 285a_time.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
320a_time.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 286a_time.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
321a_time.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 287a_time.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
322a_time.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 288a_time.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
323a_time.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h 289a_time.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
324a_time.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 290a_time.o: ../../include/openssl/symhacks.h ../cryptlib.h ../o_time.h a_time.c
325a_time.o: ../cryptlib.h ../o_time.h a_time.c
326a_type.o: ../../e_os.h ../../include/openssl/asn1.h 291a_type.o: ../../e_os.h ../../include/openssl/asn1.h
327a_type.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h 292a_type.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
328a_type.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 293a_type.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
329a_type.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 294a_type.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
330a_type.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 295a_type.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
331a_type.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 296a_type.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
332a_type.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h 297a_type.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
333a_type.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 298a_type.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
334a_type.o: ../cryptlib.h a_type.c 299a_type.o: ../../include/openssl/symhacks.h ../cryptlib.h a_type.c
335a_utctm.o: ../../e_os.h ../../include/openssl/asn1.h 300a_utctm.o: ../../e_os.h ../../include/openssl/asn1.h
336a_utctm.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 301a_utctm.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
337a_utctm.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 302a_utctm.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
338a_utctm.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 303a_utctm.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
339a_utctm.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 304a_utctm.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
340a_utctm.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 305a_utctm.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
341a_utctm.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 306a_utctm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
342a_utctm.o: ../../include/openssl/symhacks.h ../cryptlib.h ../o_time.h a_utctm.c 307a_utctm.o: ../cryptlib.h ../o_time.h a_utctm.c
343a_utf8.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h 308a_utf8.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
344a_utf8.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 309a_utf8.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
345a_utf8.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 310a_utf8.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
346a_utf8.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 311a_utf8.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
347a_utf8.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 312a_utf8.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
348a_utf8.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h 313a_utf8.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
349a_utf8.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 314a_utf8.o: ../../include/openssl/symhacks.h ../cryptlib.h a_utf8.c
350a_utf8.o: ../cryptlib.h a_utf8.c 315a_verify.o: ../../e_os.h ../../include/openssl/asn1.h
351a_verify.o: ../../e_os.h ../../include/openssl/aes.h 316a_verify.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
352a_verify.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 317a_verify.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
353a_verify.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 318a_verify.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
354a_verify.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 319a_verify.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
355a_verify.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
356a_verify.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
357a_verify.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
358a_verify.o: ../../include/openssl/err.h ../../include/openssl/evp.h 320a_verify.o: ../../include/openssl/err.h ../../include/openssl/evp.h
359a_verify.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 321a_verify.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
360a_verify.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 322a_verify.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
361a_verify.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
362a_verify.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
363a_verify.o: ../../include/openssl/opensslconf.h
364a_verify.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 323a_verify.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
365a_verify.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 324a_verify.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
366a_verify.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 325a_verify.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
367a_verify.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 326a_verify.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
368a_verify.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 327a_verify.o: ../../include/openssl/x509_vfy.h ../cryptlib.h a_verify.c
369a_verify.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
370a_verify.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
371a_verify.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
372a_verify.o: ../cryptlib.h a_verify.c
373asn1_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 328asn1_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
374asn1_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h 329asn1_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
375asn1_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 330asn1_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
376asn1_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 331asn1_err.o: ../../include/openssl/opensslconf.h
377asn1_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 332asn1_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
378asn1_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 333asn1_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
379asn1_err.o: ../../include/openssl/symhacks.h asn1_err.c 334asn1_err.o: ../../include/openssl/symhacks.h asn1_err.c
335asn1_gen.o: ../../e_os.h ../../include/openssl/asn1.h
336asn1_gen.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
337asn1_gen.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
338asn1_gen.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
339asn1_gen.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
340asn1_gen.o: ../../include/openssl/err.h ../../include/openssl/evp.h
341asn1_gen.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
342asn1_gen.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
343asn1_gen.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
344asn1_gen.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
345asn1_gen.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
346asn1_gen.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
347asn1_gen.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
348asn1_gen.o: ../cryptlib.h asn1_gen.c
380asn1_lib.o: ../../e_os.h ../../include/openssl/asn1.h 349asn1_lib.o: ../../e_os.h ../../include/openssl/asn1.h
381asn1_lib.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h 350asn1_lib.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h
382asn1_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 351asn1_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
383asn1_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 352asn1_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
384asn1_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 353asn1_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
385asn1_lib.o: ../../include/openssl/opensslconf.h
386asn1_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 354asn1_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
387asn1_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 355asn1_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
388asn1_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h asn1_lib.c 356asn1_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h asn1_lib.c
389asn1_par.o: ../../e_os.h ../../include/openssl/asn1.h 357asn1_par.o: ../../e_os.h ../../include/openssl/asn1.h
390asn1_par.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 358asn1_par.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
391asn1_par.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 359asn1_par.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
392asn1_par.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 360asn1_par.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
393asn1_par.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h 361asn1_par.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
394asn1_par.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 362asn1_par.o: ../../include/openssl/opensslconf.h
395asn1_par.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 363asn1_par.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
396asn1_par.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 364asn1_par.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
397asn1_par.o: ../../include/openssl/symhacks.h ../cryptlib.h asn1_par.c 365asn1_par.o: ../../include/openssl/symhacks.h ../cryptlib.h asn1_par.c
398asn_moid.o: ../../e_os.h ../../include/openssl/aes.h 366asn_mime.o: ../../e_os.h ../../include/openssl/asn1.h
399asn_moid.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 367asn_mime.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
400asn_moid.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 368asn_mime.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
401asn_moid.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 369asn_mime.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
370asn_mime.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
371asn_mime.o: ../../include/openssl/err.h ../../include/openssl/evp.h
372asn_mime.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
373asn_mime.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
374asn_mime.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
375asn_mime.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
376asn_mime.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
377asn_mime.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
378asn_mime.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
379asn_mime.o: ../cryptlib.h asn_mime.c
380asn_moid.o: ../../e_os.h ../../include/openssl/asn1.h
381asn_moid.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
402asn_moid.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 382asn_moid.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
403asn_moid.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
404asn_moid.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
405asn_moid.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h 383asn_moid.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
406asn_moid.o: ../../include/openssl/err.h ../../include/openssl/evp.h 384asn_moid.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
407asn_moid.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 385asn_moid.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
408asn_moid.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 386asn_moid.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
409asn_moid.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
410asn_moid.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 387asn_moid.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
411asn_moid.o: ../../include/openssl/opensslconf.h 388asn_moid.o: ../../include/openssl/opensslconf.h
412asn_moid.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 389asn_moid.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
413asn_moid.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 390asn_moid.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
414asn_moid.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 391asn_moid.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
415asn_moid.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 392asn_moid.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
416asn_moid.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 393asn_moid.o: ../../include/openssl/x509_vfy.h ../cryptlib.h asn_moid.c
417asn_moid.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
418asn_moid.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
419asn_moid.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
420asn_moid.o: ../cryptlib.h asn_moid.c
421asn_pack.o: ../../e_os.h ../../include/openssl/asn1.h 394asn_pack.o: ../../e_os.h ../../include/openssl/asn1.h
422asn_pack.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 395asn_pack.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
423asn_pack.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 396asn_pack.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
424asn_pack.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 397asn_pack.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
425asn_pack.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 398asn_pack.o: ../../include/openssl/opensslconf.h
426asn_pack.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 399asn_pack.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
427asn_pack.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 400asn_pack.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
428asn_pack.o: ../../include/openssl/symhacks.h ../cryptlib.h asn_pack.c 401asn_pack.o: ../../include/openssl/symhacks.h ../cryptlib.h asn_pack.c
429d2i_pr.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 402d2i_pr.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
430d2i_pr.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
431d2i_pr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 403d2i_pr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
432d2i_pr.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 404d2i_pr.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h
433d2i_pr.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 405d2i_pr.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
434d2i_pr.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 406d2i_pr.o: ../../include/openssl/err.h ../../include/openssl/evp.h
435d2i_pr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 407d2i_pr.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
436d2i_pr.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
437d2i_pr.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
438d2i_pr.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
439d2i_pr.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
440d2i_pr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 408d2i_pr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
441d2i_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 409d2i_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
442d2i_pr.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
443d2i_pr.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
444d2i_pr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 410d2i_pr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
445d2i_pr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 411d2i_pr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
446d2i_pr.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 412d2i_pr.o: ../cryptlib.h d2i_pr.c
447d2i_pr.o: ../../include/openssl/ui_compat.h ../cryptlib.h d2i_pr.c 413d2i_pu.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
448d2i_pu.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h
449d2i_pu.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
450d2i_pu.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 414d2i_pu.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
451d2i_pu.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 415d2i_pu.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h
452d2i_pu.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 416d2i_pu.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
453d2i_pu.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 417d2i_pu.o: ../../include/openssl/err.h ../../include/openssl/evp.h
454d2i_pu.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 418d2i_pu.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
455d2i_pu.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
456d2i_pu.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
457d2i_pu.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
458d2i_pu.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
459d2i_pu.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 419d2i_pu.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
460d2i_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 420d2i_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
461d2i_pu.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
462d2i_pu.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
463d2i_pu.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 421d2i_pu.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
464d2i_pu.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 422d2i_pu.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
465d2i_pu.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 423d2i_pu.o: ../cryptlib.h d2i_pu.c
466d2i_pu.o: ../../include/openssl/ui_compat.h ../cryptlib.h d2i_pu.c
467evp_asn1.o: ../../e_os.h ../../include/openssl/asn1.h 424evp_asn1.o: ../../e_os.h ../../include/openssl/asn1.h
468evp_asn1.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h 425evp_asn1.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h
469evp_asn1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 426evp_asn1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
470evp_asn1.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 427evp_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
471evp_asn1.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 428evp_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
472evp_asn1.o: ../../include/openssl/opensslconf.h
473evp_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 429evp_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
474evp_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 430evp_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
475evp_asn1.o: ../../include/openssl/symhacks.h ../cryptlib.h evp_asn1.c 431evp_asn1.o: ../../include/openssl/symhacks.h ../cryptlib.h evp_asn1.c
476f_enum.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h 432f_enum.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
477f_enum.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 433f_enum.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
478f_enum.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 434f_enum.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
479f_enum.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 435f_enum.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
480f_enum.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 436f_enum.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
481f_enum.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h 437f_enum.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
482f_enum.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 438f_enum.o: ../../include/openssl/symhacks.h ../cryptlib.h f_enum.c
483f_enum.o: ../cryptlib.h f_enum.c
484f_int.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h 439f_int.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
485f_int.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 440f_int.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
486f_int.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 441f_int.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
487f_int.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 442f_int.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
488f_int.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 443f_int.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
489f_int.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h 444f_int.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
490f_int.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 445f_int.o: ../../include/openssl/symhacks.h ../cryptlib.h f_int.c
491f_int.o: ../cryptlib.h f_int.c
492f_string.o: ../../e_os.h ../../include/openssl/asn1.h 446f_string.o: ../../e_os.h ../../include/openssl/asn1.h
493f_string.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 447f_string.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
494f_string.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 448f_string.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
495f_string.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 449f_string.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
496f_string.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 450f_string.o: ../../include/openssl/opensslconf.h
497f_string.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 451f_string.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
498f_string.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 452f_string.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
499f_string.o: ../../include/openssl/symhacks.h ../cryptlib.h f_string.c 453f_string.o: ../../include/openssl/symhacks.h ../cryptlib.h f_string.c
500i2d_pr.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 454i2d_pr.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
501i2d_pr.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
502i2d_pr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 455i2d_pr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
503i2d_pr.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 456i2d_pr.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h
504i2d_pr.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 457i2d_pr.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
505i2d_pr.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 458i2d_pr.o: ../../include/openssl/err.h ../../include/openssl/evp.h
506i2d_pr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 459i2d_pr.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
507i2d_pr.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
508i2d_pr.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
509i2d_pr.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
510i2d_pr.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
511i2d_pr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 460i2d_pr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
512i2d_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 461i2d_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
513i2d_pr.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
514i2d_pr.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
515i2d_pr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 462i2d_pr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
516i2d_pr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 463i2d_pr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
517i2d_pr.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 464i2d_pr.o: ../cryptlib.h i2d_pr.c
518i2d_pr.o: ../../include/openssl/ui_compat.h ../cryptlib.h i2d_pr.c 465i2d_pu.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
519i2d_pu.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h
520i2d_pu.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
521i2d_pu.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 466i2d_pu.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
522i2d_pu.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 467i2d_pu.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h
523i2d_pu.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 468i2d_pu.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
524i2d_pu.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 469i2d_pu.o: ../../include/openssl/err.h ../../include/openssl/evp.h
525i2d_pu.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 470i2d_pu.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
526i2d_pu.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
527i2d_pu.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
528i2d_pu.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
529i2d_pu.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
530i2d_pu.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 471i2d_pu.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
531i2d_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 472i2d_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
532i2d_pu.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
533i2d_pu.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
534i2d_pu.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 473i2d_pu.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
535i2d_pu.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 474i2d_pu.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
536i2d_pu.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 475i2d_pu.o: ../cryptlib.h i2d_pu.c
537i2d_pu.o: ../../include/openssl/ui_compat.h ../cryptlib.h i2d_pu.c 476n_pkey.o: ../../e_os.h ../../include/openssl/asn1.h
538n_pkey.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h
539n_pkey.o: ../../include/openssl/asn1_mac.h ../../include/openssl/asn1t.h 477n_pkey.o: ../../include/openssl/asn1_mac.h ../../include/openssl/asn1t.h
540n_pkey.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 478n_pkey.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
541n_pkey.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 479n_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
542n_pkey.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 480n_pkey.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
543n_pkey.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 481n_pkey.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
544n_pkey.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 482n_pkey.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
545n_pkey.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 483n_pkey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
546n_pkey.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 484n_pkey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
547n_pkey.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 485n_pkey.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
548n_pkey.o: ../../include/openssl/md4.h ../../include/openssl/md5.h 486n_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
549n_pkey.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h 487n_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
550n_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 488n_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
551n_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 489n_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h n_pkey.c
552n_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 490nsseq.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
553n_pkey.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 491nsseq.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
554n_pkey.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 492nsseq.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
555n_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 493nsseq.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
556n_pkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 494nsseq.o: ../../include/openssl/ecdsa.h ../../include/openssl/evp.h
557n_pkey.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 495nsseq.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
558n_pkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
559n_pkey.o: ../cryptlib.h n_pkey.c
560nsseq.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
561nsseq.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
562nsseq.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
563nsseq.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
564nsseq.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
565nsseq.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
566nsseq.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
567nsseq.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
568nsseq.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
569nsseq.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
570nsseq.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
571nsseq.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 496nsseq.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
572nsseq.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 497nsseq.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
573nsseq.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 498nsseq.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
574nsseq.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 499nsseq.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
575nsseq.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 500nsseq.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
576nsseq.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 501nsseq.o: ../../include/openssl/x509_vfy.h nsseq.c
577nsseq.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 502p5_pbe.o: ../../e_os.h ../../include/openssl/asn1.h
578nsseq.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
579nsseq.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h nsseq.c
580p5_pbe.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h
581p5_pbe.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h 503p5_pbe.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
582p5_pbe.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 504p5_pbe.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
583p5_pbe.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 505p5_pbe.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
584p5_pbe.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 506p5_pbe.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
585p5_pbe.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
586p5_pbe.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
587p5_pbe.o: ../../include/openssl/err.h ../../include/openssl/evp.h 507p5_pbe.o: ../../include/openssl/err.h ../../include/openssl/evp.h
588p5_pbe.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 508p5_pbe.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
589p5_pbe.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 509p5_pbe.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
590p5_pbe.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h 510p5_pbe.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
591p5_pbe.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 511p5_pbe.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
592p5_pbe.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
593p5_pbe.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
594p5_pbe.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
595p5_pbe.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
596p5_pbe.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
597p5_pbe.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 512p5_pbe.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
598p5_pbe.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 513p5_pbe.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
599p5_pbe.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
600p5_pbe.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 514p5_pbe.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
601p5_pbe.o: ../cryptlib.h p5_pbe.c 515p5_pbe.o: ../cryptlib.h p5_pbe.c
602p5_pbev2.o: ../../e_os.h ../../include/openssl/aes.h 516p5_pbev2.o: ../../e_os.h ../../include/openssl/asn1.h
603p5_pbev2.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h 517p5_pbev2.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
604p5_pbev2.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 518p5_pbev2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
605p5_pbev2.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 519p5_pbev2.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
606p5_pbev2.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 520p5_pbev2.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
607p5_pbev2.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 521p5_pbev2.o: ../../include/openssl/err.h ../../include/openssl/evp.h
608p5_pbev2.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 522p5_pbev2.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
609p5_pbev2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
610p5_pbev2.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
611p5_pbev2.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
612p5_pbev2.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
613p5_pbev2.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
614p5_pbev2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 523p5_pbev2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
615p5_pbev2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 524p5_pbev2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
616p5_pbev2.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h 525p5_pbev2.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
617p5_pbev2.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 526p5_pbev2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
618p5_pbev2.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 527p5_pbev2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
619p5_pbev2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 528p5_pbev2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
620p5_pbev2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 529p5_pbev2.o: ../cryptlib.h p5_pbev2.c
621p5_pbev2.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 530p8_pkey.o: ../../e_os.h ../../include/openssl/asn1.h
622p5_pbev2.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 531p8_pkey.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
623p5_pbev2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p5_pbev2.c 532p8_pkey.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
624p8_pkey.o: ../../e_os.h ../../include/openssl/aes.h 533p8_pkey.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
625p8_pkey.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h 534p8_pkey.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
626p8_pkey.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 535p8_pkey.o: ../../include/openssl/err.h ../../include/openssl/evp.h
627p8_pkey.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 536p8_pkey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
628p8_pkey.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
629p8_pkey.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
630p8_pkey.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
631p8_pkey.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
632p8_pkey.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
633p8_pkey.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
634p8_pkey.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
635p8_pkey.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
636p8_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 537p8_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
637p8_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 538p8_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
638p8_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 539p8_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
639p8_pkey.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 540p8_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
640p8_pkey.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 541p8_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
641p8_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 542p8_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p8_pkey.c
642p8_pkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 543t_bitst.o: ../../e_os.h ../../include/openssl/asn1.h
643p8_pkey.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 544t_bitst.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
644p8_pkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
645p8_pkey.o: ../cryptlib.h p8_pkey.c
646t_bitst.o: ../../e_os.h ../../include/openssl/aes.h
647t_bitst.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
648t_bitst.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
649t_bitst.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
650t_bitst.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 545t_bitst.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
651t_bitst.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 546t_bitst.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
652t_bitst.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 547t_bitst.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
653t_bitst.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 548t_bitst.o: ../../include/openssl/err.h ../../include/openssl/evp.h
654t_bitst.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 549t_bitst.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
655t_bitst.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
656t_bitst.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
657t_bitst.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
658t_bitst.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 550t_bitst.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
659t_bitst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 551t_bitst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
660t_bitst.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 552t_bitst.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
661t_bitst.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 553t_bitst.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
662t_bitst.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 554t_bitst.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
663t_bitst.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 555t_bitst.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
664t_bitst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 556t_bitst.o: ../cryptlib.h t_bitst.c
665t_bitst.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 557t_crl.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
666t_bitst.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
667t_bitst.o: ../../include/openssl/x509v3.h ../cryptlib.h t_bitst.c
668t_crl.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h
669t_crl.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
670t_crl.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 558t_crl.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
671t_crl.o: ../../include/openssl/cast.h ../../include/openssl/conf.h 559t_crl.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
672t_crl.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 560t_crl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
673t_crl.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h 561t_crl.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
674t_crl.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
675t_crl.o: ../../include/openssl/err.h ../../include/openssl/evp.h 562t_crl.o: ../../include/openssl/err.h ../../include/openssl/evp.h
676t_crl.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 563t_crl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
677t_crl.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 564t_crl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
678t_crl.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h 565t_crl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
679t_crl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 566t_crl.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
680t_crl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
681t_crl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
682t_crl.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
683t_crl.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
684t_crl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
685t_crl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 567t_crl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
686t_crl.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 568t_crl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
687t_crl.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
688t_crl.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h 569t_crl.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
689t_crl.o: ../cryptlib.h t_crl.c 570t_crl.o: ../cryptlib.h t_crl.c
690t_pkey.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h 571t_pkey.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
691t_pkey.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 572t_pkey.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
692t_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h 573t_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
693t_pkey.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h 574t_pkey.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
694t_pkey.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 575t_pkey.o: ../../include/openssl/ec.h ../../include/openssl/err.h
695t_pkey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 576t_pkey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
696t_pkey.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rsa.h 577t_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
697t_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 578t_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
698t_pkey.o: ../../include/openssl/symhacks.h ../cryptlib.h t_pkey.c 579t_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
699t_req.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 580t_pkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
700t_req.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 581t_pkey.o: ../cryptlib.h t_pkey.c
582t_req.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
701t_req.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 583t_req.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
702t_req.o: ../../include/openssl/cast.h ../../include/openssl/conf.h 584t_req.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
703t_req.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
704t_req.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
705t_req.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h 585t_req.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
706t_req.o: ../../include/openssl/err.h ../../include/openssl/evp.h 586t_req.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
707t_req.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 587t_req.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
708t_req.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 588t_req.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
709t_req.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
710t_req.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 589t_req.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
711t_req.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 590t_req.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
712t_req.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 591t_req.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
713t_req.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
714t_req.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
715t_req.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 592t_req.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
716t_req.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 593t_req.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
717t_req.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 594t_req.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
718t_req.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
719t_req.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h 595t_req.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
720t_req.o: ../cryptlib.h t_req.c 596t_req.o: ../cryptlib.h t_req.c
721t_spki.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 597t_spki.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
722t_spki.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
723t_spki.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 598t_spki.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
724t_spki.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 599t_spki.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h
725t_spki.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 600t_spki.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
726t_spki.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 601t_spki.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
727t_spki.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 602t_spki.o: ../../include/openssl/err.h ../../include/openssl/evp.h
728t_spki.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 603t_spki.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
729t_spki.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
730t_spki.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
731t_spki.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
732t_spki.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 604t_spki.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
733t_spki.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 605t_spki.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
734t_spki.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 606t_spki.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
735t_spki.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
736t_spki.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
737t_spki.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 607t_spki.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
738t_spki.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 608t_spki.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
739t_spki.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
740t_spki.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 609t_spki.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
741t_spki.o: ../cryptlib.h t_spki.c 610t_spki.o: ../cryptlib.h t_spki.c
742t_x509.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 611t_x509.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
743t_x509.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
744t_x509.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 612t_x509.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
745t_x509.o: ../../include/openssl/cast.h ../../include/openssl/conf.h 613t_x509.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
746t_x509.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
747t_x509.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
748t_x509.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h 614t_x509.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
749t_x509.o: ../../include/openssl/err.h ../../include/openssl/evp.h 615t_x509.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
750t_x509.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 616t_x509.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
751t_x509.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 617t_x509.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
752t_x509.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
753t_x509.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 618t_x509.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
754t_x509.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 619t_x509.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
755t_x509.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 620t_x509.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
756t_x509.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
757t_x509.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
758t_x509.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 621t_x509.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
759t_x509.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 622t_x509.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
760t_x509.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 623t_x509.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
761t_x509.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
762t_x509.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h 624t_x509.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
763t_x509.o: ../cryptlib.h t_x509.c 625t_x509.o: ../cryptlib.h t_x509.c
764t_x509a.o: ../../e_os.h ../../include/openssl/aes.h 626t_x509a.o: ../../e_os.h ../../include/openssl/asn1.h
765t_x509a.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 627t_x509a.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
766t_x509a.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 628t_x509a.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
767t_x509a.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 629t_x509a.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
768t_x509a.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 630t_x509a.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
769t_x509a.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h 631t_x509a.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
770t_x509a.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
771t_x509a.o: ../../include/openssl/err.h ../../include/openssl/evp.h
772t_x509a.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
773t_x509a.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
774t_x509a.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
775t_x509a.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 632t_x509a.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
776t_x509a.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 633t_x509a.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
777t_x509a.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 634t_x509a.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
778t_x509a.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 635t_x509a.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
779t_x509a.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 636t_x509a.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
780t_x509a.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 637t_x509a.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
781t_x509a.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 638t_x509a.o: ../cryptlib.h t_x509a.c
782t_x509a.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
783t_x509a.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
784t_x509a.o: ../../include/openssl/x509_vfy.h ../cryptlib.h t_x509a.c
785tasn_dec.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h 639tasn_dec.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
786tasn_dec.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 640tasn_dec.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
787tasn_dec.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 641tasn_dec.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
788tasn_dec.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 642tasn_dec.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
789tasn_dec.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h 643tasn_dec.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
790tasn_dec.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 644tasn_dec.o: ../../include/openssl/opensslconf.h
791tasn_dec.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 645tasn_dec.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
792tasn_dec.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 646tasn_dec.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
793tasn_dec.o: ../../include/openssl/symhacks.h tasn_dec.c 647tasn_dec.o: ../../include/openssl/symhacks.h tasn_dec.c
794tasn_enc.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h 648tasn_enc.o: ../../e_os.h ../../include/openssl/asn1.h
795tasn_enc.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 649tasn_enc.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
796tasn_enc.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 650tasn_enc.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
797tasn_enc.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 651tasn_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
798tasn_enc.o: ../../include/openssl/opensslconf.h 652tasn_enc.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
653tasn_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
799tasn_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 654tasn_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
800tasn_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 655tasn_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
801tasn_enc.o: ../../include/openssl/symhacks.h tasn_enc.c 656tasn_enc.o: ../../include/openssl/symhacks.h ../cryptlib.h tasn_enc.c
802tasn_fre.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h 657tasn_fre.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
803tasn_fre.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 658tasn_fre.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
804tasn_fre.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 659tasn_fre.o: ../../include/openssl/e_os2.h ../../include/openssl/obj_mac.h
805tasn_fre.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 660tasn_fre.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
806tasn_fre.o: ../../include/openssl/opensslconf.h
807tasn_fre.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 661tasn_fre.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
808tasn_fre.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 662tasn_fre.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
809tasn_fre.o: ../../include/openssl/symhacks.h tasn_fre.c 663tasn_fre.o: ../../include/openssl/symhacks.h tasn_fre.c
810tasn_new.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h 664tasn_new.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
811tasn_new.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 665tasn_new.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
812tasn_new.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 666tasn_new.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
813tasn_new.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 667tasn_new.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
814tasn_new.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 668tasn_new.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
815tasn_new.o: ../../include/openssl/opensslconf.h
816tasn_new.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 669tasn_new.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
817tasn_new.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 670tasn_new.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
818tasn_new.o: ../../include/openssl/symhacks.h tasn_new.c 671tasn_new.o: ../../include/openssl/symhacks.h tasn_new.c
819tasn_typ.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h 672tasn_typ.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
820tasn_typ.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 673tasn_typ.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
821tasn_typ.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 674tasn_typ.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
822tasn_typ.o: ../../include/openssl/opensslconf.h
823tasn_typ.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 675tasn_typ.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
824tasn_typ.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 676tasn_typ.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
825tasn_typ.o: ../../include/openssl/symhacks.h tasn_typ.c 677tasn_typ.o: ../../include/openssl/symhacks.h tasn_typ.c
826tasn_utl.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h 678tasn_utl.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
827tasn_utl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 679tasn_utl.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
828tasn_utl.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 680tasn_utl.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
829tasn_utl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 681tasn_utl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
830tasn_utl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 682tasn_utl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
831tasn_utl.o: ../../include/openssl/opensslconf.h
832tasn_utl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 683tasn_utl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
833tasn_utl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 684tasn_utl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
834tasn_utl.o: ../../include/openssl/symhacks.h tasn_utl.c 685tasn_utl.o: ../../include/openssl/symhacks.h tasn_utl.c
835x_algor.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h 686x_algor.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
836x_algor.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h 687x_algor.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
837x_algor.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 688x_algor.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
838x_algor.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 689x_algor.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
839x_algor.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 690x_algor.o: ../../include/openssl/ecdsa.h ../../include/openssl/evp.h
840x_algor.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h 691x_algor.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
841x_algor.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
842x_algor.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
843x_algor.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
844x_algor.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
845x_algor.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
846x_algor.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 692x_algor.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
847x_algor.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 693x_algor.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
848x_algor.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 694x_algor.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
849x_algor.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 695x_algor.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
850x_algor.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 696x_algor.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
851x_algor.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 697x_algor.o: ../../include/openssl/x509_vfy.h x_algor.c
852x_algor.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 698x_attrib.o: ../../e_os.h ../../include/openssl/asn1.h
853x_algor.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 699x_attrib.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
854x_algor.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 700x_attrib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
855x_algor.o: x_algor.c 701x_attrib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
856x_attrib.o: ../../e_os.h ../../include/openssl/aes.h 702x_attrib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
857x_attrib.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h 703x_attrib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
858x_attrib.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 704x_attrib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
859x_attrib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
860x_attrib.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
861x_attrib.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
862x_attrib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
863x_attrib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
864x_attrib.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
865x_attrib.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
866x_attrib.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
867x_attrib.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
868x_attrib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 705x_attrib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
869x_attrib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 706x_attrib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
870x_attrib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 707x_attrib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
871x_attrib.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 708x_attrib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
872x_attrib.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 709x_attrib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
873x_attrib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 710x_attrib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_attrib.c
874x_attrib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
875x_attrib.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
876x_attrib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
877x_attrib.o: ../cryptlib.h x_attrib.c
878x_bignum.o: ../../e_os.h ../../include/openssl/asn1.h 711x_bignum.o: ../../e_os.h ../../include/openssl/asn1.h
879x_bignum.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h 712x_bignum.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
880x_bignum.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 713x_bignum.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -884,69 +717,43 @@ x_bignum.o: ../../include/openssl/opensslconf.h
884x_bignum.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 717x_bignum.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
885x_bignum.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 718x_bignum.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
886x_bignum.o: ../../include/openssl/symhacks.h ../cryptlib.h x_bignum.c 719x_bignum.o: ../../include/openssl/symhacks.h ../cryptlib.h x_bignum.c
887x_crl.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 720x_crl.o: ../../e_os.h ../../include/openssl/asn1.h
888x_crl.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h 721x_crl.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
889x_crl.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 722x_crl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
890x_crl.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 723x_crl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
891x_crl.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 724x_crl.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
892x_crl.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
893x_crl.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
894x_crl.o: ../../include/openssl/err.h ../../include/openssl/evp.h 725x_crl.o: ../../include/openssl/err.h ../../include/openssl/evp.h
895x_crl.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 726x_crl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
896x_crl.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 727x_crl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
897x_crl.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h 728x_crl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
898x_crl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 729x_crl.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
899x_crl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
900x_crl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
901x_crl.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
902x_crl.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
903x_crl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
904x_crl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 730x_crl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
905x_crl.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 731x_crl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
906x_crl.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
907x_crl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_crl.c 732x_crl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_crl.c
908x_exten.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h 733x_exten.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
909x_exten.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h 734x_exten.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
910x_exten.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 735x_exten.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
911x_exten.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 736x_exten.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
912x_exten.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 737x_exten.o: ../../include/openssl/ecdsa.h ../../include/openssl/evp.h
913x_exten.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h 738x_exten.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
914x_exten.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
915x_exten.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
916x_exten.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
917x_exten.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
918x_exten.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
919x_exten.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 739x_exten.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
920x_exten.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 740x_exten.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
921x_exten.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 741x_exten.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
922x_exten.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 742x_exten.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
923x_exten.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 743x_exten.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
924x_exten.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 744x_exten.o: ../../include/openssl/x509_vfy.h x_exten.c
925x_exten.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 745x_info.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
926x_exten.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 746x_info.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
927x_exten.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 747x_info.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
928x_exten.o: x_exten.c 748x_info.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
929x_info.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 749x_info.o: ../../include/openssl/err.h ../../include/openssl/evp.h
930x_info.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 750x_info.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
931x_info.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
932x_info.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
933x_info.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
934x_info.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
935x_info.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
936x_info.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
937x_info.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
938x_info.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
939x_info.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
940x_info.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 751x_info.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
941x_info.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 752x_info.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
942x_info.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 753x_info.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
943x_info.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 754x_info.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
944x_info.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 755x_info.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
945x_info.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 756x_info.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_info.c
946x_info.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
947x_info.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
948x_info.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
949x_info.o: ../cryptlib.h x_info.c
950x_long.o: ../../e_os.h ../../include/openssl/asn1.h 757x_long.o: ../../e_os.h ../../include/openssl/asn1.h
951x_long.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h 758x_long.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
952x_long.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 759x_long.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -956,195 +763,123 @@ x_long.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
956x_long.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h 763x_long.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
957x_long.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 764x_long.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
958x_long.o: ../cryptlib.h x_long.c 765x_long.o: ../cryptlib.h x_long.c
959x_name.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 766x_name.o: ../../e_os.h ../../include/openssl/asn1.h
960x_name.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h 767x_name.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
961x_name.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 768x_name.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
962x_name.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 769x_name.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
963x_name.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 770x_name.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
964x_name.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
965x_name.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
966x_name.o: ../../include/openssl/err.h ../../include/openssl/evp.h 771x_name.o: ../../include/openssl/err.h ../../include/openssl/evp.h
967x_name.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 772x_name.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
968x_name.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 773x_name.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
969x_name.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h 774x_name.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
970x_name.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 775x_name.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
971x_name.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
972x_name.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
973x_name.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
974x_name.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
975x_name.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
976x_name.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 776x_name.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
977x_name.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 777x_name.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
978x_name.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
979x_name.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_name.c 778x_name.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_name.c
980x_pkey.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 779x_pkey.o: ../../e_os.h ../../include/openssl/asn1.h
981x_pkey.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h 780x_pkey.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h
982x_pkey.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 781x_pkey.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
983x_pkey.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 782x_pkey.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
984x_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 783x_pkey.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
985x_pkey.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
986x_pkey.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
987x_pkey.o: ../../include/openssl/err.h ../../include/openssl/evp.h 784x_pkey.o: ../../include/openssl/err.h ../../include/openssl/evp.h
988x_pkey.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 785x_pkey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
989x_pkey.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 786x_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
990x_pkey.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h 787x_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
991x_pkey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 788x_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
992x_pkey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
993x_pkey.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
994x_pkey.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
995x_pkey.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
996x_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
997x_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 789x_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
998x_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 790x_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
999x_pkey.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
1000x_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_pkey.c 791x_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_pkey.c
1001x_pubkey.o: ../../e_os.h ../../include/openssl/aes.h 792x_pubkey.o: ../../e_os.h ../../include/openssl/asn1.h
1002x_pubkey.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h 793x_pubkey.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
1003x_pubkey.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 794x_pubkey.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
1004x_pubkey.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 795x_pubkey.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
1005x_pubkey.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 796x_pubkey.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
1006x_pubkey.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 797x_pubkey.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
1007x_pubkey.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 798x_pubkey.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
1008x_pubkey.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 799x_pubkey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
1009x_pubkey.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 800x_pubkey.o: ../../include/openssl/opensslconf.h
1010x_pubkey.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
1011x_pubkey.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
1012x_pubkey.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
1013x_pubkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
1014x_pubkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 801x_pubkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
1015x_pubkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 802x_pubkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
1016x_pubkey.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
1017x_pubkey.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
1018x_pubkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 803x_pubkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
1019x_pubkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 804x_pubkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
1020x_pubkey.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
1021x_pubkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 805x_pubkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
1022x_pubkey.o: ../cryptlib.h x_pubkey.c 806x_pubkey.o: ../cryptlib.h x_pubkey.c
1023x_req.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 807x_req.o: ../../e_os.h ../../include/openssl/asn1.h
1024x_req.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h 808x_req.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
1025x_req.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 809x_req.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
1026x_req.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 810x_req.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
1027x_req.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 811x_req.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
1028x_req.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
1029x_req.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
1030x_req.o: ../../include/openssl/err.h ../../include/openssl/evp.h 812x_req.o: ../../include/openssl/err.h ../../include/openssl/evp.h
1031x_req.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 813x_req.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
1032x_req.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 814x_req.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
1033x_req.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h 815x_req.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
1034x_req.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 816x_req.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
1035x_req.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
1036x_req.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
1037x_req.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
1038x_req.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
1039x_req.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
1040x_req.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 817x_req.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
1041x_req.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 818x_req.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
1042x_req.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
1043x_req.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_req.c 819x_req.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_req.c
1044x_sig.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 820x_sig.o: ../../e_os.h ../../include/openssl/asn1.h
1045x_sig.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h 821x_sig.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
1046x_sig.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 822x_sig.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
1047x_sig.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 823x_sig.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
1048x_sig.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 824x_sig.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
1049x_sig.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
1050x_sig.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
1051x_sig.o: ../../include/openssl/err.h ../../include/openssl/evp.h 825x_sig.o: ../../include/openssl/err.h ../../include/openssl/evp.h
1052x_sig.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 826x_sig.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
1053x_sig.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 827x_sig.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
1054x_sig.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h 828x_sig.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
1055x_sig.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 829x_sig.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
1056x_sig.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
1057x_sig.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
1058x_sig.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
1059x_sig.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
1060x_sig.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
1061x_sig.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 830x_sig.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
1062x_sig.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 831x_sig.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
1063x_sig.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
1064x_sig.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_sig.c 832x_sig.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_sig.c
1065x_spki.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 833x_spki.o: ../../e_os.h ../../include/openssl/asn1.h
1066x_spki.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h 834x_spki.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
1067x_spki.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 835x_spki.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
1068x_spki.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 836x_spki.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
1069x_spki.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 837x_spki.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
1070x_spki.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
1071x_spki.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
1072x_spki.o: ../../include/openssl/err.h ../../include/openssl/evp.h 838x_spki.o: ../../include/openssl/err.h ../../include/openssl/evp.h
1073x_spki.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 839x_spki.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
1074x_spki.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 840x_spki.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
1075x_spki.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h 841x_spki.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
1076x_spki.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 842x_spki.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
1077x_spki.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
1078x_spki.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
1079x_spki.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
1080x_spki.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
1081x_spki.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
1082x_spki.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 843x_spki.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
1083x_spki.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 844x_spki.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
1084x_spki.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
1085x_spki.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_spki.c 845x_spki.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_spki.c
1086x_val.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 846x_val.o: ../../e_os.h ../../include/openssl/asn1.h
1087x_val.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h 847x_val.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
1088x_val.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 848x_val.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
1089x_val.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 849x_val.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
1090x_val.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 850x_val.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
1091x_val.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
1092x_val.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
1093x_val.o: ../../include/openssl/err.h ../../include/openssl/evp.h 851x_val.o: ../../include/openssl/err.h ../../include/openssl/evp.h
1094x_val.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 852x_val.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
1095x_val.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 853x_val.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
1096x_val.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h 854x_val.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
1097x_val.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 855x_val.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
1098x_val.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
1099x_val.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
1100x_val.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
1101x_val.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
1102x_val.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
1103x_val.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 856x_val.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
1104x_val.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 857x_val.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
1105x_val.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
1106x_val.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_val.c 858x_val.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_val.c
1107x_x509.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 859x_x509.o: ../../e_os.h ../../include/openssl/asn1.h
1108x_x509.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h 860x_x509.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
1109x_x509.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 861x_x509.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
1110x_x509.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 862x_x509.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
1111x_x509.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 863x_x509.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
1112x_x509.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 864x_x509.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
1113x_x509.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 865x_x509.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
1114x_x509.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 866x_x509.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
1115x_x509.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 867x_x509.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
1116x_x509.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 868x_x509.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
1117x_x509.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
1118x_x509.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
1119x_x509.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
1120x_x509.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
1121x_x509.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
1122x_x509.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
1123x_x509.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
1124x_x509.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 869x_x509.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
1125x_x509.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 870x_x509.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
1126x_x509.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
1127x_x509.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 871x_x509.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
1128x_x509.o: ../../include/openssl/x509v3.h ../cryptlib.h x_x509.c 872x_x509.o: ../../include/openssl/x509v3.h ../cryptlib.h x_x509.c
1129x_x509a.o: ../../e_os.h ../../include/openssl/aes.h 873x_x509a.o: ../../e_os.h ../../include/openssl/asn1.h
1130x_x509a.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h 874x_x509a.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
1131x_x509a.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 875x_x509a.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
1132x_x509a.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 876x_x509a.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
1133x_x509a.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 877x_x509a.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
1134x_x509a.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 878x_x509a.o: ../../include/openssl/err.h ../../include/openssl/evp.h
1135x_x509a.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 879x_x509a.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
1136x_x509a.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
1137x_x509a.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
1138x_x509a.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
1139x_x509a.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
1140x_x509a.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
1141x_x509a.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 880x_x509a.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
1142x_x509a.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 881x_x509a.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
1143x_x509a.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 882x_x509a.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
1144x_x509a.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 883x_x509a.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
1145x_x509a.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 884x_x509a.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
1146x_x509a.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 885x_x509a.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_x509a.c
1147x_x509a.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
1148x_x509a.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
1149x_x509a.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
1150x_x509a.o: ../cryptlib.h x_x509a.c
diff --git a/src/lib/libcrypto/asn1/a_gentm.c b/src/lib/libcrypto/asn1/a_gentm.c
index 0dfd576211..def79062a5 100644
--- a/src/lib/libcrypto/asn1/a_gentm.c
+++ b/src/lib/libcrypto/asn1/a_gentm.c
@@ -181,7 +181,7 @@ err:
181 return(0); 181 return(0);
182 } 182 }
183 183
184int ASN1_GENERALIZEDTIME_set_string(ASN1_GENERALIZEDTIME *s, char *str) 184int ASN1_GENERALIZEDTIME_set_string(ASN1_GENERALIZEDTIME *s, const char *str)
185 { 185 {
186 ASN1_GENERALIZEDTIME t; 186 ASN1_GENERALIZEDTIME t;
187 187
diff --git a/src/lib/libcrypto/asn1/a_hdr.c b/src/lib/libcrypto/asn1/a_hdr.c
index b1aad81f77..d1c2a7b9e3 100644
--- a/src/lib/libcrypto/asn1/a_hdr.c
+++ b/src/lib/libcrypto/asn1/a_hdr.c
@@ -76,17 +76,17 @@ int i2d_ASN1_HEADER(ASN1_HEADER *a, unsigned char **pp)
76 M_ASN1_I2D_finish(); 76 M_ASN1_I2D_finish();
77 } 77 }
78 78
79ASN1_HEADER *d2i_ASN1_HEADER(ASN1_HEADER **a, unsigned char **pp, 79ASN1_HEADER *d2i_ASN1_HEADER(ASN1_HEADER **a, const unsigned char **pp,
80 long length) 80 long length)
81 { 81 {
82 M_ASN1_D2I_vars(a,ASN1_HEADER *,ASN1_HEADER_new); 82 M_ASN1_D2I_vars(a,ASN1_HEADER *,ASN1_HEADER_new);
83 83
84 M_ASN1_D2I_Init(); 84 M_ASN1_D2I_Init();
85 M_ASN1_D2I_start_sequence(); 85 M_ASN1_D2I_start_sequence();
86 M_ASN1_D2I_get(ret->header,d2i_ASN1_OCTET_STRING); 86 M_ASN1_D2I_get_x(ASN1_OCTET_STRING,ret->header,d2i_ASN1_OCTET_STRING);
87 if (ret->meth != NULL) 87 if (ret->meth != NULL)
88 { 88 {
89 M_ASN1_D2I_get(ret->data,ret->meth->d2i); 89 M_ASN1_D2I_get_x(void,ret->data,ret->meth->d2i);
90 } 90 }
91 else 91 else
92 { 92 {
diff --git a/src/lib/libcrypto/asn1/a_meth.c b/src/lib/libcrypto/asn1/a_meth.c
index 63158e9cab..50bea917e3 100644
--- a/src/lib/libcrypto/asn1/a_meth.c
+++ b/src/lib/libcrypto/asn1/a_meth.c
@@ -62,16 +62,16 @@
62#include <openssl/asn1.h> 62#include <openssl/asn1.h>
63 63
64static ASN1_METHOD ia5string_meth={ 64static ASN1_METHOD ia5string_meth={
65 (int (*)()) i2d_ASN1_IA5STRING, 65 (I2D_OF(void)) i2d_ASN1_IA5STRING,
66 (char *(*)()) d2i_ASN1_IA5STRING, 66 (D2I_OF(void)) d2i_ASN1_IA5STRING,
67 (char *(*)()) ASN1_STRING_new, 67 (void *(*)(void))ASN1_STRING_new,
68 (void (*)()) ASN1_STRING_free}; 68 (void (*)(void *))ASN1_STRING_free};
69 69
70static ASN1_METHOD bit_string_meth={ 70static ASN1_METHOD bit_string_meth={
71 (int (*)()) i2d_ASN1_BIT_STRING, 71 (I2D_OF(void)) i2d_ASN1_BIT_STRING,
72 (char *(*)()) d2i_ASN1_BIT_STRING, 72 (D2I_OF(void)) d2i_ASN1_BIT_STRING,
73 (char *(*)()) ASN1_STRING_new, 73 (void *(*)(void))ASN1_STRING_new,
74 (void (*)()) ASN1_STRING_free}; 74 (void (*)(void *))ASN1_STRING_free};
75 75
76ASN1_METHOD *ASN1_IA5STRING_asn1_meth(void) 76ASN1_METHOD *ASN1_IA5STRING_asn1_meth(void)
77 { 77 {
diff --git a/src/lib/libcrypto/asn1/a_utctm.c b/src/lib/libcrypto/asn1/a_utctm.c
index 7b25fed331..d31c028193 100644
--- a/src/lib/libcrypto/asn1/a_utctm.c
+++ b/src/lib/libcrypto/asn1/a_utctm.c
@@ -162,7 +162,7 @@ err:
162 return(0); 162 return(0);
163 } 163 }
164 164
165int ASN1_UTCTIME_set_string(ASN1_UTCTIME *s, char *str) 165int ASN1_UTCTIME_set_string(ASN1_UTCTIME *s, const char *str)
166 { 166 {
167 ASN1_UTCTIME t; 167 ASN1_UTCTIME t;
168 168
diff --git a/src/lib/libcrypto/bf/Makefile b/src/lib/libcrypto/bf/Makefile
index 42e2c050f8..8441954a8d 100644
--- a/src/lib/libcrypto/bf/Makefile
+++ b/src/lib/libcrypto/bf/Makefile
@@ -8,11 +8,6 @@ CC= cc
8CPP= $(CC) -E 8CPP= $(CC) -E
9INCLUDES= 9INCLUDES=
10CFLAG=-g 10CFLAG=-g
11INSTALL_PREFIX=
12OPENSSLDIR= /usr/local/ssl
13INSTALLTOP=/usr/local/ssl
14MAKEDEPPROG= makedepend
15MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
16MAKEFILE= Makefile 11MAKEFILE= Makefile
17AR= ar r 12AR= ar r
18 13
@@ -22,6 +17,7 @@ BF_ENC= bf_enc.o
22 17
23CFLAGS= $(INCLUDES) $(CFLAG) 18CFLAGS= $(INCLUDES) $(CFLAG)
24ASFLAGS= $(INCLUDES) $(ASFLAG) 19ASFLAGS= $(INCLUDES) $(ASFLAG)
20AFLAGS= $(ASFLAGS)
25 21
26GENERAL=Makefile 22GENERAL=Makefile
27TEST=bftest.c 23TEST=bftest.c
@@ -48,20 +44,15 @@ lib: $(LIBOBJ)
48 $(RANLIB) $(LIB) || echo Never mind. 44 $(RANLIB) $(LIB) || echo Never mind.
49 @touch lib 45 @touch lib
50 46
51# elf 47# ELF
52asm/bx86-elf.s: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl 48bx86-elf.s: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
53 (cd asm; $(PERL) bf-586.pl elf $(CFLAGS) $(PROCESSOR) > bx86-elf.s) 49 (cd asm; $(PERL) bf-586.pl elf $(CFLAGS) $(PROCESSOR) > ../$@)
54 50# COFF
51bx86-cof.s: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
52 (cd asm; $(PERL) bf-586.pl coff $(CFLAGS) $(PROCESSOR) > ../$@)
55# a.out 53# a.out
56asm/bx86-out.o: asm/bx86unix.cpp 54bx86-out.s: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
57 $(CPP) -DOUT asm/bx86unix.cpp | as -o asm/bx86-out.o 55 (cd asm; $(PERL) bf-586.pl a.out $(CFLAGS) $(PROCESSOR) > ../$@)
58
59# bsdi
60asm/bx86bsdi.o: asm/bx86unix.cpp
61 $(CPP) -DBSDI asm/bx86unix.cpp | sed 's/ :/:/' | as -o asm/bx86bsdi.o
62
63asm/bx86unix.cpp: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
64 (cd asm; $(PERL) bf-586.pl cpp $(PROCESSOR) >bx86unix.cpp)
65 56
66files: 57files:
67 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO 58 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
@@ -71,9 +62,11 @@ links:
71 @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) 62 @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
72 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 63 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
73 64
74install: installs 65# We need to use force because 'install' matches 'INSTALL' on case
75 66# insensitive systems
76installs: 67FRC.install:
68install: FRC.install
69 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
77 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 70 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
78 do \ 71 do \
79 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 72 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -89,6 +82,7 @@ lint:
89 lint -DLINT $(INCLUDES) $(SRC)>fluff 82 lint -DLINT $(INCLUDES) $(SRC)>fluff
90 83
91depend: 84depend:
85 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
92 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 86 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
93 87
94dclean: 88dclean:
@@ -96,7 +90,7 @@ dclean:
96 mv -f Makefile.new $(MAKEFILE) 90 mv -f Makefile.new $(MAKEFILE)
97 91
98clean: 92clean:
99 rm -f asm/bx86unix.cpp asm/*-elf.* *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff 93 rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
100 94
101# DO NOT DELETE THIS LINE -- make depend depends on it. 95# DO NOT DELETE THIS LINE -- make depend depends on it.
102 96
@@ -109,8 +103,5 @@ bf_enc.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h
109bf_enc.o: ../../include/openssl/opensslconf.h bf_enc.c bf_locl.h 103bf_enc.o: ../../include/openssl/opensslconf.h bf_enc.c bf_locl.h
110bf_ofb64.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h 104bf_ofb64.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h
111bf_ofb64.o: ../../include/openssl/opensslconf.h bf_locl.h bf_ofb64.c 105bf_ofb64.o: ../../include/openssl/opensslconf.h bf_locl.h bf_ofb64.c
112bf_skey.o: ../../include/openssl/blowfish.h ../../include/openssl/crypto.h 106bf_skey.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h
113bf_skey.o: ../../include/openssl/e_os2.h ../../include/openssl/fips.h 107bf_skey.o: ../../include/openssl/opensslconf.h bf_locl.h bf_pi.h bf_skey.c
114bf_skey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
115bf_skey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
116bf_skey.o: ../../include/openssl/symhacks.h bf_locl.h bf_pi.h bf_skey.c
diff --git a/src/lib/libcrypto/bf/bf_opts.c b/src/lib/libcrypto/bf/bf_opts.c
index 171dada2ca..1721bb99b4 100644
--- a/src/lib/libcrypto/bf/bf_opts.c
+++ b/src/lib/libcrypto/bf/bf_opts.c
@@ -69,7 +69,10 @@
69#include OPENSSL_UNISTD_IO 69#include OPENSSL_UNISTD_IO
70OPENSSL_DECLARE_EXIT 70OPENSSL_DECLARE_EXIT
71 71
72#ifndef OPENSSL_SYS_NETWARE
72#include <signal.h> 73#include <signal.h>
74#endif
75
73#ifndef _IRIX 76#ifndef _IRIX
74#include <time.h> 77#include <time.h>
75#endif 78#endif
diff --git a/src/lib/libcrypto/bf/bfspeed.c b/src/lib/libcrypto/bf/bfspeed.c
index f346af64f3..c41ef3b403 100644
--- a/src/lib/libcrypto/bf/bfspeed.c
+++ b/src/lib/libcrypto/bf/bfspeed.c
@@ -69,7 +69,10 @@
69#include OPENSSL_UNISTD_IO 69#include OPENSSL_UNISTD_IO
70OPENSSL_DECLARE_EXIT 70OPENSSL_DECLARE_EXIT
71 71
72#ifndef OPENSSL_SYS_NETWARE
72#include <signal.h> 73#include <signal.h>
74#endif
75
73#ifndef _IRIX 76#ifndef _IRIX
74#include <time.h> 77#include <time.h>
75#endif 78#endif
diff --git a/src/lib/libcrypto/bf/bftest.c b/src/lib/libcrypto/bf/bftest.c
index 24d526b14b..97e6634d37 100644
--- a/src/lib/libcrypto/bf/bftest.c
+++ b/src/lib/libcrypto/bf/bftest.c
@@ -62,6 +62,7 @@
62#include <stdio.h> 62#include <stdio.h>
63#include <string.h> 63#include <string.h>
64#include <stdlib.h> 64#include <stdlib.h>
65#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_BF is defined */
65 66
66#include "../e_os.h" 67#include "../e_os.h"
67 68
@@ -277,6 +278,9 @@ int main(int argc, char *argv[])
277 else 278 else
278 ret=test(); 279 ret=test();
279 280
281#ifdef OPENSSL_SYS_NETWARE
282 if (ret) printf("ERROR: %d\n", ret);
283#endif
280 EXIT(ret); 284 EXIT(ret);
281 return(0); 285 return(0);
282 } 286 }
diff --git a/src/lib/libcrypto/bio/Makefile b/src/lib/libcrypto/bio/Makefile
index a565154499..1ef6c2fb9f 100644
--- a/src/lib/libcrypto/bio/Makefile
+++ b/src/lib/libcrypto/bio/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include 8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -26,19 +21,21 @@ LIBSRC= bio_lib.c bio_cb.c bio_err.c \
26 bss_mem.c bss_null.c bss_fd.c \ 21 bss_mem.c bss_null.c bss_fd.c \
27 bss_file.c bss_sock.c bss_conn.c \ 22 bss_file.c bss_sock.c bss_conn.c \
28 bf_null.c bf_buff.c b_print.c b_dump.c \ 23 bf_null.c bf_buff.c b_print.c b_dump.c \
29 b_sock.c bss_acpt.c bf_nbio.c bss_log.c bss_bio.c 24 b_sock.c bss_acpt.c bf_nbio.c bss_log.c bss_bio.c \
25 bss_dgram.c
30# bf_lbuf.c 26# bf_lbuf.c
31LIBOBJ= bio_lib.o bio_cb.o bio_err.o \ 27LIBOBJ= bio_lib.o bio_cb.o bio_err.o \
32 bss_mem.o bss_null.o bss_fd.o \ 28 bss_mem.o bss_null.o bss_fd.o \
33 bss_file.o bss_sock.o bss_conn.o \ 29 bss_file.o bss_sock.o bss_conn.o \
34 bf_null.o bf_buff.o b_print.o b_dump.o \ 30 bf_null.o bf_buff.o b_print.o b_dump.o \
35 b_sock.o bss_acpt.o bf_nbio.o bss_log.o bss_bio.o 31 b_sock.o bss_acpt.o bf_nbio.o bss_log.o bss_bio.o \
32 bss_dgram.o
36# bf_lbuf.o 33# bf_lbuf.o
37 34
38SRC= $(LIBSRC) 35SRC= $(LIBSRC)
39 36
40EXHEADER= bio.h 37EXHEADER= bio.h
41HEADER= bss_file.c $(EXHEADER) 38HEADER= bio_lcl.h $(EXHEADER)
42 39
43ALL= $(GENERAL) $(SRC) $(HEADER) 40ALL= $(GENERAL) $(SRC) $(HEADER)
44 41
@@ -61,6 +58,7 @@ links:
61 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 58 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
62 59
63install: 60install:
61 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
64 @headerlist="$(EXHEADER)"; for i in $$headerlist; \ 62 @headerlist="$(EXHEADER)"; for i in $$headerlist; \
65 do \ 63 do \
66 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 64 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -76,6 +74,7 @@ lint:
76 lint -DLINT $(INCLUDES) $(SRC)>fluff 74 lint -DLINT $(INCLUDES) $(SRC)>fluff
77 75
78depend: 76depend:
77 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
79 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 78 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
80 79
81dclean: 80dclean:
@@ -91,30 +90,30 @@ b_dump.o: ../../e_os.h ../../include/openssl/bio.h
91b_dump.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 90b_dump.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
92b_dump.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 91b_dump.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
93b_dump.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 92b_dump.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
94b_dump.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 93b_dump.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
95b_dump.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 94b_dump.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
96b_dump.o: ../cryptlib.h b_dump.c 95b_dump.o: ../../include/openssl/symhacks.h ../cryptlib.h b_dump.c bio_lcl.h
97b_print.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h 96b_print.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
98b_print.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 97b_print.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
99b_print.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 98b_print.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
100b_print.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 99b_print.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
101b_print.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 100b_print.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
102b_print.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 101b_print.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
103b_print.o: ../cryptlib.h b_print.c 102b_print.o: ../../include/openssl/symhacks.h ../cryptlib.h b_print.c
104b_sock.o: ../../e_os.h ../../include/openssl/bio.h 103b_sock.o: ../../e_os.h ../../include/openssl/bio.h
105b_sock.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 104b_sock.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
106b_sock.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 105b_sock.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
107b_sock.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 106b_sock.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
108b_sock.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 107b_sock.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
109b_sock.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 108b_sock.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
110b_sock.o: ../cryptlib.h b_sock.c 109b_sock.o: ../../include/openssl/symhacks.h ../cryptlib.h b_sock.c
111bf_buff.o: ../../e_os.h ../../include/openssl/bio.h 110bf_buff.o: ../../e_os.h ../../include/openssl/bio.h
112bf_buff.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 111bf_buff.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
113bf_buff.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 112bf_buff.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
114bf_buff.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 113bf_buff.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
115bf_buff.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 114bf_buff.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
116bf_buff.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 115bf_buff.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
117bf_buff.o: ../cryptlib.h bf_buff.c 116bf_buff.o: ../../include/openssl/symhacks.h ../cryptlib.h bf_buff.c
118bf_nbio.o: ../../e_os.h ../../include/openssl/bio.h 117bf_nbio.o: ../../e_os.h ../../include/openssl/bio.h
119bf_nbio.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 118bf_nbio.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
120bf_nbio.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 119bf_nbio.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
@@ -127,88 +126,96 @@ bf_null.o: ../../e_os.h ../../include/openssl/bio.h
127bf_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 126bf_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
128bf_null.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 127bf_null.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
129bf_null.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 128bf_null.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
130bf_null.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 129bf_null.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
131bf_null.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 130bf_null.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
132bf_null.o: ../cryptlib.h bf_null.c 131bf_null.o: ../../include/openssl/symhacks.h ../cryptlib.h bf_null.c
133bio_cb.o: ../../e_os.h ../../include/openssl/bio.h 132bio_cb.o: ../../e_os.h ../../include/openssl/bio.h
134bio_cb.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 133bio_cb.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
135bio_cb.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 134bio_cb.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
136bio_cb.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 135bio_cb.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
137bio_cb.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 136bio_cb.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
138bio_cb.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 137bio_cb.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
139bio_cb.o: ../cryptlib.h bio_cb.c 138bio_cb.o: ../../include/openssl/symhacks.h ../cryptlib.h bio_cb.c
140bio_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h 139bio_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
141bio_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 140bio_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
142bio_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 141bio_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
143bio_err.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 142bio_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
144bio_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 143bio_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
145bio_err.o: bio_err.c 144bio_err.o: ../../include/openssl/symhacks.h bio_err.c
146bio_lib.o: ../../e_os.h ../../include/openssl/bio.h 145bio_lib.o: ../../e_os.h ../../include/openssl/bio.h
147bio_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 146bio_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
148bio_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 147bio_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
149bio_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 148bio_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
150bio_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 149bio_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
151bio_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 150bio_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
152bio_lib.o: ../cryptlib.h bio_lib.c 151bio_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h bio_lib.c
153bss_acpt.o: ../../e_os.h ../../include/openssl/bio.h 152bss_acpt.o: ../../e_os.h ../../include/openssl/bio.h
154bss_acpt.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 153bss_acpt.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
155bss_acpt.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 154bss_acpt.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
156bss_acpt.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 155bss_acpt.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
157bss_acpt.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 156bss_acpt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
158bss_acpt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 157bss_acpt.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
159bss_acpt.o: ../cryptlib.h bss_acpt.c 158bss_acpt.o: ../../include/openssl/symhacks.h ../cryptlib.h bss_acpt.c
160bss_bio.o: ../../e_os.h ../../include/openssl/bio.h 159bss_bio.o: ../../e_os.h ../../include/openssl/bio.h
161bss_bio.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 160bss_bio.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
162bss_bio.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 161bss_bio.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
163bss_bio.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 162bss_bio.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
164bss_bio.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 163bss_bio.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
165bss_bio.o: ../../include/openssl/symhacks.h bss_bio.c 164bss_bio.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
165bss_bio.o: bss_bio.c
166bss_conn.o: ../../e_os.h ../../include/openssl/bio.h 166bss_conn.o: ../../e_os.h ../../include/openssl/bio.h
167bss_conn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 167bss_conn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
168bss_conn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 168bss_conn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
169bss_conn.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 169bss_conn.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
170bss_conn.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 170bss_conn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
171bss_conn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 171bss_conn.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
172bss_conn.o: ../cryptlib.h bss_conn.c 172bss_conn.o: ../../include/openssl/symhacks.h ../cryptlib.h bss_conn.c
173bss_dgram.o: ../../e_os.h ../../include/openssl/bio.h
174bss_dgram.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
175bss_dgram.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
176bss_dgram.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
177bss_dgram.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
178bss_dgram.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
179bss_dgram.o: ../../include/openssl/symhacks.h ../cryptlib.h bss_dgram.c
173bss_fd.o: ../../e_os.h ../../include/openssl/bio.h 180bss_fd.o: ../../e_os.h ../../include/openssl/bio.h
174bss_fd.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 181bss_fd.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
175bss_fd.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 182bss_fd.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
176bss_fd.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 183bss_fd.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
177bss_fd.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 184bss_fd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
178bss_fd.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 185bss_fd.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
179bss_fd.o: ../cryptlib.h bss_fd.c 186bss_fd.o: ../../include/openssl/symhacks.h ../cryptlib.h bio_lcl.h bss_fd.c
180bss_file.o: ../../e_os.h ../../include/openssl/bio.h 187bss_file.o: ../../e_os.h ../../include/openssl/bio.h
181bss_file.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 188bss_file.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
182bss_file.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 189bss_file.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
183bss_file.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 190bss_file.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
184bss_file.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 191bss_file.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
185bss_file.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 192bss_file.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
186bss_file.o: ../cryptlib.h bss_file.c 193bss_file.o: ../../include/openssl/symhacks.h ../cryptlib.h bio_lcl.h bss_file.c
187bss_log.o: ../../e_os.h ../../include/openssl/bio.h 194bss_log.o: ../../e_os.h ../../include/openssl/bio.h
188bss_log.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 195bss_log.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
189bss_log.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 196bss_log.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
190bss_log.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 197bss_log.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
191bss_log.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 198bss_log.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
192bss_log.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 199bss_log.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
193bss_log.o: ../cryptlib.h bss_log.c 200bss_log.o: ../../include/openssl/symhacks.h ../cryptlib.h bss_log.c
194bss_mem.o: ../../e_os.h ../../include/openssl/bio.h 201bss_mem.o: ../../e_os.h ../../include/openssl/bio.h
195bss_mem.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 202bss_mem.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
196bss_mem.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 203bss_mem.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
197bss_mem.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 204bss_mem.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
198bss_mem.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 205bss_mem.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
199bss_mem.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 206bss_mem.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
200bss_mem.o: ../cryptlib.h bss_mem.c 207bss_mem.o: ../../include/openssl/symhacks.h ../cryptlib.h bss_mem.c
201bss_null.o: ../../e_os.h ../../include/openssl/bio.h 208bss_null.o: ../../e_os.h ../../include/openssl/bio.h
202bss_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 209bss_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
203bss_null.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 210bss_null.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
204bss_null.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 211bss_null.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
205bss_null.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 212bss_null.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
206bss_null.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 213bss_null.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
207bss_null.o: ../cryptlib.h bss_null.c 214bss_null.o: ../../include/openssl/symhacks.h ../cryptlib.h bss_null.c
208bss_sock.o: ../../e_os.h ../../include/openssl/bio.h 215bss_sock.o: ../../e_os.h ../../include/openssl/bio.h
209bss_sock.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 216bss_sock.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
210bss_sock.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 217bss_sock.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
211bss_sock.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 218bss_sock.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
212bss_sock.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 219bss_sock.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
213bss_sock.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 220bss_sock.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
214bss_sock.o: ../cryptlib.h bss_sock.c 221bss_sock.o: ../../include/openssl/symhacks.h ../cryptlib.h bss_sock.c
diff --git a/src/lib/libcrypto/bn/Makefile b/src/lib/libcrypto/bn/Makefile
index 9969d242cc..e97c751390 100644
--- a/src/lib/libcrypto/bn/Makefile
+++ b/src/lib/libcrypto/bn/Makefile
@@ -8,11 +8,6 @@ CC= cc
8CPP= $(CC) -E 8CPP= $(CC) -E
9INCLUDES= -I.. -I$(TOP) -I../../include 9INCLUDES= -I.. -I$(TOP) -I../../include
10CFLAG=-g 10CFLAG=-g
11INSTALL_PREFIX=
12OPENSSLDIR= /usr/local/ssl
13INSTALLTOP=/usr/local/ssl
14MAKEDEPPROG= makedepend
15MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
16MAKEFILE= Makefile 11MAKEFILE= Makefile
17AR= ar r 12AR= ar r
18 13
@@ -22,6 +17,7 @@ BN_ASM= bn_asm.o
22 17
23CFLAGS= $(INCLUDES) $(CFLAG) 18CFLAGS= $(INCLUDES) $(CFLAG)
24ASFLAGS= $(INCLUDES) $(ASFLAG) 19ASFLAGS= $(INCLUDES) $(ASFLAG)
20AFLAGS= $(ASFLAGS)
25 21
26GENERAL=Makefile 22GENERAL=Makefile
27TEST=bntest.c exptest.c 23TEST=bntest.c exptest.c
@@ -31,12 +27,14 @@ LIB=$(TOP)/libcrypto.a
31LIBSRC= bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mul.c bn_mod.c \ 27LIBSRC= bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mul.c bn_mod.c \
32 bn_print.c bn_rand.c bn_shift.c bn_word.c bn_blind.c \ 28 bn_print.c bn_rand.c bn_shift.c bn_word.c bn_blind.c \
33 bn_kron.c bn_sqrt.c bn_gcd.c bn_prime.c bn_err.c bn_sqr.c bn_asm.c \ 29 bn_kron.c bn_sqrt.c bn_gcd.c bn_prime.c bn_err.c bn_sqr.c bn_asm.c \
34 bn_recp.c bn_mont.c bn_mpi.c bn_exp2.c bn_x931p.c 30 bn_recp.c bn_mont.c bn_mpi.c bn_exp2.c bn_gf2m.c bn_nist.c \
31 bn_depr.c bn_const.c
35 32
36LIBOBJ= bn_add.o bn_div.o bn_exp.o bn_lib.o bn_ctx.o bn_mul.o bn_mod.o \ 33LIBOBJ= bn_add.o bn_div.o bn_exp.o bn_lib.o bn_ctx.o bn_mul.o bn_mod.o \
37 bn_print.o bn_rand.o bn_shift.o bn_word.o bn_blind.o \ 34 bn_print.o bn_rand.o bn_shift.o bn_word.o bn_blind.o \
38 bn_kron.o bn_sqrt.o bn_gcd.o bn_prime.o bn_err.o bn_sqr.o $(BN_ASM) \ 35 bn_kron.o bn_sqrt.o bn_gcd.o bn_prime.o bn_err.o bn_sqr.o $(BN_ASM) \
39 bn_recp.o bn_mont.o bn_mpi.o bn_exp2.o bn_x931p.o 36 bn_recp.o bn_mont.o bn_mpi.o bn_exp2.o bn_gf2m.o bn_nist.o \
37 bn_depr.o bn_const.o
40 38
41SRC= $(LIBSRC) 39SRC= $(LIBSRC)
42 40
@@ -64,70 +62,60 @@ lib: $(LIBOBJ)
64 $(RANLIB) $(LIB) || echo Never mind. 62 $(RANLIB) $(LIB) || echo Never mind.
65 @touch lib 63 @touch lib
66 64
67# elf 65# ELF
68asm/bn86-elf.s: asm/bn-586.pl ../perlasm/x86asm.pl 66bn86-elf.s: asm/bn-586.pl ../perlasm/x86asm.pl
69 (cd asm; $(PERL) bn-586.pl elf $(CFLAGS) > bn86-elf.s) 67 (cd asm; $(PERL) bn-586.pl elf $(CFLAGS) > ../$@)
70 68co86-elf.s: asm/co-586.pl ../perlasm/x86asm.pl
71asm/co86-elf.s: asm/co-586.pl ../perlasm/x86asm.pl 69 (cd asm; $(PERL) co-586.pl elf $(CFLAGS) > ../$@)
72 (cd asm; $(PERL) co-586.pl elf $(CFLAGS) > co86-elf.s) 70mo86-elf.s: asm/mo-586.pl ../perlasm/x86asm.pl
73 71 (cd asm; $(PERL) mo-586.pl elf $(CFLAGS) > ../$@)
72# COFF
73bn86-cof.s: asm/bn-586.pl ../perlasm/x86asm.pl
74 (cd asm; $(PERL) bn-586.pl coff $(CFLAGS) > ../$@)
75co86-cof.s: asm/co-586.pl ../perlasm/x86asm.pl
76 (cd asm; $(PERL) co-586.pl coff $(CFLAGS) > ../$@)
77mo86-cof.s: asm/mo-586.pl ../perlasm/x86asm.pl
78 (cd asm; $(PERL) mo-586.pl coff $(CFLAGS) > ../$@)
74# a.out 79# a.out
75asm/bn86-out.o: asm/bn86unix.cpp 80bn86-out.s: asm/bn-586.pl ../perlasm/x86asm.pl
76 $(CPP) -DOUT asm/bn86unix.cpp | as -o asm/bn86-out.o 81 (cd asm; $(PERL) bn-586.pl a.out $(CFLAGS) > ../$@)
77 82co86-out.s: asm/co-586.pl ../perlasm/x86asm.pl
78asm/co86-out.o: asm/co86unix.cpp 83 (cd asm; $(PERL) co-586.pl a.out $(CFLAGS) > ../$@)
79 $(CPP) -DOUT asm/co86unix.cpp | as -o asm/co86-out.o 84mo86-out.s: asm/mo-586.pl ../perlasm/x86asm.pl
80 85 (cd asm; $(PERL) mo-586.pl a.out $(CFLAGS) > ../$@)
81# bsdi 86
82asm/bn86bsdi.o: asm/bn86unix.cpp 87sparcv8.o: asm/sparcv8.S
83 $(CPP) -DBSDI asm/bn86unix.cpp | sed 's/ :/:/' | as -o asm/bn86bsdi.o 88 $(CC) $(CFLAGS) -c asm/sparcv8.S
84 89sparcv8plus.o: asm/sparcv8plus.S
85asm/co86bsdi.o: asm/co86unix.cpp 90 $(CC) $(CFLAGS) -c asm/sparcv8plus.S
86 $(CPP) -DBSDI asm/co86unix.cpp | sed 's/ :/:/' | as -o asm/co86bsdi.o 91
87 92bn-mips3.o: asm/mips3.s
88asm/bn86unix.cpp: asm/bn-586.pl ../perlasm/x86asm.pl 93 @if [ "$(CC)" = "gcc" ]; then \
89 (cd asm; $(PERL) bn-586.pl cpp >bn86unix.cpp ) 94 ABI=`expr "$(CFLAGS)" : ".*-mabi=\([n3264]*\)"` && \
90 95 as -$$ABI -O -o $@ asm/mips3.s; \
91asm/co86unix.cpp: asm/co-586.pl ../perlasm/x86asm.pl 96 else $(CC) -c $(CFLAGS) -o $@ asm/mips3.s; fi
92 (cd asm; $(PERL) co-586.pl cpp >co86unix.cpp ) 97
93 98x86_64-gcc.o: asm/x86_64-gcc.c
94asm/sparcv8.o: asm/sparcv8.S 99 $(CC) $(CFLAGS) -c -o $@ asm/x86_64-gcc.c
95 100x86_64-mont.s: asm/x86_64-mont.pl
96asm/sparcv8plus.o: asm/sparcv8plus.S 101 $(PERL) asm/x86_64-mont.pl $@
97 102
98# Old GNU assembler doesn't understand V9 instructions, so we 103bn-ia64.s: asm/ia64.S
99# hire /usr/ccs/bin/as to do the job. Note that option is called 104 $(CC) $(CFLAGS) -E asm/ia64.S > $@
100# *-gcc27, but even gcc 2>=8 users may experience similar problem 105
101# if they didn't bother to upgrade GNU assembler. Such users should 106# GNU assembler fails to compile PA-RISC2 modules, insist on calling
102# not choose this option, but be adviced to *remove* GNU assembler 107# vendor assembler...
103# or upgrade it. 108pa-risc2W.o: asm/pa-risc2W.s
104asm/sparcv8plus-gcc27.o: asm/sparcv8plus.S 109 /usr/ccs/bin/as -o pa-risc2W.o asm/pa-risc2W.s
105 $(CC) $(ASFLAGS) -E asm/sparcv8plus.S | \ 110pa-risc2.o: asm/pa-risc2.s
106 /usr/ccs/bin/as -xarch=v8plus - -o asm/sparcv8plus-gcc27.o 111 /usr/ccs/bin/as -o pa-risc2.o asm/pa-risc2.s
107 112
108 113# ppc - AIX, Linux, MacOS X...
109asm/ia64.o: asm/ia64.S 114linux_ppc32.s: asm/ppc.pl; $(PERL) $< $@
110 115linux_ppc64.s: asm/ppc.pl; $(PERL) $< $@
111# Some compiler drivers (most notably HP-UX and Intel C++) don't 116aix_ppc32.s: asm/ppc.pl; $(PERL) asm/ppc.pl $@
112# understand .S extension:-( I wish I could pipe output from cc -E, 117aix_ppc64.s: asm/ppc.pl; $(PERL) asm/ppc.pl $@
113# but it's too compiler driver/ABI dependent to cover with a single 118osx_ppc32.s: asm/ppc.pl; $(PERL) $< $@
114# rule... <appro@fy.chalmers.se>
115asm/ia64-cpp.o: asm/ia64.S
116 $(CC) $(ASFLAGS) -E asm/ia64.S > /tmp/ia64.$$$$.s && \
117 $(CC) $(ASFLAGS) -c -o asm/ia64-cpp.o /tmp/ia64.$$$$.s; \
118 rm -f /tmp/ia64.$$$$.s
119
120asm/x86_64-gcc.o: asm/x86_64-gcc.c
121 $(CC) $(ASFLAGS) -c -o $@ $<
122
123asm/pa-risc2W.o: asm/pa-risc2W.s
124 /usr/ccs/bin/as -o asm/pa-risc2W.o asm/pa-risc2W.s
125
126asm/linux_ppc32.s: asm/ppc.pl; $(PERL) $< $@
127asm/linux_ppc64.s: asm/ppc.pl; $(PERL) $< $@
128asm/aix_ppc32.s: asm/ppc.pl; $(PERL) asm/ppc.pl $@
129asm/aix_ppc64.s: asm/ppc.pl; $(PERL) asm/ppc.pl $@
130asm/osx_ppc32.s: asm/ppc.pl; $(PERL) $< $@
131 119
132files: 120files:
133 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO 121 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
@@ -138,6 +126,7 @@ links:
138 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 126 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
139 127
140install: 128install:
129 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
141 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 130 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
142 do \ 131 do \
143 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 132 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -161,6 +150,7 @@ lint:
161 lint -DLINT $(INCLUDES) $(SRC)>fluff 150 lint -DLINT $(INCLUDES) $(SRC)>fluff
162 151
163depend: 152depend:
153 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
164 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 154 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
165 155
166dclean: 156dclean:
@@ -168,7 +158,7 @@ dclean:
168 mv -f Makefile.new $(MAKEFILE) 158 mv -f Makefile.new $(MAKEFILE)
169 159
170clean: 160clean:
171 rm -f asm/co86unix.cpp asm/bn86unix.cpp asm/*-elf.* *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff bn_asm.s 161 rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
172 162
173# DO NOT DELETE THIS LINE -- make depend depends on it. 163# DO NOT DELETE THIS LINE -- make depend depends on it.
174 164
@@ -176,101 +166,131 @@ bn_add.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
176bn_add.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 166bn_add.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
177bn_add.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 167bn_add.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
178bn_add.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 168bn_add.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
179bn_add.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 169bn_add.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
180bn_add.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 170bn_add.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
181bn_add.o: ../cryptlib.h bn_add.c bn_lcl.h 171bn_add.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_add.c bn_lcl.h
182bn_asm.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h 172bn_asm.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
183bn_asm.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 173bn_asm.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
184bn_asm.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 174bn_asm.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
185bn_asm.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 175bn_asm.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
186bn_asm.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 176bn_asm.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
187bn_asm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 177bn_asm.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
188bn_asm.o: ../cryptlib.h bn_asm.c bn_lcl.h 178bn_asm.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_asm.c bn_lcl.h
189bn_blind.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h 179bn_blind.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
190bn_blind.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 180bn_blind.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
191bn_blind.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 181bn_blind.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
192bn_blind.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 182bn_blind.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
193bn_blind.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 183bn_blind.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
194bn_blind.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 184bn_blind.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
195bn_blind.o: ../cryptlib.h bn_blind.c bn_lcl.h 185bn_blind.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_blind.c bn_lcl.h
186bn_const.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
187bn_const.o: ../../include/openssl/ossl_typ.h bn.h bn_const.c
196bn_ctx.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h 188bn_ctx.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
197bn_ctx.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 189bn_ctx.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
198bn_ctx.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 190bn_ctx.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
199bn_ctx.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 191bn_ctx.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
200bn_ctx.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 192bn_ctx.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
201bn_ctx.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 193bn_ctx.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
202bn_ctx.o: ../cryptlib.h bn_ctx.c bn_lcl.h 194bn_ctx.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_ctx.c bn_lcl.h
195bn_depr.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
196bn_depr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
197bn_depr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
198bn_depr.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
199bn_depr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
200bn_depr.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
201bn_depr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
202bn_depr.o: ../cryptlib.h bn_depr.c bn_lcl.h
203bn_div.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h 203bn_div.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
204bn_div.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 204bn_div.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
205bn_div.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 205bn_div.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
206bn_div.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 206bn_div.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
207bn_div.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 207bn_div.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
208bn_div.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 208bn_div.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
209bn_div.o: ../cryptlib.h bn_div.c bn_lcl.h 209bn_div.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_div.c bn_lcl.h
210bn_err.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 210bn_err.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
211bn_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 211bn_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
212bn_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 212bn_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
213bn_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 213bn_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
214bn_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 214bn_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
215bn_err.o: ../../include/openssl/symhacks.h bn_err.c 215bn_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
216bn_err.o: bn_err.c
216bn_exp.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h 217bn_exp.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
217bn_exp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 218bn_exp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
218bn_exp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 219bn_exp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
219bn_exp.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 220bn_exp.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
220bn_exp.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 221bn_exp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
221bn_exp.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 222bn_exp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
222bn_exp.o: ../cryptlib.h bn_exp.c bn_lcl.h 223bn_exp.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_exp.c bn_lcl.h
223bn_exp2.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h 224bn_exp2.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
224bn_exp2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 225bn_exp2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
225bn_exp2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 226bn_exp2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
226bn_exp2.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 227bn_exp2.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
227bn_exp2.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 228bn_exp2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
228bn_exp2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 229bn_exp2.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
229bn_exp2.o: ../cryptlib.h bn_exp2.c bn_lcl.h 230bn_exp2.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_exp2.c bn_lcl.h
230bn_gcd.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h 231bn_gcd.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
231bn_gcd.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 232bn_gcd.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
232bn_gcd.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 233bn_gcd.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
233bn_gcd.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 234bn_gcd.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
234bn_gcd.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 235bn_gcd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
235bn_gcd.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 236bn_gcd.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
236bn_gcd.o: ../cryptlib.h bn_gcd.c bn_lcl.h 237bn_gcd.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_gcd.c bn_lcl.h
237bn_kron.o: ../../include/openssl/bn.h ../../include/openssl/e_os2.h 238bn_gf2m.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
238bn_kron.o: ../../include/openssl/opensslconf.h bn_kron.c bn_lcl.h 239bn_gf2m.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
240bn_gf2m.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
241bn_gf2m.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
242bn_gf2m.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
243bn_gf2m.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
244bn_gf2m.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_gf2m.c bn_lcl.h
245bn_kron.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
246bn_kron.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
247bn_kron.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
248bn_kron.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
249bn_kron.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
250bn_kron.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
251bn_kron.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_kron.c bn_lcl.h
239bn_lib.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h 252bn_lib.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
240bn_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 253bn_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
241bn_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 254bn_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
242bn_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 255bn_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
243bn_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 256bn_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
244bn_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 257bn_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
245bn_lib.o: ../cryptlib.h bn_lcl.h bn_lib.c 258bn_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_lib.c
246bn_mod.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h 259bn_mod.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
247bn_mod.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 260bn_mod.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
248bn_mod.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 261bn_mod.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
249bn_mod.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 262bn_mod.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
250bn_mod.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 263bn_mod.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
251bn_mod.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 264bn_mod.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
252bn_mod.o: ../cryptlib.h bn_lcl.h bn_mod.c 265bn_mod.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_mod.c
253bn_mont.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h 266bn_mont.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
254bn_mont.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 267bn_mont.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
255bn_mont.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 268bn_mont.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
256bn_mont.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 269bn_mont.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
257bn_mont.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 270bn_mont.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
258bn_mont.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 271bn_mont.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
259bn_mont.o: ../cryptlib.h bn_lcl.h bn_mont.c 272bn_mont.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_mont.c
260bn_mpi.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h 273bn_mpi.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
261bn_mpi.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 274bn_mpi.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
262bn_mpi.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 275bn_mpi.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
263bn_mpi.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 276bn_mpi.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
264bn_mpi.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 277bn_mpi.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
265bn_mpi.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 278bn_mpi.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
266bn_mpi.o: ../cryptlib.h bn_lcl.h bn_mpi.c 279bn_mpi.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_mpi.c
267bn_mul.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h 280bn_mul.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
268bn_mul.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 281bn_mul.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
269bn_mul.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 282bn_mul.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
270bn_mul.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 283bn_mul.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
271bn_mul.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 284bn_mul.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
272bn_mul.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 285bn_mul.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
273bn_mul.o: ../cryptlib.h bn_lcl.h bn_mul.c 286bn_mul.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_mul.c
287bn_nist.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
288bn_nist.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
289bn_nist.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
290bn_nist.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
291bn_nist.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
292bn_nist.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
293bn_nist.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_nist.c
274bn_prime.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h 294bn_prime.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
275bn_prime.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 295bn_prime.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
276bn_prime.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 296bn_prime.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
@@ -283,9 +303,9 @@ bn_print.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
283bn_print.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 303bn_print.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
284bn_print.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 304bn_print.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
285bn_print.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 305bn_print.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
286bn_print.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 306bn_print.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
287bn_print.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 307bn_print.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
288bn_print.o: ../cryptlib.h bn_lcl.h bn_print.c 308bn_print.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_print.c
289bn_rand.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h 309bn_rand.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
290bn_rand.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 310bn_rand.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
291bn_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 311bn_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
@@ -298,36 +318,34 @@ bn_recp.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
298bn_recp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 318bn_recp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
299bn_recp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 319bn_recp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
300bn_recp.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 320bn_recp.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
301bn_recp.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 321bn_recp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
302bn_recp.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 322bn_recp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
303bn_recp.o: ../cryptlib.h bn_lcl.h bn_recp.c 323bn_recp.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_recp.c
304bn_shift.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h 324bn_shift.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
305bn_shift.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 325bn_shift.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
306bn_shift.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 326bn_shift.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
307bn_shift.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 327bn_shift.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
308bn_shift.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 328bn_shift.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
309bn_shift.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 329bn_shift.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
310bn_shift.o: ../cryptlib.h bn_lcl.h bn_shift.c 330bn_shift.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_shift.c
311bn_sqr.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h 331bn_sqr.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
312bn_sqr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 332bn_sqr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
313bn_sqr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 333bn_sqr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
314bn_sqr.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 334bn_sqr.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
315bn_sqr.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 335bn_sqr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
316bn_sqr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 336bn_sqr.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
317bn_sqr.o: ../cryptlib.h bn_lcl.h bn_sqr.c 337bn_sqr.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_sqr.c
318bn_sqrt.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h 338bn_sqrt.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
319bn_sqrt.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 339bn_sqrt.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
320bn_sqrt.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 340bn_sqrt.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
321bn_sqrt.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 341bn_sqrt.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
322bn_sqrt.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 342bn_sqrt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
323bn_sqrt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 343bn_sqrt.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
324bn_sqrt.o: ../cryptlib.h bn_lcl.h bn_sqrt.c 344bn_sqrt.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_sqrt.c
325bn_word.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h 345bn_word.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
326bn_word.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 346bn_word.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
327bn_word.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 347bn_word.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
328bn_word.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 348bn_word.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
329bn_word.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 349bn_word.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
330bn_word.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 350bn_word.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
331bn_word.o: ../cryptlib.h bn_lcl.h bn_word.c 351bn_word.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_word.c
332bn_x931p.o: ../../include/openssl/bn.h ../../include/openssl/e_os2.h
333bn_x931p.o: ../../include/openssl/opensslconf.h bn_x931p.c
diff --git a/src/lib/libcrypto/bn/asm/mo-586.pl b/src/lib/libcrypto/bn/asm/mo-586.pl
new file mode 100644
index 0000000000..0982293094
--- /dev/null
+++ b/src/lib/libcrypto/bn/asm/mo-586.pl
@@ -0,0 +1,603 @@
1#!/usr/bin/env perl
2
3# This is crypto/bn/asm/x86-mont.pl (with asciz from crypto/perlasm/x86asm.pl)
4# from OpenSSL 0.9.9-dev
5
6sub ::asciz
7{ my @str=unpack("C*",shift);
8 push @str,0;
9 while ($#str>15) {
10 &data_byte(@str[0..15]);
11 foreach (0..15) { shift @str; }
12 }
13 &data_byte(@str) if (@str);
14}
15
16# ====================================================================
17# Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
18# project. The module is, however, dual licensed under OpenSSL and
19# CRYPTOGAMS licenses depending on where you obtain it. For further
20# details see http://www.openssl.org/~appro/cryptogams/.
21# ====================================================================
22
23# October 2005
24#
25# This is a "teaser" code, as it can be improved in several ways...
26# First of all non-SSE2 path should be implemented (yes, for now it
27# performs Montgomery multiplication/convolution only on SSE2-capable
28# CPUs such as P4, others fall down to original code). Then inner loop
29# can be unrolled and modulo-scheduled to improve ILP and possibly
30# moved to 128-bit XMM register bank (though it would require input
31# rearrangement and/or increase bus bandwidth utilization). Dedicated
32# squaring procedure should give further performance improvement...
33# Yet, for being draft, the code improves rsa512 *sign* benchmark by
34# 110%(!), rsa1024 one - by 70% and rsa4096 - by 20%:-)
35
36# December 2006
37#
38# Modulo-scheduling SSE2 loops results in further 15-20% improvement.
39# Integer-only code [being equipped with dedicated squaring procedure]
40# gives ~40% on rsa512 sign benchmark...
41
42push(@INC,"perlasm","../../perlasm");
43require "x86asm.pl";
44
45&asm_init($ARGV[0],$0);
46
47$sse2=0;
48for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
49
50&external_label("OPENSSL_ia32cap_P") if ($sse2);
51
52&function_begin("bn_mul_mont");
53
54$i="edx";
55$j="ecx";
56$ap="esi"; $tp="esi"; # overlapping variables!!!
57$rp="edi"; $bp="edi"; # overlapping variables!!!
58$np="ebp";
59$num="ebx";
60
61$_num=&DWP(4*0,"esp"); # stack top layout
62$_rp=&DWP(4*1,"esp");
63$_ap=&DWP(4*2,"esp");
64$_bp=&DWP(4*3,"esp");
65$_np=&DWP(4*4,"esp");
66$_n0=&DWP(4*5,"esp"); $_n0q=&QWP(4*5,"esp");
67$_sp=&DWP(4*6,"esp");
68$_bpend=&DWP(4*7,"esp");
69$frame=32; # size of above frame rounded up to 16n
70
71 &xor ("eax","eax");
72 &mov ("edi",&wparam(5)); # int num
73 &cmp ("edi",4);
74 &jl (&label("just_leave"));
75
76 &lea ("esi",&wparam(0)); # put aside pointer to argument block
77 &lea ("edx",&wparam(1)); # load ap
78 &mov ("ebp","esp"); # saved stack pointer!
79 &add ("edi",2); # extra two words on top of tp
80 &neg ("edi");
81 &lea ("esp",&DWP(-$frame,"esp","edi",4)); # alloca($frame+4*(num+2))
82 &neg ("edi");
83
84 # minimize cache contention by arraning 2K window between stack
85 # pointer and ap argument [np is also position sensitive vector,
86 # but it's assumed to be near ap, as it's allocated at ~same
87 # time].
88 &mov ("eax","esp");
89 &sub ("eax","edx");
90 &and ("eax",2047);
91 &sub ("esp","eax"); # this aligns sp and ap modulo 2048
92
93 &xor ("edx","esp");
94 &and ("edx",2048);
95 &xor ("edx",2048);
96 &sub ("esp","edx"); # this splits them apart modulo 4096
97
98 &and ("esp",-64); # align to cache line
99
100 ################################# load argument block...
101 &mov ("eax",&DWP(0*4,"esi"));# BN_ULONG *rp
102 &mov ("ebx",&DWP(1*4,"esi"));# const BN_ULONG *ap
103 &mov ("ecx",&DWP(2*4,"esi"));# const BN_ULONG *bp
104 &mov ("edx",&DWP(3*4,"esi"));# const BN_ULONG *np
105 &mov ("esi",&DWP(4*4,"esi"));# const BN_ULONG *n0
106 #&mov ("edi",&DWP(5*4,"esi"));# int num
107
108 &mov ("esi",&DWP(0,"esi")); # pull n0[0]
109 &mov ($_rp,"eax"); # ... save a copy of argument block
110 &mov ($_ap,"ebx");
111 &mov ($_bp,"ecx");
112 &mov ($_np,"edx");
113 &mov ($_n0,"esi");
114 &lea ($num,&DWP(-3,"edi")); # num=num-1 to assist modulo-scheduling
115 #&mov ($_num,$num); # redundant as $num is not reused
116 &mov ($_sp,"ebp"); # saved stack pointer!
117
118if($sse2) {
119$acc0="mm0"; # mmx register bank layout
120$acc1="mm1";
121$car0="mm2";
122$car1="mm3";
123$mul0="mm4";
124$mul1="mm5";
125$temp="mm6";
126$mask="mm7";
127
128 &picmeup("eax","OPENSSL_ia32cap_P");
129 &bt (&DWP(0,"eax"),26);
130 &jnc (&label("non_sse2"));
131
132 &mov ("eax",-1);
133 &movd ($mask,"eax"); # mask 32 lower bits
134
135 &mov ($ap,$_ap); # load input pointers
136 &mov ($bp,$_bp);
137 &mov ($np,$_np);
138
139 &xor ($i,$i); # i=0
140 &xor ($j,$j); # j=0
141
142 &movd ($mul0,&DWP(0,$bp)); # bp[0]
143 &movd ($mul1,&DWP(0,$ap)); # ap[0]
144 &movd ($car1,&DWP(0,$np)); # np[0]
145
146 &pmuludq($mul1,$mul0); # ap[0]*bp[0]
147 &movq ($car0,$mul1);
148 &movq ($acc0,$mul1); # I wish movd worked for
149 &pand ($acc0,$mask); # inter-register transfers
150
151 &pmuludq($mul1,$_n0q); # *=n0
152
153 &pmuludq($car1,$mul1); # "t[0]"*np[0]*n0
154 &paddq ($car1,$acc0);
155
156 &movd ($acc1,&DWP(4,$np)); # np[1]
157 &movd ($acc0,&DWP(4,$ap)); # ap[1]
158
159 &psrlq ($car0,32);
160 &psrlq ($car1,32);
161
162 &inc ($j); # j++
163&set_label("1st",16);
164 &pmuludq($acc0,$mul0); # ap[j]*bp[0]
165 &pmuludq($acc1,$mul1); # np[j]*m1
166 &paddq ($car0,$acc0); # +=c0
167 &paddq ($car1,$acc1); # +=c1
168
169 &movq ($acc0,$car0);
170 &pand ($acc0,$mask);
171 &movd ($acc1,&DWP(4,$np,$j,4)); # np[j+1]
172 &paddq ($car1,$acc0); # +=ap[j]*bp[0];
173 &movd ($acc0,&DWP(4,$ap,$j,4)); # ap[j+1]
174 &psrlq ($car0,32);
175 &movd (&DWP($frame-4,"esp",$j,4),$car1); # tp[j-1]=
176 &psrlq ($car1,32);
177
178 &lea ($j,&DWP(1,$j));
179 &cmp ($j,$num);
180 &jl (&label("1st"));
181
182 &pmuludq($acc0,$mul0); # ap[num-1]*bp[0]
183 &pmuludq($acc1,$mul1); # np[num-1]*m1
184 &paddq ($car0,$acc0); # +=c0
185 &paddq ($car1,$acc1); # +=c1
186
187 &movq ($acc0,$car0);
188 &pand ($acc0,$mask);
189 &paddq ($car1,$acc0); # +=ap[num-1]*bp[0];
190 &movd (&DWP($frame-4,"esp",$j,4),$car1); # tp[num-2]=
191
192 &psrlq ($car0,32);
193 &psrlq ($car1,32);
194
195 &paddq ($car1,$car0);
196 &movq (&QWP($frame,"esp",$num,4),$car1); # tp[num].tp[num-1]
197
198 &inc ($i); # i++
199&set_label("outer");
200 &xor ($j,$j); # j=0
201
202 &movd ($mul0,&DWP(0,$bp,$i,4)); # bp[i]
203 &movd ($mul1,&DWP(0,$ap)); # ap[0]
204 &movd ($temp,&DWP($frame,"esp")); # tp[0]
205 &movd ($car1,&DWP(0,$np)); # np[0]
206 &pmuludq($mul1,$mul0); # ap[0]*bp[i]
207
208 &paddq ($mul1,$temp); # +=tp[0]
209 &movq ($acc0,$mul1);
210 &movq ($car0,$mul1);
211 &pand ($acc0,$mask);
212
213 &pmuludq($mul1,$_n0q); # *=n0
214
215 &pmuludq($car1,$mul1);
216 &paddq ($car1,$acc0);
217
218 &movd ($temp,&DWP($frame+4,"esp")); # tp[1]
219 &movd ($acc1,&DWP(4,$np)); # np[1]
220 &movd ($acc0,&DWP(4,$ap)); # ap[1]
221
222 &psrlq ($car0,32);
223 &psrlq ($car1,32);
224 &paddq ($car0,$temp); # +=tp[1]
225
226 &inc ($j); # j++
227 &dec ($num);
228&set_label("inner");
229 &pmuludq($acc0,$mul0); # ap[j]*bp[i]
230 &pmuludq($acc1,$mul1); # np[j]*m1
231 &paddq ($car0,$acc0); # +=c0
232 &paddq ($car1,$acc1); # +=c1
233
234 &movq ($acc0,$car0);
235 &movd ($temp,&DWP($frame+4,"esp",$j,4));# tp[j+1]
236 &pand ($acc0,$mask);
237 &movd ($acc1,&DWP(4,$np,$j,4)); # np[j+1]
238 &paddq ($car1,$acc0); # +=ap[j]*bp[i]+tp[j]
239 &movd ($acc0,&DWP(4,$ap,$j,4)); # ap[j+1]
240 &psrlq ($car0,32);
241 &movd (&DWP($frame-4,"esp",$j,4),$car1);# tp[j-1]=
242 &psrlq ($car1,32);
243 &paddq ($car0,$temp); # +=tp[j+1]
244
245 &dec ($num);
246 &lea ($j,&DWP(1,$j)); # j++
247 &jnz (&label("inner"));
248
249 &mov ($num,$j);
250 &pmuludq($acc0,$mul0); # ap[num-1]*bp[i]
251 &pmuludq($acc1,$mul1); # np[num-1]*m1
252 &paddq ($car0,$acc0); # +=c0
253 &paddq ($car1,$acc1); # +=c1
254
255 &movq ($acc0,$car0);
256 &pand ($acc0,$mask);
257 &paddq ($car1,$acc0); # +=ap[num-1]*bp[i]+tp[num-1]
258 &movd (&DWP($frame-4,"esp",$j,4),$car1); # tp[num-2]=
259 &psrlq ($car0,32);
260 &psrlq ($car1,32);
261
262 &movd ($temp,&DWP($frame+4,"esp",$num,4)); # += tp[num]
263 &paddq ($car1,$car0);
264 &paddq ($car1,$temp);
265 &movq (&QWP($frame,"esp",$num,4),$car1); # tp[num].tp[num-1]
266
267 &lea ($i,&DWP(1,$i)); # i++
268 &cmp ($i,$num);
269 &jle (&label("outer"));
270
271 &emms (); # done with mmx bank
272 &jmp (&label("common_tail"));
273
274&set_label("non_sse2",16);
275}
276
277if (0) {
278 &mov ("esp",$_sp);
279 &xor ("eax","eax"); # signal "not fast enough [yet]"
280 &jmp (&label("just_leave"));
281 # While the below code provides competitive performance for
282 # all key lengthes on modern Intel cores, it's still more
283 # than 10% slower for 4096-bit key elsewhere:-( "Competitive"
284 # means compared to the original integer-only assembler.
285 # 512-bit RSA sign is better by ~40%, but that's about all
286 # one can say about all CPUs...
287} else {
288$inp="esi"; # integer path uses these registers differently
289$word="edi";
290$carry="ebp";
291
292 &mov ($inp,$_ap);
293 &lea ($carry,&DWP(1,$num));
294 &mov ($word,$_bp);
295 &xor ($j,$j); # j=0
296 &mov ("edx",$inp);
297 &and ($carry,1); # see if num is even
298 &sub ("edx",$word); # see if ap==bp
299 &lea ("eax",&DWP(4,$word,$num,4)); # &bp[num]
300 &or ($carry,"edx");
301 &mov ($word,&DWP(0,$word)); # bp[0]
302 &jz (&label("bn_sqr_mont"));
303 &mov ($_bpend,"eax");
304 &mov ("eax",&DWP(0,$inp));
305 &xor ("edx","edx");
306
307&set_label("mull",16);
308 &mov ($carry,"edx");
309 &mul ($word); # ap[j]*bp[0]
310 &add ($carry,"eax");
311 &lea ($j,&DWP(1,$j));
312 &adc ("edx",0);
313 &mov ("eax",&DWP(0,$inp,$j,4)); # ap[j+1]
314 &cmp ($j,$num);
315 &mov (&DWP($frame-4,"esp",$j,4),$carry); # tp[j]=
316 &jl (&label("mull"));
317
318 &mov ($carry,"edx");
319 &mul ($word); # ap[num-1]*bp[0]
320 &mov ($word,$_n0);
321 &add ("eax",$carry);
322 &mov ($inp,$_np);
323 &adc ("edx",0);
324 &imul ($word,&DWP($frame,"esp")); # n0*tp[0]
325
326 &mov (&DWP($frame,"esp",$num,4),"eax"); # tp[num-1]=
327 &xor ($j,$j);
328 &mov (&DWP($frame+4,"esp",$num,4),"edx"); # tp[num]=
329 &mov (&DWP($frame+8,"esp",$num,4),$j); # tp[num+1]=
330
331 &mov ("eax",&DWP(0,$inp)); # np[0]
332 &mul ($word); # np[0]*m
333 &add ("eax",&DWP($frame,"esp")); # +=tp[0]
334 &mov ("eax",&DWP(4,$inp)); # np[1]
335 &adc ("edx",0);
336 &inc ($j);
337
338 &jmp (&label("2ndmadd"));
339
340&set_label("1stmadd",16);
341 &mov ($carry,"edx");
342 &mul ($word); # ap[j]*bp[i]
343 &add ($carry,&DWP($frame,"esp",$j,4)); # +=tp[j]
344 &lea ($j,&DWP(1,$j));
345 &adc ("edx",0);
346 &add ($carry,"eax");
347 &mov ("eax",&DWP(0,$inp,$j,4)); # ap[j+1]
348 &adc ("edx",0);
349 &cmp ($j,$num);
350 &mov (&DWP($frame-4,"esp",$j,4),$carry); # tp[j]=
351 &jl (&label("1stmadd"));
352
353 &mov ($carry,"edx");
354 &mul ($word); # ap[num-1]*bp[i]
355 &add ("eax",&DWP($frame,"esp",$num,4)); # +=tp[num-1]
356 &mov ($word,$_n0);
357 &adc ("edx",0);
358 &mov ($inp,$_np);
359 &add ($carry,"eax");
360 &adc ("edx",0);
361 &imul ($word,&DWP($frame,"esp")); # n0*tp[0]
362
363 &xor ($j,$j);
364 &add ("edx",&DWP($frame+4,"esp",$num,4)); # carry+=tp[num]
365 &mov (&DWP($frame,"esp",$num,4),$carry); # tp[num-1]=
366 &adc ($j,0);
367 &mov ("eax",&DWP(0,$inp)); # np[0]
368 &mov (&DWP($frame+4,"esp",$num,4),"edx"); # tp[num]=
369 &mov (&DWP($frame+8,"esp",$num,4),$j); # tp[num+1]=
370
371 &mul ($word); # np[0]*m
372 &add ("eax",&DWP($frame,"esp")); # +=tp[0]
373 &mov ("eax",&DWP(4,$inp)); # np[1]
374 &adc ("edx",0);
375 &mov ($j,1);
376
377&set_label("2ndmadd",16);
378 &mov ($carry,"edx");
379 &mul ($word); # np[j]*m
380 &add ($carry,&DWP($frame,"esp",$j,4)); # +=tp[j]
381 &lea ($j,&DWP(1,$j));
382 &adc ("edx",0);
383 &add ($carry,"eax");
384 &mov ("eax",&DWP(0,$inp,$j,4)); # np[j+1]
385 &adc ("edx",0);
386 &cmp ($j,$num);
387 &mov (&DWP($frame-8,"esp",$j,4),$carry); # tp[j-1]=
388 &jl (&label("2ndmadd"));
389
390 &mov ($carry,"edx");
391 &mul ($word); # np[j]*m
392 &add ($carry,&DWP($frame,"esp",$num,4)); # +=tp[num-1]
393 &adc ("edx",0);
394 &add ($carry,"eax");
395 &adc ("edx",0);
396 &mov (&DWP($frame-4,"esp",$num,4),$carry); # tp[num-2]=
397
398 &xor ("eax","eax");
399 &mov ($j,$_bp); # &bp[i]
400 &add ("edx",&DWP($frame+4,"esp",$num,4)); # carry+=tp[num]
401 &adc ("eax",&DWP($frame+8,"esp",$num,4)); # +=tp[num+1]
402 &lea ($j,&DWP(4,$j));
403 &mov (&DWP($frame,"esp",$num,4),"edx"); # tp[num-1]=
404 &cmp ($j,$_bpend);
405 &mov (&DWP($frame+4,"esp",$num,4),"eax"); # tp[num]=
406 &je (&label("common_tail"));
407
408 &mov ($word,&DWP(0,$j)); # bp[i+1]
409 &mov ($inp,$_ap);
410 &mov ($_bp,$j); # &bp[++i]
411 &xor ($j,$j);
412 &xor ("edx","edx");
413 &mov ("eax",&DWP(0,$inp));
414 &jmp (&label("1stmadd"));
415
416&set_label("bn_sqr_mont",16);
417$sbit=$num;
418 &mov ($_num,$num);
419 &mov ($_bp,$j); # i=0
420
421 &mov ("eax",$word); # ap[0]
422 &mul ($word); # ap[0]*ap[0]
423 &mov (&DWP($frame,"esp"),"eax"); # tp[0]=
424 &mov ($sbit,"edx");
425 &shr ("edx",1);
426 &and ($sbit,1);
427 &inc ($j);
428&set_label("sqr",16);
429 &mov ("eax",&DWP(0,$inp,$j,4)); # ap[j]
430 &mov ($carry,"edx");
431 &mul ($word); # ap[j]*ap[0]
432 &add ("eax",$carry);
433 &lea ($j,&DWP(1,$j));
434 &adc ("edx",0);
435 &lea ($carry,&DWP(0,$sbit,"eax",2));
436 &shr ("eax",31);
437 &cmp ($j,$_num);
438 &mov ($sbit,"eax");
439 &mov (&DWP($frame-4,"esp",$j,4),$carry); # tp[j]=
440 &jl (&label("sqr"));
441
442 &mov ("eax",&DWP(0,$inp,$j,4)); # ap[num-1]
443 &mov ($carry,"edx");
444 &mul ($word); # ap[num-1]*ap[0]
445 &add ("eax",$carry);
446 &mov ($word,$_n0);
447 &adc ("edx",0);
448 &mov ($inp,$_np);
449 &lea ($carry,&DWP(0,$sbit,"eax",2));
450 &imul ($word,&DWP($frame,"esp")); # n0*tp[0]
451 &shr ("eax",31);
452 &mov (&DWP($frame,"esp",$j,4),$carry); # tp[num-1]=
453
454 &lea ($carry,&DWP(0,"eax","edx",2));
455 &mov ("eax",&DWP(0,$inp)); # np[0]
456 &shr ("edx",31);
457 &mov (&DWP($frame+4,"esp",$j,4),$carry); # tp[num]=
458 &mov (&DWP($frame+8,"esp",$j,4),"edx"); # tp[num+1]=
459
460 &mul ($word); # np[0]*m
461 &add ("eax",&DWP($frame,"esp")); # +=tp[0]
462 &mov ($num,$j);
463 &adc ("edx",0);
464 &mov ("eax",&DWP(4,$inp)); # np[1]
465 &mov ($j,1);
466
467&set_label("3rdmadd",16);
468 &mov ($carry,"edx");
469 &mul ($word); # np[j]*m
470 &add ($carry,&DWP($frame,"esp",$j,4)); # +=tp[j]
471 &adc ("edx",0);
472 &add ($carry,"eax");
473 &mov ("eax",&DWP(4,$inp,$j,4)); # np[j+1]
474 &adc ("edx",0);
475 &mov (&DWP($frame-4,"esp",$j,4),$carry); # tp[j-1]=
476
477 &mov ($carry,"edx");
478 &mul ($word); # np[j+1]*m
479 &add ($carry,&DWP($frame+4,"esp",$j,4)); # +=tp[j+1]
480 &lea ($j,&DWP(2,$j));
481 &adc ("edx",0);
482 &add ($carry,"eax");
483 &mov ("eax",&DWP(0,$inp,$j,4)); # np[j+2]
484 &adc ("edx",0);
485 &cmp ($j,$num);
486 &mov (&DWP($frame-8,"esp",$j,4),$carry); # tp[j]=
487 &jl (&label("3rdmadd"));
488
489 &mov ($carry,"edx");
490 &mul ($word); # np[j]*m
491 &add ($carry,&DWP($frame,"esp",$num,4)); # +=tp[num-1]
492 &adc ("edx",0);
493 &add ($carry,"eax");
494 &adc ("edx",0);
495 &mov (&DWP($frame-4,"esp",$num,4),$carry); # tp[num-2]=
496
497 &mov ($j,$_bp); # i
498 &xor ("eax","eax");
499 &mov ($inp,$_ap);
500 &add ("edx",&DWP($frame+4,"esp",$num,4)); # carry+=tp[num]
501 &adc ("eax",&DWP($frame+8,"esp",$num,4)); # +=tp[num+1]
502 &mov (&DWP($frame,"esp",$num,4),"edx"); # tp[num-1]=
503 &cmp ($j,$num);
504 &mov (&DWP($frame+4,"esp",$num,4),"eax"); # tp[num]=
505 &je (&label("common_tail"));
506
507 &mov ($word,&DWP(4,$inp,$j,4)); # ap[i]
508 &lea ($j,&DWP(1,$j));
509 &mov ("eax",$word);
510 &mov ($_bp,$j); # ++i
511 &mul ($word); # ap[i]*ap[i]
512 &add ("eax",&DWP($frame,"esp",$j,4)); # +=tp[i]
513 &adc ("edx",0);
514 &mov (&DWP($frame,"esp",$j,4),"eax"); # tp[i]=
515 &xor ($carry,$carry);
516 &cmp ($j,$num);
517 &lea ($j,&DWP(1,$j));
518 &je (&label("sqrlast"));
519
520 &mov ($sbit,"edx"); # zaps $num
521 &shr ("edx",1);
522 &and ($sbit,1);
523&set_label("sqradd",16);
524 &mov ("eax",&DWP(0,$inp,$j,4)); # ap[j]
525 &mov ($carry,"edx");
526 &mul ($word); # ap[j]*ap[i]
527 &add ("eax",$carry);
528 &lea ($carry,&DWP(0,"eax","eax"));
529 &adc ("edx",0);
530 &shr ("eax",31);
531 &add ($carry,&DWP($frame,"esp",$j,4)); # +=tp[j]
532 &lea ($j,&DWP(1,$j));
533 &adc ("eax",0);
534 &add ($carry,$sbit);
535 &adc ("eax",0);
536 &cmp ($j,$_num);
537 &mov (&DWP($frame-4,"esp",$j,4),$carry); # tp[j]=
538 &mov ($sbit,"eax");
539 &jle (&label("sqradd"));
540
541 &mov ($carry,"edx");
542 &lea ("edx",&DWP(0,$sbit,"edx",2));
543 &shr ($carry,31);
544&set_label("sqrlast");
545 &mov ($word,$_n0);
546 &mov ($inp,$_np);
547 &imul ($word,&DWP($frame,"esp")); # n0*tp[0]
548
549 &add ("edx",&DWP($frame,"esp",$j,4)); # +=tp[num]
550 &mov ("eax",&DWP(0,$inp)); # np[0]
551 &adc ($carry,0);
552 &mov (&DWP($frame,"esp",$j,4),"edx"); # tp[num]=
553 &mov (&DWP($frame+4,"esp",$j,4),$carry); # tp[num+1]=
554
555 &mul ($word); # np[0]*m
556 &add ("eax",&DWP($frame,"esp")); # +=tp[0]
557 &lea ($num,&DWP(-1,$j));
558 &adc ("edx",0);
559 &mov ($j,1);
560 &mov ("eax",&DWP(4,$inp)); # np[1]
561
562 &jmp (&label("3rdmadd"));
563}
564
565&set_label("common_tail",16);
566 &mov ($np,$_np); # load modulus pointer
567 &mov ($rp,$_rp); # load result pointer
568 &lea ($tp,&DWP($frame,"esp")); # [$ap and $bp are zapped]
569
570 &mov ("eax",&DWP(0,$tp)); # tp[0]
571 &mov ($j,$num); # j=num-1
572 &xor ($i,$i); # i=0 and clear CF!
573
574&set_label("sub",16);
575 &sbb ("eax",&DWP(0,$np,$i,4));
576 &mov (&DWP(0,$rp,$i,4),"eax"); # rp[i]=tp[i]-np[i]
577 &dec ($j); # doesn't affect CF!
578 &mov ("eax",&DWP(4,$tp,$i,4)); # tp[i+1]
579 &lea ($i,&DWP(1,$i)); # i++
580 &jge (&label("sub"));
581
582 &sbb ("eax",0); # handle upmost overflow bit
583 &and ($tp,"eax");
584 &not ("eax");
585 &mov ($np,$rp);
586 &and ($np,"eax");
587 &or ($tp,$np); # tp=carry?tp:rp
588
589&set_label("copy",16); # copy or in-place refresh
590 &mov ("eax",&DWP(0,$tp,$num,4));
591 &mov (&DWP(0,$rp,$num,4),"eax"); # rp[i]=tp[i]
592 &mov (&DWP($frame,"esp",$num,4),$j); # zap temporary vector
593 &dec ($num);
594 &jge (&label("copy"));
595
596 &mov ("esp",$_sp); # pull saved stack pointer
597 &mov ("eax",1);
598&set_label("just_leave");
599&function_end("bn_mul_mont");
600
601&asciz("Montgomery Multiplication for x86, CRYPTOGAMS by <appro\@openssl.org>");
602
603&asm_finish();
diff --git a/src/lib/libcrypto/bn/bntest.c b/src/lib/libcrypto/bn/bntest.c
index 685007d330..310763eca0 100644
--- a/src/lib/libcrypto/bn/bntest.c
+++ b/src/lib/libcrypto/bn/bntest.c
@@ -55,6 +55,25 @@
55 * copied and put under another distribution licence 55 * copied and put under another distribution licence
56 * [including the GNU Public Licence.] 56 * [including the GNU Public Licence.]
57 */ 57 */
58/* ====================================================================
59 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
60 *
61 * Portions of the attached software ("Contribution") are developed by
62 * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
63 *
64 * The Contribution is licensed pursuant to the Eric Young open source
65 * license provided above.
66 *
67 * The binary polynomial arithmetic software is originally written by
68 * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
69 *
70 */
71
72/* Until the key-gen callbacks are modified to use newer prototypes, we allow
73 * deprecated functions for openssl-internal code */
74#ifdef OPENSSL_NO_DEPRECATED
75#undef OPENSSL_NO_DEPRECATED
76#endif
58 77
59#include <stdio.h> 78#include <stdio.h>
60#include <stdlib.h> 79#include <stdlib.h>
@@ -79,6 +98,7 @@ int test_lshift(BIO *bp,BN_CTX *ctx,BIGNUM *a_);
79int test_rshift1(BIO *bp); 98int test_rshift1(BIO *bp);
80int test_rshift(BIO *bp,BN_CTX *ctx); 99int test_rshift(BIO *bp,BN_CTX *ctx);
81int test_div(BIO *bp,BN_CTX *ctx); 100int test_div(BIO *bp,BN_CTX *ctx);
101int test_div_word(BIO *bp);
82int test_div_recp(BIO *bp,BN_CTX *ctx); 102int test_div_recp(BIO *bp,BN_CTX *ctx);
83int test_mul(BIO *bp); 103int test_mul(BIO *bp);
84int test_sqr(BIO *bp,BN_CTX *ctx); 104int test_sqr(BIO *bp,BN_CTX *ctx);
@@ -88,6 +108,15 @@ int test_mod_mul(BIO *bp,BN_CTX *ctx);
88int test_mod_exp(BIO *bp,BN_CTX *ctx); 108int test_mod_exp(BIO *bp,BN_CTX *ctx);
89int test_mod_exp_mont_consttime(BIO *bp,BN_CTX *ctx); 109int test_mod_exp_mont_consttime(BIO *bp,BN_CTX *ctx);
90int test_exp(BIO *bp,BN_CTX *ctx); 110int test_exp(BIO *bp,BN_CTX *ctx);
111int test_gf2m_add(BIO *bp);
112int test_gf2m_mod(BIO *bp);
113int test_gf2m_mod_mul(BIO *bp,BN_CTX *ctx);
114int test_gf2m_mod_sqr(BIO *bp,BN_CTX *ctx);
115int test_gf2m_mod_inv(BIO *bp,BN_CTX *ctx);
116int test_gf2m_mod_div(BIO *bp,BN_CTX *ctx);
117int test_gf2m_mod_exp(BIO *bp,BN_CTX *ctx);
118int test_gf2m_mod_sqrt(BIO *bp,BN_CTX *ctx);
119int test_gf2m_mod_solve_quad(BIO *bp,BN_CTX *ctx);
91int test_kron(BIO *bp,BN_CTX *ctx); 120int test_kron(BIO *bp,BN_CTX *ctx);
92int test_sqrt(BIO *bp,BN_CTX *ctx); 121int test_sqrt(BIO *bp,BN_CTX *ctx);
93int rand_neg(void); 122int rand_neg(void);
@@ -155,80 +184,120 @@ int main(int argc, char *argv[])
155 184
156 message(out,"BN_add"); 185 message(out,"BN_add");
157 if (!test_add(out)) goto err; 186 if (!test_add(out)) goto err;
158 BIO_flush(out); 187 (void)BIO_flush(out);
159 188
160 message(out,"BN_sub"); 189 message(out,"BN_sub");
161 if (!test_sub(out)) goto err; 190 if (!test_sub(out)) goto err;
162 BIO_flush(out); 191 (void)BIO_flush(out);
163 192
164 message(out,"BN_lshift1"); 193 message(out,"BN_lshift1");
165 if (!test_lshift1(out)) goto err; 194 if (!test_lshift1(out)) goto err;
166 BIO_flush(out); 195 (void)BIO_flush(out);
167 196
168 message(out,"BN_lshift (fixed)"); 197 message(out,"BN_lshift (fixed)");
169 if (!test_lshift(out,ctx,BN_bin2bn(lst,sizeof(lst)-1,NULL))) 198 if (!test_lshift(out,ctx,BN_bin2bn(lst,sizeof(lst)-1,NULL)))
170 goto err; 199 goto err;
171 BIO_flush(out); 200 (void)BIO_flush(out);
172 201
173 message(out,"BN_lshift"); 202 message(out,"BN_lshift");
174 if (!test_lshift(out,ctx,NULL)) goto err; 203 if (!test_lshift(out,ctx,NULL)) goto err;
175 BIO_flush(out); 204 (void)BIO_flush(out);
176 205
177 message(out,"BN_rshift1"); 206 message(out,"BN_rshift1");
178 if (!test_rshift1(out)) goto err; 207 if (!test_rshift1(out)) goto err;
179 BIO_flush(out); 208 (void)BIO_flush(out);
180 209
181 message(out,"BN_rshift"); 210 message(out,"BN_rshift");
182 if (!test_rshift(out,ctx)) goto err; 211 if (!test_rshift(out,ctx)) goto err;
183 BIO_flush(out); 212 (void)BIO_flush(out);
184 213
185 message(out,"BN_sqr"); 214 message(out,"BN_sqr");
186 if (!test_sqr(out,ctx)) goto err; 215 if (!test_sqr(out,ctx)) goto err;
187 BIO_flush(out); 216 (void)BIO_flush(out);
188 217
189 message(out,"BN_mul"); 218 message(out,"BN_mul");
190 if (!test_mul(out)) goto err; 219 if (!test_mul(out)) goto err;
191 BIO_flush(out); 220 (void)BIO_flush(out);
192 221
193 message(out,"BN_div"); 222 message(out,"BN_div");
194 if (!test_div(out,ctx)) goto err; 223 if (!test_div(out,ctx)) goto err;
195 BIO_flush(out); 224 (void)BIO_flush(out);
225
226 message(out,"BN_div_word");
227 if (!test_div_word(out)) goto err;
228 (void)BIO_flush(out);
196 229
197 message(out,"BN_div_recp"); 230 message(out,"BN_div_recp");
198 if (!test_div_recp(out,ctx)) goto err; 231 if (!test_div_recp(out,ctx)) goto err;
199 BIO_flush(out); 232 (void)BIO_flush(out);
200 233
201 message(out,"BN_mod"); 234 message(out,"BN_mod");
202 if (!test_mod(out,ctx)) goto err; 235 if (!test_mod(out,ctx)) goto err;
203 BIO_flush(out); 236 (void)BIO_flush(out);
204 237
205 message(out,"BN_mod_mul"); 238 message(out,"BN_mod_mul");
206 if (!test_mod_mul(out,ctx)) goto err; 239 if (!test_mod_mul(out,ctx)) goto err;
207 BIO_flush(out); 240 (void)BIO_flush(out);
208 241
209 message(out,"BN_mont"); 242 message(out,"BN_mont");
210 if (!test_mont(out,ctx)) goto err; 243 if (!test_mont(out,ctx)) goto err;
211 BIO_flush(out); 244 (void)BIO_flush(out);
212 245
213 message(out,"BN_mod_exp"); 246 message(out,"BN_mod_exp");
214 if (!test_mod_exp(out,ctx)) goto err; 247 if (!test_mod_exp(out,ctx)) goto err;
215 BIO_flush(out); 248 (void)BIO_flush(out);
216 249
217 message(out,"BN_mod_exp_mont_consttime"); 250 message(out,"BN_mod_exp_mont_consttime");
218 if (!test_mod_exp_mont_consttime(out,ctx)) goto err; 251 if (!test_mod_exp_mont_consttime(out,ctx)) goto err;
219 BIO_flush(out); 252 (void)BIO_flush(out);
220 253
221 message(out,"BN_exp"); 254 message(out,"BN_exp");
222 if (!test_exp(out,ctx)) goto err; 255 if (!test_exp(out,ctx)) goto err;
223 BIO_flush(out); 256 (void)BIO_flush(out);
224 257
225 message(out,"BN_kronecker"); 258 message(out,"BN_kronecker");
226 if (!test_kron(out,ctx)) goto err; 259 if (!test_kron(out,ctx)) goto err;
227 BIO_flush(out); 260 (void)BIO_flush(out);
228 261
229 message(out,"BN_mod_sqrt"); 262 message(out,"BN_mod_sqrt");
230 if (!test_sqrt(out,ctx)) goto err; 263 if (!test_sqrt(out,ctx)) goto err;
231 BIO_flush(out); 264 (void)BIO_flush(out);
265
266 message(out,"BN_GF2m_add");
267 if (!test_gf2m_add(out)) goto err;
268 (void)BIO_flush(out);
269
270 message(out,"BN_GF2m_mod");
271 if (!test_gf2m_mod(out)) goto err;
272 (void)BIO_flush(out);
273
274 message(out,"BN_GF2m_mod_mul");
275 if (!test_gf2m_mod_mul(out,ctx)) goto err;
276 (void)BIO_flush(out);
277
278 message(out,"BN_GF2m_mod_sqr");
279 if (!test_gf2m_mod_sqr(out,ctx)) goto err;
280 (void)BIO_flush(out);
281
282 message(out,"BN_GF2m_mod_inv");
283 if (!test_gf2m_mod_inv(out,ctx)) goto err;
284 (void)BIO_flush(out);
285
286 message(out,"BN_GF2m_mod_div");
287 if (!test_gf2m_mod_div(out,ctx)) goto err;
288 (void)BIO_flush(out);
289
290 message(out,"BN_GF2m_mod_exp");
291 if (!test_gf2m_mod_exp(out,ctx)) goto err;
292 (void)BIO_flush(out);
293
294 message(out,"BN_GF2m_mod_sqrt");
295 if (!test_gf2m_mod_sqrt(out,ctx)) goto err;
296 (void)BIO_flush(out);
297
298 message(out,"BN_GF2m_mod_solve_quad");
299 if (!test_gf2m_mod_solve_quad(out,ctx)) goto err;
300 (void)BIO_flush(out);
232 301
233 BN_CTX_free(ctx); 302 BN_CTX_free(ctx);
234 BIO_free(out); 303 BIO_free(out);
@@ -237,8 +306,8 @@ int main(int argc, char *argv[])
237 EXIT(0); 306 EXIT(0);
238err: 307err:
239 BIO_puts(out,"1\n"); /* make sure the Perl script fed by bc notices 308 BIO_puts(out,"1\n"); /* make sure the Perl script fed by bc notices
240 * the failure, see test_bn in test/Makefile */ 309 * the failure, see test_bn in test/Makefile.ssl*/
241 BIO_flush(out); 310 (void)BIO_flush(out);
242 ERR_load_crypto_strings(); 311 ERR_load_crypto_strings();
243 ERR_print_errors_fp(stderr); 312 ERR_print_errors_fp(stderr);
244 EXIT(1); 313 EXIT(1);
@@ -404,6 +473,78 @@ int test_div(BIO *bp, BN_CTX *ctx)
404 return(1); 473 return(1);
405 } 474 }
406 475
476static void print_word(BIO *bp,BN_ULONG w)
477 {
478#ifdef SIXTY_FOUR_BIT
479 if (sizeof(w) > sizeof(unsigned long))
480 {
481 unsigned long h=(unsigned long)(w>>32),
482 l=(unsigned long)(w);
483
484 if (h) BIO_printf(bp,"%lX%08lX",h,l);
485 else BIO_printf(bp,"%lX",l);
486 return;
487 }
488#endif
489 BIO_printf(bp,"%lX",w);
490 }
491
492int test_div_word(BIO *bp)
493 {
494 BIGNUM a,b;
495 BN_ULONG r,s;
496 int i;
497
498 BN_init(&a);
499 BN_init(&b);
500
501 for (i=0; i<num0; i++)
502 {
503 do {
504 BN_bntest_rand(&a,512,-1,0);
505 BN_bntest_rand(&b,BN_BITS2,-1,0);
506 s = b.d[0];
507 } while (!s);
508
509 BN_copy(&b, &a);
510 r = BN_div_word(&b, s);
511
512 if (bp != NULL)
513 {
514 if (!results)
515 {
516 BN_print(bp,&a);
517 BIO_puts(bp," / ");
518 print_word(bp,s);
519 BIO_puts(bp," - ");
520 }
521 BN_print(bp,&b);
522 BIO_puts(bp,"\n");
523
524 if (!results)
525 {
526 BN_print(bp,&a);
527 BIO_puts(bp," % ");
528 print_word(bp,s);
529 BIO_puts(bp," - ");
530 }
531 print_word(bp,r);
532 BIO_puts(bp,"\n");
533 }
534 BN_mul_word(&b,s);
535 BN_add_word(&b,r);
536 BN_sub(&b,&a,&b);
537 if(!BN_is_zero(&b))
538 {
539 fprintf(stderr,"Division (word) test failed!\n");
540 return 0;
541 }
542 }
543 BN_free(&a);
544 BN_free(&b);
545 return(1);
546 }
547
407int test_div_recp(BIO *bp, BN_CTX *ctx) 548int test_div_recp(BIO *bp, BN_CTX *ctx)
408 { 549 {
409 BIGNUM a,b,c,d,e; 550 BIGNUM a,b,c,d,e;
@@ -919,7 +1060,582 @@ int test_exp(BIO *bp, BN_CTX *ctx)
919 return(1); 1060 return(1);
920 } 1061 }
921 1062
922static void genprime_cb(int p, int n, void *arg) 1063int test_gf2m_add(BIO *bp)
1064 {
1065 BIGNUM a,b,c;
1066 int i, ret = 0;
1067
1068 BN_init(&a);
1069 BN_init(&b);
1070 BN_init(&c);
1071
1072 for (i=0; i<num0; i++)
1073 {
1074 BN_rand(&a,512,0,0);
1075 BN_copy(&b, BN_value_one());
1076 a.neg=rand_neg();
1077 b.neg=rand_neg();
1078 BN_GF2m_add(&c,&a,&b);
1079#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
1080 if (bp != NULL)
1081 {
1082 if (!results)
1083 {
1084 BN_print(bp,&a);
1085 BIO_puts(bp," ^ ");
1086 BN_print(bp,&b);
1087 BIO_puts(bp," = ");
1088 }
1089 BN_print(bp,&c);
1090 BIO_puts(bp,"\n");
1091 }
1092#endif
1093 /* Test that two added values have the correct parity. */
1094 if((BN_is_odd(&a) && BN_is_odd(&c)) || (!BN_is_odd(&a) && !BN_is_odd(&c)))
1095 {
1096 fprintf(stderr,"GF(2^m) addition test (a) failed!\n");
1097 goto err;
1098 }
1099 BN_GF2m_add(&c,&c,&c);
1100 /* Test that c + c = 0. */
1101 if(!BN_is_zero(&c))
1102 {
1103 fprintf(stderr,"GF(2^m) addition test (b) failed!\n");
1104 goto err;
1105 }
1106 }
1107 ret = 1;
1108 err:
1109 BN_free(&a);
1110 BN_free(&b);
1111 BN_free(&c);
1112 return ret;
1113 }
1114
1115int test_gf2m_mod(BIO *bp)
1116 {
1117 BIGNUM *a,*b[2],*c,*d,*e;
1118 int i, j, ret = 0;
1119 unsigned int p0[] = {163,7,6,3,0};
1120 unsigned int p1[] = {193,15,0};
1121
1122 a=BN_new();
1123 b[0]=BN_new();
1124 b[1]=BN_new();
1125 c=BN_new();
1126 d=BN_new();
1127 e=BN_new();
1128
1129 BN_GF2m_arr2poly(p0, b[0]);
1130 BN_GF2m_arr2poly(p1, b[1]);
1131
1132 for (i=0; i<num0; i++)
1133 {
1134 BN_bntest_rand(a, 1024, 0, 0);
1135 for (j=0; j < 2; j++)
1136 {
1137 BN_GF2m_mod(c, a, b[j]);
1138#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
1139 if (bp != NULL)
1140 {
1141 if (!results)
1142 {
1143 BN_print(bp,a);
1144 BIO_puts(bp," % ");
1145 BN_print(bp,b[j]);
1146 BIO_puts(bp," - ");
1147 BN_print(bp,c);
1148 BIO_puts(bp,"\n");
1149 }
1150 }
1151#endif
1152 BN_GF2m_add(d, a, c);
1153 BN_GF2m_mod(e, d, b[j]);
1154 /* Test that a + (a mod p) mod p == 0. */
1155 if(!BN_is_zero(e))
1156 {
1157 fprintf(stderr,"GF(2^m) modulo test failed!\n");
1158 goto err;
1159 }
1160 }
1161 }
1162 ret = 1;
1163 err:
1164 BN_free(a);
1165 BN_free(b[0]);
1166 BN_free(b[1]);
1167 BN_free(c);
1168 BN_free(d);
1169 BN_free(e);
1170 return ret;
1171 }
1172
1173int test_gf2m_mod_mul(BIO *bp,BN_CTX *ctx)
1174 {
1175 BIGNUM *a,*b[2],*c,*d,*e,*f,*g,*h;
1176 int i, j, ret = 0;
1177 unsigned int p0[] = {163,7,6,3,0};
1178 unsigned int p1[] = {193,15,0};
1179
1180 a=BN_new();
1181 b[0]=BN_new();
1182 b[1]=BN_new();
1183 c=BN_new();
1184 d=BN_new();
1185 e=BN_new();
1186 f=BN_new();
1187 g=BN_new();
1188 h=BN_new();
1189
1190 BN_GF2m_arr2poly(p0, b[0]);
1191 BN_GF2m_arr2poly(p1, b[1]);
1192
1193 for (i=0; i<num0; i++)
1194 {
1195 BN_bntest_rand(a, 1024, 0, 0);
1196 BN_bntest_rand(c, 1024, 0, 0);
1197 BN_bntest_rand(d, 1024, 0, 0);
1198 for (j=0; j < 2; j++)
1199 {
1200 BN_GF2m_mod_mul(e, a, c, b[j], ctx);
1201#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
1202 if (bp != NULL)
1203 {
1204 if (!results)
1205 {
1206 BN_print(bp,a);
1207 BIO_puts(bp," * ");
1208 BN_print(bp,c);
1209 BIO_puts(bp," % ");
1210 BN_print(bp,b[j]);
1211 BIO_puts(bp," - ");
1212 BN_print(bp,e);
1213 BIO_puts(bp,"\n");
1214 }
1215 }
1216#endif
1217 BN_GF2m_add(f, a, d);
1218 BN_GF2m_mod_mul(g, f, c, b[j], ctx);
1219 BN_GF2m_mod_mul(h, d, c, b[j], ctx);
1220 BN_GF2m_add(f, e, g);
1221 BN_GF2m_add(f, f, h);
1222 /* Test that (a+d)*c = a*c + d*c. */
1223 if(!BN_is_zero(f))
1224 {
1225 fprintf(stderr,"GF(2^m) modular multiplication test failed!\n");
1226 goto err;
1227 }
1228 }
1229 }
1230 ret = 1;
1231 err:
1232 BN_free(a);
1233 BN_free(b[0]);
1234 BN_free(b[1]);
1235 BN_free(c);
1236 BN_free(d);
1237 BN_free(e);
1238 BN_free(f);
1239 BN_free(g);
1240 BN_free(h);
1241 return ret;
1242 }
1243
1244int test_gf2m_mod_sqr(BIO *bp,BN_CTX *ctx)
1245 {
1246 BIGNUM *a,*b[2],*c,*d;
1247 int i, j, ret = 0;
1248 unsigned int p0[] = {163,7,6,3,0};
1249 unsigned int p1[] = {193,15,0};
1250
1251 a=BN_new();
1252 b[0]=BN_new();
1253 b[1]=BN_new();
1254 c=BN_new();
1255 d=BN_new();
1256
1257 BN_GF2m_arr2poly(p0, b[0]);
1258 BN_GF2m_arr2poly(p1, b[1]);
1259
1260 for (i=0; i<num0; i++)
1261 {
1262 BN_bntest_rand(a, 1024, 0, 0);
1263 for (j=0; j < 2; j++)
1264 {
1265 BN_GF2m_mod_sqr(c, a, b[j], ctx);
1266 BN_copy(d, a);
1267 BN_GF2m_mod_mul(d, a, d, b[j], ctx);
1268#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
1269 if (bp != NULL)
1270 {
1271 if (!results)
1272 {
1273 BN_print(bp,a);
1274 BIO_puts(bp," ^ 2 % ");
1275 BN_print(bp,b[j]);
1276 BIO_puts(bp, " = ");
1277 BN_print(bp,c);
1278 BIO_puts(bp,"; a * a = ");
1279 BN_print(bp,d);
1280 BIO_puts(bp,"\n");
1281 }
1282 }
1283#endif
1284 BN_GF2m_add(d, c, d);
1285 /* Test that a*a = a^2. */
1286 if(!BN_is_zero(d))
1287 {
1288 fprintf(stderr,"GF(2^m) modular squaring test failed!\n");
1289 goto err;
1290 }
1291 }
1292 }
1293 ret = 1;
1294 err:
1295 BN_free(a);
1296 BN_free(b[0]);
1297 BN_free(b[1]);
1298 BN_free(c);
1299 BN_free(d);
1300 return ret;
1301 }
1302
1303int test_gf2m_mod_inv(BIO *bp,BN_CTX *ctx)
1304 {
1305 BIGNUM *a,*b[2],*c,*d;
1306 int i, j, ret = 0;
1307 unsigned int p0[] = {163,7,6,3,0};
1308 unsigned int p1[] = {193,15,0};
1309
1310 a=BN_new();
1311 b[0]=BN_new();
1312 b[1]=BN_new();
1313 c=BN_new();
1314 d=BN_new();
1315
1316 BN_GF2m_arr2poly(p0, b[0]);
1317 BN_GF2m_arr2poly(p1, b[1]);
1318
1319 for (i=0; i<num0; i++)
1320 {
1321 BN_bntest_rand(a, 512, 0, 0);
1322 for (j=0; j < 2; j++)
1323 {
1324 BN_GF2m_mod_inv(c, a, b[j], ctx);
1325 BN_GF2m_mod_mul(d, a, c, b[j], ctx);
1326#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
1327 if (bp != NULL)
1328 {
1329 if (!results)
1330 {
1331 BN_print(bp,a);
1332 BIO_puts(bp, " * ");
1333 BN_print(bp,c);
1334 BIO_puts(bp," - 1 % ");
1335 BN_print(bp,b[j]);
1336 BIO_puts(bp,"\n");
1337 }
1338 }
1339#endif
1340 /* Test that ((1/a)*a) = 1. */
1341 if(!BN_is_one(d))
1342 {
1343 fprintf(stderr,"GF(2^m) modular inversion test failed!\n");
1344 goto err;
1345 }
1346 }
1347 }
1348 ret = 1;
1349 err:
1350 BN_free(a);
1351 BN_free(b[0]);
1352 BN_free(b[1]);
1353 BN_free(c);
1354 BN_free(d);
1355 return ret;
1356 }
1357
1358int test_gf2m_mod_div(BIO *bp,BN_CTX *ctx)
1359 {
1360 BIGNUM *a,*b[2],*c,*d,*e,*f;
1361 int i, j, ret = 0;
1362 unsigned int p0[] = {163,7,6,3,0};
1363 unsigned int p1[] = {193,15,0};
1364
1365 a=BN_new();
1366 b[0]=BN_new();
1367 b[1]=BN_new();
1368 c=BN_new();
1369 d=BN_new();
1370 e=BN_new();
1371 f=BN_new();
1372
1373 BN_GF2m_arr2poly(p0, b[0]);
1374 BN_GF2m_arr2poly(p1, b[1]);
1375
1376 for (i=0; i<num0; i++)
1377 {
1378 BN_bntest_rand(a, 512, 0, 0);
1379 BN_bntest_rand(c, 512, 0, 0);
1380 for (j=0; j < 2; j++)
1381 {
1382 BN_GF2m_mod_div(d, a, c, b[j], ctx);
1383 BN_GF2m_mod_mul(e, d, c, b[j], ctx);
1384 BN_GF2m_mod_div(f, a, e, b[j], ctx);
1385#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
1386 if (bp != NULL)
1387 {
1388 if (!results)
1389 {
1390 BN_print(bp,a);
1391 BIO_puts(bp, " = ");
1392 BN_print(bp,c);
1393 BIO_puts(bp," * ");
1394 BN_print(bp,d);
1395 BIO_puts(bp, " % ");
1396 BN_print(bp,b[j]);
1397 BIO_puts(bp,"\n");
1398 }
1399 }
1400#endif
1401 /* Test that ((a/c)*c)/a = 1. */
1402 if(!BN_is_one(f))
1403 {
1404 fprintf(stderr,"GF(2^m) modular division test failed!\n");
1405 goto err;
1406 }
1407 }
1408 }
1409 ret = 1;
1410 err:
1411 BN_free(a);
1412 BN_free(b[0]);
1413 BN_free(b[1]);
1414 BN_free(c);
1415 BN_free(d);
1416 BN_free(e);
1417 BN_free(f);
1418 return ret;
1419 }
1420
1421int test_gf2m_mod_exp(BIO *bp,BN_CTX *ctx)
1422 {
1423 BIGNUM *a,*b[2],*c,*d,*e,*f;
1424 int i, j, ret = 0;
1425 unsigned int p0[] = {163,7,6,3,0};
1426 unsigned int p1[] = {193,15,0};
1427
1428 a=BN_new();
1429 b[0]=BN_new();
1430 b[1]=BN_new();
1431 c=BN_new();
1432 d=BN_new();
1433 e=BN_new();
1434 f=BN_new();
1435
1436 BN_GF2m_arr2poly(p0, b[0]);
1437 BN_GF2m_arr2poly(p1, b[1]);
1438
1439 for (i=0; i<num0; i++)
1440 {
1441 BN_bntest_rand(a, 512, 0, 0);
1442 BN_bntest_rand(c, 512, 0, 0);
1443 BN_bntest_rand(d, 512, 0, 0);
1444 for (j=0; j < 2; j++)
1445 {
1446 BN_GF2m_mod_exp(e, a, c, b[j], ctx);
1447 BN_GF2m_mod_exp(f, a, d, b[j], ctx);
1448 BN_GF2m_mod_mul(e, e, f, b[j], ctx);
1449 BN_add(f, c, d);
1450 BN_GF2m_mod_exp(f, a, f, b[j], ctx);
1451#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
1452 if (bp != NULL)
1453 {
1454 if (!results)
1455 {
1456 BN_print(bp,a);
1457 BIO_puts(bp, " ^ (");
1458 BN_print(bp,c);
1459 BIO_puts(bp," + ");
1460 BN_print(bp,d);
1461 BIO_puts(bp, ") = ");
1462 BN_print(bp,e);
1463 BIO_puts(bp, "; - ");
1464 BN_print(bp,f);
1465 BIO_puts(bp, " % ");
1466 BN_print(bp,b[j]);
1467 BIO_puts(bp,"\n");
1468 }
1469 }
1470#endif
1471 BN_GF2m_add(f, e, f);
1472 /* Test that a^(c+d)=a^c*a^d. */
1473 if(!BN_is_zero(f))
1474 {
1475 fprintf(stderr,"GF(2^m) modular exponentiation test failed!\n");
1476 goto err;
1477 }
1478 }
1479 }
1480 ret = 1;
1481 err:
1482 BN_free(a);
1483 BN_free(b[0]);
1484 BN_free(b[1]);
1485 BN_free(c);
1486 BN_free(d);
1487 BN_free(e);
1488 BN_free(f);
1489 return ret;
1490 }
1491
1492int test_gf2m_mod_sqrt(BIO *bp,BN_CTX *ctx)
1493 {
1494 BIGNUM *a,*b[2],*c,*d,*e,*f;
1495 int i, j, ret = 0;
1496 unsigned int p0[] = {163,7,6,3,0};
1497 unsigned int p1[] = {193,15,0};
1498
1499 a=BN_new();
1500 b[0]=BN_new();
1501 b[1]=BN_new();
1502 c=BN_new();
1503 d=BN_new();
1504 e=BN_new();
1505 f=BN_new();
1506
1507 BN_GF2m_arr2poly(p0, b[0]);
1508 BN_GF2m_arr2poly(p1, b[1]);
1509
1510 for (i=0; i<num0; i++)
1511 {
1512 BN_bntest_rand(a, 512, 0, 0);
1513 for (j=0; j < 2; j++)
1514 {
1515 BN_GF2m_mod(c, a, b[j]);
1516 BN_GF2m_mod_sqrt(d, a, b[j], ctx);
1517 BN_GF2m_mod_sqr(e, d, b[j], ctx);
1518#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
1519 if (bp != NULL)
1520 {
1521 if (!results)
1522 {
1523 BN_print(bp,d);
1524 BIO_puts(bp, " ^ 2 - ");
1525 BN_print(bp,a);
1526 BIO_puts(bp,"\n");
1527 }
1528 }
1529#endif
1530 BN_GF2m_add(f, c, e);
1531 /* Test that d^2 = a, where d = sqrt(a). */
1532 if(!BN_is_zero(f))
1533 {
1534 fprintf(stderr,"GF(2^m) modular square root test failed!\n");
1535 goto err;
1536 }
1537 }
1538 }
1539 ret = 1;
1540 err:
1541 BN_free(a);
1542 BN_free(b[0]);
1543 BN_free(b[1]);
1544 BN_free(c);
1545 BN_free(d);
1546 BN_free(e);
1547 BN_free(f);
1548 return ret;
1549 }
1550
1551int test_gf2m_mod_solve_quad(BIO *bp,BN_CTX *ctx)
1552 {
1553 BIGNUM *a,*b[2],*c,*d,*e;
1554 int i, j, s = 0, t, ret = 0;
1555 unsigned int p0[] = {163,7,6,3,0};
1556 unsigned int p1[] = {193,15,0};
1557
1558 a=BN_new();
1559 b[0]=BN_new();
1560 b[1]=BN_new();
1561 c=BN_new();
1562 d=BN_new();
1563 e=BN_new();
1564
1565 BN_GF2m_arr2poly(p0, b[0]);
1566 BN_GF2m_arr2poly(p1, b[1]);
1567
1568 for (i=0; i<num0; i++)
1569 {
1570 BN_bntest_rand(a, 512, 0, 0);
1571 for (j=0; j < 2; j++)
1572 {
1573 t = BN_GF2m_mod_solve_quad(c, a, b[j], ctx);
1574 if (t)
1575 {
1576 s++;
1577 BN_GF2m_mod_sqr(d, c, b[j], ctx);
1578 BN_GF2m_add(d, c, d);
1579 BN_GF2m_mod(e, a, b[j]);
1580#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
1581 if (bp != NULL)
1582 {
1583 if (!results)
1584 {
1585 BN_print(bp,c);
1586 BIO_puts(bp, " is root of z^2 + z = ");
1587 BN_print(bp,a);
1588 BIO_puts(bp, " % ");
1589 BN_print(bp,b[j]);
1590 BIO_puts(bp, "\n");
1591 }
1592 }
1593#endif
1594 BN_GF2m_add(e, e, d);
1595 /* Test that solution of quadratic c satisfies c^2 + c = a. */
1596 if(!BN_is_zero(e))
1597 {
1598 fprintf(stderr,"GF(2^m) modular solve quadratic test failed!\n");
1599 goto err;
1600 }
1601
1602 }
1603 else
1604 {
1605#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
1606 if (bp != NULL)
1607 {
1608 if (!results)
1609 {
1610 BIO_puts(bp, "There are no roots of z^2 + z = ");
1611 BN_print(bp,a);
1612 BIO_puts(bp, " % ");
1613 BN_print(bp,b[j]);
1614 BIO_puts(bp, "\n");
1615 }
1616 }
1617#endif
1618 }
1619 }
1620 }
1621 if (s == 0)
1622 {
1623 fprintf(stderr,"All %i tests of GF(2^m) modular solve quadratic resulted in no roots;\n", num0);
1624 fprintf(stderr,"this is very unlikely and probably indicates an error.\n");
1625 goto err;
1626 }
1627 ret = 1;
1628 err:
1629 BN_free(a);
1630 BN_free(b[0]);
1631 BN_free(b[1]);
1632 BN_free(c);
1633 BN_free(d);
1634 BN_free(e);
1635 return ret;
1636 }
1637
1638static int genprime_cb(int p, int n, BN_GENCB *arg)
923 { 1639 {
924 char c='*'; 1640 char c='*';
925 1641
@@ -929,12 +1645,12 @@ static void genprime_cb(int p, int n, void *arg)
929 if (p == 3) c='\n'; 1645 if (p == 3) c='\n';
930 putc(c, stderr); 1646 putc(c, stderr);
931 fflush(stderr); 1647 fflush(stderr);
932 (void)n; 1648 return 1;
933 (void)arg;
934 } 1649 }
935 1650
936int test_kron(BIO *bp, BN_CTX *ctx) 1651int test_kron(BIO *bp, BN_CTX *ctx)
937 { 1652 {
1653 BN_GENCB cb;
938 BIGNUM *a,*b,*r,*t; 1654 BIGNUM *a,*b,*r,*t;
939 int i; 1655 int i;
940 int legendre, kronecker; 1656 int legendre, kronecker;
@@ -945,6 +1661,8 @@ int test_kron(BIO *bp, BN_CTX *ctx)
945 r = BN_new(); 1661 r = BN_new();
946 t = BN_new(); 1662 t = BN_new();
947 if (a == NULL || b == NULL || r == NULL || t == NULL) goto err; 1663 if (a == NULL || b == NULL || r == NULL || t == NULL) goto err;
1664
1665 BN_GENCB_set(&cb, genprime_cb, NULL);
948 1666
949 /* We test BN_kronecker(a, b, ctx) just for b odd (Jacobi symbol). 1667 /* We test BN_kronecker(a, b, ctx) just for b odd (Jacobi symbol).
950 * In this case we know that if b is prime, then BN_kronecker(a, b, ctx) 1668 * In this case we know that if b is prime, then BN_kronecker(a, b, ctx)
@@ -955,7 +1673,7 @@ int test_kron(BIO *bp, BN_CTX *ctx)
955 * don't want to test whether b is prime but whether BN_kronecker 1673 * don't want to test whether b is prime but whether BN_kronecker
956 * works.) */ 1674 * works.) */
957 1675
958 if (!BN_generate_prime(b, 512, 0, NULL, NULL, genprime_cb, NULL)) goto err; 1676 if (!BN_generate_prime_ex(b, 512, 0, NULL, NULL, &cb)) goto err;
959 b->neg = rand_neg(); 1677 b->neg = rand_neg();
960 putc('\n', stderr); 1678 putc('\n', stderr);
961 1679
@@ -1023,6 +1741,7 @@ int test_kron(BIO *bp, BN_CTX *ctx)
1023 1741
1024int test_sqrt(BIO *bp, BN_CTX *ctx) 1742int test_sqrt(BIO *bp, BN_CTX *ctx)
1025 { 1743 {
1744 BN_GENCB cb;
1026 BIGNUM *a,*p,*r; 1745 BIGNUM *a,*p,*r;
1027 int i, j; 1746 int i, j;
1028 int ret = 0; 1747 int ret = 0;
@@ -1031,7 +1750,9 @@ int test_sqrt(BIO *bp, BN_CTX *ctx)
1031 p = BN_new(); 1750 p = BN_new();
1032 r = BN_new(); 1751 r = BN_new();
1033 if (a == NULL || p == NULL || r == NULL) goto err; 1752 if (a == NULL || p == NULL || r == NULL) goto err;
1034 1753
1754 BN_GENCB_set(&cb, genprime_cb, NULL);
1755
1035 for (i = 0; i < 16; i++) 1756 for (i = 0; i < 16; i++)
1036 { 1757 {
1037 if (i < 8) 1758 if (i < 8)
@@ -1045,7 +1766,7 @@ int test_sqrt(BIO *bp, BN_CTX *ctx)
1045 if (!BN_set_word(a, 32)) goto err; 1766 if (!BN_set_word(a, 32)) goto err;
1046 if (!BN_set_word(r, 2*i + 1)) goto err; 1767 if (!BN_set_word(r, 2*i + 1)) goto err;
1047 1768
1048 if (!BN_generate_prime(p, 256, 0, a, r, genprime_cb, NULL)) goto err; 1769 if (!BN_generate_prime_ex(p, 256, 0, a, r, &cb)) goto err;
1049 putc('\n', stderr); 1770 putc('\n', stderr);
1050 } 1771 }
1051 p->neg = rand_neg(); 1772 p->neg = rand_neg();
diff --git a/src/lib/libcrypto/bn/exptest.c b/src/lib/libcrypto/bn/exptest.c
index 28aaac2ac1..f598a07cf5 100644
--- a/src/lib/libcrypto/bn/exptest.c
+++ b/src/lib/libcrypto/bn/exptest.c
@@ -195,6 +195,9 @@ int main(int argc, char *argv[])
195err: 195err:
196 ERR_load_crypto_strings(); 196 ERR_load_crypto_strings();
197 ERR_print_errors(out); 197 ERR_print_errors(out);
198#ifdef OPENSSL_SYS_NETWARE
199 printf("ERROR\n");
200#endif
198 EXIT(1); 201 EXIT(1);
199 return(1); 202 return(1);
200 } 203 }
diff --git a/src/lib/libcrypto/buffer/Makefile b/src/lib/libcrypto/buffer/Makefile
index 4b53c595a3..9f3a88d2d6 100644
--- a/src/lib/libcrypto/buffer/Makefile
+++ b/src/lib/libcrypto/buffer/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include 8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -51,6 +46,7 @@ links:
51 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 46 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
52 47
53install: 48install:
49 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
54 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 50 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
55 do \ 51 do \
56 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 52 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -66,6 +62,7 @@ lint:
66 lint -DLINT $(INCLUDES) $(SRC)>fluff 62 lint -DLINT $(INCLUDES) $(SRC)>fluff
67 63
68depend: 64depend:
65 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
69 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 66 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
70 67
71dclean: 68dclean:
@@ -81,12 +78,13 @@ buf_err.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
81buf_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 78buf_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
82buf_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 79buf_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
83buf_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 80buf_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
84buf_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 81buf_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
85buf_err.o: ../../include/openssl/symhacks.h buf_err.c 82buf_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
83buf_err.o: buf_err.c
86buffer.o: ../../e_os.h ../../include/openssl/bio.h 84buffer.o: ../../e_os.h ../../include/openssl/bio.h
87buffer.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 85buffer.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
88buffer.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 86buffer.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
89buffer.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 87buffer.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
90buffer.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 88buffer.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
91buffer.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 89buffer.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
92buffer.o: ../cryptlib.h buffer.c 90buffer.o: ../../include/openssl/symhacks.h ../cryptlib.h buffer.c
diff --git a/src/lib/libcrypto/cast/Makefile b/src/lib/libcrypto/cast/Makefile
index b388f6271c..149956ee90 100644
--- a/src/lib/libcrypto/cast/Makefile
+++ b/src/lib/libcrypto/cast/Makefile
@@ -8,23 +8,14 @@ CC= cc
8CPP= $(CC) -E 8CPP= $(CC) -E
9INCLUDES= 9INCLUDES=
10CFLAG=-g 10CFLAG=-g
11INSTALL_PREFIX=
12OPENSSLDIR= /usr/local/ssl
13INSTALLTOP=/usr/local/ssl
14MAKEDEPPROG= makedepend
15MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
16MAKEFILE= Makefile 11MAKEFILE= Makefile
17AR= ar r 12AR= ar r
18 13
19CAST_ENC=c_enc.o 14CAST_ENC=c_enc.o
20# or use
21#CAST_ENC=asm/cx86-elf.o
22#CAST_ENC=asm/cx86-out.o
23#CAST_ENC=asm/cx86-sol.o
24#CAST_ENC=asm/cx86bdsi.o
25 15
26CFLAGS= $(INCLUDES) $(CFLAG) 16CFLAGS= $(INCLUDES) $(CFLAG)
27ASFLAGS= $(INCLUDES) $(ASFLAG) 17ASFLAGS= $(INCLUDES) $(ASFLAG)
18AFLAGS= $(ASFLAGS)
28 19
29GENERAL=Makefile 20GENERAL=Makefile
30TEST=casttest.c 21TEST=casttest.c
@@ -51,20 +42,15 @@ lib: $(LIBOBJ)
51 $(RANLIB) $(LIB) || echo Never mind. 42 $(RANLIB) $(LIB) || echo Never mind.
52 @touch lib 43 @touch lib
53 44
54# elf 45# ELF
55asm/cx86-elf.s: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl 46cx86-elf.s: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
56 (cd asm; $(PERL) cast-586.pl elf $(CLAGS) $(PROCESSOR) > cx86-elf.s) 47 (cd asm; $(PERL) cast-586.pl elf $(CLAGS) $(PROCESSOR) > ../$@)
57 48# COFF
49cx86-cof.s: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
50 (cd asm; $(PERL) cast-586.pl coff $(CLAGS) $(PROCESSOR) > ../$@)
58# a.out 51# a.out
59asm/cx86-out.o: asm/cx86unix.cpp 52cx86-out.s: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
60 $(CPP) -DOUT asm/cx86unix.cpp | as -o asm/cx86-out.o 53 (cd asm; $(PERL) cast-586.pl a.out $(CLAGS) $(PROCESSOR) > ../$@)
61
62# bsdi
63asm/cx86bsdi.o: asm/cx86unix.cpp
64 $(CPP) -DBSDI asm/cx86unix.cpp | sed 's/ :/:/' | as -o asm/cx86bsdi.o
65
66asm/cx86unix.cpp: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
67 (cd asm; $(PERL) cast-586.pl cpp $(PROCESSOR) >cx86unix.cpp)
68 54
69files: 55files:
70 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO 56 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
@@ -75,6 +61,7 @@ links:
75 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 61 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
76 62
77install: 63install:
64 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
78 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 65 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
79 do \ 66 do \
80 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 67 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -90,6 +77,7 @@ lint:
90 lint -DLINT $(INCLUDES) $(SRC)>fluff 77 lint -DLINT $(INCLUDES) $(SRC)>fluff
91 78
92depend: 79depend:
80 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
93 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 81 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
94 82
95dclean: 83dclean:
@@ -97,7 +85,7 @@ dclean:
97 mv -f Makefile.new $(MAKEFILE) 85 mv -f Makefile.new $(MAKEFILE)
98 86
99clean: 87clean:
100 rm -f asm/cx86unix.cpp asm/*-elf.* *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff 88 rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
101 89
102# DO NOT DELETE THIS LINE -- make depend depends on it. 90# DO NOT DELETE THIS LINE -- make depend depends on it.
103 91
@@ -114,8 +102,5 @@ c_ofb64.o: ../../e_os.h ../../include/openssl/cast.h
114c_ofb64.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h 102c_ofb64.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
115c_ofb64.o: c_ofb64.c cast_lcl.h 103c_ofb64.o: c_ofb64.c cast_lcl.h
116c_skey.o: ../../e_os.h ../../include/openssl/cast.h 104c_skey.o: ../../e_os.h ../../include/openssl/cast.h
117c_skey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 105c_skey.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
118c_skey.o: ../../include/openssl/fips.h ../../include/openssl/opensslconf.h
119c_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
120c_skey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
121c_skey.o: c_skey.c cast_lcl.h cast_s.h 106c_skey.o: c_skey.c cast_lcl.h cast_s.h
diff --git a/src/lib/libcrypto/cast/cast_spd.c b/src/lib/libcrypto/cast/cast_spd.c
index 76abf50d98..d650af475c 100644
--- a/src/lib/libcrypto/cast/cast_spd.c
+++ b/src/lib/libcrypto/cast/cast_spd.c
@@ -69,7 +69,10 @@
69#include OPENSSL_UNISTD_IO 69#include OPENSSL_UNISTD_IO
70OPENSSL_DECLARE_EXIT 70OPENSSL_DECLARE_EXIT
71 71
72#ifndef OPENSSL_SYS_NETWARE
72#include <signal.h> 73#include <signal.h>
74#endif
75
73#ifndef _IRIX 76#ifndef _IRIX
74#include <time.h> 77#include <time.h>
75#endif 78#endif
diff --git a/src/lib/libcrypto/cast/castopts.c b/src/lib/libcrypto/cast/castopts.c
index 1b858d153b..33b2c7b06f 100644
--- a/src/lib/libcrypto/cast/castopts.c
+++ b/src/lib/libcrypto/cast/castopts.c
@@ -69,7 +69,10 @@
69#include OPENSSL_UNISTD_IO 69#include OPENSSL_UNISTD_IO
70OPENSSL_DECLARE_EXIT 70OPENSSL_DECLARE_EXIT
71 71
72#ifndef OPENSSL_SYS_NETWARE
72#include <signal.h> 73#include <signal.h>
74#endif
75
73#ifndef _IRIX 76#ifndef _IRIX
74#include <time.h> 77#include <time.h>
75#endif 78#endif
diff --git a/src/lib/libcrypto/cast/casttest.c b/src/lib/libcrypto/cast/casttest.c
index 83e5a16c73..0d020d6975 100644
--- a/src/lib/libcrypto/cast/casttest.c
+++ b/src/lib/libcrypto/cast/casttest.c
@@ -59,6 +59,7 @@
59#include <stdio.h> 59#include <stdio.h>
60#include <string.h> 60#include <string.h>
61#include <stdlib.h> 61#include <stdlib.h>
62#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_CAST is defined */
62 63
63#include "../e_os.h" 64#include "../e_os.h"
64 65
diff --git a/src/lib/libcrypto/comp/Makefile b/src/lib/libcrypto/comp/Makefile
index df1babec5c..efda832dce 100644
--- a/src/lib/libcrypto/comp/Makefile
+++ b/src/lib/libcrypto/comp/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include 8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -54,6 +49,7 @@ links:
54 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 49 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
55 50
56install: 51install:
52 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
57 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 53 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
58 do \ 54 do \
59 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 55 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -69,6 +65,7 @@ lint:
69 lint -DLINT $(INCLUDES) $(SRC)>fluff 65 lint -DLINT $(INCLUDES) $(SRC)>fluff
70 66
71depend: 67depend:
68 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
72 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC) 69 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
73 70
74dclean: 71dclean:
@@ -81,33 +78,31 @@ clean:
81# DO NOT DELETE THIS LINE -- make depend depends on it. 78# DO NOT DELETE THIS LINE -- make depend depends on it.
82 79
83c_rle.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 80c_rle.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
84c_rle.o: ../../include/openssl/bn.h ../../include/openssl/comp.h 81c_rle.o: ../../include/openssl/comp.h ../../include/openssl/crypto.h
85c_rle.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 82c_rle.o: ../../include/openssl/e_os2.h ../../include/openssl/obj_mac.h
86c_rle.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 83c_rle.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
87c_rle.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 84c_rle.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
88c_rle.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h 85c_rle.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
89c_rle.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h c_rle.c 86c_rle.o: ../../include/openssl/symhacks.h c_rle.c
90c_zlib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 87c_zlib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
91c_zlib.o: ../../include/openssl/bn.h ../../include/openssl/comp.h 88c_zlib.o: ../../include/openssl/comp.h ../../include/openssl/crypto.h
92c_zlib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 89c_zlib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
93c_zlib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 90c_zlib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
94c_zlib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 91c_zlib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
95c_zlib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 92c_zlib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
96c_zlib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h 93c_zlib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
97c_zlib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 94c_zlib.o: ../../include/openssl/symhacks.h c_zlib.c
98c_zlib.o: c_zlib.c
99comp_err.o: ../../include/openssl/bio.h ../../include/openssl/comp.h 95comp_err.o: ../../include/openssl/bio.h ../../include/openssl/comp.h
100comp_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 96comp_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
101comp_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 97comp_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
102comp_err.o: ../../include/openssl/opensslconf.h 98comp_err.o: ../../include/openssl/opensslconf.h
103comp_err.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 99comp_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
104comp_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 100comp_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
105comp_err.o: comp_err.c 101comp_err.o: ../../include/openssl/symhacks.h comp_err.c
106comp_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 102comp_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
107comp_lib.o: ../../include/openssl/bn.h ../../include/openssl/comp.h 103comp_lib.o: ../../include/openssl/comp.h ../../include/openssl/crypto.h
108comp_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 104comp_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/obj_mac.h
109comp_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 105comp_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
110comp_lib.o: ../../include/openssl/opensslconf.h
111comp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 106comp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
112comp_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 107comp_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
113comp_lib.o: ../../include/openssl/symhacks.h comp_lib.c 108comp_lib.o: ../../include/openssl/symhacks.h comp_lib.c
diff --git a/src/lib/libcrypto/conf/Makefile b/src/lib/libcrypto/conf/Makefile
index 403d12b28c..78bb324106 100644
--- a/src/lib/libcrypto/conf/Makefile
+++ b/src/lib/libcrypto/conf/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include 8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -54,6 +49,7 @@ links:
54 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 49 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
55 50
56install: 51install:
52 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
57 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 53 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
58 do \ 54 do \
59 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 55 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -69,6 +65,7 @@ lint:
69 lint -DLINT $(INCLUDES) $(SRC)>fluff 65 lint -DLINT $(INCLUDES) $(SRC)>fluff
70 66
71depend: 67depend:
68 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
72 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC) 69 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
73 70
74dclean: 71dclean:
@@ -84,98 +81,72 @@ conf_api.o: ../../e_os.h ../../include/openssl/bio.h
84conf_api.o: ../../include/openssl/conf.h ../../include/openssl/conf_api.h 81conf_api.o: ../../include/openssl/conf.h ../../include/openssl/conf_api.h
85conf_api.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 82conf_api.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
86conf_api.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 83conf_api.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
87conf_api.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 84conf_api.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
88conf_api.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 85conf_api.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
89conf_api.o: conf_api.c 86conf_api.o: ../../include/openssl/symhacks.h conf_api.c
90conf_def.o: ../../e_os.h ../../include/openssl/bio.h 87conf_def.o: ../../e_os.h ../../include/openssl/bio.h
91conf_def.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h 88conf_def.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
92conf_def.o: ../../include/openssl/conf_api.h ../../include/openssl/crypto.h 89conf_def.o: ../../include/openssl/conf_api.h ../../include/openssl/crypto.h
93conf_def.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 90conf_def.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
94conf_def.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 91conf_def.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
95conf_def.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 92conf_def.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
96conf_def.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 93conf_def.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
97conf_def.o: ../cryptlib.h conf_def.c conf_def.h 94conf_def.o: ../../include/openssl/symhacks.h ../cryptlib.h conf_def.c
95conf_def.o: conf_def.h
98conf_err.o: ../../include/openssl/bio.h ../../include/openssl/conf.h 96conf_err.o: ../../include/openssl/bio.h ../../include/openssl/conf.h
99conf_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 97conf_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
100conf_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 98conf_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
101conf_err.o: ../../include/openssl/opensslconf.h 99conf_err.o: ../../include/openssl/opensslconf.h
102conf_err.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 100conf_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
103conf_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 101conf_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
104conf_err.o: conf_err.c 102conf_err.o: ../../include/openssl/symhacks.h conf_err.c
105conf_lib.o: ../../include/openssl/bio.h ../../include/openssl/conf.h 103conf_lib.o: ../../include/openssl/bio.h ../../include/openssl/conf.h
106conf_lib.o: ../../include/openssl/conf_api.h ../../include/openssl/crypto.h 104conf_lib.o: ../../include/openssl/conf_api.h ../../include/openssl/crypto.h
107conf_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 105conf_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
108conf_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 106conf_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
109conf_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 107conf_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
110conf_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 108conf_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
111conf_lib.o: conf_lib.c 109conf_lib.o: ../../include/openssl/symhacks.h conf_lib.c
112conf_mall.o: ../../e_os.h ../../include/openssl/aes.h 110conf_mall.o: ../../e_os.h ../../include/openssl/asn1.h
113conf_mall.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 111conf_mall.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
114conf_mall.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
115conf_mall.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
116conf_mall.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 112conf_mall.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
117conf_mall.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
118conf_mall.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
119conf_mall.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h 113conf_mall.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
120conf_mall.o: ../../include/openssl/engine.h ../../include/openssl/err.h 114conf_mall.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
121conf_mall.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 115conf_mall.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
122conf_mall.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 116conf_mall.o: ../../include/openssl/err.h ../../include/openssl/evp.h
123conf_mall.o: ../../include/openssl/md4.h ../../include/openssl/md5.h 117conf_mall.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
124conf_mall.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
125conf_mall.o: ../../include/openssl/objects.h 118conf_mall.o: ../../include/openssl/objects.h
126conf_mall.o: ../../include/openssl/opensslconf.h 119conf_mall.o: ../../include/openssl/opensslconf.h
127conf_mall.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 120conf_mall.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
128conf_mall.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h 121conf_mall.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
129conf_mall.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
130conf_mall.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
131conf_mall.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
132conf_mall.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 122conf_mall.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
133conf_mall.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 123conf_mall.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
134conf_mall.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
135conf_mall.o: ../../include/openssl/x509_vfy.h ../cryptlib.h conf_mall.c 124conf_mall.o: ../../include/openssl/x509_vfy.h ../cryptlib.h conf_mall.c
136conf_mod.o: ../../e_os.h ../../include/openssl/aes.h 125conf_mod.o: ../../e_os.h ../../include/openssl/asn1.h
137conf_mod.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 126conf_mod.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
138conf_mod.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
139conf_mod.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
140conf_mod.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 127conf_mod.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
141conf_mod.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
142conf_mod.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
143conf_mod.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h 128conf_mod.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
144conf_mod.o: ../../include/openssl/err.h ../../include/openssl/evp.h 129conf_mod.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
145conf_mod.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 130conf_mod.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
146conf_mod.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 131conf_mod.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
147conf_mod.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
148conf_mod.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 132conf_mod.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
149conf_mod.o: ../../include/openssl/opensslconf.h 133conf_mod.o: ../../include/openssl/opensslconf.h
150conf_mod.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 134conf_mod.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
151conf_mod.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 135conf_mod.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
152conf_mod.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 136conf_mod.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
153conf_mod.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 137conf_mod.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
154conf_mod.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 138conf_mod.o: ../../include/openssl/x509_vfy.h ../cryptlib.h conf_mod.c
155conf_mod.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 139conf_sap.o: ../../e_os.h ../../include/openssl/asn1.h
156conf_mod.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 140conf_sap.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
157conf_mod.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
158conf_mod.o: ../cryptlib.h conf_mod.c
159conf_sap.o: ../../e_os.h ../../include/openssl/aes.h
160conf_sap.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
161conf_sap.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
162conf_sap.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
163conf_sap.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 141conf_sap.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
164conf_sap.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
165conf_sap.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
166conf_sap.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h 142conf_sap.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
167conf_sap.o: ../../include/openssl/engine.h ../../include/openssl/err.h 143conf_sap.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
168conf_sap.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 144conf_sap.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
169conf_sap.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 145conf_sap.o: ../../include/openssl/err.h ../../include/openssl/evp.h
170conf_sap.o: ../../include/openssl/md4.h ../../include/openssl/md5.h 146conf_sap.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
171conf_sap.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
172conf_sap.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 147conf_sap.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
173conf_sap.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 148conf_sap.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
174conf_sap.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h 149conf_sap.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
175conf_sap.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
176conf_sap.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
177conf_sap.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
178conf_sap.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 150conf_sap.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
179conf_sap.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 151conf_sap.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
180conf_sap.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
181conf_sap.o: ../../include/openssl/x509_vfy.h ../cryptlib.h conf_sap.c 152conf_sap.o: ../../include/openssl/x509_vfy.h ../cryptlib.h conf_sap.c
diff --git a/src/lib/libcrypto/crypto-lib.com b/src/lib/libcrypto/crypto-lib.com
index 427c321f25..8898f30c1f 100644
--- a/src/lib/libcrypto/crypto-lib.com
+++ b/src/lib/libcrypto/crypto-lib.com
@@ -75,12 +75,15 @@ $ ENDIF
75$! 75$!
76$! Define The Different Encryption Types. 76$! Define The Different Encryption Types.
77$! 77$!
78$ ENCRYPT_TYPES = "Basic,MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,"+ - 78$ ENCRYPT_TYPES = "Basic,"+ -
79 "DES,RC2,RC4,RC5,IDEA,BF,CAST,"+ - 79 "OBJECTS,"+ -
80 "BN,EC,RSA,DSA,DH,DSO,ENGINE,AES,"+ - 80 "MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,"+ -
81 "BUFFER,BIO,STACK,LHASH,RAND,ERR,OBJECTS,"+ - 81 "DES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,SEED,"+ -
82 "BN,EC,RSA,DSA,ECDSA,DH,ECDH,DSO,ENGINE,AES,"+ -
83 "BUFFER,BIO,STACK,LHASH,RAND,ERR,"+ -
82 "EVP,EVP_2,ASN1,ASN1_2,PEM,X509,X509V3,"+ - 84 "EVP,EVP_2,ASN1,ASN1_2,PEM,X509,X509V3,"+ -
83 "CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI,KRB5" 85 "CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI,KRB5,"+ -
86 "STORE,CMS,PQUEUE"
84$! 87$!
85$! Check To Make Sure We Have Valid Command Line Parameters. 88$! Check To Make Sure We Have Valid Command Line Parameters.
86$! 89$!
@@ -158,11 +161,11 @@ $!
158$ APPS_DES = "DES/DES,CBC3_ENC" 161$ APPS_DES = "DES/DES,CBC3_ENC"
159$ APPS_PKCS7 = "ENC/ENC;DEC/DEC;SIGN/SIGN;VERIFY/VERIFY,EXAMPLE" 162$ APPS_PKCS7 = "ENC/ENC;DEC/DEC;SIGN/SIGN;VERIFY/VERIFY,EXAMPLE"
160$ 163$
161$ LIB_ = "cryptlib,mem,mem_clr,mem_dbg,cversion,ex_data,tmdiff,cpt_err,ebcdic,uid,o_time,o_str" 164$ LIB_ = "cryptlib,mem,mem_clr,mem_dbg,cversion,ex_data,tmdiff,cpt_err,ebcdic,uid,o_time,o_str,o_dir"
162$ LIB_MD2 = "md2_dgst,md2_one" 165$ LIB_MD2 = "md2_dgst,md2_one"
163$ LIB_MD4 = "md4_dgst,md4_one" 166$ LIB_MD4 = "md4_dgst,md4_one"
164$ LIB_MD5 = "md5_dgst,md5_one" 167$ LIB_MD5 = "md5_dgst,md5_one"
165$ LIB_SHA = "sha_dgst,sha1dgst,sha_one,sha1_one" 168$ LIB_SHA = "sha_dgst,sha1dgst,sha_one,sha1_one,sha256,sha512"
166$ LIB_MDC2 = "mdc2dgst,mdc2_one" 169$ LIB_MDC2 = "mdc2dgst,mdc2_one"
167$ LIB_HMAC = "hmac" 170$ LIB_HMAC = "hmac"
168$ LIB_RIPEMD = "rmd_dgst,rmd_one" 171$ LIB_RIPEMD = "rmd_dgst,rmd_one"
@@ -179,34 +182,43 @@ $ LIB_RC5 = "rc5_skey,rc5_ecb,rc5_enc,rc5cfb64,rc5ofb64"
179$ LIB_IDEA = "i_cbc,i_cfb64,i_ofb64,i_ecb,i_skey" 182$ LIB_IDEA = "i_cbc,i_cfb64,i_ofb64,i_ecb,i_skey"
180$ LIB_BF = "bf_skey,bf_ecb,bf_enc,bf_cfb64,bf_ofb64" 183$ LIB_BF = "bf_skey,bf_ecb,bf_enc,bf_cfb64,bf_ofb64"
181$ LIB_CAST = "c_skey,c_ecb,c_enc,c_cfb64,c_ofb64" 184$ LIB_CAST = "c_skey,c_ecb,c_enc,c_cfb64,c_ofb64"
185$ LIB_CAMELLIA = "camellia,cmll_misc,cmll_ecb,cmll_cbc,cmll_ofb,"+ -
186 "cmll_cfb,cmll_ctr"
187$ LIB_SEED = "seed,seed_cbc,seed_ecb,seed_cfb,seed_ofb"
182$ LIB_BN_ASM = "[.asm]vms.mar,vms-helper" 188$ LIB_BN_ASM = "[.asm]vms.mar,vms-helper"
183$ IF F$TRNLNM("OPENSSL_NO_ASM").OR.ARCH.EQS."AXP" THEN LIB_BN_ASM = "bn_asm" 189$ IF F$TRNLNM("OPENSSL_NO_ASM").OR.ARCH.EQS."AXP" THEN LIB_BN_ASM = "bn_asm"
184$ LIB_BN = "bn_add,bn_div,bn_exp,bn_lib,bn_ctx,bn_mul,bn_mod,"+ - 190$ LIB_BN = "bn_add,bn_div,bn_exp,bn_lib,bn_ctx,bn_mul,bn_mod,"+ -
185 "bn_print,bn_rand,bn_shift,bn_word,bn_blind,"+ - 191 "bn_print,bn_rand,bn_shift,bn_word,bn_blind,"+ -
186 "bn_kron,bn_sqrt,bn_gcd,bn_prime,bn_err,bn_sqr,"+LIB_BN_ASM+","+ - 192 "bn_kron,bn_sqrt,bn_gcd,bn_prime,bn_err,bn_sqr,"+LIB_BN_ASM+","+ -
187 "bn_recp,bn_mont,bn_mpi,bn_exp2,bn_x931p" 193 "bn_recp,bn_mont,bn_mpi,bn_exp2,bn_gf2m,bn_nist,"+ -
194 "bn_depr,bn_const"
195$ LIB_EC = "ec_lib,ecp_smpl,ecp_mont,ecp_nist,ec_cvt,ec_mult,"+ -
196 "ec_err,ec_curve,ec_check,ec_print,ec_asn1,ec_key,"+ -
197 "ec2_smpl,ec2_mult"
188$ LIB_RSA = "rsa_eay,rsa_gen,rsa_lib,rsa_sign,rsa_saos,rsa_err,"+ - 198$ LIB_RSA = "rsa_eay,rsa_gen,rsa_lib,rsa_sign,rsa_saos,rsa_err,"+ -
189 "rsa_pk1,rsa_ssl,rsa_none,rsa_oaep,rsa_chk,rsa_null,"+ - 199 "rsa_pk1,rsa_ssl,rsa_none,rsa_oaep,rsa_chk,rsa_null,"+ -
190 "rsa_pss,rsa_x931,rsa_asn1" 200 "rsa_pss,rsa_x931,rsa_asn1,rsa_depr"
191$ LIB_EC = "ec_lib,ecp_smpl,ecp_mont,ecp_recp,ecp_nist,ec_cvt,ec_mult,"+ - 201$ LIB_DSA = "dsa_gen,dsa_key,dsa_lib,dsa_asn1,dsa_vrf,dsa_sign,"+ -
192 "ec_err" 202 "dsa_err,dsa_ossl,dsa_depr"
193$ LIB_DSA = "dsa_gen,dsa_key,dsa_lib,dsa_asn1,dsa_vrf,dsa_sign,dsa_err,dsa_ossl" 203$ LIB_ECDSA = "ecs_lib,ecs_asn1,ecs_ossl,ecs_sign,ecs_vrf,ecs_err"
194$ LIB_DH = "dh_asn1,dh_gen,dh_key,dh_lib,dh_check,dh_err" 204$ LIB_DH = "dh_asn1,dh_gen,dh_key,dh_lib,dh_check,dh_err,dh_depr"
205$ LIB_ECDH = "ech_lib,ech_ossl,ech_key,ech_err"
195$ LIB_DSO = "dso_dl,dso_dlfcn,dso_err,dso_lib,dso_null,"+ - 206$ LIB_DSO = "dso_dl,dso_dlfcn,dso_err,dso_lib,dso_null,"+ -
196 "dso_openssl,dso_win32,dso_vms" 207 "dso_openssl,dso_win32,dso_vms"
197$ LIB_ENGINE = "eng_err,eng_lib,eng_list,eng_init,eng_ctrl,"+ - 208$ LIB_ENGINE = "eng_err,eng_lib,eng_list,eng_init,eng_ctrl,"+ -
198 "eng_table,eng_pkey,eng_fat,eng_all,"+ - 209 "eng_table,eng_pkey,eng_fat,eng_all,"+ -
199 "tb_rsa,tb_dsa,tb_dh,tb_rand,tb_cipher,tb_digest,"+ - 210 "tb_rsa,tb_dsa,tb_ecdsa,tb_dh,tb_ecdh,tb_rand,tb_store,"+ -
200 "eng_openssl,eng_dyn,eng_cnf,"+ - 211 "tb_cipher,tb_digest,"+ -
201 "hw_atalla,hw_cswift,hw_ncipher,hw_nuron,hw_ubsec,"+ - 212 "eng_openssl,eng_dyn,eng_cnf,eng_cryptodev,eng_padlock"
202 "hw_cryptodev,hw_aep,hw_sureware,hw_4758_cca" 213$ LIB_AES = "aes_core,aes_misc,aes_ecb,aes_cbc,aes_cfb,aes_ofb,"+ -
203$ LIB_AES = "aes_core,aes_misc,aes_ecb,aes_cbc,aes_cfb,aes_ofb,aes_ctr" 214 "aes_ctr,aes_ige,aes_wrap"
204$ LIB_BUFFER = "buffer,buf_err" 215$ LIB_BUFFER = "buffer,buf_err"
205$ LIB_BIO = "bio_lib,bio_cb,bio_err,"+ - 216$ LIB_BIO = "bio_lib,bio_cb,bio_err,"+ -
206 "bss_mem,bss_null,bss_fd,"+ - 217 "bss_mem,bss_null,bss_fd,"+ -
207 "bss_file,bss_sock,bss_conn,"+ - 218 "bss_file,bss_sock,bss_conn,"+ -
208 "bf_null,bf_buff,b_print,b_dump,"+ - 219 "bf_null,bf_buff,b_print,b_dump,"+ -
209 "b_sock,bss_acpt,bf_nbio,bss_rtcp,bss_bio,bss_log,"+ - 220 "b_sock,bss_acpt,bf_nbio,bss_rtcp,bss_bio,bss_log,"+ -
221 "bss_dgram,"+ -
210 "bf_lbuf" 222 "bf_lbuf"
211$ LIB_STACK = "stack" 223$ LIB_STACK = "stack"
212$ LIB_LHASH = "lhash,lh_stats" 224$ LIB_LHASH = "lhash,lh_stats"
@@ -215,11 +227,11 @@ $ LIB_RAND = "md_rand,randfile,rand_lib,rand_err,rand_egd,"+ -
215$ LIB_ERR = "err,err_all,err_prn" 227$ LIB_ERR = "err,err_all,err_prn"
216$ LIB_OBJECTS = "o_names,obj_dat,obj_lib,obj_err" 228$ LIB_OBJECTS = "o_names,obj_dat,obj_lib,obj_err"
217$ LIB_EVP = "encode,digest,evp_enc,evp_key,evp_acnf,"+ - 229$ LIB_EVP = "encode,digest,evp_enc,evp_key,evp_acnf,"+ -
218 "e_des,e_bf,e_idea,e_des3,"+ - 230 "e_des,e_bf,e_idea,e_des3,e_camellia,e_seed,"+ -
219 "e_rc4,e_aes,names,"+ - 231 "e_rc4,e_aes,names,"+ -
220 "e_xcbc_d,e_rc2,e_cast,e_rc5" 232 "e_xcbc_d,e_rc2,e_cast,e_rc5"
221$ LIB_EVP_2 = "m_null,m_md2,m_md4,m_md5,m_sha,m_sha1," + - 233$ LIB_EVP_2 = "m_null,m_md2,m_md4,m_md5,m_sha,m_sha1," + -
222 "m_dss,m_dss1,m_mdc2,m_ripemd,"+ - 234 "m_dss,m_dss1,m_mdc2,m_ripemd,m_ecdsa,"+ -
223 "p_open,p_seal,p_sign,p_verify,p_lib,p_enc,p_dec,"+ - 235 "p_open,p_seal,p_sign,p_verify,p_lib,p_enc,p_dec,"+ -
224 "bio_md,bio_b64,bio_enc,evp_err,e_null,"+ - 236 "bio_md,bio_b64,bio_enc,evp_err,e_null,"+ -
225 "c_all,c_allc,c_alld,evp_lib,bio_ok,"+- 237 "c_all,c_allc,c_alld,evp_lib,bio_ok,"+-
@@ -233,8 +245,8 @@ $ LIB_ASN1 = "a_object,a_bitstr,a_utctm,a_gentm,a_time,a_int,a_octet,"+ -
233$ LIB_ASN1_2 = "t_req,t_x509,t_x509a,t_crl,t_pkey,t_spki,t_bitst,"+ - 245$ LIB_ASN1_2 = "t_req,t_x509,t_x509a,t_crl,t_pkey,t_spki,t_bitst,"+ -
234 "tasn_new,tasn_fre,tasn_enc,tasn_dec,tasn_utl,tasn_typ,"+ - 246 "tasn_new,tasn_fre,tasn_enc,tasn_dec,tasn_utl,tasn_typ,"+ -
235 "f_int,f_string,n_pkey,"+ - 247 "f_int,f_string,n_pkey,"+ -
236 "f_enum,a_hdr,x_pkey,a_bool,x_exten,"+ - 248 "f_enum,a_hdr,x_pkey,a_bool,x_exten,asn_mime,"+ -
237 "asn1_par,asn1_lib,asn1_err,a_meth,a_bytes,a_strnid,"+ - 249 "asn1_gen,asn1_par,asn1_lib,asn1_err,a_meth,a_bytes,a_strnid,"+ -
238 "evp_asn1,asn_pack,p5_pbe,p5_pbev2,p8_pkey,asn_moid" 250 "evp_asn1,asn_pack,p5_pbe,p5_pbev2,p8_pkey,asn_moid"
239$ LIB_PEM = "pem_sign,pem_seal,pem_info,pem_lib,pem_all,pem_err,"+ - 251$ LIB_PEM = "pem_sign,pem_seal,pem_info,pem_lib,pem_all,pem_err,"+ -
240 "pem_x509,pem_xaux,pem_oth,pem_pk8,pem_pkey" 252 "pem_x509,pem_xaux,pem_oth,pem_pk8,pem_pkey"
@@ -243,11 +255,13 @@ $ LIB_X509 = "x509_def,x509_d2,x509_r2x,x509_cmp,"+ -
243 "x509_set,x509cset,x509rset,x509_err,"+ - 255 "x509_set,x509cset,x509rset,x509_err,"+ -
244 "x509name,x509_v3,x509_ext,x509_att,"+ - 256 "x509name,x509_v3,x509_ext,x509_att,"+ -
245 "x509type,x509_lu,x_all,x509_txt,"+ - 257 "x509type,x509_lu,x_all,x509_txt,"+ -
246 "x509_trs,by_file,by_dir" 258 "x509_trs,by_file,by_dir,x509_vpm"
247$ LIB_X509V3 = "v3_bcons,v3_bitst,v3_conf,v3_extku,v3_ia5,v3_lib,"+ - 259$ LIB_X509V3 = "v3_bcons,v3_bitst,v3_conf,v3_extku,v3_ia5,v3_lib,"+ -
248 "v3_prn,v3_utl,v3err,v3_genn,v3_alt,v3_skey,v3_akey,v3_pku,"+ - 260 "v3_prn,v3_utl,v3err,v3_genn,v3_alt,v3_skey,v3_akey,v3_pku,"+ -
249 "v3_int,v3_enum,v3_sxnet,v3_cpols,v3_crld,v3_purp,v3_info,"+ - 261 "v3_int,v3_enum,v3_sxnet,v3_cpols,v3_crld,v3_purp,v3_info,"+ -
250 "v3_ocsp,v3_akeya,v3_pcia,v3_pci" 262 "v3_ocsp,v3_akeya,v3_pmaps,v3_pcons,v3_ncons,v3_pcia,v3_pci,"+ -
263 "pcy_cache,pcy_node,pcy_data,pcy_map,pcy_tree,pcy_lib,"+ -
264 "v3_asid,v3_addr"
251$ LIB_CONF = "conf_err,conf_lib,conf_api,conf_def,conf_mod,conf_mall,conf_sap" 265$ LIB_CONF = "conf_err,conf_lib,conf_api,conf_def,conf_mod,conf_mall,conf_sap"
252$ LIB_TXT_DB = "txt_db" 266$ LIB_TXT_DB = "txt_db"
253$ LIB_PKCS7 = "pk7_asn1,pk7_lib,pkcs7err,pk7_doit,pk7_smime,pk7_attr,"+ - 267$ LIB_PKCS7 = "pk7_asn1,pk7_lib,pkcs7err,pk7_doit,pk7_smime,pk7_attr,"+ -
@@ -262,13 +276,17 @@ $ LIB_OCSP = "ocsp_asn,ocsp_ext,ocsp_ht,ocsp_lib,ocsp_cl,"+ -
262$ LIB_UI_COMPAT = ",ui_compat" 276$ LIB_UI_COMPAT = ",ui_compat"
263$ LIB_UI = "ui_err,ui_lib,ui_openssl,ui_util"+LIB_UI_COMPAT 277$ LIB_UI = "ui_err,ui_lib,ui_openssl,ui_util"+LIB_UI_COMPAT
264$ LIB_KRB5 = "krb5_asn" 278$ LIB_KRB5 = "krb5_asn"
279$ LIB_STORE = "str_err,str_lib,str_meth,str_mem"
280$ LIB_CMS = "cms_lib,cms_asn1,cms_att,cms_io,cms_smime,cms_err,"+ -
281 "cms_sd,cms_dd,cms_cd,cms_env,cms_enc,cms_ess"
282$ LIB_PQUEUE = "pqueue"
265$! 283$!
266$! Setup exceptional compilations 284$! Setup exceptional compilations
267$! 285$!
268$ ! Add definitions for no threads on OpenVMS 7.1 and higher 286$ ! Add definitions for no threads on OpenVMS 7.1 and higher
269$ COMPILEWITH_CC3 = ",bss_rtcp," 287$ COMPILEWITH_CC3 = ",bss_rtcp,"
270$ ! Disable the DOLLARID warning 288$ ! Disable the DOLLARID warning
271$ COMPILEWITH_CC4 = ",a_utctm,bss_log,o_time," 289$ COMPILEWITH_CC4 = ",a_utctm,bss_log,o_time,o_dir"
272$ ! Disable disjoint optimization 290$ ! Disable disjoint optimization
273$ COMPILEWITH_CC5 = ",md2_dgst,md4_dgst,md5_dgst,mdc2dgst," + - 291$ COMPILEWITH_CC5 = ",md2_dgst,md4_dgst,md5_dgst,mdc2dgst," + -
274 "sha_dgst,sha1dgst,rmd_dgst,bf_enc," 292 "sha_dgst,sha1dgst,rmd_dgst,bf_enc,"
diff --git a/src/lib/libcrypto/des/FILES0 b/src/lib/libcrypto/des/FILES0
index 1c2e1f75b9..4c7ea2de7a 100644
--- a/src/lib/libcrypto/des/FILES0
+++ b/src/lib/libcrypto/des/FILES0
@@ -8,7 +8,7 @@ README - What this package is.
8VERSION - Which version this is and what was changed. 8VERSION - Which version this is and what was changed.
9KERBEROS - Kerberos version 4 notes. 9KERBEROS - Kerberos version 4 notes.
10Makefile.PL - An old makefile to build with perl5, not current. 10Makefile.PL - An old makefile to build with perl5, not current.
11Makefile - The SSLeay makefile 11Makefile.ssl - The SSLeay makefile
12Makefile.uni - The normal unix makefile. 12Makefile.uni - The normal unix makefile.
13GNUmakefile - The makefile for use with glibc. 13GNUmakefile - The makefile for use with glibc.
14makefile.bc - A Borland C makefile 14makefile.bc - A Borland C makefile
diff --git a/src/lib/libcrypto/des/INSTALL b/src/lib/libcrypto/des/INSTALL
index 32457d775c..8aebdfe110 100644
--- a/src/lib/libcrypto/des/INSTALL
+++ b/src/lib/libcrypto/des/INSTALL
@@ -25,7 +25,7 @@ and then you can use the 'DES_PTR' option.
25 25
26The file options.txt has the options listed for best speed on quite a 26The file options.txt has the options listed for best speed on quite a
27few systems. Look and the options (UNROLL, PTR, RISC2 etc) and then 27few systems. Look and the options (UNROLL, PTR, RISC2 etc) and then
28turn on the relevent option in the Makefile 28turn on the relevant option in the Makefile.
29 29
30There are some special Makefile targets that make life easier. 30There are some special Makefile targets that make life easier.
31make cc - standard cc build 31make cc - standard cc build
diff --git a/src/lib/libcrypto/des/Makefile b/src/lib/libcrypto/des/Makefile
index 800af0b123..523dfe38f2 100644
--- a/src/lib/libcrypto/des/Makefile
+++ b/src/lib/libcrypto/des/Makefile
@@ -8,11 +8,6 @@ CC= cc
8CPP= $(CC) -E 8CPP= $(CC) -E
9INCLUDES=-I$(TOP) -I../../include 9INCLUDES=-I$(TOP) -I../../include
10CFLAG=-g 10CFLAG=-g
11INSTALL_PREFIX=
12OPENSSLDIR= /usr/local/ssl
13INSTALLTOP=/usr/local/ssl
14MAKEDEPPROG= makedepend
15MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
16MAKEFILE= Makefile 11MAKEFILE= Makefile
17AR= ar r 12AR= ar r
18RANLIB= ranlib 13RANLIB= ranlib
@@ -22,6 +17,7 @@ DES_ENC= des_enc.o fcrypt_b.o
22 17
23CFLAGS= $(INCLUDES) $(CFLAG) 18CFLAGS= $(INCLUDES) $(CFLAG)
24ASFLAGS= $(INCLUDES) $(ASFLAG) 19ASFLAGS= $(INCLUDES) $(ASFLAG)
20AFLAGS= $(ASFLAGS)
25 21
26GENERAL=Makefile 22GENERAL=Makefile
27TEST=destest.c 23TEST=destest.c
@@ -65,32 +61,24 @@ lib: $(LIBOBJ)
65des: des.o cbc3_enc.o lib 61des: des.o cbc3_enc.o lib
66 $(CC) $(CFLAGS) -o des des.o cbc3_enc.o $(LIB) 62 $(CC) $(CFLAGS) -o des des.o cbc3_enc.o $(LIB)
67 63
68# elf 64des_enc-sparc.S: asm/des_enc.m4
69asm/dx86-elf.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl 65 m4 -B 8192 asm/des_enc.m4 > des_enc-sparc.S
70 (cd asm; $(PERL) des-586.pl elf $(CFLAGS) > dx86-elf.s) 66
71 67# ELF
72asm/yx86-elf.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl 68dx86-elf.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
73 (cd asm; $(PERL) crypt586.pl elf $(CFLAGS) > yx86-elf.s) 69 (cd asm; $(PERL) des-586.pl elf $(CFLAGS) > ../$@)
74 70yx86-elf.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
71 (cd asm; $(PERL) crypt586.pl elf $(CFLAGS) > ../$@)
72# COFF
73dx86-cof.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
74 (cd asm; $(PERL) des-586.pl coff $(CFLAGS) > ../$@)
75yx86-cof.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
76 (cd asm; $(PERL) crypt586.pl coff $(CFLAGS) > ../$@)
75# a.out 77# a.out
76asm/dx86-out.o: asm/dx86unix.cpp 78dx86-out.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
77 $(CPP) -DOUT asm/dx86unix.cpp | as -o asm/dx86-out.o 79 (cd asm; $(PERL) des-586.pl a.out $(CFLAGS) > ../$@)
78 80yx86-out.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
79asm/yx86-out.o: asm/yx86unix.cpp 81 (cd asm; $(PERL) crypt586.pl a.out $(CFLAGS) > ../$@)
80 $(CPP) -DOUT asm/yx86unix.cpp | as -o asm/yx86-out.o
81
82# bsdi
83asm/dx86bsdi.o: asm/dx86unix.cpp
84 $(CPP) -DBSDI asm/dx86unix.cpp | sed 's/ :/:/' | as -o asm/dx86bsdi.o
85
86asm/yx86bsdi.o: asm/yx86unix.cpp
87 $(CPP) -DBSDI asm/yx86unix.cpp | sed 's/ :/:/' | as -o asm/yx86bsdi.o
88
89asm/dx86unix.cpp: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
90 (cd asm; $(PERL) des-586.pl cpp >dx86unix.cpp)
91
92asm/yx86unix.cpp: asm/crypt586.pl ../perlasm/x86asm.pl
93 (cd asm; $(PERL) crypt586.pl cpp >yx86unix.cpp)
94 82
95files: 83files:
96 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO 84 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
@@ -100,9 +88,11 @@ links:
100 @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) 88 @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
101 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 89 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
102 90
103install: installs 91# We need to use force because 'install' matches 'INSTALL' on case
104 92# insensitive systems
105installs: 93FRC.install:
94install: FRC.install
95 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
106 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 96 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
107 do \ 97 do \
108 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 98 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -118,6 +108,7 @@ lint:
118 lint -DLINT $(INCLUDES) $(SRC)>fluff 108 lint -DLINT $(INCLUDES) $(SRC)>fluff
119 109
120depend: 110depend:
111 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
121 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 112 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
122 113
123dclean: 114dclean:
@@ -125,83 +116,77 @@ dclean:
125 mv -f Makefile.new $(MAKEFILE) 116 mv -f Makefile.new $(MAKEFILE)
126 117
127clean: 118clean:
128 rm -f asm/dx86unix.cpp asm/yx86unix.cpp asm/*-elf.* *.o asm/*.o *.obj des lib tags core .pure .nfs* *.old *.bak fluff 119 rm -f *.s *.o *.obj des lib tags core .pure .nfs* *.old *.bak fluff
129 120
130# DO NOT DELETE THIS LINE -- make depend depends on it. 121# DO NOT DELETE THIS LINE -- make depend depends on it.
131 122
132cbc_cksm.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 123cbc_cksm.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
133cbc_cksm.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 124cbc_cksm.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
134cbc_cksm.o: ../../include/openssl/opensslconf.h 125cbc_cksm.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
135cbc_cksm.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
136cbc_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 126cbc_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
137cbc_cksm.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 127cbc_cksm.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
138cbc_cksm.o: cbc_cksm.c des_locl.h 128cbc_cksm.o: cbc_cksm.c des_locl.h
139cbc_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 129cbc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
140cbc_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 130cbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
141cbc_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 131cbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
142cbc_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 132cbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
143cbc_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 133cbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
144cbc_enc.o: ../../include/openssl/ui_compat.h cbc_enc.c des_locl.h ncbc_enc.c 134cbc_enc.o: cbc_enc.c des_locl.h ncbc_enc.c
145cfb64ede.o: ../../e_os.h ../../include/openssl/crypto.h 135cfb64ede.o: ../../e_os.h ../../include/openssl/des.h
146cfb64ede.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 136cfb64ede.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
147cfb64ede.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h 137cfb64ede.o: ../../include/openssl/opensslconf.h
148cfb64ede.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 138cfb64ede.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
149cfb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 139cfb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
150cfb64ede.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 140cfb64ede.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
151cfb64ede.o: cfb64ede.c des_locl.h 141cfb64ede.o: cfb64ede.c des_locl.h
152cfb64enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 142cfb64enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
153cfb64enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 143cfb64enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
154cfb64enc.o: ../../include/openssl/opensslconf.h 144cfb64enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
155cfb64enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
156cfb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 145cfb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
157cfb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 146cfb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
158cfb64enc.o: cfb64enc.c des_locl.h 147cfb64enc.o: cfb64enc.c des_locl.h
159cfb_enc.o: ../../e_os.h ../../include/openssl/crypto.h 148cfb_enc.o: ../../e_os.h ../../include/openssl/des.h
160cfb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 149cfb_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
161cfb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h 150cfb_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/ossl_typ.h
162cfb_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 151cfb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
163cfb_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 152cfb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
164cfb_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 153cfb_enc.o: ../../include/openssl/ui_compat.h cfb_enc.c des_locl.h
165cfb_enc.o: cfb_enc.c des_locl.h 154des_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
166des_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 155des_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
167des_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 156des_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
168des_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 157des_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
169des_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 158des_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
170des_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 159des_enc.o: des_enc.c des_locl.h ncbc_enc.c
171des_enc.o: ../../include/openssl/ui_compat.h des_enc.c des_locl.h ncbc_enc.c 160des_old.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
172des_old.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 161des_old.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
173des_old.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
174des_old.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
175des_old.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h 162des_old.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
176des_old.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 163des_old.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
177des_old.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 164des_old.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
178des_old.o: ../../include/openssl/ui_compat.h des_old.c 165des_old.o: ../../include/openssl/ui_compat.h des_old.c
179des_old2.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 166des_old2.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
180des_old2.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 167des_old2.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
181des_old2.o: ../../include/openssl/opensslconf.h 168des_old2.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
182des_old2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 169des_old2.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
183des_old2.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h 170des_old2.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
184des_old2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 171des_old2.o: ../../include/openssl/ui_compat.h des_old2.c
185des_old2.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 172ecb3_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
186des_old2.o: des_old2.c 173ecb3_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
187ecb3_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 174ecb3_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
188ecb3_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
189ecb3_enc.o: ../../include/openssl/opensslconf.h
190ecb3_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
191ecb3_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 175ecb3_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
192ecb3_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 176ecb3_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
193ecb3_enc.o: des_locl.h ecb3_enc.c 177ecb3_enc.o: des_locl.h ecb3_enc.c
194ecb_enc.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h 178ecb_enc.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
195ecb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 179ecb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
196ecb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h 180ecb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
197ecb_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 181ecb_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
198ecb_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 182ecb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
199ecb_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 183ecb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
200ecb_enc.o: des_locl.h des_ver.h ecb_enc.c spr.h 184ecb_enc.o: ../../include/openssl/ui_compat.h des_locl.h des_ver.h ecb_enc.c
201ede_cbcm_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 185ecb_enc.o: spr.h
202ede_cbcm_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 186ede_cbcm_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
187ede_cbcm_enc.o: ../../include/openssl/e_os2.h
203ede_cbcm_enc.o: ../../include/openssl/opensslconf.h 188ede_cbcm_enc.o: ../../include/openssl/opensslconf.h
204ede_cbcm_enc.o: ../../include/openssl/opensslv.h 189ede_cbcm_enc.o: ../../include/openssl/ossl_typ.h
205ede_cbcm_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 190ede_cbcm_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
206ede_cbcm_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 191ede_cbcm_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
207ede_cbcm_enc.o: ../../include/openssl/ui_compat.h des_locl.h ede_cbcm_enc.c 192ede_cbcm_enc.o: ../../include/openssl/ui_compat.h des_locl.h ede_cbcm_enc.c
@@ -210,10 +195,11 @@ enc_read.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
210enc_read.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 195enc_read.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
211enc_read.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 196enc_read.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
212enc_read.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 197enc_read.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
213enc_read.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 198enc_read.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
214enc_read.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 199enc_read.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
215enc_read.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 200enc_read.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
216enc_read.o: ../cryptlib.h des_locl.h enc_read.c 201enc_read.o: ../../include/openssl/ui_compat.h ../cryptlib.h des_locl.h
202enc_read.o: enc_read.c
217enc_writ.o: ../../e_os.h ../../include/openssl/bio.h 203enc_writ.o: ../../e_os.h ../../include/openssl/bio.h
218enc_writ.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 204enc_writ.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
219enc_writ.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 205enc_writ.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
@@ -224,91 +210,83 @@ enc_writ.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
224enc_writ.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 210enc_writ.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
225enc_writ.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 211enc_writ.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
226enc_writ.o: ../cryptlib.h des_locl.h enc_writ.c 212enc_writ.o: ../cryptlib.h des_locl.h enc_writ.c
227fcrypt.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 213fcrypt.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
228fcrypt.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 214fcrypt.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
229fcrypt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 215fcrypt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
230fcrypt.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 216fcrypt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
231fcrypt.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 217fcrypt.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
232fcrypt.o: ../../include/openssl/ui_compat.h des_locl.h fcrypt.c 218fcrypt.o: des_locl.h fcrypt.c
233fcrypt_b.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 219fcrypt_b.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
234fcrypt_b.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 220fcrypt_b.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
235fcrypt_b.o: ../../include/openssl/opensslconf.h 221fcrypt_b.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
236fcrypt_b.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
237fcrypt_b.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 222fcrypt_b.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
238fcrypt_b.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 223fcrypt_b.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
239fcrypt_b.o: des_locl.h fcrypt_b.c 224fcrypt_b.o: des_locl.h fcrypt_b.c
240ofb64ede.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 225ofb64ede.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
241ofb64ede.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 226ofb64ede.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
242ofb64ede.o: ../../include/openssl/opensslconf.h 227ofb64ede.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
243ofb64ede.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
244ofb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 228ofb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
245ofb64ede.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 229ofb64ede.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
246ofb64ede.o: des_locl.h ofb64ede.c 230ofb64ede.o: des_locl.h ofb64ede.c
247ofb64enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 231ofb64enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
248ofb64enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 232ofb64enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
249ofb64enc.o: ../../include/openssl/opensslconf.h 233ofb64enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
250ofb64enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
251ofb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 234ofb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
252ofb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 235ofb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
253ofb64enc.o: des_locl.h ofb64enc.c 236ofb64enc.o: des_locl.h ofb64enc.c
254ofb_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 237ofb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
255ofb_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 238ofb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
256ofb_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 239ofb_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
257ofb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 240ofb_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
258ofb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 241ofb_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
259ofb_enc.o: ../../include/openssl/ui_compat.h des_locl.h ofb_enc.c 242ofb_enc.o: des_locl.h ofb_enc.c
260pcbc_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 243pcbc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
261pcbc_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 244pcbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
262pcbc_enc.o: ../../include/openssl/opensslconf.h 245pcbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
263pcbc_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
264pcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 246pcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
265pcbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 247pcbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
266pcbc_enc.o: des_locl.h pcbc_enc.c 248pcbc_enc.o: des_locl.h pcbc_enc.c
267qud_cksm.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 249qud_cksm.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
268qud_cksm.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 250qud_cksm.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
269qud_cksm.o: ../../include/openssl/opensslconf.h 251qud_cksm.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
270qud_cksm.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
271qud_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 252qud_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
272qud_cksm.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 253qud_cksm.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
273qud_cksm.o: des_locl.h qud_cksm.c 254qud_cksm.o: des_locl.h qud_cksm.c
274rand_key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 255rand_key.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
275rand_key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 256rand_key.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
276rand_key.o: ../../include/openssl/opensslconf.h 257rand_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
277rand_key.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 258rand_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
278rand_key.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h 259rand_key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
279rand_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 260rand_key.o: ../../include/openssl/ui_compat.h rand_key.c
280rand_key.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
281rand_key.o: rand_key.c
282read2pwd.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 261read2pwd.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
283read2pwd.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 262read2pwd.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
284read2pwd.o: ../../include/openssl/opensslconf.h 263read2pwd.o: ../../include/openssl/opensslconf.h
285read2pwd.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 264read2pwd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
286read2pwd.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 265read2pwd.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
287read2pwd.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 266read2pwd.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
288read2pwd.o: read2pwd.c 267read2pwd.o: ../../include/openssl/ui_compat.h read2pwd.c
289rpc_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 268rpc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
290rpc_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 269rpc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
291rpc_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 270rpc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
292rpc_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 271rpc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
293rpc_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 272rpc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
294rpc_enc.o: ../../include/openssl/ui_compat.h des_locl.h des_ver.h rpc_des.h 273rpc_enc.o: des_locl.h des_ver.h rpc_des.h rpc_enc.c
295rpc_enc.o: rpc_enc.c 274set_key.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
296set_key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 275set_key.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
297set_key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 276set_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
298set_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 277set_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
299set_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 278set_key.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
300set_key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 279set_key.o: des_locl.h set_key.c
301set_key.o: ../../include/openssl/ui_compat.h des_locl.h set_key.c
302str2key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 280str2key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
303str2key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 281str2key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
304str2key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 282str2key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
305str2key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 283str2key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
306str2key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 284str2key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
307str2key.o: ../../include/openssl/ui_compat.h des_locl.h str2key.c 285str2key.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
308xcbc_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 286str2key.o: des_locl.h str2key.c
309xcbc_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h 287xcbc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
310xcbc_enc.o: ../../include/openssl/opensslconf.h 288xcbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
311xcbc_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 289xcbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
312xcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 290xcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
313xcbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 291xcbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
314xcbc_enc.o: des_locl.h xcbc_enc.c 292xcbc_enc.o: des_locl.h xcbc_enc.c
diff --git a/src/lib/libcrypto/des/des_old.c b/src/lib/libcrypto/des/des_old.c
index 88e9802aad..7c33ed7a93 100644
--- a/src/lib/libcrypto/des/des_old.c
+++ b/src/lib/libcrypto/des/des_old.c
@@ -84,7 +84,7 @@ void _ossl_old_des_ecb3_encrypt(_ossl_old_des_cblock *input,_ossl_old_des_cblock
84 des_key_schedule ks1,des_key_schedule ks2, 84 des_key_schedule ks1,des_key_schedule ks2,
85 des_key_schedule ks3, int enc) 85 des_key_schedule ks3, int enc)
86 { 86 {
87 DES_ecb3_encrypt((const unsigned char *)input, (unsigned char *)output, 87 DES_ecb3_encrypt((const_DES_cblock *)input, output,
88 (DES_key_schedule *)ks1, (DES_key_schedule *)ks2, 88 (DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
89 (DES_key_schedule *)ks3, enc); 89 (DES_key_schedule *)ks3, enc);
90 } 90 }
@@ -169,11 +169,13 @@ void _ossl_old_des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out,
169 (DES_key_schedule *)ks3, ivec, num); 169 (DES_key_schedule *)ks3, ivec, num);
170 } 170 }
171 171
172#if 0 /* broken code, preserved just in case anyone specifically looks for this */
172void _ossl_old_des_xwhite_in2out(_ossl_old_des_cblock (*des_key), _ossl_old_des_cblock (*in_white), 173void _ossl_old_des_xwhite_in2out(_ossl_old_des_cblock (*des_key), _ossl_old_des_cblock (*in_white),
173 _ossl_old_des_cblock (*out_white)) 174 _ossl_old_des_cblock (*out_white))
174 { 175 {
175 DES_xwhite_in2out(des_key, in_white, out_white); 176 DES_xwhite_in2out(des_key, in_white, out_white);
176 } 177 }
178#endif
177 179
178int _ossl_old_des_enc_read(int fd,char *buf,int len,des_key_schedule sched, 180int _ossl_old_des_enc_read(int fd,char *buf,int len,des_key_schedule sched,
179 _ossl_old_des_cblock *iv) 181 _ossl_old_des_cblock *iv)
diff --git a/src/lib/libcrypto/des/des_old.h b/src/lib/libcrypto/des/des_old.h
index 1d840b474a..2b2c372354 100644
--- a/src/lib/libcrypto/des/des_old.h
+++ b/src/lib/libcrypto/des/des_old.h
@@ -91,6 +91,8 @@
91#ifndef HEADER_DES_H 91#ifndef HEADER_DES_H
92#define HEADER_DES_H 92#define HEADER_DES_H
93 93
94#include <openssl/e_os2.h> /* OPENSSL_EXTERN, OPENSSL_NO_DES, DES_LONG */
95
94#ifdef OPENSSL_NO_DES 96#ifdef OPENSSL_NO_DES
95#error DES is disabled. 97#error DES is disabled.
96#endif 98#endif
@@ -103,8 +105,6 @@
103#error <openssl/des_old.h> replaces <kerberos/des.h>. 105#error <openssl/des_old.h> replaces <kerberos/des.h>.
104#endif 106#endif
105 107
106#include <openssl/opensslconf.h> /* DES_LONG */
107#include <openssl/e_os2.h> /* OPENSSL_EXTERN */
108#include <openssl/symhacks.h> 108#include <openssl/symhacks.h>
109 109
110#ifdef OPENSSL_BUILD_SHLIBCRYPTO 110#ifdef OPENSSL_BUILD_SHLIBCRYPTO
@@ -116,6 +116,10 @@
116extern "C" { 116extern "C" {
117#endif 117#endif
118 118
119#ifdef _
120#undef _
121#endif
122
119typedef unsigned char _ossl_old_des_cblock[8]; 123typedef unsigned char _ossl_old_des_cblock[8];
120typedef struct _ossl_old_des_ks_struct 124typedef struct _ossl_old_des_ks_struct
121 { 125 {
@@ -171,9 +175,9 @@ typedef struct _ossl_old_des_ks_struct
171 DES_enc_write((f),(b),(l),&(k),(iv)) 175 DES_enc_write((f),(b),(l),&(k),(iv))
172#define des_fcrypt(b,s,r)\ 176#define des_fcrypt(b,s,r)\
173 DES_fcrypt((b),(s),(r)) 177 DES_fcrypt((b),(s),(r))
178#if 0
174#define des_crypt(b,s)\ 179#define des_crypt(b,s)\
175 DES_crypt((b),(s)) 180 DES_crypt((b),(s))
176#if 0
177#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) 181#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__)
178#define crypt(b,s)\ 182#define crypt(b,s)\
179 DES_crypt((b),(s)) 183 DES_crypt((b),(s))
@@ -360,9 +364,10 @@ void _ossl_old_des_ede3_cfb64_encrypt(unsigned char *in, unsigned char *out,
360void _ossl_old_des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out, 364void _ossl_old_des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out,
361 long length, _ossl_old_des_key_schedule ks1, _ossl_old_des_key_schedule ks2, 365 long length, _ossl_old_des_key_schedule ks1, _ossl_old_des_key_schedule ks2,
362 _ossl_old_des_key_schedule ks3, _ossl_old_des_cblock *ivec, int *num); 366 _ossl_old_des_key_schedule ks3, _ossl_old_des_cblock *ivec, int *num);
363 367#if 0
364void _ossl_old_des_xwhite_in2out(_ossl_old_des_cblock (*des_key), _ossl_old_des_cblock (*in_white), 368void _ossl_old_des_xwhite_in2out(_ossl_old_des_cblock (*des_key), _ossl_old_des_cblock (*in_white),
365 _ossl_old_des_cblock (*out_white)); 369 _ossl_old_des_cblock (*out_white));
370#endif
366 371
367int _ossl_old_des_enc_read(int fd,char *buf,int len,_ossl_old_des_key_schedule sched, 372int _ossl_old_des_enc_read(int fd,char *buf,int len,_ossl_old_des_key_schedule sched,
368 _ossl_old_des_cblock *iv); 373 _ossl_old_des_cblock *iv);
diff --git a/src/lib/libcrypto/des/des_opts.c b/src/lib/libcrypto/des/des_opts.c
index 79278b920e..2df82962c5 100644
--- a/src/lib/libcrypto/des/des_opts.c
+++ b/src/lib/libcrypto/des/des_opts.c
@@ -71,7 +71,11 @@
71#include <io.h> 71#include <io.h>
72extern void exit(); 72extern void exit();
73#endif 73#endif
74
75#ifndef OPENSSL_SYS_NETWARE
74#include <signal.h> 76#include <signal.h>
77#endif
78
75#ifndef _IRIX 79#ifndef _IRIX
76#include <time.h> 80#include <time.h>
77#endif 81#endif
diff --git a/src/lib/libcrypto/des/des_ver.h b/src/lib/libcrypto/des/des_ver.h
index 379bbadda2..d1ada258a6 100644
--- a/src/lib/libcrypto/des/des_ver.h
+++ b/src/lib/libcrypto/des/des_ver.h
@@ -67,5 +67,5 @@
67#define DES_version OSSL_DES_version 67#define DES_version OSSL_DES_version
68#define libdes_version OSSL_libdes_version 68#define libdes_version OSSL_libdes_version
69 69
70OPENSSL_EXTERN const char *OSSL_DES_version; /* SSLeay version string */ 70OPENSSL_EXTERN const char OSSL_DES_version[]; /* SSLeay version string */
71OPENSSL_EXTERN const char *OSSL_libdes_version; /* old libdes version string */ 71OPENSSL_EXTERN const char OSSL_libdes_version[]; /* old libdes version string */
diff --git a/src/lib/libcrypto/des/destest.c b/src/lib/libcrypto/des/destest.c
index e3e9d77f14..64b92a34fe 100644
--- a/src/lib/libcrypto/des/destest.c
+++ b/src/lib/libcrypto/des/destest.c
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
84#else 84#else
85#include <openssl/des.h> 85#include <openssl/des.h>
86 86
87#define crypt(c,s) (des_crypt((c),(s))) 87#define crypt(c,s) (DES_crypt((c),(s)))
88 88
89/* tisk tisk - the test keys don't all have odd parity :-( */ 89/* tisk tisk - the test keys don't all have odd parity :-( */
90/* test data */ 90/* test data */
@@ -333,7 +333,8 @@ static int cfb64_test(unsigned char *cfb_cipher);
333static int ede_cfb64_test(unsigned char *cfb_cipher); 333static int ede_cfb64_test(unsigned char *cfb_cipher);
334int main(int argc, char *argv[]) 334int main(int argc, char *argv[])
335 { 335 {
336 int i,j,err=0; 336 int j,err=0;
337 unsigned int i;
337 des_cblock in,out,outin,iv3,iv2; 338 des_cblock in,out,outin,iv3,iv2;
338 des_key_schedule ks,ks2,ks3; 339 des_key_schedule ks,ks2,ks3;
339 unsigned char cbc_in[40]; 340 unsigned char cbc_in[40];
@@ -391,7 +392,7 @@ int main(int argc, char *argv[])
391 DES_ede3_cbcm_encrypt(cbc_out,cbc_in,i,&ks,&ks2,&ks3,&iv3,&iv2,DES_DECRYPT); 392 DES_ede3_cbcm_encrypt(cbc_out,cbc_in,i,&ks,&ks2,&ks3,&iv3,&iv2,DES_DECRYPT);
392 if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0) 393 if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0)
393 { 394 {
394 int n; 395 unsigned int n;
395 396
396 printf("des_ede3_cbcm_encrypt decrypt error\n"); 397 printf("des_ede3_cbcm_encrypt decrypt error\n");
397 for(n=0 ; n < i ; ++n) 398 for(n=0 ; n < i ; ++n)
@@ -439,8 +440,8 @@ int main(int argc, char *argv[])
439 memcpy(in,plain_data[i],8); 440 memcpy(in,plain_data[i],8);
440 memset(out,0,8); 441 memset(out,0,8);
441 memset(outin,0,8); 442 memset(outin,0,8);
442 des_ecb2_encrypt(in,out,ks,ks2,DES_ENCRYPT); 443 des_ecb2_encrypt(&in,&out,ks,ks2,DES_ENCRYPT);
443 des_ecb2_encrypt(out,outin,ks,ks2,DES_DECRYPT); 444 des_ecb2_encrypt(&out,&outin,ks,ks2,DES_DECRYPT);
444 445
445 if (memcmp(out,cipher_ecb2[i],8) != 0) 446 if (memcmp(out,cipher_ecb2[i],8) != 0)
446 { 447 {
@@ -540,7 +541,7 @@ int main(int argc, char *argv[])
540 if (memcmp(cbc_out,cbc3_ok, 541 if (memcmp(cbc_out,cbc3_ok,
541 (unsigned int)(strlen((char *)cbc_data)+1+7)/8*8) != 0) 542 (unsigned int)(strlen((char *)cbc_data)+1+7)/8*8) != 0)
542 { 543 {
543 int n; 544 unsigned int n;
544 545
545 printf("des_ede3_cbc_encrypt encrypt error\n"); 546 printf("des_ede3_cbc_encrypt encrypt error\n");
546 for(n=0 ; n < i ; ++n) 547 for(n=0 ; n < i ; ++n)
@@ -556,7 +557,7 @@ int main(int argc, char *argv[])
556 des_ede3_cbc_encrypt(cbc_out,cbc_in,i,ks,ks2,ks3,&iv3,DES_DECRYPT); 557 des_ede3_cbc_encrypt(cbc_out,cbc_in,i,ks,ks2,ks3,&iv3,DES_DECRYPT);
557 if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0) 558 if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0)
558 { 559 {
559 int n; 560 unsigned int n;
560 561
561 printf("des_ede3_cbc_encrypt decrypt error\n"); 562 printf("des_ede3_cbc_encrypt decrypt error\n");
562 for(n=0 ; n < i ; ++n) 563 for(n=0 ; n < i ; ++n)
@@ -820,6 +821,9 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
820 printf("fast crypt error, %s should be yA1Rp/1hZXIJk\n",str); 821 printf("fast crypt error, %s should be yA1Rp/1hZXIJk\n",str);
821 err=1; 822 err=1;
822 } 823 }
824#ifdef OPENSSL_SYS_NETWARE
825 if (err) printf("ERROR: %d\n", err);
826#endif
823 printf("\n"); 827 printf("\n");
824 return(err); 828 return(err);
825 } 829 }
diff --git a/src/lib/libcrypto/des/read2pwd.c b/src/lib/libcrypto/des/read2pwd.c
index 3a63c4016c..ee6969f76e 100644
--- a/src/lib/libcrypto/des/read2pwd.c
+++ b/src/lib/libcrypto/des/read2pwd.c
@@ -112,6 +112,7 @@
112#include <string.h> 112#include <string.h>
113#include <openssl/des.h> 113#include <openssl/des.h>
114#include <openssl/ui.h> 114#include <openssl/ui.h>
115#include <openssl/crypto.h>
115 116
116int DES_read_password(DES_cblock *key, const char *prompt, int verify) 117int DES_read_password(DES_cblock *key, const char *prompt, int verify)
117 { 118 {
diff --git a/src/lib/libcrypto/des/speed.c b/src/lib/libcrypto/des/speed.c
index 48fc1d49fc..1616f4b7c9 100644
--- a/src/lib/libcrypto/des/speed.c
+++ b/src/lib/libcrypto/des/speed.c
@@ -69,7 +69,11 @@
69#include OPENSSL_UNISTD_IO 69#include OPENSSL_UNISTD_IO
70OPENSSL_DECLARE_EXIT 70OPENSSL_DECLARE_EXIT
71 71
72#ifndef OPENSSL_SYS_NETWARE
72#include <signal.h> 73#include <signal.h>
74#define crypt(c,s) (des_crypt((c),(s)))
75#endif
76
73#ifndef _IRIX 77#ifndef _IRIX
74#include <time.h> 78#include <time.h>
75#endif 79#endif
diff --git a/src/lib/libcrypto/dh/Makefile b/src/lib/libcrypto/dh/Makefile
index 352678b94a..d368e33b4c 100644
--- a/src/lib/libcrypto/dh/Makefile
+++ b/src/lib/libcrypto/dh/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include 8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -22,8 +17,8 @@ TEST= dhtest.c
22APPS= 17APPS=
23 18
24LIB=$(TOP)/libcrypto.a 19LIB=$(TOP)/libcrypto.a
25LIBSRC= dh_asn1.c dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c 20LIBSRC= dh_asn1.c dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c dh_depr.c
26LIBOBJ= dh_asn1.o dh_gen.o dh_key.o dh_lib.o dh_check.o dh_err.o 21LIBOBJ= dh_asn1.o dh_gen.o dh_key.o dh_lib.o dh_check.o dh_err.o dh_depr.o
27 22
28SRC= $(LIBSRC) 23SRC= $(LIBSRC)
29 24
@@ -51,6 +46,7 @@ links:
51 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 46 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
52 47
53install: 48install:
49 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
54 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 50 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
55 do \ 51 do \
56 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 52 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -66,6 +62,7 @@ lint:
66 lint -DLINT $(INCLUDES) $(SRC)>fluff 62 lint -DLINT $(INCLUDES) $(SRC)>fluff
67 63
68depend: 64depend:
65 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
69 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 66 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
70 67
71dclean: 68dclean:
@@ -95,13 +92,21 @@ dh_check.o: ../../include/openssl/opensslconf.h
95dh_check.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 92dh_check.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
96dh_check.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 93dh_check.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
97dh_check.o: ../../include/openssl/symhacks.h ../cryptlib.h dh_check.c 94dh_check.o: ../../include/openssl/symhacks.h ../cryptlib.h dh_check.c
98dh_err.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 95dh_depr.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
99dh_err.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h 96dh_depr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
100dh_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 97dh_depr.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h
101dh_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 98dh_depr.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
102dh_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 99dh_depr.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
103dh_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 100dh_depr.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
104dh_err.o: ../../include/openssl/symhacks.h dh_err.c 101dh_depr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
102dh_depr.o: ../cryptlib.h dh_depr.c
103dh_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
104dh_err.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h
105dh_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
106dh_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
107dh_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
108dh_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
109dh_err.o: dh_err.c
105dh_gen.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h 110dh_gen.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
106dh_gen.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 111dh_gen.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
107dh_gen.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h 112dh_gen.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h
@@ -118,14 +123,11 @@ dh_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
118dh_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h 123dh_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
119dh_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 124dh_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
120dh_key.o: ../../include/openssl/symhacks.h ../cryptlib.h dh_key.c 125dh_key.o: ../../include/openssl/symhacks.h ../cryptlib.h dh_key.c
121dh_lib.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h 126dh_lib.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
122dh_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 127dh_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
123dh_lib.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h 128dh_lib.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h
124dh_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
125dh_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h 129dh_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h
126dh_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 130dh_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
127dh_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 131dh_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
128dh_lib.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
129dh_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 132dh_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
130dh_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 133dh_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h dh_lib.c
131dh_lib.o: ../cryptlib.h dh_lib.c
diff --git a/src/lib/libcrypto/dh/dhtest.c b/src/lib/libcrypto/dh/dhtest.c
index b76dede771..882f5c310a 100644
--- a/src/lib/libcrypto/dh/dhtest.c
+++ b/src/lib/libcrypto/dh/dhtest.c
@@ -56,6 +56,12 @@
56 * [including the GNU Public Licence.] 56 * [including the GNU Public Licence.]
57 */ 57 */
58 58
59/* Until the key-gen callbacks are modified to use newer prototypes, we allow
60 * deprecated functions for openssl-internal code */
61#ifdef OPENSSL_NO_DEPRECATED
62#undef OPENSSL_NO_DEPRECATED
63#endif
64
59#include <stdio.h> 65#include <stdio.h>
60#include <stdlib.h> 66#include <stdlib.h>
61#include <string.h> 67#include <string.h>
@@ -83,12 +89,13 @@ int main(int argc, char *argv[])
83#define MS_CALLBACK 89#define MS_CALLBACK
84#endif 90#endif
85 91
86static void MS_CALLBACK cb(int p, int n, void *arg); 92static int MS_CALLBACK cb(int p, int n, BN_GENCB *arg);
87 93
88static const char rnd_seed[] = "string to make the random number generator think it has entropy"; 94static const char rnd_seed[] = "string to make the random number generator think it has entropy";
89 95
90int main(int argc, char *argv[]) 96int main(int argc, char *argv[])
91 { 97 {
98 BN_GENCB _cb;
92 DH *a; 99 DH *a;
93 DH *b=NULL; 100 DH *b=NULL;
94 char buf[12]; 101 char buf[12];
@@ -110,8 +117,10 @@ int main(int argc, char *argv[])
110 if (out == NULL) EXIT(1); 117 if (out == NULL) EXIT(1);
111 BIO_set_fp(out,stdout,BIO_NOCLOSE); 118 BIO_set_fp(out,stdout,BIO_NOCLOSE);
112 119
113 a=DH_generate_parameters(64,DH_GENERATOR_5,cb,out); 120 BN_GENCB_set(&_cb, &cb, out);
114 if (a == NULL) goto err; 121 if(((a = DH_new()) == NULL) || !DH_generate_parameters_ex(a, 64,
122 DH_GENERATOR_5, &_cb))
123 goto err;
115 124
116 if (!DH_check(a, &i)) goto err; 125 if (!DH_check(a, &i)) goto err;
117 if (i & DH_CHECK_P_NOT_PRIME) 126 if (i & DH_CHECK_P_NOT_PRIME)
@@ -192,14 +201,14 @@ err:
192 if(b != NULL) DH_free(b); 201 if(b != NULL) DH_free(b);
193 if(a != NULL) DH_free(a); 202 if(a != NULL) DH_free(a);
194 BIO_free(out); 203 BIO_free(out);
195 CRYPTO_cleanup_all_ex_data(); 204#ifdef OPENSSL_SYS_NETWARE
196 ERR_remove_state(0); 205 if (ret) printf("ERROR: %d\n", ret);
197 CRYPTO_mem_leaks_fp(stderr); 206#endif
198 EXIT(ret); 207 EXIT(ret);
199 return(ret); 208 return(ret);
200 } 209 }
201 210
202static void MS_CALLBACK cb(int p, int n, void *arg) 211static int MS_CALLBACK cb(int p, int n, BN_GENCB *arg)
203 { 212 {
204 char c='*'; 213 char c='*';
205 214
@@ -207,10 +216,11 @@ static void MS_CALLBACK cb(int p, int n, void *arg)
207 if (p == 1) c='+'; 216 if (p == 1) c='+';
208 if (p == 2) c='*'; 217 if (p == 2) c='*';
209 if (p == 3) c='\n'; 218 if (p == 3) c='\n';
210 BIO_write((BIO *)arg,&c,1); 219 BIO_write(arg->arg,&c,1);
211 (void)BIO_flush((BIO *)arg); 220 (void)BIO_flush(arg->arg);
212#ifdef LINT 221#ifdef LINT
213 p=n; 222 p=n;
214#endif 223#endif
224 return 1;
215 } 225 }
216#endif 226#endif
diff --git a/src/lib/libcrypto/dsa/Makefile b/src/lib/libcrypto/dsa/Makefile
index 4f10278039..676baf7d49 100644
--- a/src/lib/libcrypto/dsa/Makefile
+++ b/src/lib/libcrypto/dsa/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include 8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -23,9 +18,9 @@ APPS=
23 18
24LIB=$(TOP)/libcrypto.a 19LIB=$(TOP)/libcrypto.a
25LIBSRC= dsa_gen.c dsa_key.c dsa_lib.c dsa_asn1.c dsa_vrf.c dsa_sign.c \ 20LIBSRC= dsa_gen.c dsa_key.c dsa_lib.c dsa_asn1.c dsa_vrf.c dsa_sign.c \
26 dsa_err.c dsa_ossl.c 21 dsa_err.c dsa_ossl.c dsa_depr.c
27LIBOBJ= dsa_gen.o dsa_key.o dsa_lib.o dsa_asn1.o dsa_vrf.o dsa_sign.o \ 22LIBOBJ= dsa_gen.o dsa_key.o dsa_lib.o dsa_asn1.o dsa_vrf.o dsa_sign.o \
28 dsa_err.o dsa_ossl.o 23 dsa_err.o dsa_ossl.o dsa_depr.o
29 24
30SRC= $(LIBSRC) 25SRC= $(LIBSRC)
31 26
@@ -53,6 +48,7 @@ links:
53 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 48 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
54 49
55install: 50install:
51 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
56 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 52 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
57 do \ 53 do \
58 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 54 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -68,6 +64,7 @@ lint:
68 lint -DLINT $(INCLUDES) $(SRC)>fluff 64 lint -DLINT $(INCLUDES) $(SRC)>fluff
69 65
70depend: 66depend:
67 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
71 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 68 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
72 69
73dclean: 70dclean:
@@ -81,51 +78,50 @@ clean:
81 78
82dsa_asn1.o: ../../e_os.h ../../include/openssl/asn1.h 79dsa_asn1.o: ../../e_os.h ../../include/openssl/asn1.h
83dsa_asn1.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h 80dsa_asn1.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
84dsa_asn1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 81dsa_asn1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
85dsa_asn1.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
86dsa_asn1.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h 82dsa_asn1.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
87dsa_asn1.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 83dsa_asn1.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
88dsa_asn1.o: ../../include/openssl/opensslconf.h 84dsa_asn1.o: ../../include/openssl/opensslconf.h
89dsa_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 85dsa_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
90dsa_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 86dsa_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
91dsa_asn1.o: ../../include/openssl/symhacks.h ../cryptlib.h dsa_asn1.c 87dsa_asn1.o: ../../include/openssl/symhacks.h ../cryptlib.h dsa_asn1.c
92dsa_err.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 88dsa_depr.o: ../../e_os.h ../../include/openssl/asn1.h
93dsa_err.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h 89dsa_depr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
90dsa_depr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
91dsa_depr.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
92dsa_depr.o: ../../include/openssl/err.h ../../include/openssl/evp.h
93dsa_depr.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
94dsa_depr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
95dsa_depr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
96dsa_depr.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
97dsa_depr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
98dsa_depr.o: ../../include/openssl/symhacks.h ../cryptlib.h dsa_depr.c
99dsa_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
94dsa_err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h 100dsa_err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
95dsa_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 101dsa_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
96dsa_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 102dsa_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
97dsa_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h 103dsa_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
98dsa_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 104dsa_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
99dsa_err.o: dsa_err.c 105dsa_err.o: dsa_err.c
100dsa_gen.o: ../../e_os.h ../../include/openssl/aes.h 106dsa_gen.o: ../../e_os.h ../../include/openssl/asn1.h
101dsa_gen.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 107dsa_gen.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
102dsa_gen.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 108dsa_gen.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
103dsa_gen.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
104dsa_gen.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
105dsa_gen.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
106dsa_gen.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h 109dsa_gen.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
107dsa_gen.o: ../../include/openssl/err.h ../../include/openssl/evp.h 110dsa_gen.o: ../../include/openssl/err.h ../../include/openssl/evp.h
108dsa_gen.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 111dsa_gen.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
109dsa_gen.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 112dsa_gen.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
110dsa_gen.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h 113dsa_gen.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
111dsa_gen.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 114dsa_gen.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
112dsa_gen.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
113dsa_gen.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
114dsa_gen.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
115dsa_gen.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
116dsa_gen.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
117dsa_gen.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 115dsa_gen.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
118dsa_gen.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 116dsa_gen.o: ../../include/openssl/symhacks.h ../cryptlib.h dsa_gen.c
119dsa_gen.o: ../../include/openssl/ui_compat.h ../cryptlib.h dsa_gen.c
120dsa_key.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h 117dsa_key.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
121dsa_key.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 118dsa_key.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
122dsa_key.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 119dsa_key.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
123dsa_key.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 120dsa_key.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
124dsa_key.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 121dsa_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
125dsa_key.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 122dsa_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
126dsa_key.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h 123dsa_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
127dsa_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 124dsa_key.o: ../../include/openssl/symhacks.h ../cryptlib.h dsa_key.c
128dsa_key.o: ../cryptlib.h dsa_key.c
129dsa_lib.o: ../../e_os.h ../../include/openssl/asn1.h 125dsa_lib.o: ../../e_os.h ../../include/openssl/asn1.h
130dsa_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 126dsa_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
131dsa_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 127dsa_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -133,16 +129,15 @@ dsa_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
133dsa_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h 129dsa_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
134dsa_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 130dsa_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
135dsa_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 131dsa_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
136dsa_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h 132dsa_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
137dsa_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
138dsa_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 133dsa_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
139dsa_lib.o: ../../include/openssl/ui.h ../cryptlib.h dsa_lib.c 134dsa_lib.o: ../cryptlib.h dsa_lib.c
140dsa_ossl.o: ../../e_os.h ../../include/openssl/asn1.h 135dsa_ossl.o: ../../e_os.h ../../include/openssl/asn1.h
141dsa_ossl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 136dsa_ossl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
142dsa_ossl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 137dsa_ossl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
143dsa_ossl.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 138dsa_ossl.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
144dsa_ossl.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 139dsa_ossl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
145dsa_ossl.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 140dsa_ossl.o: ../../include/openssl/opensslconf.h
146dsa_ossl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 141dsa_ossl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
147dsa_ossl.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h 142dsa_ossl.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
148dsa_ossl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 143dsa_ossl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
@@ -150,24 +145,20 @@ dsa_ossl.o: ../cryptlib.h dsa_ossl.c
150dsa_sign.o: ../../e_os.h ../../include/openssl/asn1.h 145dsa_sign.o: ../../e_os.h ../../include/openssl/asn1.h
151dsa_sign.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 146dsa_sign.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
152dsa_sign.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 147dsa_sign.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
153dsa_sign.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 148dsa_sign.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
154dsa_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h 149dsa_sign.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
155dsa_sign.o: ../../include/openssl/err.h ../../include/openssl/fips.h 150dsa_sign.o: ../../include/openssl/opensslconf.h
156dsa_sign.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
157dsa_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 151dsa_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
158dsa_sign.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h 152dsa_sign.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
159dsa_sign.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 153dsa_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
160dsa_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
161dsa_sign.o: ../cryptlib.h dsa_sign.c 154dsa_sign.o: ../cryptlib.h dsa_sign.c
162dsa_vrf.o: ../../e_os.h ../../include/openssl/asn1.h 155dsa_vrf.o: ../../e_os.h ../../include/openssl/asn1.h
163dsa_vrf.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h 156dsa_vrf.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h
164dsa_vrf.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 157dsa_vrf.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
165dsa_vrf.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h 158dsa_vrf.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h
166dsa_vrf.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h 159dsa_vrf.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
167dsa_vrf.o: ../../include/openssl/engine.h ../../include/openssl/err.h 160dsa_vrf.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
168dsa_vrf.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h 161dsa_vrf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
169dsa_vrf.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 162dsa_vrf.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
170dsa_vrf.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
171dsa_vrf.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
172dsa_vrf.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 163dsa_vrf.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
173dsa_vrf.o: ../../include/openssl/ui.h ../cryptlib.h dsa_vrf.c 164dsa_vrf.o: ../cryptlib.h dsa_vrf.c
diff --git a/src/lib/libcrypto/dsa/dsatest.c b/src/lib/libcrypto/dsa/dsatest.c
index 55a3756aff..912317bb44 100644
--- a/src/lib/libcrypto/dsa/dsatest.c
+++ b/src/lib/libcrypto/dsa/dsatest.c
@@ -56,6 +56,12 @@
56 * [including the GNU Public Licence.] 56 * [including the GNU Public Licence.]
57 */ 57 */
58 58
59/* Until the key-gen callbacks are modified to use newer prototypes, we allow
60 * deprecated functions for openssl-internal code */
61#ifdef OPENSSL_NO_DEPRECATED
62#undef OPENSSL_NO_DEPRECATED
63#endif
64
59#include <stdio.h> 65#include <stdio.h>
60#include <stdlib.h> 66#include <stdlib.h>
61#include <string.h> 67#include <string.h>
@@ -68,6 +74,7 @@
68#include <openssl/rand.h> 74#include <openssl/rand.h>
69#include <openssl/bio.h> 75#include <openssl/bio.h>
70#include <openssl/err.h> 76#include <openssl/err.h>
77#include <openssl/bn.h>
71 78
72#ifdef OPENSSL_NO_DSA 79#ifdef OPENSSL_NO_DSA
73int main(int argc, char *argv[]) 80int main(int argc, char *argv[])
@@ -84,7 +91,7 @@ int main(int argc, char *argv[])
84#define MS_CALLBACK 91#define MS_CALLBACK
85#endif 92#endif
86 93
87static void MS_CALLBACK dsa_cb(int p, int n, void *arg); 94static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *arg);
88 95
89/* seed, out_p, out_q, out_g are taken from the updated Appendix 5 to 96/* seed, out_p, out_q, out_g are taken from the updated Appendix 5 to
90 * FIPS PUB 186 and also appear in Appendix 5 to FIPS PIB 186-1 */ 97 * FIPS PUB 186 and also appear in Appendix 5 to FIPS PIB 186-1 */
@@ -129,6 +136,7 @@ static BIO *bio_err=NULL;
129 136
130int main(int argc, char **argv) 137int main(int argc, char **argv)
131 { 138 {
139 BN_GENCB cb;
132 DSA *dsa=NULL; 140 DSA *dsa=NULL;
133 int counter,ret=0,i,j; 141 int counter,ret=0,i,j;
134 unsigned char buf[256]; 142 unsigned char buf[256];
@@ -148,7 +156,10 @@ int main(int argc, char **argv)
148 156
149 BIO_printf(bio_err,"test generation of DSA parameters\n"); 157 BIO_printf(bio_err,"test generation of DSA parameters\n");
150 158
151 dsa=DSA_generate_parameters(512,seed,20,&counter,&h,dsa_cb,bio_err); 159 BN_GENCB_set(&cb, dsa_cb, bio_err);
160 if(((dsa = DSA_new()) == NULL) || !DSA_generate_parameters_ex(dsa, 512,
161 seed, 20, &counter, &h, &cb))
162 goto end;
152 163
153 BIO_printf(bio_err,"seed\n"); 164 BIO_printf(bio_err,"seed\n");
154 for (i=0; i<20; i+=4) 165 for (i=0; i<20; i+=4)
@@ -156,7 +167,7 @@ int main(int argc, char **argv)
156 BIO_printf(bio_err,"%02X%02X%02X%02X ", 167 BIO_printf(bio_err,"%02X%02X%02X%02X ",
157 seed[i],seed[i+1],seed[i+2],seed[i+3]); 168 seed[i],seed[i+1],seed[i+2],seed[i+3]);
158 } 169 }
159 BIO_printf(bio_err,"\ncounter=%d h=%d\n",counter,h); 170 BIO_printf(bio_err,"\ncounter=%d h=%ld\n",counter,h);
160 171
161 if (dsa == NULL) goto end; 172 if (dsa == NULL) goto end;
162 DSA_print(bio_err,dsa,0); 173 DSA_print(bio_err,dsa,0);
@@ -220,17 +231,14 @@ end:
220 BIO_free(bio_err); 231 BIO_free(bio_err);
221 bio_err = NULL; 232 bio_err = NULL;
222 } 233 }
234#ifdef OPENSSL_SYS_NETWARE
235 if (!ret) printf("ERROR\n");
236#endif
223 EXIT(!ret); 237 EXIT(!ret);
224 return(0); 238 return(0);
225 } 239 }
226 240
227static int cb_exit(int ec) 241static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *arg)
228 {
229 EXIT(ec);
230 return(0); /* To keep some compilers quiet */
231 }
232
233static void MS_CALLBACK dsa_cb(int p, int n, void *arg)
234 { 242 {
235 char c='*'; 243 char c='*';
236 static int ok=0,num=0; 244 static int ok=0,num=0;
@@ -239,13 +247,14 @@ static void MS_CALLBACK dsa_cb(int p, int n, void *arg)
239 if (p == 1) c='+'; 247 if (p == 1) c='+';
240 if (p == 2) { c='*'; ok++; } 248 if (p == 2) { c='*'; ok++; }
241 if (p == 3) c='\n'; 249 if (p == 3) c='\n';
242 BIO_write(arg,&c,1); 250 BIO_write(arg->arg,&c,1);
243 (void)BIO_flush(arg); 251 (void)BIO_flush(arg->arg);
244 252
245 if (!ok && (p == 0) && (num > 1)) 253 if (!ok && (p == 0) && (num > 1))
246 { 254 {
247 BIO_printf((BIO *)arg,"error in dsatest\n"); 255 BIO_printf((BIO *)arg,"error in dsatest\n");
248 cb_exit(1); 256 return 0;
249 } 257 }
258 return 1;
250 } 259 }
251#endif 260#endif
diff --git a/src/lib/libcrypto/dso/Makefile b/src/lib/libcrypto/dso/Makefile
index c16278c3ff..07f5d8d159 100644
--- a/src/lib/libcrypto/dso/Makefile
+++ b/src/lib/libcrypto/dso/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include 8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -53,6 +48,7 @@ links:
53 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 48 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
54 49
55install: 50install:
51 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
56 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 52 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
57 do \ 53 do \
58 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 54 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -68,6 +64,7 @@ lint:
68 lint -DLINT $(INCLUDES) $(SRC)>fluff 64 lint -DLINT $(INCLUDES) $(SRC)>fluff
69 65
70depend: 66depend:
67 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
71 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 68 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
72 69
73dclean: 70dclean:
@@ -84,43 +81,47 @@ dso_dl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
84dso_dl.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h 81dso_dl.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
85dso_dl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 82dso_dl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
86dso_dl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 83dso_dl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
87dso_dl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 84dso_dl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
88dso_dl.o: ../../include/openssl/symhacks.h ../cryptlib.h dso_dl.c 85dso_dl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
86dso_dl.o: ../cryptlib.h dso_dl.c
89dso_dlfcn.o: ../../e_os.h ../../include/openssl/bio.h 87dso_dlfcn.o: ../../e_os.h ../../include/openssl/bio.h
90dso_dlfcn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 88dso_dlfcn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
91dso_dlfcn.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h 89dso_dlfcn.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
92dso_dlfcn.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 90dso_dlfcn.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
93dso_dlfcn.o: ../../include/openssl/opensslconf.h 91dso_dlfcn.o: ../../include/openssl/opensslconf.h
94dso_dlfcn.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 92dso_dlfcn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
95dso_dlfcn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 93dso_dlfcn.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
96dso_dlfcn.o: ../cryptlib.h dso_dlfcn.c 94dso_dlfcn.o: ../../include/openssl/symhacks.h ../cryptlib.h dso_dlfcn.c
97dso_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h 95dso_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
98dso_err.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h 96dso_err.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
99dso_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 97dso_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
100dso_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 98dso_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
101dso_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 99dso_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
102dso_err.o: ../../include/openssl/symhacks.h dso_err.c 100dso_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
101dso_err.o: dso_err.c
103dso_lib.o: ../../e_os.h ../../include/openssl/bio.h 102dso_lib.o: ../../e_os.h ../../include/openssl/bio.h
104dso_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 103dso_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
105dso_lib.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h 104dso_lib.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
106dso_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 105dso_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
107dso_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 106dso_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
108dso_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 107dso_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
109dso_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h dso_lib.c 108dso_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
109dso_lib.o: ../cryptlib.h dso_lib.c
110dso_null.o: ../../e_os.h ../../include/openssl/bio.h 110dso_null.o: ../../e_os.h ../../include/openssl/bio.h
111dso_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 111dso_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
112dso_null.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h 112dso_null.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
113dso_null.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 113dso_null.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
114dso_null.o: ../../include/openssl/opensslconf.h 114dso_null.o: ../../include/openssl/opensslconf.h
115dso_null.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 115dso_null.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
116dso_null.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 116dso_null.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
117dso_null.o: ../cryptlib.h dso_null.c 117dso_null.o: ../../include/openssl/symhacks.h ../cryptlib.h dso_null.c
118dso_openssl.o: ../../e_os.h ../../include/openssl/bio.h 118dso_openssl.o: ../../e_os.h ../../include/openssl/bio.h
119dso_openssl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 119dso_openssl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
120dso_openssl.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h 120dso_openssl.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
121dso_openssl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 121dso_openssl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
122dso_openssl.o: ../../include/openssl/opensslconf.h 122dso_openssl.o: ../../include/openssl/opensslconf.h
123dso_openssl.o: ../../include/openssl/opensslv.h 123dso_openssl.o: ../../include/openssl/opensslv.h
124dso_openssl.o: ../../include/openssl/ossl_typ.h
124dso_openssl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 125dso_openssl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
125dso_openssl.o: ../../include/openssl/symhacks.h ../cryptlib.h dso_openssl.c 126dso_openssl.o: ../../include/openssl/symhacks.h ../cryptlib.h dso_openssl.c
126dso_vms.o: ../../e_os.h ../../include/openssl/bio.h 127dso_vms.o: ../../e_os.h ../../include/openssl/bio.h
@@ -128,13 +129,14 @@ dso_vms.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
128dso_vms.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h 129dso_vms.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
129dso_vms.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 130dso_vms.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
130dso_vms.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 131dso_vms.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
131dso_vms.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 132dso_vms.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
132dso_vms.o: ../../include/openssl/symhacks.h ../cryptlib.h dso_vms.c 133dso_vms.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
134dso_vms.o: ../cryptlib.h dso_vms.c
133dso_win32.o: ../../e_os.h ../../include/openssl/bio.h 135dso_win32.o: ../../e_os.h ../../include/openssl/bio.h
134dso_win32.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 136dso_win32.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
135dso_win32.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h 137dso_win32.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
136dso_win32.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 138dso_win32.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
137dso_win32.o: ../../include/openssl/opensslconf.h 139dso_win32.o: ../../include/openssl/opensslconf.h
138dso_win32.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 140dso_win32.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
139dso_win32.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 141dso_win32.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
140dso_win32.o: ../cryptlib.h dso_win32.c 142dso_win32.o: ../../include/openssl/symhacks.h ../cryptlib.h dso_win32.c
diff --git a/src/lib/libcrypto/dso/dso_dl.c b/src/lib/libcrypto/dso/dso_dl.c
index f7b4dfc0c3..417abb6ea9 100644
--- a/src/lib/libcrypto/dso/dso_dl.c
+++ b/src/lib/libcrypto/dso/dso_dl.c
@@ -1,4 +1,4 @@
1/* dso_dl.c */ 1/* dso_dl.c -*- mode:C; c-file-style: "eay" -*- */
2/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL 2/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
@@ -84,6 +84,7 @@ static int dl_finish(DSO *dso);
84static int dl_ctrl(DSO *dso, int cmd, long larg, void *parg); 84static int dl_ctrl(DSO *dso, int cmd, long larg, void *parg);
85#endif 85#endif
86static char *dl_name_converter(DSO *dso, const char *filename); 86static char *dl_name_converter(DSO *dso, const char *filename);
87static char *dl_merger(DSO *dso, const char *filespec1, const char *filespec2);
87 88
88static DSO_METHOD dso_meth_dl = { 89static DSO_METHOD dso_meth_dl = {
89 "OpenSSL 'dl' shared library method", 90 "OpenSSL 'dl' shared library method",
@@ -98,6 +99,7 @@ static DSO_METHOD dso_meth_dl = {
98#endif 99#endif
99 NULL, /* ctrl */ 100 NULL, /* ctrl */
100 dl_name_converter, 101 dl_name_converter,
102 dl_merger,
101 NULL, /* init */ 103 NULL, /* init */
102 NULL /* finish */ 104 NULL /* finish */
103 }; 105 };
@@ -239,6 +241,72 @@ static DSO_FUNC_TYPE dl_bind_func(DSO *dso, const char *symname)
239 return((DSO_FUNC_TYPE)sym); 241 return((DSO_FUNC_TYPE)sym);
240 } 242 }
241 243
244static char *dl_merger(DSO *dso, const char *filespec1, const char *filespec2)
245 {
246 char *merged;
247
248 if(!filespec1 && !filespec2)
249 {
250 DSOerr(DSO_F_DL_MERGER,
251 ERR_R_PASSED_NULL_PARAMETER);
252 return(NULL);
253 }
254 /* If the first file specification is a rooted path, it rules.
255 same goes if the second file specification is missing. */
256 if (!filespec2 || filespec1[0] == '/')
257 {
258 merged = OPENSSL_malloc(strlen(filespec1) + 1);
259 if(!merged)
260 {
261 DSOerr(DSO_F_DL_MERGER,
262 ERR_R_MALLOC_FAILURE);
263 return(NULL);
264 }
265 strcpy(merged, filespec1);
266 }
267 /* If the first file specification is missing, the second one rules. */
268 else if (!filespec1)
269 {
270 merged = OPENSSL_malloc(strlen(filespec2) + 1);
271 if(!merged)
272 {
273 DSOerr(DSO_F_DL_MERGER,
274 ERR_R_MALLOC_FAILURE);
275 return(NULL);
276 }
277 strcpy(merged, filespec2);
278 }
279 else
280 /* This part isn't as trivial as it looks. It assumes that
281 the second file specification really is a directory, and
282 makes no checks whatsoever. Therefore, the result becomes
283 the concatenation of filespec2 followed by a slash followed
284 by filespec1. */
285 {
286 int spec2len, len;
287
288 spec2len = (filespec2 ? strlen(filespec2) : 0);
289 len = spec2len + (filespec1 ? strlen(filespec1) : 0);
290
291 if(filespec2 && filespec2[spec2len - 1] == '/')
292 {
293 spec2len--;
294 len--;
295 }
296 merged = OPENSSL_malloc(len + 2);
297 if(!merged)
298 {
299 DSOerr(DSO_F_DL_MERGER,
300 ERR_R_MALLOC_FAILURE);
301 return(NULL);
302 }
303 strcpy(merged, filespec2);
304 merged[spec2len] = '/';
305 strcpy(&merged[spec2len + 1], filespec1);
306 }
307 return(merged);
308 }
309
242/* This function is identical to the one in dso_dlfcn.c, but as it is highly 310/* This function is identical to the one in dso_dlfcn.c, but as it is highly
243 * unlikely that both the "dl" *and* "dlfcn" variants are being compiled at the 311 * unlikely that both the "dl" *and* "dlfcn" variants are being compiled at the
244 * same time, there's no great duplicating the code. Figuring out an elegant 312 * same time, there's no great duplicating the code. Figuring out an elegant
@@ -282,36 +350,4 @@ static char *dl_name_converter(DSO *dso, const char *filename)
282 return(translated); 350 return(translated);
283 } 351 }
284 352
285#ifdef OPENSSL_FIPS
286static void dl_ref_point(){}
287
288int DSO_pathbyaddr(void *addr,char *path,int sz)
289 {
290 struct shl_descriptor inf;
291 int i,len;
292
293 if (addr == NULL)
294 {
295 union { void(*f)(); void *p; } t = { dl_ref_point };
296 addr = t.p;
297 }
298
299 for (i=-1;shl_get_r(i,&inf)==0;i++)
300 {
301 if (((size_t)addr >= inf.tstart && (size_t)addr < inf.tend) ||
302 ((size_t)addr >= inf.dstart && (size_t)addr < inf.dend))
303 {
304 len = (int)strlen(inf.filename);
305 if (sz <= 0) return len+1;
306 if (len >= sz) len=sz-1;
307 memcpy(path,inf.filename,len);
308 path[len++] = 0;
309 return len;
310 }
311 }
312
313 return -1;
314 }
315#endif
316
317#endif /* DSO_DL */ 353#endif /* DSO_DL */
diff --git a/src/lib/libcrypto/dso/dso_vms.c b/src/lib/libcrypto/dso/dso_vms.c
index 1674619d17..2c434ee8a6 100644
--- a/src/lib/libcrypto/dso/dso_vms.c
+++ b/src/lib/libcrypto/dso/dso_vms.c
@@ -1,4 +1,4 @@
1/* dso_vms.c */ 1/* dso_vms.c -*- mode:C; c-file-style: "eay" -*- */
2/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL 2/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
@@ -63,6 +63,7 @@
63#include <openssl/dso.h> 63#include <openssl/dso.h>
64#ifdef OPENSSL_SYS_VMS 64#ifdef OPENSSL_SYS_VMS
65#pragma message disable DOLLARID 65#pragma message disable DOLLARID
66#include <rms.h>
66#include <lib$routines.h> 67#include <lib$routines.h>
67#include <stsdef.h> 68#include <stsdef.h>
68#include <descrip.h> 69#include <descrip.h>
@@ -89,6 +90,8 @@ static int vms_finish(DSO *dso);
89static long vms_ctrl(DSO *dso, int cmd, long larg, void *parg); 90static long vms_ctrl(DSO *dso, int cmd, long larg, void *parg);
90#endif 91#endif
91static char *vms_name_converter(DSO *dso, const char *filename); 92static char *vms_name_converter(DSO *dso, const char *filename);
93static char *vms_merger(DSO *dso, const char *filespec1,
94 const char *filespec2);
92 95
93static DSO_METHOD dso_meth_vms = { 96static DSO_METHOD dso_meth_vms = {
94 "OpenSSL 'VMS' shared library method", 97 "OpenSSL 'VMS' shared library method",
@@ -103,6 +106,7 @@ static DSO_METHOD dso_meth_vms = {
103#endif 106#endif
104 NULL, /* ctrl */ 107 NULL, /* ctrl */
105 vms_name_converter, 108 vms_name_converter,
109 vms_merger,
106 NULL, /* init */ 110 NULL, /* init */
107 NULL /* finish */ 111 NULL /* finish */
108 }; 112 };
@@ -140,7 +144,7 @@ static int vms_load(DSO *dso)
140 144
141 if(filename == NULL) 145 if(filename == NULL)
142 { 146 {
143 DSOerr(DSO_F_DLFCN_LOAD,DSO_R_NO_FILENAME); 147 DSOerr(DSO_F_VMS_LOAD,DSO_R_NO_FILENAME);
144 goto err; 148 goto err;
145 } 149 }
146 150
@@ -295,19 +299,19 @@ void vms_bind_sym(DSO *dso, const char *symname, void **sym)
295 299
296 if((dso == NULL) || (symname == NULL)) 300 if((dso == NULL) || (symname == NULL))
297 { 301 {
298 DSOerr(DSO_F_VMS_BIND_VAR,ERR_R_PASSED_NULL_PARAMETER); 302 DSOerr(DSO_F_VMS_BIND_SYM,ERR_R_PASSED_NULL_PARAMETER);
299 return; 303 return;
300 } 304 }
301 if(sk_num(dso->meth_data) < 1) 305 if(sk_num(dso->meth_data) < 1)
302 { 306 {
303 DSOerr(DSO_F_VMS_BIND_VAR,DSO_R_STACK_ERROR); 307 DSOerr(DSO_F_VMS_BIND_SYM,DSO_R_STACK_ERROR);
304 return; 308 return;
305 } 309 }
306 ptr = (DSO_VMS_INTERNAL *)sk_value(dso->meth_data, 310 ptr = (DSO_VMS_INTERNAL *)sk_value(dso->meth_data,
307 sk_num(dso->meth_data) - 1); 311 sk_num(dso->meth_data) - 1);
308 if(ptr == NULL) 312 if(ptr == NULL)
309 { 313 {
310 DSOerr(DSO_F_VMS_BIND_VAR,DSO_R_NULL_HANDLE); 314 DSOerr(DSO_F_VMS_BIND_SYM,DSO_R_NULL_HANDLE);
311 return; 315 return;
312 } 316 }
313 317
@@ -336,7 +340,7 @@ void vms_bind_sym(DSO *dso, const char *symname, void **sym)
336 { 340 {
337 errstring[length] = '\0'; 341 errstring[length] = '\0';
338 342
339 DSOerr(DSO_F_VMS_BIND_VAR,DSO_R_SYM_FAILURE); 343 DSOerr(DSO_F_VMS_BIND_SYM,DSO_R_SYM_FAILURE);
340 if (ptr->imagename_dsc.dsc$w_length) 344 if (ptr->imagename_dsc.dsc$w_length)
341 ERR_add_error_data(9, 345 ERR_add_error_data(9,
342 "Symbol ", symname, 346 "Symbol ", symname,
@@ -368,6 +372,127 @@ static DSO_FUNC_TYPE vms_bind_func(DSO *dso, const char *symname)
368 return sym; 372 return sym;
369 } 373 }
370 374
375static char *vms_merger(DSO *dso, const char *filespec1, const char *filespec2)
376 {
377 int status;
378 int filespec1len, filespec2len;
379 struct FAB fab;
380#ifdef NAML$C_MAXRSS
381 struct NAML nam;
382 char esa[NAML$C_MAXRSS];
383#else
384 struct NAM nam;
385 char esa[NAM$C_MAXRSS];
386#endif
387 char *merged;
388
389 if (!filespec1) filespec1 = "";
390 if (!filespec2) filespec2 = "";
391 filespec1len = strlen(filespec1);
392 filespec2len = strlen(filespec2);
393
394 fab = cc$rms_fab;
395#ifdef NAML$C_MAXRSS
396 nam = cc$rms_naml;
397#else
398 nam = cc$rms_nam;
399#endif
400
401 fab.fab$l_fna = (char *)filespec1;
402 fab.fab$b_fns = filespec1len;
403 fab.fab$l_dna = (char *)filespec2;
404 fab.fab$b_dns = filespec2len;
405#ifdef NAML$C_MAXRSS
406 if (filespec1len > NAM$C_MAXRSS)
407 {
408 fab.fab$l_fna = 0;
409 fab.fab$b_fns = 0;
410 nam.naml$l_long_filename = (char *)filespec1;
411 nam.naml$l_long_filename_size = filespec1len;
412 }
413 if (filespec2len > NAM$C_MAXRSS)
414 {
415 fab.fab$l_dna = 0;
416 fab.fab$b_dns = 0;
417 nam.naml$l_long_defname = (char *)filespec2;
418 nam.naml$l_long_defname_size = filespec2len;
419 }
420 nam.naml$l_esa = esa;
421 nam.naml$b_ess = NAM$C_MAXRSS;
422 nam.naml$l_long_expand = esa;
423 nam.naml$l_long_expand_alloc = sizeof(esa);
424 nam.naml$b_nop = NAM$M_SYNCHK | NAM$M_PWD;
425 nam.naml$v_no_short_upcase = 1;
426 fab.fab$l_naml = &nam;
427#else
428 nam.nam$l_esa = esa;
429 nam.nam$b_ess = NAM$C_MAXRSS;
430 nam.nam$b_nop = NAM$M_SYNCHK | NAM$M_PWD;
431 fab.fab$l_nam = &nam;
432#endif
433
434 status = sys$parse(&fab, 0, 0);
435
436 if(!$VMS_STATUS_SUCCESS(status))
437 {
438 unsigned short length;
439 char errstring[257];
440 struct dsc$descriptor_s errstring_dsc;
441
442 errstring_dsc.dsc$w_length = sizeof(errstring);
443 errstring_dsc.dsc$b_dtype = DSC$K_DTYPE_T;
444 errstring_dsc.dsc$b_class = DSC$K_CLASS_S;
445 errstring_dsc.dsc$a_pointer = errstring;
446
447 status = sys$getmsg(status, &length, &errstring_dsc, 1, 0);
448
449 if (!$VMS_STATUS_SUCCESS(status))
450 lib$signal(status); /* This is really bad. Abort! */
451 else
452 {
453 errstring[length] = '\0';
454
455 DSOerr(DSO_F_VMS_MERGER,DSO_R_FAILURE);
456 ERR_add_error_data(7,
457 "filespec \"", filespec1, "\", ",
458 "defaults \"", filespec2, "\": ",
459 errstring);
460 }
461 return(NULL);
462 }
463#ifdef NAML$C_MAXRSS
464 if (nam.naml$l_long_expand_size)
465 {
466 merged = OPENSSL_malloc(nam.naml$l_long_expand_size + 1);
467 if(!merged)
468 goto malloc_err;
469 strncpy(merged, nam.naml$l_long_expand,
470 nam.naml$l_long_expand_size);
471 merged[nam.naml$l_long_expand_size] = '\0';
472 }
473 else
474 {
475 merged = OPENSSL_malloc(nam.naml$b_esl + 1);
476 if(!merged)
477 goto malloc_err;
478 strncpy(merged, nam.naml$l_esa,
479 nam.naml$b_esl);
480 merged[nam.naml$b_esl] = '\0';
481 }
482#else
483 merged = OPENSSL_malloc(nam.nam$b_esl + 1);
484 if(!merged)
485 goto malloc_err;
486 strncpy(merged, nam.nam$l_esa,
487 nam.nam$b_esl);
488 merged[nam.nam$b_esl] = '\0';
489#endif
490 return(merged);
491 malloc_err:
492 DSOerr(DSO_F_VMS_MERGER,
493 ERR_R_MALLOC_FAILURE);
494 }
495
371static char *vms_name_converter(DSO *dso, const char *filename) 496static char *vms_name_converter(DSO *dso, const char *filename)
372 { 497 {
373 int len = strlen(filename); 498 int len = strlen(filename);
diff --git a/src/lib/libcrypto/dso/dso_win32.c b/src/lib/libcrypto/dso/dso_win32.c
index cc4ac68696..fd3dd6a7fe 100644
--- a/src/lib/libcrypto/dso/dso_win32.c
+++ b/src/lib/libcrypto/dso/dso_win32.c
@@ -1,4 +1,4 @@
1/* dso_win32.c */ 1/* dso_win32.c -*- mode:C; c-file-style: "eay" -*- */
2/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL 2/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
@@ -85,6 +85,26 @@ static FARPROC GetProcAddressA(HMODULE hModule,LPCSTR lpProcName)
85# endif 85# endif
86# undef GetProcAddress 86# undef GetProcAddress
87# define GetProcAddress GetProcAddressA 87# define GetProcAddress GetProcAddressA
88
89static HINSTANCE LoadLibraryA(LPCSTR lpLibFileName)
90 {
91 WCHAR *fnamw;
92 size_t len_0=strlen(lpLibFileName)+1,i;
93
94#ifdef _MSC_VER
95 fnamw = (WCHAR *)_alloca (len_0*sizeof(WCHAR));
96#else
97 fnamw = (WCHAR *)alloca (len_0*sizeof(WCHAR));
98#endif
99 if (fnamw == NULL) return NULL;
100
101#if defined(_WIN32_WCE) && _WIN32_WCE>=101
102 if (!MultiByteToWideChar(CP_ACP,0,lpLibFileName,len_0,fnamw,len_0))
103#endif
104 for (i=0;i<len_0;i++) fnamw[i]=(WCHAR)lpLibFileName[i];
105
106 return LoadLibraryW(fnamw);
107 }
88#endif 108#endif
89 109
90/* Part of the hack in "win32_load" ... */ 110/* Part of the hack in "win32_load" ... */
@@ -102,6 +122,10 @@ static int win32_finish(DSO *dso);
102static long win32_ctrl(DSO *dso, int cmd, long larg, void *parg); 122static long win32_ctrl(DSO *dso, int cmd, long larg, void *parg);
103#endif 123#endif
104static char *win32_name_converter(DSO *dso, const char *filename); 124static char *win32_name_converter(DSO *dso, const char *filename);
125static char *win32_merger(DSO *dso, const char *filespec1,
126 const char *filespec2);
127
128static const char *openssl_strnchr(const char *string, int c, size_t len);
105 129
106static DSO_METHOD dso_meth_win32 = { 130static DSO_METHOD dso_meth_win32 = {
107 "OpenSSL 'win32' shared library method", 131 "OpenSSL 'win32' shared library method",
@@ -116,6 +140,7 @@ static DSO_METHOD dso_meth_win32 = {
116#endif 140#endif
117 NULL, /* ctrl */ 141 NULL, /* ctrl */
118 win32_name_converter, 142 win32_name_converter,
143 win32_merger,
119 NULL, /* init */ 144 NULL, /* init */
120 NULL /* finish */ 145 NULL /* finish */
121 }; 146 };
@@ -267,6 +292,330 @@ static DSO_FUNC_TYPE win32_bind_func(DSO *dso, const char *symname)
267 return((DSO_FUNC_TYPE)sym); 292 return((DSO_FUNC_TYPE)sym);
268 } 293 }
269 294
295struct file_st
296 {
297 const char *node; int nodelen;
298 const char *device; int devicelen;
299 const char *predir; int predirlen;
300 const char *dir; int dirlen;
301 const char *file; int filelen;
302 };
303
304static struct file_st *win32_splitter(DSO *dso, const char *filename,
305 int assume_last_is_dir)
306 {
307 struct file_st *result = NULL;
308 enum { IN_NODE, IN_DEVICE, IN_FILE } position;
309 const char *start = filename;
310 char last;
311
312 if (!filename)
313 {
314 DSOerr(DSO_F_WIN32_SPLITTER,DSO_R_NO_FILENAME);
315 /*goto err;*/
316 return(NULL);
317 }
318
319 result = OPENSSL_malloc(sizeof(struct file_st));
320 if(result == NULL)
321 {
322 DSOerr(DSO_F_WIN32_SPLITTER,
323 ERR_R_MALLOC_FAILURE);
324 return(NULL);
325 }
326
327 memset(result, 0, sizeof(struct file_st));
328 position = IN_DEVICE;
329
330 if(filename[0] == '\\' && filename[1] == '\\'
331 || filename[0] == '/' && filename[1] == '/')
332 {
333 position = IN_NODE;
334 filename += 2;
335 start = filename;
336 result->node = start;
337 }
338
339 do
340 {
341 last = filename[0];
342 switch(last)
343 {
344 case ':':
345 if(position != IN_DEVICE)
346 {
347 DSOerr(DSO_F_WIN32_SPLITTER,
348 DSO_R_INCORRECT_FILE_SYNTAX);
349 /*goto err;*/
350 return(NULL);
351 }
352 result->device = start;
353 result->devicelen = filename - start;
354 position = IN_FILE;
355 start = ++filename;
356 result->dir = start;
357 break;
358 case '\\':
359 case '/':
360 if(position == IN_NODE)
361 {
362 result->nodelen = filename - start;
363 position = IN_FILE;
364 start = ++filename;
365 result->dir = start;
366 }
367 else if(position == IN_DEVICE)
368 {
369 position = IN_FILE;
370 filename++;
371 result->dir = start;
372 result->dirlen = filename - start;
373 start = filename;
374 }
375 else
376 {
377 filename++;
378 result->dirlen += filename - start;
379 start = filename;
380 }
381 break;
382 case '\0':
383 if(position == IN_NODE)
384 {
385 result->nodelen = filename - start;
386 }
387 else
388 {
389 if(filename - start > 0)
390 {
391 if (assume_last_is_dir)
392 {
393 if (position == IN_DEVICE)
394 {
395 result->dir = start;
396 result->dirlen = 0;
397 }
398 result->dirlen +=
399 filename - start;
400 }
401 else
402 {
403 result->file = start;
404 result->filelen =
405 filename - start;
406 }
407 }
408 }
409 break;
410 default:
411 filename++;
412 break;
413 }
414 }
415 while(last);
416
417 if(!result->nodelen) result->node = NULL;
418 if(!result->devicelen) result->device = NULL;
419 if(!result->dirlen) result->dir = NULL;
420 if(!result->filelen) result->file = NULL;
421
422 return(result);
423 }
424
425static char *win32_joiner(DSO *dso, const struct file_st *file_split)
426 {
427 int len = 0, offset = 0;
428 char *result = NULL;
429 const char *start;
430
431 if(!file_split)
432 {
433 DSOerr(DSO_F_WIN32_JOINER,
434 ERR_R_PASSED_NULL_PARAMETER);
435 return(NULL);
436 }
437 if(file_split->node)
438 {
439 len += 2 + file_split->nodelen; /* 2 for starting \\ */
440 if(file_split->predir || file_split->dir || file_split->file)
441 len++; /* 1 for ending \ */
442 }
443 else if(file_split->device)
444 {
445 len += file_split->devicelen + 1; /* 1 for ending : */
446 }
447 len += file_split->predirlen;
448 if(file_split->predir && (file_split->dir || file_split->file))
449 {
450 len++; /* 1 for ending \ */
451 }
452 len += file_split->dirlen;
453 if(file_split->dir && file_split->file)
454 {
455 len++; /* 1 for ending \ */
456 }
457 len += file_split->filelen;
458
459 if(!len)
460 {
461 DSOerr(DSO_F_WIN32_JOINER, DSO_R_EMPTY_FILE_STRUCTURE);
462 return(NULL);
463 }
464
465 result = OPENSSL_malloc(len + 1);
466 if (!result)
467 {
468 DSOerr(DSO_F_WIN32_JOINER,
469 ERR_R_MALLOC_FAILURE);
470 return(NULL);
471 }
472
473 if(file_split->node)
474 {
475 strcpy(&result[offset], "\\\\"); offset += 2;
476 strncpy(&result[offset], file_split->node,
477 file_split->nodelen); offset += file_split->nodelen;
478 if(file_split->predir || file_split->dir || file_split->file)
479 {
480 result[offset] = '\\'; offset++;
481 }
482 }
483 else if(file_split->device)
484 {
485 strncpy(&result[offset], file_split->device,
486 file_split->devicelen); offset += file_split->devicelen;
487 result[offset] = ':'; offset++;
488 }
489 start = file_split->predir;
490 while(file_split->predirlen > (start - file_split->predir))
491 {
492 const char *end = openssl_strnchr(start, '/',
493 file_split->predirlen - (start - file_split->predir));
494 if(!end)
495 end = start
496 + file_split->predirlen
497 - (start - file_split->predir);
498 strncpy(&result[offset], start,
499 end - start); offset += end - start;
500 result[offset] = '\\'; offset++;
501 start = end + 1;
502 }
503#if 0 /* Not needed, since the directory converter above already appeneded
504 a backslash */
505 if(file_split->predir && (file_split->dir || file_split->file))
506 {
507 result[offset] = '\\'; offset++;
508 }
509#endif
510 start = file_split->dir;
511 while(file_split->dirlen > (start - file_split->dir))
512 {
513 const char *end = openssl_strnchr(start, '/',
514 file_split->dirlen - (start - file_split->dir));
515 if(!end)
516 end = start
517 + file_split->dirlen
518 - (start - file_split->dir);
519 strncpy(&result[offset], start,
520 end - start); offset += end - start;
521 result[offset] = '\\'; offset++;
522 start = end + 1;
523 }
524#if 0 /* Not needed, since the directory converter above already appeneded
525 a backslash */
526 if(file_split->dir && file_split->file)
527 {
528 result[offset] = '\\'; offset++;
529 }
530#endif
531 strncpy(&result[offset], file_split->file,
532 file_split->filelen); offset += file_split->filelen;
533 result[offset] = '\0';
534 return(result);
535 }
536
537static char *win32_merger(DSO *dso, const char *filespec1, const char *filespec2)
538 {
539 char *merged = NULL;
540 struct file_st *filespec1_split = NULL;
541 struct file_st *filespec2_split = NULL;
542
543 if(!filespec1 && !filespec2)
544 {
545 DSOerr(DSO_F_WIN32_MERGER,
546 ERR_R_PASSED_NULL_PARAMETER);
547 return(NULL);
548 }
549 if (!filespec2)
550 {
551 merged = OPENSSL_malloc(strlen(filespec1) + 1);
552 if(!merged)
553 {
554 DSOerr(DSO_F_WIN32_MERGER,
555 ERR_R_MALLOC_FAILURE);
556 return(NULL);
557 }
558 strcpy(merged, filespec1);
559 }
560 else if (!filespec1)
561 {
562 merged = OPENSSL_malloc(strlen(filespec2) + 1);
563 if(!merged)
564 {
565 DSOerr(DSO_F_WIN32_MERGER,
566 ERR_R_MALLOC_FAILURE);
567 return(NULL);
568 }
569 strcpy(merged, filespec2);
570 }
571 else
572 {
573 filespec1_split = win32_splitter(dso, filespec1, 0);
574 if (!filespec1_split)
575 {
576 DSOerr(DSO_F_WIN32_MERGER,
577 ERR_R_MALLOC_FAILURE);
578 return(NULL);
579 }
580 filespec2_split = win32_splitter(dso, filespec2, 1);
581 if (!filespec2_split)
582 {
583 DSOerr(DSO_F_WIN32_MERGER,
584 ERR_R_MALLOC_FAILURE);
585 OPENSSL_free(filespec1_split);
586 return(NULL);
587 }
588
589 /* Fill in into filespec1_split */
590 if (!filespec1_split->node && !filespec1_split->device)
591 {
592 filespec1_split->node = filespec2_split->node;
593 filespec1_split->nodelen = filespec2_split->nodelen;
594 filespec1_split->device = filespec2_split->device;
595 filespec1_split->devicelen = filespec2_split->devicelen;
596 }
597 if (!filespec1_split->dir)
598 {
599 filespec1_split->dir = filespec2_split->dir;
600 filespec1_split->dirlen = filespec2_split->dirlen;
601 }
602 else if (filespec1_split->dir[0] != '\\'
603 && filespec1_split->dir[0] != '/')
604 {
605 filespec1_split->predir = filespec2_split->dir;
606 filespec1_split->predirlen = filespec2_split->dirlen;
607 }
608 if (!filespec1_split->file)
609 {
610 filespec1_split->file = filespec2_split->file;
611 filespec1_split->filelen = filespec2_split->filelen;
612 }
613
614 merged = win32_joiner(dso, filespec1_split);
615 }
616 return(merged);
617 }
618
270static char *win32_name_converter(DSO *dso, const char *filename) 619static char *win32_name_converter(DSO *dso, const char *filename)
271 { 620 {
272 char *translated; 621 char *translated;
@@ -295,4 +644,17 @@ static char *win32_name_converter(DSO *dso, const char *filename)
295 return(translated); 644 return(translated);
296 } 645 }
297 646
647static const char *openssl_strnchr(const char *string, int c, size_t len)
648 {
649 size_t i;
650 const char *p;
651 for (i = 0, p = string; i < len && *p; i++, p++)
652 {
653 if (*p == c)
654 return p;
655 }
656 return NULL;
657 }
658
659
298#endif /* OPENSSL_SYS_WIN32 */ 660#endif /* OPENSSL_SYS_WIN32 */
diff --git a/src/lib/libcrypto/ebcdic.c b/src/lib/libcrypto/ebcdic.c
index d1bece87f7..43e53bcaf7 100644
--- a/src/lib/libcrypto/ebcdic.c
+++ b/src/lib/libcrypto/ebcdic.c
@@ -1,6 +1,14 @@
1/* crypto/ebcdic.c */ 1/* crypto/ebcdic.c */
2 2
3#ifdef CHARSET_EBCDIC 3#ifndef CHARSET_EBCDIC
4
5#include <openssl/e_os2.h>
6#if defined(PEDANTIC) || defined(__DECC) || defined(OPENSSL_SYS_MACOSX)
7static void *dummy=&dummy;
8#endif
9
10#else /*CHARSET_EBCDIC*/
11
4#include "ebcdic.h" 12#include "ebcdic.h"
5/* Initial Port for Apache-1.3 by <Martin.Kraemer@Mch.SNI.De> 13/* Initial Port for Apache-1.3 by <Martin.Kraemer@Mch.SNI.De>
6 * Adapted for OpenSSL-0.9.4 by <Martin.Kraemer@Mch.SNI.De> 14 * Adapted for OpenSSL-0.9.4 by <Martin.Kraemer@Mch.SNI.De>
@@ -210,9 +218,4 @@ ascii2ebcdic(void *dest, const void *srce, size_t count)
210 return dest; 218 return dest;
211} 219}
212 220
213#else /*CHARSET_EBCDIC*/
214#include <openssl/e_os2.h>
215#if defined(PEDANTIC) || defined(__DECC) || defined(OPENSSL_SYS_MACOSX)
216static void *dummy=&dummy;
217#endif
218#endif 221#endif
diff --git a/src/lib/libcrypto/ec/Makefile b/src/lib/libcrypto/ec/Makefile
index 8f03658ad4..42f7bb7fc8 100644
--- a/src/lib/libcrypto/ec/Makefile
+++ b/src/lib/libcrypto/ec/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include 8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -22,11 +17,13 @@ TEST=ectest.c
22APPS= 17APPS=
23 18
24LIB=$(TOP)/libcrypto.a 19LIB=$(TOP)/libcrypto.a
25LIBSRC= ec_lib.c ecp_smpl.c ecp_mont.c ecp_recp.c ecp_nist.c ec_cvt.c ec_mult.c \ 20LIBSRC= ec_lib.c ecp_smpl.c ecp_mont.c ecp_nist.c ec_cvt.c ec_mult.c\
26 ec_err.c 21 ec_err.c ec_curve.c ec_check.c ec_print.c ec_asn1.c ec_key.c\
22 ec2_smpl.c ec2_smpt.c ec2_mult.c
27 23
28LIBOBJ= ec_lib.o ecp_smpl.o ecp_mont.o ecp_recp.o ecp_nist.o ec_cvt.o ec_mult.o \ 24LIBOBJ= ec_lib.o ecp_smpl.o ecp_mont.o ecp_nist.o ec_cvt.o ec_mult.o\
29 ec_err.o 25 ec_err.o ec_curve.o ec_check.o ec_print.o ec_asn1.o ec_key.o\
26 ec2_smpl.o ec2_mult.o
30 27
31SRC= $(LIBSRC) 28SRC= $(LIBSRC)
32 29
@@ -54,6 +51,7 @@ links:
54 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 51 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
55 52
56install: 53install:
54 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
57 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 55 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
58 do \ 56 do \
59 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 57 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -69,6 +67,7 @@ lint:
69 lint -DLINT $(INCLUDES) $(SRC)>fluff 67 lint -DLINT $(INCLUDES) $(SRC)>fluff
70 68
71depend: 69depend:
70 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
72 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 71 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
73 72
74dclean: 73dclean:
@@ -80,47 +79,115 @@ clean:
80 79
81# DO NOT DELETE THIS LINE -- make depend depends on it. 80# DO NOT DELETE THIS LINE -- make depend depends on it.
82 81
83ec_cvt.o: ../../include/openssl/bn.h ../../include/openssl/e_os2.h 82ec2_mult.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
84ec_cvt.o: ../../include/openssl/ec.h ../../include/openssl/opensslconf.h 83ec2_mult.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
84ec2_mult.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
85ec2_mult.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
86ec2_mult.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
87ec2_mult.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
88ec2_mult.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
89ec2_mult.o: ../../include/openssl/symhacks.h ec2_mult.c ec_lcl.h
90ec2_smpl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
91ec2_smpl.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
92ec2_smpl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
93ec2_smpl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
94ec2_smpl.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
95ec2_smpl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
96ec2_smpl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
97ec2_smpl.o: ../../include/openssl/symhacks.h ec2_smpl.c ec2_smpt.c ec_lcl.h
98ec2_smpt.o: ec2_smpt.c
99ec_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
100ec_asn1.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
101ec_asn1.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
102ec_asn1.o: ../../include/openssl/ec.h ../../include/openssl/err.h
103ec_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
104ec_asn1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
105ec_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
106ec_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
107ec_asn1.o: ../../include/openssl/symhacks.h ec_asn1.c ec_lcl.h
108ec_check.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
109ec_check.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
110ec_check.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
111ec_check.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
112ec_check.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
113ec_check.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
114ec_check.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
115ec_check.o: ../../include/openssl/symhacks.h ec_check.c ec_lcl.h
116ec_curve.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
117ec_curve.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
118ec_curve.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
119ec_curve.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
120ec_curve.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
121ec_curve.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
122ec_curve.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
123ec_curve.o: ../../include/openssl/symhacks.h ec_curve.c ec_lcl.h
124ec_cvt.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
125ec_cvt.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
126ec_cvt.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
127ec_cvt.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
128ec_cvt.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
129ec_cvt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
130ec_cvt.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
85ec_cvt.o: ../../include/openssl/symhacks.h ec_cvt.c ec_lcl.h 131ec_cvt.o: ../../include/openssl/symhacks.h ec_cvt.c ec_lcl.h
86ec_err.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 132ec_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
87ec_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 133ec_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
88ec_err.o: ../../include/openssl/ec.h ../../include/openssl/err.h 134ec_err.o: ../../include/openssl/ec.h ../../include/openssl/err.h
89ec_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 135ec_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
90ec_err.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 136ec_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
91ec_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 137ec_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
92ec_err.o: ec_err.c 138ec_err.o: ../../include/openssl/symhacks.h ec_err.c
93ec_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 139ec_key.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
94ec_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 140ec_key.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
95ec_lib.o: ../../include/openssl/ec.h ../../include/openssl/err.h 141ec_key.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
96ec_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 142ec_key.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
97ec_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 143ec_key.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
98ec_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 144ec_key.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
99ec_lib.o: ec_lcl.h ec_lib.c 145ec_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
100ec_mult.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 146ec_key.o: ../../include/openssl/symhacks.h ec_key.c ec_lcl.h
101ec_mult.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 147ec_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
102ec_mult.o: ../../include/openssl/ec.h ../../include/openssl/err.h 148ec_lib.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
103ec_mult.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 149ec_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
104ec_mult.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 150ec_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
105ec_mult.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 151ec_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
106ec_mult.o: ec_lcl.h ec_mult.c 152ec_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
107ecp_mont.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 153ec_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
108ecp_mont.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 154ec_lib.o: ../../include/openssl/symhacks.h ec_lcl.h ec_lib.c
109ecp_mont.o: ../../include/openssl/ec.h ../../include/openssl/err.h 155ec_mult.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
110ecp_mont.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 156ec_mult.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
111ecp_mont.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 157ec_mult.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
112ecp_mont.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 158ec_mult.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
113ecp_mont.o: ec_lcl.h ecp_mont.c 159ec_mult.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
114ecp_nist.o: ../../include/openssl/bn.h ../../include/openssl/e_os2.h 160ec_mult.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
115ecp_nist.o: ../../include/openssl/ec.h ../../include/openssl/opensslconf.h 161ec_mult.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
162ec_mult.o: ../../include/openssl/symhacks.h ec_lcl.h ec_mult.c
163ec_print.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
164ec_print.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
165ec_print.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
166ec_print.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
167ec_print.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
168ec_print.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
169ec_print.o: ../../include/openssl/symhacks.h ec_lcl.h ec_print.c
170ecp_mont.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
171ecp_mont.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
172ecp_mont.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
173ecp_mont.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
174ecp_mont.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
175ecp_mont.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
176ecp_mont.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
177ecp_mont.o: ../../include/openssl/symhacks.h ec_lcl.h ecp_mont.c
178ecp_nist.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
179ecp_nist.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
180ecp_nist.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
181ecp_nist.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
182ecp_nist.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
183ecp_nist.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
184ecp_nist.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
116ecp_nist.o: ../../include/openssl/symhacks.h ec_lcl.h ecp_nist.c 185ecp_nist.o: ../../include/openssl/symhacks.h ec_lcl.h ecp_nist.c
117ecp_recp.o: ../../include/openssl/bn.h ../../include/openssl/e_os2.h 186ecp_smpl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
118ecp_recp.o: ../../include/openssl/ec.h ../../include/openssl/opensslconf.h 187ecp_smpl.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
119ecp_recp.o: ../../include/openssl/symhacks.h ec_lcl.h ecp_recp.c 188ecp_smpl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
120ecp_smpl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 189ecp_smpl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
121ecp_smpl.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 190ecp_smpl.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
122ecp_smpl.o: ../../include/openssl/ec.h ../../include/openssl/err.h 191ecp_smpl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
123ecp_smpl.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 192ecp_smpl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
124ecp_smpl.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 193ecp_smpl.o: ../../include/openssl/symhacks.h ec_lcl.h ecp_smpl.c
125ecp_smpl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
126ecp_smpl.o: ec_lcl.h ecp_smpl.c
diff --git a/src/lib/libcrypto/ec/ec2_smpt.c b/src/lib/libcrypto/ec/ec2_smpt.c
new file mode 100644
index 0000000000..59d52bf663
--- /dev/null
+++ b/src/lib/libcrypto/ec/ec2_smpt.c
@@ -0,0 +1,74 @@
1/* crypto/ec/ec2_smpt.c */
2/* This code was originally written by Douglas Stebila
3 * <dstebila@student.math.uwaterloo.ca> for the OpenSSL project.
4 */
5/* ====================================================================
6 * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions
10 * are met:
11 *
12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer.
14 *
15 * 2. Redistributions in binary form must reproduce the above copyright
16 * notice, this list of conditions and the following disclaimer in
17 * the documentation and/or other materials provided with the
18 * distribution.
19 *
20 * 3. All advertising materials mentioning features or use of this
21 * software must display the following acknowledgment:
22 * "This product includes software developed by the OpenSSL Project
23 * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
24 *
25 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
26 * endorse or promote products derived from this software without
27 * prior written permission. For written permission, please contact
28 * openssl-core@openssl.org.
29 *
30 * 5. Products derived from this software may not be called "OpenSSL"
31 * nor may "OpenSSL" appear in their names without prior written
32 * permission of the OpenSSL Project.
33 *
34 * 6. Redistributions of any form whatsoever must retain the following
35 * acknowledgment:
36 * "This product includes software developed by the OpenSSL Project
37 * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
38 *
39 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
40 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
41 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
42 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
43 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
44 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
45 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
46 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
47 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
48 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
49 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
50 * OF THE POSSIBILITY OF SUCH DAMAGE.
51 * ====================================================================
52 *
53 * This product includes cryptographic software written by Eric Young
54 * (eay@cryptsoft.com). This product includes software written by Tim
55 * Hudson (tjh@cryptsoft.com).
56 *
57 */
58
59
60/* Calaculates and sets the affine coordinates of an EC_POINT from the given
61 * compressed coordinates. Uses algorithm 2.3.4 of SEC 1.
62 * Note that the simple implementation only uses affine coordinates.
63 *
64 * This algorithm is patented by Certicom Corp. under US Patent 6,141,420
65 * (for licensing information, contact licensing@certicom.com).
66 * This function is disabled by default and can be enabled by defining the
67 * preprocessor macro OPENSSL_EC_BIN_PT_COMP at Configure-time.
68 */
69int ec_GF2m_simple_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point,
70 const BIGNUM *x_, int y_bit, BN_CTX *ctx)
71 {
72 ECerr(EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES, ERR_R_DISABLED);
73 return 0;
74 }
diff --git a/src/lib/libcrypto/ec/ectest.c b/src/lib/libcrypto/ec/ectest.c
index 345d3e4289..6148d553f9 100644
--- a/src/lib/libcrypto/ec/ectest.c
+++ b/src/lib/libcrypto/ec/ectest.c
@@ -1,4 +1,7 @@
1/* crypto/ec/ectest.c */ 1/* crypto/ec/ectest.c */
2/*
3 * Originally written by Bodo Moeller for the OpenSSL project.
4 */
2/* ==================================================================== 5/* ====================================================================
3 * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved. 6 * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.
4 * 7 *
@@ -52,6 +55,19 @@
52 * Hudson (tjh@cryptsoft.com). 55 * Hudson (tjh@cryptsoft.com).
53 * 56 *
54 */ 57 */
58/* ====================================================================
59 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
60 *
61 * Portions of the attached software ("Contribution") are developed by
62 * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
63 *
64 * The Contribution is licensed pursuant to the OpenSSL open source
65 * license provided above.
66 *
67 * The elliptic curve binary polynomial software is originally written by
68 * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
69 *
70 */
55 71
56#include <stdio.h> 72#include <stdio.h>
57#include <stdlib.h> 73#include <stdlib.h>
@@ -74,6 +90,15 @@ int main(int argc, char * argv[]) { puts("Elliptic curves are disabled."); retur
74#include <openssl/engine.h> 90#include <openssl/engine.h>
75#endif 91#endif
76#include <openssl/err.h> 92#include <openssl/err.h>
93#include <openssl/obj_mac.h>
94#include <openssl/objects.h>
95#include <openssl/rand.h>
96#include <openssl/bn.h>
97
98#if defined(_MSC_VER) && defined(_MIPS_) && (_MSC_VER/100==12)
99/* suppress "too big too optimize" warning */
100#pragma warning(disable:4959)
101#endif
77 102
78#define ABORT do { \ 103#define ABORT do { \
79 fflush(stdout); \ 104 fflush(stdout); \
@@ -82,47 +107,59 @@ int main(int argc, char * argv[]) { puts("Elliptic curves are disabled."); retur
82 EXIT(1); \ 107 EXIT(1); \
83} while (0) 108} while (0)
84 109
110void prime_field_tests(void);
111void char2_field_tests(void);
112void internal_curve_test(void);
113
114#define TIMING_BASE_PT 0
115#define TIMING_RAND_PT 1
116#define TIMING_SIMUL 2
117
85#if 0 118#if 0
86static void timings(EC_GROUP *group, int multi, BN_CTX *ctx) 119static void timings(EC_GROUP *group, int type, BN_CTX *ctx)
87 { 120 {
88 clock_t clck; 121 clock_t clck;
89 int i, j; 122 int i, j;
90 BIGNUM *s, *s0; 123 BIGNUM *s;
124 BIGNUM *r[10], *r0[10];
91 EC_POINT *P; 125 EC_POINT *P;
92 126
93 s = BN_new(); 127 s = BN_new();
94 s0 = BN_new(); 128 if (s == NULL) ABORT;
95 if (s == NULL || s0 == NULL) ABORT;
96 129
97 if (!EC_GROUP_get_curve_GFp(group, s, NULL, NULL, ctx)) ABORT; 130 fprintf(stdout, "Timings for %d-bit field, ", EC_GROUP_get_degree(group));
98 fprintf(stdout, "Timings for %d bit prime, ", (int)BN_num_bits(s));
99 if (!EC_GROUP_get_order(group, s, ctx)) ABORT; 131 if (!EC_GROUP_get_order(group, s, ctx)) ABORT;
100 fprintf(stdout, "%d bit scalars ", (int)BN_num_bits(s)); 132 fprintf(stdout, "%d-bit scalars ", (int)BN_num_bits(s));
101 fflush(stdout); 133 fflush(stdout);
102 134
103 P = EC_POINT_new(group); 135 P = EC_POINT_new(group);
104 if (P == NULL) ABORT; 136 if (P == NULL) ABORT;
105 EC_POINT_copy(P, EC_GROUP_get0_generator(group)); 137 EC_POINT_copy(P, EC_GROUP_get0_generator(group));
106 138
107 clck = clock();
108 for (i = 0; i < 10; i++) 139 for (i = 0; i < 10; i++)
109 { 140 {
110 if (!BN_pseudo_rand(s, BN_num_bits(s), 0, 0)) ABORT; 141 if ((r[i] = BN_new()) == NULL) ABORT;
111 if (multi) 142 if (!BN_pseudo_rand(r[i], BN_num_bits(s), 0, 0)) ABORT;
143 if (type != TIMING_BASE_PT)
112 { 144 {
113 if (!BN_pseudo_rand(s0, BN_num_bits(s), 0, 0)) ABORT; 145 if ((r0[i] = BN_new()) == NULL) ABORT;
146 if (!BN_pseudo_rand(r0[i], BN_num_bits(s), 0, 0)) ABORT;
114 } 147 }
148 }
149
150 clck = clock();
151 for (i = 0; i < 10; i++)
152 {
115 for (j = 0; j < 10; j++) 153 for (j = 0; j < 10; j++)
116 { 154 {
117 if (!EC_POINT_mul(group, P, s, multi ? P : NULL, multi ? s0 : NULL, ctx)) ABORT; 155 if (!EC_POINT_mul(group, P, (type != TIMING_RAND_PT) ? r[i] : NULL,
156 (type != TIMING_BASE_PT) ? P : NULL, (type != TIMING_BASE_PT) ? r0[i] : NULL, ctx)) ABORT;
118 } 157 }
119 fprintf(stdout, ".");
120 fflush(stdout);
121 } 158 }
122 fprintf(stdout, "\n");
123
124 clck = clock() - clck; 159 clck = clock() - clck;
125 160
161 fprintf(stdout, "\n");
162
126#ifdef CLOCKS_PER_SEC 163#ifdef CLOCKS_PER_SEC
127 /* "To determine the time in seconds, the value returned 164 /* "To determine the time in seconds, the value returned
128 * by the clock function should be divided by the value 165 * by the clock function should be divided by the value
@@ -136,43 +173,40 @@ static void timings(EC_GROUP *group, int multi, BN_CTX *ctx)
136# define CLOCKS_PER_SEC 1 173# define CLOCKS_PER_SEC 1
137#endif 174#endif
138 175
139 fprintf(stdout, "%i %s in %.2f " UNIT "\n", i*j, 176 if (type == TIMING_BASE_PT) {
140 multi ? "s*P+t*Q operations" : "point multiplications", 177 fprintf(stdout, "%i %s in %.2f " UNIT "\n", i*j,
141 (double)clck/CLOCKS_PER_SEC); 178 "base point multiplications", (double)clck/CLOCKS_PER_SEC);
179 } else if (type == TIMING_RAND_PT) {
180 fprintf(stdout, "%i %s in %.2f " UNIT "\n", i*j,
181 "random point multiplications", (double)clck/CLOCKS_PER_SEC);
182 } else if (type == TIMING_SIMUL) {
183 fprintf(stdout, "%i %s in %.2f " UNIT "\n", i*j,
184 "s*P+t*Q operations", (double)clck/CLOCKS_PER_SEC);
185 }
142 fprintf(stdout, "average: %.4f " UNIT "\n", (double)clck/(CLOCKS_PER_SEC*i*j)); 186 fprintf(stdout, "average: %.4f " UNIT "\n", (double)clck/(CLOCKS_PER_SEC*i*j));
143 187
144 EC_POINT_free(P); 188 EC_POINT_free(P);
145 BN_free(s); 189 BN_free(s);
146 BN_free(s0); 190 for (i = 0; i < 10; i++)
191 {
192 BN_free(r[i]);
193 if (type != TIMING_BASE_PT) BN_free(r0[i]);
194 }
147 } 195 }
148#endif 196#endif
149 197
150int main(int argc, char *argv[]) 198void prime_field_tests()
151 { 199 {
152 BN_CTX *ctx = NULL; 200 BN_CTX *ctx = NULL;
153 BIGNUM *p, *a, *b; 201 BIGNUM *p, *a, *b;
154 EC_GROUP *group; 202 EC_GROUP *group;
155 EC_GROUP *P_192 = NULL, *P_224 = NULL, *P_256 = NULL, *P_384 = NULL, *P_521 = NULL; 203 EC_GROUP *P_160 = NULL, *P_192 = NULL, *P_224 = NULL, *P_256 = NULL, *P_384 = NULL, *P_521 = NULL;
156 EC_POINT *P, *Q, *R; 204 EC_POINT *P, *Q, *R;
157 BIGNUM *x, *y, *z; 205 BIGNUM *x, *y, *z;
158 unsigned char buf[100]; 206 unsigned char buf[100];
159 size_t i, len; 207 size_t i, len;
160 int k; 208 int k;
161 209
162 /* enable memory leak checking unless explicitly disabled */
163 if (!((getenv("OPENSSL_DEBUG_MEMORY") != NULL) && (0 == strcmp(getenv("OPENSSL_DEBUG_MEMORY"), "off"))))
164 {
165 CRYPTO_malloc_debug_init();
166 CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL);
167 }
168 else
169 {
170 /* OPENSSL_DEBUG_MEMORY=off */
171 CRYPTO_set_mem_debug_functions(0, 0, 0, 0, 0);
172 }
173 CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
174 ERR_load_crypto_strings();
175
176#if 1 /* optional */ 210#if 1 /* optional */
177 ctx = BN_CTX_new(); 211 ctx = BN_CTX_new();
178 if (!ctx) ABORT; 212 if (!ctx) ABORT;
@@ -197,7 +231,7 @@ int main(int argc, char *argv[])
197 EC_GROUP *tmp; 231 EC_GROUP *tmp;
198 tmp = EC_GROUP_new(EC_GROUP_method_of(group)); 232 tmp = EC_GROUP_new(EC_GROUP_method_of(group));
199 if (!tmp) ABORT; 233 if (!tmp) ABORT;
200 if (!EC_GROUP_copy(tmp, group)); 234 if (!EC_GROUP_copy(tmp, group)) ABORT;
201 EC_GROUP_free(group); 235 EC_GROUP_free(group);
202 group = tmp; 236 group = tmp;
203 } 237 }
@@ -317,10 +351,56 @@ int main(int argc, char *argv[])
317 if (0 != EC_POINT_cmp(group, P, R, ctx)) ABORT; 351 if (0 != EC_POINT_cmp(group, P, R, ctx)) ABORT;
318 352
319 353
354 /* Curve secp160r1 (Certicom Research SEC 2 Version 1.0, section 2.4.2, 2000)
355 * -- not a NIST curve, but commonly used */
356
357 if (!BN_hex2bn(&p, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF")) ABORT;
358 if (1 != BN_is_prime_ex(p, BN_prime_checks, ctx, NULL)) ABORT;
359 if (!BN_hex2bn(&a, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC")) ABORT;
360 if (!BN_hex2bn(&b, "1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45")) ABORT;
361 if (!EC_GROUP_set_curve_GFp(group, p, a, b, ctx)) ABORT;
362
363 if (!BN_hex2bn(&x, "4A96B5688EF573284664698968C38BB913CBFC82")) ABORT;
364 if (!BN_hex2bn(&y, "23a628553168947d59dcc912042351377ac5fb32")) ABORT;
365 if (!EC_POINT_set_affine_coordinates_GFp(group, P, x, y, ctx)) ABORT;
366 if (!EC_POINT_is_on_curve(group, P, ctx)) ABORT;
367 if (!BN_hex2bn(&z, "0100000000000000000001F4C8F927AED3CA752257")) ABORT;
368 if (!EC_GROUP_set_generator(group, P, z, BN_value_one())) ABORT;
369
370 if (!EC_POINT_get_affine_coordinates_GFp(group, P, x, y, ctx)) ABORT;
371 fprintf(stdout, "\nSEC2 curve secp160r1 -- Generator:\n x = 0x");
372 BN_print_fp(stdout, x);
373 fprintf(stdout, "\n y = 0x");
374 BN_print_fp(stdout, y);
375 fprintf(stdout, "\n");
376 /* G_y value taken from the standard: */
377 if (!BN_hex2bn(&z, "23a628553168947d59dcc912042351377ac5fb32")) ABORT;
378 if (0 != BN_cmp(y, z)) ABORT;
379
380 fprintf(stdout, "verify degree ...");
381 if (EC_GROUP_get_degree(group) != 160) ABORT;
382 fprintf(stdout, " ok\n");
383
384 fprintf(stdout, "verify group order ...");
385 fflush(stdout);
386 if (!EC_GROUP_get_order(group, z, ctx)) ABORT;
387 if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
388 if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
389 fprintf(stdout, ".");
390 fflush(stdout);
391 if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
392 if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
393 if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
394 fprintf(stdout, " ok\n");
395
396 if (!(P_160 = EC_GROUP_new(EC_GROUP_method_of(group)))) ABORT;
397 if (!EC_GROUP_copy(P_160, group)) ABORT;
398
399
320 /* Curve P-192 (FIPS PUB 186-2, App. 6) */ 400 /* Curve P-192 (FIPS PUB 186-2, App. 6) */
321 401
322 if (!BN_hex2bn(&p, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF")) ABORT; 402 if (!BN_hex2bn(&p, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF")) ABORT;
323 if (1 != BN_is_prime(p, BN_prime_checks, 0, ctx, NULL)) ABORT; 403 if (1 != BN_is_prime_ex(p, BN_prime_checks, ctx, NULL)) ABORT;
324 if (!BN_hex2bn(&a, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC")) ABORT; 404 if (!BN_hex2bn(&a, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC")) ABORT;
325 if (!BN_hex2bn(&b, "64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1")) ABORT; 405 if (!BN_hex2bn(&b, "64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1")) ABORT;
326 if (!EC_GROUP_set_curve_GFp(group, p, a, b, ctx)) ABORT; 406 if (!EC_GROUP_set_curve_GFp(group, p, a, b, ctx)) ABORT;
@@ -340,6 +420,10 @@ int main(int argc, char *argv[])
340 /* G_y value taken from the standard: */ 420 /* G_y value taken from the standard: */
341 if (!BN_hex2bn(&z, "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811")) ABORT; 421 if (!BN_hex2bn(&z, "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811")) ABORT;
342 if (0 != BN_cmp(y, z)) ABORT; 422 if (0 != BN_cmp(y, z)) ABORT;
423
424 fprintf(stdout, "verify degree ...");
425 if (EC_GROUP_get_degree(group) != 192) ABORT;
426 fprintf(stdout, " ok\n");
343 427
344 fprintf(stdout, "verify group order ..."); 428 fprintf(stdout, "verify group order ...");
345 fflush(stdout); 429 fflush(stdout);
@@ -348,7 +432,9 @@ int main(int argc, char *argv[])
348 if (!EC_POINT_is_at_infinity(group, Q)) ABORT; 432 if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
349 fprintf(stdout, "."); 433 fprintf(stdout, ".");
350 fflush(stdout); 434 fflush(stdout);
435#if 0
351 if (!EC_GROUP_precompute_mult(group, ctx)) ABORT; 436 if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
437#endif
352 if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT; 438 if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
353 if (!EC_POINT_is_at_infinity(group, Q)) ABORT; 439 if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
354 fprintf(stdout, " ok\n"); 440 fprintf(stdout, " ok\n");
@@ -360,7 +446,7 @@ int main(int argc, char *argv[])
360 /* Curve P-224 (FIPS PUB 186-2, App. 6) */ 446 /* Curve P-224 (FIPS PUB 186-2, App. 6) */
361 447
362 if (!BN_hex2bn(&p, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001")) ABORT; 448 if (!BN_hex2bn(&p, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001")) ABORT;
363 if (1 != BN_is_prime(p, BN_prime_checks, 0, ctx, NULL)) ABORT; 449 if (1 != BN_is_prime_ex(p, BN_prime_checks, ctx, NULL)) ABORT;
364 if (!BN_hex2bn(&a, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE")) ABORT; 450 if (!BN_hex2bn(&a, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE")) ABORT;
365 if (!BN_hex2bn(&b, "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4")) ABORT; 451 if (!BN_hex2bn(&b, "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4")) ABORT;
366 if (!EC_GROUP_set_curve_GFp(group, p, a, b, ctx)) ABORT; 452 if (!EC_GROUP_set_curve_GFp(group, p, a, b, ctx)) ABORT;
@@ -381,6 +467,10 @@ int main(int argc, char *argv[])
381 if (!BN_hex2bn(&z, "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34")) ABORT; 467 if (!BN_hex2bn(&z, "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34")) ABORT;
382 if (0 != BN_cmp(y, z)) ABORT; 468 if (0 != BN_cmp(y, z)) ABORT;
383 469
470 fprintf(stdout, "verify degree ...");
471 if (EC_GROUP_get_degree(group) != 224) ABORT;
472 fprintf(stdout, " ok\n");
473
384 fprintf(stdout, "verify group order ..."); 474 fprintf(stdout, "verify group order ...");
385 fflush(stdout); 475 fflush(stdout);
386 if (!EC_GROUP_get_order(group, z, ctx)) ABORT; 476 if (!EC_GROUP_get_order(group, z, ctx)) ABORT;
@@ -388,7 +478,9 @@ int main(int argc, char *argv[])
388 if (!EC_POINT_is_at_infinity(group, Q)) ABORT; 478 if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
389 fprintf(stdout, "."); 479 fprintf(stdout, ".");
390 fflush(stdout); 480 fflush(stdout);
481#if 0
391 if (!EC_GROUP_precompute_mult(group, ctx)) ABORT; 482 if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
483#endif
392 if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT; 484 if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
393 if (!EC_POINT_is_at_infinity(group, Q)) ABORT; 485 if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
394 fprintf(stdout, " ok\n"); 486 fprintf(stdout, " ok\n");
@@ -400,7 +492,7 @@ int main(int argc, char *argv[])
400 /* Curve P-256 (FIPS PUB 186-2, App. 6) */ 492 /* Curve P-256 (FIPS PUB 186-2, App. 6) */
401 493
402 if (!BN_hex2bn(&p, "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF")) ABORT; 494 if (!BN_hex2bn(&p, "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF")) ABORT;
403 if (1 != BN_is_prime(p, BN_prime_checks, 0, ctx, NULL)) ABORT; 495 if (1 != BN_is_prime_ex(p, BN_prime_checks, ctx, NULL)) ABORT;
404 if (!BN_hex2bn(&a, "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC")) ABORT; 496 if (!BN_hex2bn(&a, "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC")) ABORT;
405 if (!BN_hex2bn(&b, "5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B")) ABORT; 497 if (!BN_hex2bn(&b, "5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B")) ABORT;
406 if (!EC_GROUP_set_curve_GFp(group, p, a, b, ctx)) ABORT; 498 if (!EC_GROUP_set_curve_GFp(group, p, a, b, ctx)) ABORT;
@@ -422,6 +514,10 @@ int main(int argc, char *argv[])
422 if (!BN_hex2bn(&z, "4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5")) ABORT; 514 if (!BN_hex2bn(&z, "4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5")) ABORT;
423 if (0 != BN_cmp(y, z)) ABORT; 515 if (0 != BN_cmp(y, z)) ABORT;
424 516
517 fprintf(stdout, "verify degree ...");
518 if (EC_GROUP_get_degree(group) != 256) ABORT;
519 fprintf(stdout, " ok\n");
520
425 fprintf(stdout, "verify group order ..."); 521 fprintf(stdout, "verify group order ...");
426 fflush(stdout); 522 fflush(stdout);
427 if (!EC_GROUP_get_order(group, z, ctx)) ABORT; 523 if (!EC_GROUP_get_order(group, z, ctx)) ABORT;
@@ -429,7 +525,9 @@ int main(int argc, char *argv[])
429 if (!EC_POINT_is_at_infinity(group, Q)) ABORT; 525 if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
430 fprintf(stdout, "."); 526 fprintf(stdout, ".");
431 fflush(stdout); 527 fflush(stdout);
528#if 0
432 if (!EC_GROUP_precompute_mult(group, ctx)) ABORT; 529 if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
530#endif
433 if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT; 531 if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
434 if (!EC_POINT_is_at_infinity(group, Q)) ABORT; 532 if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
435 fprintf(stdout, " ok\n"); 533 fprintf(stdout, " ok\n");
@@ -442,7 +540,7 @@ int main(int argc, char *argv[])
442 540
443 if (!BN_hex2bn(&p, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" 541 if (!BN_hex2bn(&p, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
444 "FFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFF")) ABORT; 542 "FFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFF")) ABORT;
445 if (1 != BN_is_prime(p, BN_prime_checks, 0, ctx, NULL)) ABORT; 543 if (1 != BN_is_prime_ex(p, BN_prime_checks, ctx, NULL)) ABORT;
446 if (!BN_hex2bn(&a, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" 544 if (!BN_hex2bn(&a, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
447 "FFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFC")) ABORT; 545 "FFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFC")) ABORT;
448 if (!BN_hex2bn(&b, "B3312FA7E23EE7E4988E056BE3F82D19181D9C6EFE8141" 546 if (!BN_hex2bn(&b, "B3312FA7E23EE7E4988E056BE3F82D19181D9C6EFE8141"
@@ -468,6 +566,10 @@ int main(int argc, char *argv[])
468 "7CE9DA3113B5F0B8C00A60B1CE1D7E819D7A431D7C90EA0E5F")) ABORT; 566 "7CE9DA3113B5F0B8C00A60B1CE1D7E819D7A431D7C90EA0E5F")) ABORT;
469 if (0 != BN_cmp(y, z)) ABORT; 567 if (0 != BN_cmp(y, z)) ABORT;
470 568
569 fprintf(stdout, "verify degree ...");
570 if (EC_GROUP_get_degree(group) != 384) ABORT;
571 fprintf(stdout, " ok\n");
572
471 fprintf(stdout, "verify group order ..."); 573 fprintf(stdout, "verify group order ...");
472 fflush(stdout); 574 fflush(stdout);
473 if (!EC_GROUP_get_order(group, z, ctx)) ABORT; 575 if (!EC_GROUP_get_order(group, z, ctx)) ABORT;
@@ -475,7 +577,9 @@ int main(int argc, char *argv[])
475 if (!EC_POINT_is_at_infinity(group, Q)) ABORT; 577 if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
476 fprintf(stdout, "."); 578 fprintf(stdout, ".");
477 fflush(stdout); 579 fflush(stdout);
580#if 0
478 if (!EC_GROUP_precompute_mult(group, ctx)) ABORT; 581 if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
582#endif
479 if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT; 583 if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
480 if (!EC_POINT_is_at_infinity(group, Q)) ABORT; 584 if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
481 fprintf(stdout, " ok\n"); 585 fprintf(stdout, " ok\n");
@@ -489,7 +593,7 @@ int main(int argc, char *argv[])
489 if (!BN_hex2bn(&p, "1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" 593 if (!BN_hex2bn(&p, "1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
490 "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" 594 "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
491 "FFFFFFFFFFFFFFFFFFFFFFFFFFFF")) ABORT; 595 "FFFFFFFFFFFFFFFFFFFFFFFFFFFF")) ABORT;
492 if (1 != BN_is_prime(p, BN_prime_checks, 0, ctx, NULL)) ABORT; 596 if (1 != BN_is_prime_ex(p, BN_prime_checks, ctx, NULL)) ABORT;
493 if (!BN_hex2bn(&a, "1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" 597 if (!BN_hex2bn(&a, "1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
494 "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" 598 "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
495 "FFFFFFFFFFFFFFFFFFFFFFFFFFFC")) ABORT; 599 "FFFFFFFFFFFFFFFFFFFFFFFFFFFC")) ABORT;
@@ -520,6 +624,10 @@ int main(int argc, char *argv[])
520 "7086A272C24088BE94769FD16650")) ABORT; 624 "7086A272C24088BE94769FD16650")) ABORT;
521 if (0 != BN_cmp(y, z)) ABORT; 625 if (0 != BN_cmp(y, z)) ABORT;
522 626
627 fprintf(stdout, "verify degree ...");
628 if (EC_GROUP_get_degree(group) != 521) ABORT;
629 fprintf(stdout, " ok\n");
630
523 fprintf(stdout, "verify group order ..."); 631 fprintf(stdout, "verify group order ...");
524 fflush(stdout); 632 fflush(stdout);
525 if (!EC_GROUP_get_order(group, z, ctx)) ABORT; 633 if (!EC_GROUP_get_order(group, z, ctx)) ABORT;
@@ -527,7 +635,9 @@ int main(int argc, char *argv[])
527 if (!EC_POINT_is_at_infinity(group, Q)) ABORT; 635 if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
528 fprintf(stdout, "."); 636 fprintf(stdout, ".");
529 fflush(stdout); 637 fflush(stdout);
638#if 0
530 if (!EC_GROUP_precompute_mult(group, ctx)) ABORT; 639 if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
640#endif
531 if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT; 641 if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
532 if (!EC_POINT_is_at_infinity(group, Q)) ABORT; 642 if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
533 fprintf(stdout, " ok\n"); 643 fprintf(stdout, " ok\n");
@@ -549,13 +659,15 @@ int main(int argc, char *argv[])
549 if (!EC_POINT_is_at_infinity(group, R)) ABORT; /* R = P + 2Q */ 659 if (!EC_POINT_is_at_infinity(group, R)) ABORT; /* R = P + 2Q */
550 660
551 { 661 {
552 const EC_POINT *points[3]; 662 const EC_POINT *points[4];
553 const BIGNUM *scalars[3]; 663 const BIGNUM *scalars[4];
664 BIGNUM scalar3;
554 665
555 if (EC_POINT_is_at_infinity(group, Q)) ABORT; 666 if (EC_POINT_is_at_infinity(group, Q)) ABORT;
556 points[0] = Q; 667 points[0] = Q;
557 points[1] = Q; 668 points[1] = Q;
558 points[2] = Q; 669 points[2] = Q;
670 points[3] = Q;
559 671
560 if (!BN_add(y, z, BN_value_one())) ABORT; 672 if (!BN_add(y, z, BN_value_one())) ABORT;
561 if (BN_is_odd(y)) ABORT; 673 if (BN_is_odd(y)) ABORT;
@@ -577,7 +689,7 @@ int main(int argc, char *argv[])
577 689
578 if (!BN_pseudo_rand(y, BN_num_bits(y), 0, 0)) ABORT; 690 if (!BN_pseudo_rand(y, BN_num_bits(y), 0, 0)) ABORT;
579 if (!BN_add(z, z, y)) ABORT; 691 if (!BN_add(z, z, y)) ABORT;
580 z->neg = 1; 692 BN_set_negative(z, 1);
581 scalars[0] = y; 693 scalars[0] = y;
582 scalars[1] = z; /* z = -(order + y) */ 694 scalars[1] = z; /* z = -(order + y) */
583 695
@@ -589,29 +701,43 @@ int main(int argc, char *argv[])
589 701
590 if (!BN_pseudo_rand(x, BN_num_bits(y) - 1, 0, 0)) ABORT; 702 if (!BN_pseudo_rand(x, BN_num_bits(y) - 1, 0, 0)) ABORT;
591 if (!BN_add(z, x, y)) ABORT; 703 if (!BN_add(z, x, y)) ABORT;
592 z->neg = 1; 704 BN_set_negative(z, 1);
593 scalars[0] = x; 705 scalars[0] = x;
594 scalars[1] = y; 706 scalars[1] = y;
595 scalars[2] = z; /* z = -(x+y) */ 707 scalars[2] = z; /* z = -(x+y) */
596 708
597 if (!EC_POINTs_mul(group, P, NULL, 3, points, scalars, ctx)) ABORT; 709 BN_init(&scalar3);
710 BN_zero(&scalar3);
711 scalars[3] = &scalar3;
712
713 if (!EC_POINTs_mul(group, P, NULL, 4, points, scalars, ctx)) ABORT;
598 if (!EC_POINT_is_at_infinity(group, P)) ABORT; 714 if (!EC_POINT_is_at_infinity(group, P)) ABORT;
599 715
600 fprintf(stdout, " ok\n\n"); 716 fprintf(stdout, " ok\n\n");
717
718 BN_free(&scalar3);
601 } 719 }
602 720
603 721
604#if 0 722#if 0
605 timings(P_192, 0, ctx); 723 timings(P_160, TIMING_BASE_PT, ctx);
606 timings(P_192, 1, ctx); 724 timings(P_160, TIMING_RAND_PT, ctx);
607 timings(P_224, 0, ctx); 725 timings(P_160, TIMING_SIMUL, ctx);
608 timings(P_224, 1, ctx); 726 timings(P_192, TIMING_BASE_PT, ctx);
609 timings(P_256, 0, ctx); 727 timings(P_192, TIMING_RAND_PT, ctx);
610 timings(P_256, 1, ctx); 728 timings(P_192, TIMING_SIMUL, ctx);
611 timings(P_384, 0, ctx); 729 timings(P_224, TIMING_BASE_PT, ctx);
612 timings(P_384, 1, ctx); 730 timings(P_224, TIMING_RAND_PT, ctx);
613 timings(P_521, 0, ctx); 731 timings(P_224, TIMING_SIMUL, ctx);
614 timings(P_521, 1, ctx); 732 timings(P_256, TIMING_BASE_PT, ctx);
733 timings(P_256, TIMING_RAND_PT, ctx);
734 timings(P_256, TIMING_SIMUL, ctx);
735 timings(P_384, TIMING_BASE_PT, ctx);
736 timings(P_384, TIMING_RAND_PT, ctx);
737 timings(P_384, TIMING_SIMUL, ctx);
738 timings(P_521, TIMING_BASE_PT, ctx);
739 timings(P_521, TIMING_RAND_PT, ctx);
740 timings(P_521, TIMING_SIMUL, ctx);
615#endif 741#endif
616 742
617 743
@@ -624,12 +750,587 @@ int main(int argc, char *argv[])
624 EC_POINT_free(R); 750 EC_POINT_free(R);
625 BN_free(x); BN_free(y); BN_free(z); 751 BN_free(x); BN_free(y); BN_free(z);
626 752
753 if (P_160) EC_GROUP_free(P_160);
627 if (P_192) EC_GROUP_free(P_192); 754 if (P_192) EC_GROUP_free(P_192);
628 if (P_224) EC_GROUP_free(P_224); 755 if (P_224) EC_GROUP_free(P_224);
629 if (P_256) EC_GROUP_free(P_256); 756 if (P_256) EC_GROUP_free(P_256);
630 if (P_384) EC_GROUP_free(P_384); 757 if (P_384) EC_GROUP_free(P_384);
631 if (P_521) EC_GROUP_free(P_521); 758 if (P_521) EC_GROUP_free(P_521);
632 759
760 }
761
762/* Change test based on whether binary point compression is enabled or not. */
763#ifdef OPENSSL_EC_BIN_PT_COMP
764#define CHAR2_CURVE_TEST_INTERNAL(_name, _p, _a, _b, _x, _y, _y_bit, _order, _cof, _degree, _variable) \
765 if (!BN_hex2bn(&x, _x)) ABORT; \
766 if (!EC_POINT_set_compressed_coordinates_GF2m(group, P, x, _y_bit, ctx)) ABORT; \
767 if (!EC_POINT_is_on_curve(group, P, ctx)) ABORT; \
768 if (!BN_hex2bn(&z, _order)) ABORT; \
769 if (!BN_hex2bn(&cof, _cof)) ABORT; \
770 if (!EC_GROUP_set_generator(group, P, z, cof)) ABORT; \
771 if (!EC_POINT_get_affine_coordinates_GF2m(group, P, x, y, ctx)) ABORT; \
772 fprintf(stdout, "\n%s -- Generator:\n x = 0x", _name); \
773 BN_print_fp(stdout, x); \
774 fprintf(stdout, "\n y = 0x"); \
775 BN_print_fp(stdout, y); \
776 fprintf(stdout, "\n"); \
777 /* G_y value taken from the standard: */ \
778 if (!BN_hex2bn(&z, _y)) ABORT; \
779 if (0 != BN_cmp(y, z)) ABORT;
780#else
781#define CHAR2_CURVE_TEST_INTERNAL(_name, _p, _a, _b, _x, _y, _y_bit, _order, _cof, _degree, _variable) \
782 if (!BN_hex2bn(&x, _x)) ABORT; \
783 if (!BN_hex2bn(&y, _y)) ABORT; \
784 if (!EC_POINT_set_affine_coordinates_GF2m(group, P, x, y, ctx)) ABORT; \
785 if (!EC_POINT_is_on_curve(group, P, ctx)) ABORT; \
786 if (!BN_hex2bn(&z, _order)) ABORT; \
787 if (!BN_hex2bn(&cof, _cof)) ABORT; \
788 if (!EC_GROUP_set_generator(group, P, z, cof)) ABORT; \
789 fprintf(stdout, "\n%s -- Generator:\n x = 0x", _name); \
790 BN_print_fp(stdout, x); \
791 fprintf(stdout, "\n y = 0x"); \
792 BN_print_fp(stdout, y); \
793 fprintf(stdout, "\n");
794#endif
795
796#define CHAR2_CURVE_TEST(_name, _p, _a, _b, _x, _y, _y_bit, _order, _cof, _degree, _variable) \
797 if (!BN_hex2bn(&p, _p)) ABORT; \
798 if (!BN_hex2bn(&a, _a)) ABORT; \
799 if (!BN_hex2bn(&b, _b)) ABORT; \
800 if (!EC_GROUP_set_curve_GF2m(group, p, a, b, ctx)) ABORT; \
801 CHAR2_CURVE_TEST_INTERNAL(_name, _p, _a, _b, _x, _y, _y_bit, _order, _cof, _degree, _variable) \
802 fprintf(stdout, "verify degree ..."); \
803 if (EC_GROUP_get_degree(group) != _degree) ABORT; \
804 fprintf(stdout, " ok\n"); \
805 fprintf(stdout, "verify group order ..."); \
806 fflush(stdout); \
807 if (!EC_GROUP_get_order(group, z, ctx)) ABORT; \
808 if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT; \
809 if (!EC_POINT_is_at_infinity(group, Q)) ABORT; \
810 fprintf(stdout, "."); \
811 fflush(stdout); \
812 /* if (!EC_GROUP_precompute_mult(group, ctx)) ABORT; */ \
813 if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT; \
814 if (!EC_POINT_is_at_infinity(group, Q)) ABORT; \
815 fprintf(stdout, " ok\n"); \
816 if (!(_variable = EC_GROUP_new(EC_GROUP_method_of(group)))) ABORT; \
817 if (!EC_GROUP_copy(_variable, group)) ABORT;
818
819void char2_field_tests()
820 {
821 BN_CTX *ctx = NULL;
822 BIGNUM *p, *a, *b;
823 EC_GROUP *group;
824 EC_GROUP *C2_K163 = NULL, *C2_K233 = NULL, *C2_K283 = NULL, *C2_K409 = NULL, *C2_K571 = NULL;
825 EC_GROUP *C2_B163 = NULL, *C2_B233 = NULL, *C2_B283 = NULL, *C2_B409 = NULL, *C2_B571 = NULL;
826 EC_POINT *P, *Q, *R;
827 BIGNUM *x, *y, *z, *cof;
828 unsigned char buf[100];
829 size_t i, len;
830 int k;
831
832#if 1 /* optional */
833 ctx = BN_CTX_new();
834 if (!ctx) ABORT;
835#endif
836
837 p = BN_new();
838 a = BN_new();
839 b = BN_new();
840 if (!p || !a || !b) ABORT;
841
842 if (!BN_hex2bn(&p, "13")) ABORT;
843 if (!BN_hex2bn(&a, "3")) ABORT;
844 if (!BN_hex2bn(&b, "1")) ABORT;
845
846 group = EC_GROUP_new(EC_GF2m_simple_method()); /* applications should use EC_GROUP_new_curve_GF2m
847 * so that the library gets to choose the EC_METHOD */
848 if (!group) ABORT;
849 if (!EC_GROUP_set_curve_GF2m(group, p, a, b, ctx)) ABORT;
850
851 {
852 EC_GROUP *tmp;
853 tmp = EC_GROUP_new(EC_GROUP_method_of(group));
854 if (!tmp) ABORT;
855 if (!EC_GROUP_copy(tmp, group)) ABORT;
856 EC_GROUP_free(group);
857 group = tmp;
858 }
859
860 if (!EC_GROUP_get_curve_GF2m(group, p, a, b, ctx)) ABORT;
861
862 fprintf(stdout, "Curve defined by Weierstrass equation\n y^2 + x*y = x^3 + a*x^2 + b (mod 0x");
863 BN_print_fp(stdout, p);
864 fprintf(stdout, ")\n a = 0x");
865 BN_print_fp(stdout, a);
866 fprintf(stdout, "\n b = 0x");
867 BN_print_fp(stdout, b);
868 fprintf(stdout, "\n(0x... means binary polynomial)\n");
869
870 P = EC_POINT_new(group);
871 Q = EC_POINT_new(group);
872 R = EC_POINT_new(group);
873 if (!P || !Q || !R) ABORT;
874
875 if (!EC_POINT_set_to_infinity(group, P)) ABORT;
876 if (!EC_POINT_is_at_infinity(group, P)) ABORT;
877
878 buf[0] = 0;
879 if (!EC_POINT_oct2point(group, Q, buf, 1, ctx)) ABORT;
880
881 if (!EC_POINT_add(group, P, P, Q, ctx)) ABORT;
882 if (!EC_POINT_is_at_infinity(group, P)) ABORT;
883
884 x = BN_new();
885 y = BN_new();
886 z = BN_new();
887 cof = BN_new();
888 if (!x || !y || !z || !cof) ABORT;
889
890 if (!BN_hex2bn(&x, "6")) ABORT;
891/* Change test based on whether binary point compression is enabled or not. */
892#ifdef OPENSSL_EC_BIN_PT_COMP
893 if (!EC_POINT_set_compressed_coordinates_GF2m(group, Q, x, 1, ctx)) ABORT;
894#else
895 if (!BN_hex2bn(&y, "8")) ABORT;
896 if (!EC_POINT_set_affine_coordinates_GF2m(group, Q, x, y, ctx)) ABORT;
897#endif
898 if (!EC_POINT_is_on_curve(group, Q, ctx))
899 {
900/* Change test based on whether binary point compression is enabled or not. */
901#ifdef OPENSSL_EC_BIN_PT_COMP
902 if (!EC_POINT_get_affine_coordinates_GF2m(group, Q, x, y, ctx)) ABORT;
903#endif
904 fprintf(stderr, "Point is not on curve: x = 0x");
905 BN_print_fp(stderr, x);
906 fprintf(stderr, ", y = 0x");
907 BN_print_fp(stderr, y);
908 fprintf(stderr, "\n");
909 ABORT;
910 }
911
912 fprintf(stdout, "A cyclic subgroup:\n");
913 k = 100;
914 do
915 {
916 if (k-- == 0) ABORT;
917
918 if (EC_POINT_is_at_infinity(group, P))
919 fprintf(stdout, " point at infinity\n");
920 else
921 {
922 if (!EC_POINT_get_affine_coordinates_GF2m(group, P, x, y, ctx)) ABORT;
923
924 fprintf(stdout, " x = 0x");
925 BN_print_fp(stdout, x);
926 fprintf(stdout, ", y = 0x");
927 BN_print_fp(stdout, y);
928 fprintf(stdout, "\n");
929 }
930
931 if (!EC_POINT_copy(R, P)) ABORT;
932 if (!EC_POINT_add(group, P, P, Q, ctx)) ABORT;
933 }
934 while (!EC_POINT_is_at_infinity(group, P));
935
936 if (!EC_POINT_add(group, P, Q, R, ctx)) ABORT;
937 if (!EC_POINT_is_at_infinity(group, P)) ABORT;
938
939/* Change test based on whether binary point compression is enabled or not. */
940#ifdef OPENSSL_EC_BIN_PT_COMP
941 len = EC_POINT_point2oct(group, Q, POINT_CONVERSION_COMPRESSED, buf, sizeof buf, ctx);
942 if (len == 0) ABORT;
943 if (!EC_POINT_oct2point(group, P, buf, len, ctx)) ABORT;
944 if (0 != EC_POINT_cmp(group, P, Q, ctx)) ABORT;
945 fprintf(stdout, "Generator as octet string, compressed form:\n ");
946 for (i = 0; i < len; i++) fprintf(stdout, "%02X", buf[i]);
947#endif
948
949 len = EC_POINT_point2oct(group, Q, POINT_CONVERSION_UNCOMPRESSED, buf, sizeof buf, ctx);
950 if (len == 0) ABORT;
951 if (!EC_POINT_oct2point(group, P, buf, len, ctx)) ABORT;
952 if (0 != EC_POINT_cmp(group, P, Q, ctx)) ABORT;
953 fprintf(stdout, "\nGenerator as octet string, uncompressed form:\n ");
954 for (i = 0; i < len; i++) fprintf(stdout, "%02X", buf[i]);
955
956/* Change test based on whether binary point compression is enabled or not. */
957#ifdef OPENSSL_EC_BIN_PT_COMP
958 len = EC_POINT_point2oct(group, Q, POINT_CONVERSION_HYBRID, buf, sizeof buf, ctx);
959 if (len == 0) ABORT;
960 if (!EC_POINT_oct2point(group, P, buf, len, ctx)) ABORT;
961 if (0 != EC_POINT_cmp(group, P, Q, ctx)) ABORT;
962 fprintf(stdout, "\nGenerator as octet string, hybrid form:\n ");
963 for (i = 0; i < len; i++) fprintf(stdout, "%02X", buf[i]);
964#endif
965
966 fprintf(stdout, "\n");
967
968 if (!EC_POINT_invert(group, P, ctx)) ABORT;
969 if (0 != EC_POINT_cmp(group, P, R, ctx)) ABORT;
970
971
972 /* Curve K-163 (FIPS PUB 186-2, App. 6) */
973 CHAR2_CURVE_TEST
974 (
975 "NIST curve K-163",
976 "0800000000000000000000000000000000000000C9",
977 "1",
978 "1",
979 "02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8",
980 "0289070FB05D38FF58321F2E800536D538CCDAA3D9",
981 1,
982 "04000000000000000000020108A2E0CC0D99F8A5EF",
983 "2",
984 163,
985 C2_K163
986 );
987
988 /* Curve B-163 (FIPS PUB 186-2, App. 6) */
989 CHAR2_CURVE_TEST
990 (
991 "NIST curve B-163",
992 "0800000000000000000000000000000000000000C9",
993 "1",
994 "020A601907B8C953CA1481EB10512F78744A3205FD",
995 "03F0EBA16286A2D57EA0991168D4994637E8343E36",
996 "00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1",
997 1,
998 "040000000000000000000292FE77E70C12A4234C33",
999 "2",
1000 163,
1001 C2_B163
1002 );
1003
1004 /* Curve K-233 (FIPS PUB 186-2, App. 6) */
1005 CHAR2_CURVE_TEST
1006 (
1007 "NIST curve K-233",
1008 "020000000000000000000000000000000000000004000000000000000001",
1009 "0",
1010 "1",
1011 "017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126",
1012 "01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3",
1013 0,
1014 "008000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF",
1015 "4",
1016 233,
1017 C2_K233
1018 );
1019
1020 /* Curve B-233 (FIPS PUB 186-2, App. 6) */
1021 CHAR2_CURVE_TEST
1022 (
1023 "NIST curve B-233",
1024 "020000000000000000000000000000000000000004000000000000000001",
1025 "000000000000000000000000000000000000000000000000000000000001",
1026 "0066647EDE6C332C7F8C0923BB58213B333B20E9CE4281FE115F7D8F90AD",
1027 "00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B",
1028 "01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052",
1029 1,
1030 "01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7",
1031 "2",
1032 233,
1033 C2_B233
1034 );
1035
1036 /* Curve K-283 (FIPS PUB 186-2, App. 6) */
1037 CHAR2_CURVE_TEST
1038 (
1039 "NIST curve K-283",
1040 "0800000000000000000000000000000000000000000000000000000000000000000010A1",
1041 "0",
1042 "1",
1043 "0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836",
1044 "01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259",
1045 0,
1046 "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E061E163C61",
1047 "4",
1048 283,
1049 C2_K283
1050 );
1051
1052 /* Curve B-283 (FIPS PUB 186-2, App. 6) */
1053 CHAR2_CURVE_TEST
1054 (
1055 "NIST curve B-283",
1056 "0800000000000000000000000000000000000000000000000000000000000000000010A1",
1057 "000000000000000000000000000000000000000000000000000000000000000000000001",
1058 "027B680AC8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E313B79A2F5",
1059 "05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053",
1060 "03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4",
1061 1,
1062 "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB307",
1063 "2",
1064 283,
1065 C2_B283
1066 );
1067
1068 /* Curve K-409 (FIPS PUB 186-2, App. 6) */
1069 CHAR2_CURVE_TEST
1070 (
1071 "NIST curve K-409",
1072 "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001",
1073 "0",
1074 "1",
1075 "0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746",
1076 "01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B",
1077 1,
1078 "007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5F83B2D4EA20400EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF",
1079 "4",
1080 409,
1081 C2_K409
1082 );
1083
1084 /* Curve B-409 (FIPS PUB 186-2, App. 6) */
1085 CHAR2_CURVE_TEST
1086 (
1087 "NIST curve B-409",
1088 "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001",
1089 "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
1090 "0021A5C2C8EE9FEB5C4B9A753B7B476B7FD6422EF1F3DD674761FA99D6AC27C8A9A197B272822F6CD57A55AA4F50AE317B13545F",
1091 "015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7",
1092 "0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706",
1093 1,
1094 "010000000000000000000000000000000000000000000000000001E2AAD6A612F33307BE5FA47C3C9E052F838164CD37D9A21173",
1095 "2",
1096 409,
1097 C2_B409
1098 );
1099
1100 /* Curve K-571 (FIPS PUB 186-2, App. 6) */
1101 CHAR2_CURVE_TEST
1102 (
1103 "NIST curve K-571",
1104 "80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425",
1105 "0",
1106 "1",
1107 "026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972",
1108 "0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3",
1109 0,
1110 "020000000000000000000000000000000000000000000000000000000000000000000000131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F637C1001",
1111 "4",
1112 571,
1113 C2_K571
1114 );
1115
1116 /* Curve B-571 (FIPS PUB 186-2, App. 6) */
1117 CHAR2_CURVE_TEST
1118 (
1119 "NIST curve B-571",
1120 "80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425",
1121 "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
1122 "02F40E7E2221F295DE297117B7F3D62F5C6A97FFCB8CEFF1CD6BA8CE4A9A18AD84FFABBD8EFA59332BE7AD6756A66E294AFD185A78FF12AA520E4DE739BACA0C7FFEFF7F2955727A",
1123 "0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19",
1124 "037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B",
1125 1,
1126 "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2FE84E47",
1127 "2",
1128 571,
1129 C2_B571
1130 );
1131
1132 /* more tests using the last curve */
1133
1134 if (!EC_POINT_copy(Q, P)) ABORT;
1135 if (EC_POINT_is_at_infinity(group, Q)) ABORT;
1136 if (!EC_POINT_dbl(group, P, P, ctx)) ABORT;
1137 if (!EC_POINT_is_on_curve(group, P, ctx)) ABORT;
1138 if (!EC_POINT_invert(group, Q, ctx)) ABORT; /* P = -2Q */
1139
1140 if (!EC_POINT_add(group, R, P, Q, ctx)) ABORT;
1141 if (!EC_POINT_add(group, R, R, Q, ctx)) ABORT;
1142 if (!EC_POINT_is_at_infinity(group, R)) ABORT; /* R = P + 2Q */
1143
1144 {
1145 const EC_POINT *points[3];
1146 const BIGNUM *scalars[3];
1147
1148 if (EC_POINT_is_at_infinity(group, Q)) ABORT;
1149 points[0] = Q;
1150 points[1] = Q;
1151 points[2] = Q;
1152
1153 if (!BN_add(y, z, BN_value_one())) ABORT;
1154 if (BN_is_odd(y)) ABORT;
1155 if (!BN_rshift1(y, y)) ABORT;
1156 scalars[0] = y; /* (group order + 1)/2, so y*Q + y*Q = Q */
1157 scalars[1] = y;
1158
1159 fprintf(stdout, "combined multiplication ...");
1160 fflush(stdout);
1161
1162 /* z is still the group order */
1163 if (!EC_POINTs_mul(group, P, NULL, 2, points, scalars, ctx)) ABORT;
1164 if (!EC_POINTs_mul(group, R, z, 2, points, scalars, ctx)) ABORT;
1165 if (0 != EC_POINT_cmp(group, P, R, ctx)) ABORT;
1166 if (0 != EC_POINT_cmp(group, R, Q, ctx)) ABORT;
1167
1168 fprintf(stdout, ".");
1169 fflush(stdout);
1170
1171 if (!BN_pseudo_rand(y, BN_num_bits(y), 0, 0)) ABORT;
1172 if (!BN_add(z, z, y)) ABORT;
1173 BN_set_negative(z, 1);
1174 scalars[0] = y;
1175 scalars[1] = z; /* z = -(order + y) */
1176
1177 if (!EC_POINTs_mul(group, P, NULL, 2, points, scalars, ctx)) ABORT;
1178 if (!EC_POINT_is_at_infinity(group, P)) ABORT;
1179
1180 fprintf(stdout, ".");
1181 fflush(stdout);
1182
1183 if (!BN_pseudo_rand(x, BN_num_bits(y) - 1, 0, 0)) ABORT;
1184 if (!BN_add(z, x, y)) ABORT;
1185 BN_set_negative(z, 1);
1186 scalars[0] = x;
1187 scalars[1] = y;
1188 scalars[2] = z; /* z = -(x+y) */
1189
1190 if (!EC_POINTs_mul(group, P, NULL, 3, points, scalars, ctx)) ABORT;
1191 if (!EC_POINT_is_at_infinity(group, P)) ABORT;
1192
1193 fprintf(stdout, " ok\n\n");
1194 }
1195
1196
1197#if 0
1198 timings(C2_K163, TIMING_BASE_PT, ctx);
1199 timings(C2_K163, TIMING_RAND_PT, ctx);
1200 timings(C2_K163, TIMING_SIMUL, ctx);
1201 timings(C2_B163, TIMING_BASE_PT, ctx);
1202 timings(C2_B163, TIMING_RAND_PT, ctx);
1203 timings(C2_B163, TIMING_SIMUL, ctx);
1204 timings(C2_K233, TIMING_BASE_PT, ctx);
1205 timings(C2_K233, TIMING_RAND_PT, ctx);
1206 timings(C2_K233, TIMING_SIMUL, ctx);
1207 timings(C2_B233, TIMING_BASE_PT, ctx);
1208 timings(C2_B233, TIMING_RAND_PT, ctx);
1209 timings(C2_B233, TIMING_SIMUL, ctx);
1210 timings(C2_K283, TIMING_BASE_PT, ctx);
1211 timings(C2_K283, TIMING_RAND_PT, ctx);
1212 timings(C2_K283, TIMING_SIMUL, ctx);
1213 timings(C2_B283, TIMING_BASE_PT, ctx);
1214 timings(C2_B283, TIMING_RAND_PT, ctx);
1215 timings(C2_B283, TIMING_SIMUL, ctx);
1216 timings(C2_K409, TIMING_BASE_PT, ctx);
1217 timings(C2_K409, TIMING_RAND_PT, ctx);
1218 timings(C2_K409, TIMING_SIMUL, ctx);
1219 timings(C2_B409, TIMING_BASE_PT, ctx);
1220 timings(C2_B409, TIMING_RAND_PT, ctx);
1221 timings(C2_B409, TIMING_SIMUL, ctx);
1222 timings(C2_K571, TIMING_BASE_PT, ctx);
1223 timings(C2_K571, TIMING_RAND_PT, ctx);
1224 timings(C2_K571, TIMING_SIMUL, ctx);
1225 timings(C2_B571, TIMING_BASE_PT, ctx);
1226 timings(C2_B571, TIMING_RAND_PT, ctx);
1227 timings(C2_B571, TIMING_SIMUL, ctx);
1228#endif
1229
1230
1231 if (ctx)
1232 BN_CTX_free(ctx);
1233 BN_free(p); BN_free(a); BN_free(b);
1234 EC_GROUP_free(group);
1235 EC_POINT_free(P);
1236 EC_POINT_free(Q);
1237 EC_POINT_free(R);
1238 BN_free(x); BN_free(y); BN_free(z); BN_free(cof);
1239
1240 if (C2_K163) EC_GROUP_free(C2_K163);
1241 if (C2_B163) EC_GROUP_free(C2_B163);
1242 if (C2_K233) EC_GROUP_free(C2_K233);
1243 if (C2_B233) EC_GROUP_free(C2_B233);
1244 if (C2_K283) EC_GROUP_free(C2_K283);
1245 if (C2_B283) EC_GROUP_free(C2_B283);
1246 if (C2_K409) EC_GROUP_free(C2_K409);
1247 if (C2_B409) EC_GROUP_free(C2_B409);
1248 if (C2_K571) EC_GROUP_free(C2_K571);
1249 if (C2_B571) EC_GROUP_free(C2_B571);
1250
1251 }
1252
1253void internal_curve_test(void)
1254 {
1255 EC_builtin_curve *curves = NULL;
1256 size_t crv_len = 0, n = 0;
1257 int ok = 1;
1258
1259 crv_len = EC_get_builtin_curves(NULL, 0);
1260
1261 curves = OPENSSL_malloc(sizeof(EC_builtin_curve) * crv_len);
1262
1263 if (curves == NULL)
1264 return;
1265
1266 if (!EC_get_builtin_curves(curves, crv_len))
1267 {
1268 OPENSSL_free(curves);
1269 return;
1270 }
1271
1272 fprintf(stdout, "testing internal curves: ");
1273
1274 for (n = 0; n < crv_len; n++)
1275 {
1276 EC_GROUP *group = NULL;
1277 int nid = curves[n].nid;
1278 if ((group = EC_GROUP_new_by_curve_name(nid)) == NULL)
1279 {
1280 ok = 0;
1281 fprintf(stdout, "\nEC_GROUP_new_curve_name() failed with"
1282 " curve %s\n", OBJ_nid2sn(nid));
1283 /* try next curve */
1284 continue;
1285 }
1286 if (!EC_GROUP_check(group, NULL))
1287 {
1288 ok = 0;
1289 fprintf(stdout, "\nEC_GROUP_check() failed with"
1290 " curve %s\n", OBJ_nid2sn(nid));
1291 EC_GROUP_free(group);
1292 /* try the next curve */
1293 continue;
1294 }
1295 fprintf(stdout, ".");
1296 fflush(stdout);
1297 EC_GROUP_free(group);
1298 }
1299 if (ok)
1300 fprintf(stdout, " ok\n");
1301 else
1302 fprintf(stdout, " failed\n");
1303 OPENSSL_free(curves);
1304 return;
1305 }
1306
1307static const char rnd_seed[] = "string to make the random number generator think it has entropy";
1308
1309int main(int argc, char *argv[])
1310 {
1311
1312 /* enable memory leak checking unless explicitly disabled */
1313 if (!((getenv("OPENSSL_DEBUG_MEMORY") != NULL) && (0 == strcmp(getenv("OPENSSL_DEBUG_MEMORY"), "off"))))
1314 {
1315 CRYPTO_malloc_debug_init();
1316 CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL);
1317 }
1318 else
1319 {
1320 /* OPENSSL_DEBUG_MEMORY=off */
1321 CRYPTO_set_mem_debug_functions(0, 0, 0, 0, 0);
1322 }
1323 CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
1324 ERR_load_crypto_strings();
1325
1326 RAND_seed(rnd_seed, sizeof rnd_seed); /* or BN_generate_prime may fail */
1327
1328 prime_field_tests();
1329 puts("");
1330 char2_field_tests();
1331 /* test the internal curves */
1332 internal_curve_test();
1333
633#ifndef OPENSSL_NO_ENGINE 1334#ifndef OPENSSL_NO_ENGINE
634 ENGINE_cleanup(); 1335 ENGINE_cleanup();
635#endif 1336#endif
diff --git a/src/lib/libcrypto/engine/Makefile b/src/lib/libcrypto/engine/Makefile
index 38f83f1654..13f211a0ae 100644
--- a/src/lib/libcrypto/engine/Makefile
+++ b/src/lib/libcrypto/engine/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include 8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -24,16 +19,14 @@ APPS=
24LIB=$(TOP)/libcrypto.a 19LIB=$(TOP)/libcrypto.a
25LIBSRC= eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c \ 20LIBSRC= eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c \
26 eng_table.c eng_pkey.c eng_fat.c eng_all.c \ 21 eng_table.c eng_pkey.c eng_fat.c eng_all.c \
27 tb_rsa.c tb_dsa.c tb_dh.c tb_rand.c tb_cipher.c tb_digest.c \ 22 tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c \
28 eng_openssl.c eng_dyn.c eng_cnf.c \ 23 tb_cipher.c tb_digest.c \
29 hw_atalla.c hw_cswift.c hw_ncipher.c hw_nuron.c hw_ubsec.c \ 24 eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c eng_padlock.c
30 hw_cryptodev.c hw_aep.c hw_sureware.c hw_4758_cca.c
31LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \ 25LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \
32 eng_table.o eng_pkey.o eng_fat.o eng_all.o \ 26 eng_table.o eng_pkey.o eng_fat.o eng_all.o \
33 tb_rsa.o tb_dsa.o tb_dh.o tb_rand.o tb_cipher.o tb_digest.o \ 27 tb_rsa.o tb_dsa.o tb_ecdsa.o tb_dh.o tb_ecdh.o tb_rand.o tb_store.o \
34 eng_openssl.o eng_dyn.o eng_cnf.o \ 28 tb_cipher.o tb_digest.o \
35 hw_atalla.o hw_cswift.o hw_ncipher.o hw_nuron.o hw_ubsec.o \ 29 eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o eng_padlock.o
36 hw_cryptodev.o hw_aep.o hw_sureware.o hw_4758_cca.o
37 30
38SRC= $(LIBSRC) 31SRC= $(LIBSRC)
39 32
@@ -61,6 +54,7 @@ links:
61 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 54 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
62 55
63install: 56install:
57 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
64 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 58 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
65 do \ 59 do \
66 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 60 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -70,16 +64,13 @@ install:
70tags: 64tags:
71 ctags $(SRC) 65 ctags $(SRC)
72 66
73errors:
74 $(PERL) $(TOP)/util/mkerr.pl -conf hw.ec \
75 -nostatic -staticloader -write hw_*.c
76
77tests: 67tests:
78 68
79lint: 69lint:
80 lint -DLINT $(INCLUDES) $(SRC)>fluff 70 lint -DLINT $(INCLUDES) $(SRC)>fluff
81 71
82depend: 72depend:
73 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
83 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 74 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
84 75
85dclean: 76dclean:
@@ -91,446 +82,207 @@ clean:
91 82
92# DO NOT DELETE THIS LINE -- make depend depends on it. 83# DO NOT DELETE THIS LINE -- make depend depends on it.
93 84
94eng_all.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 85eng_all.o: ../../e_os.h ../../include/openssl/bio.h
95eng_all.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h 86eng_all.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
96eng_all.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
97eng_all.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h 87eng_all.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
98eng_all.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 88eng_all.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
99eng_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 89eng_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
100eng_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h 90eng_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
101eng_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
102eng_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 91eng_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
103eng_all.o: ../../include/openssl/ui.h eng_all.c eng_int.h 92eng_all.o: ../cryptlib.h eng_all.c eng_int.h
104eng_cnf.o: ../../e_os.h ../../include/openssl/asn1.h 93eng_cnf.o: ../../e_os.h ../../include/openssl/bio.h
105eng_cnf.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
106eng_cnf.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h 94eng_cnf.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
107eng_cnf.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h 95eng_cnf.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
108eng_cnf.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
109eng_cnf.o: ../../include/openssl/engine.h ../../include/openssl/err.h 96eng_cnf.o: ../../include/openssl/engine.h ../../include/openssl/err.h
110eng_cnf.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 97eng_cnf.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
111eng_cnf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 98eng_cnf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
112eng_cnf.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
113eng_cnf.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 99eng_cnf.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
114eng_cnf.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 100eng_cnf.o: ../../include/openssl/symhacks.h ../cryptlib.h eng_cnf.c eng_int.h
115eng_cnf.o: ../cryptlib.h eng_cnf.c 101eng_cryptodev.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
116eng_ctrl.o: ../../e_os.h ../../include/openssl/asn1.h 102eng_cryptodev.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
117eng_ctrl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 103eng_cryptodev.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
104eng_cryptodev.o: ../../include/openssl/evp.h ../../include/openssl/obj_mac.h
105eng_cryptodev.o: ../../include/openssl/objects.h
106eng_cryptodev.o: ../../include/openssl/opensslconf.h
107eng_cryptodev.o: ../../include/openssl/opensslv.h
108eng_cryptodev.o: ../../include/openssl/ossl_typ.h
109eng_cryptodev.o: ../../include/openssl/safestack.h
110eng_cryptodev.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
111eng_cryptodev.o: eng_cryptodev.c
112eng_ctrl.o: ../../e_os.h ../../include/openssl/bio.h
118eng_ctrl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 113eng_ctrl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
119eng_ctrl.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
120eng_ctrl.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h 114eng_ctrl.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
121eng_ctrl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 115eng_ctrl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
122eng_ctrl.o: ../../include/openssl/opensslconf.h 116eng_ctrl.o: ../../include/openssl/opensslconf.h
123eng_ctrl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 117eng_ctrl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
124eng_ctrl.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
125eng_ctrl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 118eng_ctrl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
126eng_ctrl.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 119eng_ctrl.o: ../../include/openssl/symhacks.h ../cryptlib.h eng_ctrl.c eng_int.h
127eng_ctrl.o: ../cryptlib.h eng_ctrl.c eng_int.h 120eng_dyn.o: ../../e_os.h ../../include/openssl/bio.h
128eng_dyn.o: ../../e_os.h ../../include/openssl/asn1.h
129eng_dyn.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
130eng_dyn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 121eng_dyn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
131eng_dyn.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
132eng_dyn.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h 122eng_dyn.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
133eng_dyn.o: ../../include/openssl/engine.h ../../include/openssl/err.h 123eng_dyn.o: ../../include/openssl/engine.h ../../include/openssl/err.h
134eng_dyn.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 124eng_dyn.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
135eng_dyn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 125eng_dyn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
136eng_dyn.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
137eng_dyn.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 126eng_dyn.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
138eng_dyn.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 127eng_dyn.o: ../../include/openssl/symhacks.h ../cryptlib.h eng_dyn.c eng_int.h
139eng_dyn.o: ../cryptlib.h eng_dyn.c eng_int.h 128eng_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
140eng_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
141eng_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
142eng_err.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
143eng_err.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h 129eng_err.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
144eng_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 130eng_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
145eng_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 131eng_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
146eng_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h 132eng_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
147eng_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
148eng_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 133eng_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
149eng_err.o: ../../include/openssl/ui.h eng_err.c 134eng_err.o: eng_err.c
150eng_fat.o: ../../e_os.h ../../include/openssl/asn1.h 135eng_fat.o: ../../e_os.h ../../include/openssl/bio.h
151eng_fat.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
152eng_fat.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h 136eng_fat.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
153eng_fat.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h 137eng_fat.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
154eng_fat.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
155eng_fat.o: ../../include/openssl/engine.h ../../include/openssl/err.h 138eng_fat.o: ../../include/openssl/engine.h ../../include/openssl/err.h
156eng_fat.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 139eng_fat.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
157eng_fat.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 140eng_fat.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
158eng_fat.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
159eng_fat.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 141eng_fat.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
160eng_fat.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 142eng_fat.o: ../../include/openssl/symhacks.h ../cryptlib.h eng_fat.c eng_int.h
161eng_fat.o: ../cryptlib.h eng_fat.c eng_int.h 143eng_init.o: ../../e_os.h ../../include/openssl/bio.h
162eng_init.o: ../../e_os.h ../../include/openssl/asn1.h
163eng_init.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
164eng_init.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 144eng_init.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
165eng_init.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
166eng_init.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h 145eng_init.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
167eng_init.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 146eng_init.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
168eng_init.o: ../../include/openssl/opensslconf.h 147eng_init.o: ../../include/openssl/opensslconf.h
169eng_init.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 148eng_init.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
170eng_init.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
171eng_init.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 149eng_init.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
172eng_init.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 150eng_init.o: ../../include/openssl/symhacks.h ../cryptlib.h eng_init.c eng_int.h
173eng_init.o: ../cryptlib.h eng_init.c eng_int.h 151eng_lib.o: ../../e_os.h ../../include/openssl/bio.h
174eng_lib.o: ../../e_os.h ../../include/openssl/asn1.h
175eng_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
176eng_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 152eng_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
177eng_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
178eng_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h 153eng_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
179eng_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 154eng_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
180eng_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 155eng_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
181eng_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h 156eng_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
182eng_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 157eng_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
183eng_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 158eng_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h eng_int.h eng_lib.c
184eng_lib.o: ../../include/openssl/ui.h ../cryptlib.h eng_int.h eng_lib.c 159eng_list.o: ../../e_os.h ../../include/openssl/bio.h
185eng_list.o: ../../e_os.h ../../include/openssl/asn1.h
186eng_list.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
187eng_list.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 160eng_list.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
188eng_list.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
189eng_list.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h 161eng_list.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
190eng_list.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 162eng_list.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
191eng_list.o: ../../include/openssl/opensslconf.h 163eng_list.o: ../../include/openssl/opensslconf.h
192eng_list.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 164eng_list.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
193eng_list.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
194eng_list.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 165eng_list.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
195eng_list.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 166eng_list.o: ../../include/openssl/symhacks.h ../cryptlib.h eng_int.h eng_list.c
196eng_list.o: ../cryptlib.h eng_int.h eng_list.c 167eng_openssl.o: ../../e_os.h ../../include/openssl/asn1.h
197eng_openssl.o: ../../e_os.h ../../include/openssl/aes.h 168eng_openssl.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
198eng_openssl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 169eng_openssl.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
199eng_openssl.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
200eng_openssl.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
201eng_openssl.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
202eng_openssl.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
203eng_openssl.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h 170eng_openssl.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
204eng_openssl.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h 171eng_openssl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
205eng_openssl.o: ../../include/openssl/err.h ../../include/openssl/evp.h 172eng_openssl.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
206eng_openssl.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 173eng_openssl.o: ../../include/openssl/engine.h ../../include/openssl/err.h
207eng_openssl.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 174eng_openssl.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
208eng_openssl.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
209eng_openssl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 175eng_openssl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
210eng_openssl.o: ../../include/openssl/opensslconf.h 176eng_openssl.o: ../../include/openssl/opensslconf.h
211eng_openssl.o: ../../include/openssl/opensslv.h 177eng_openssl.o: ../../include/openssl/opensslv.h
212eng_openssl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h 178eng_openssl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
213eng_openssl.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h 179eng_openssl.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
214eng_openssl.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h 180eng_openssl.o: ../../include/openssl/rand.h ../../include/openssl/rc4.h
215eng_openssl.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 181eng_openssl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
216eng_openssl.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 182eng_openssl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
217eng_openssl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 183eng_openssl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
218eng_openssl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 184eng_openssl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_openssl.c
219eng_openssl.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 185eng_padlock.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
220eng_openssl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 186eng_padlock.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
221eng_openssl.o: ../cryptlib.h eng_openssl.c 187eng_padlock.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
222eng_pkey.o: ../../e_os.h ../../include/openssl/asn1.h 188eng_padlock.o: ../../include/openssl/engine.h ../../include/openssl/err.h
223eng_pkey.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 189eng_padlock.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
190eng_padlock.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
191eng_padlock.o: ../../include/openssl/opensslconf.h
192eng_padlock.o: ../../include/openssl/opensslv.h
193eng_padlock.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
194eng_padlock.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
195eng_padlock.o: ../../include/openssl/symhacks.h eng_padlock.c
196eng_pkey.o: ../../e_os.h ../../include/openssl/bio.h
224eng_pkey.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 197eng_pkey.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
225eng_pkey.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
226eng_pkey.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h 198eng_pkey.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
227eng_pkey.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 199eng_pkey.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
228eng_pkey.o: ../../include/openssl/opensslconf.h 200eng_pkey.o: ../../include/openssl/opensslconf.h
229eng_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 201eng_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
230eng_pkey.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
231eng_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 202eng_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
232eng_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 203eng_pkey.o: ../../include/openssl/symhacks.h ../cryptlib.h eng_int.h eng_pkey.c
233eng_pkey.o: ../cryptlib.h eng_int.h eng_pkey.c 204eng_table.o: ../../e_os.h ../../include/openssl/asn1.h
234eng_table.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h 205eng_table.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
235eng_table.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 206eng_table.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
236eng_table.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
237eng_table.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
238eng_table.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
239eng_table.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
240eng_table.o: ../../include/openssl/engine.h ../../include/openssl/err.h 207eng_table.o: ../../include/openssl/engine.h ../../include/openssl/err.h
241eng_table.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 208eng_table.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
242eng_table.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 209eng_table.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
243eng_table.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
244eng_table.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
245eng_table.o: ../../include/openssl/objects.h
246eng_table.o: ../../include/openssl/opensslconf.h 210eng_table.o: ../../include/openssl/opensslconf.h
247eng_table.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 211eng_table.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
248eng_table.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h 212eng_table.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
249eng_table.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 213eng_table.o: ../../include/openssl/symhacks.h ../cryptlib.h eng_int.h
250eng_table.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 214eng_table.o: eng_table.c
251eng_table.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 215tb_cipher.o: ../../e_os.h ../../include/openssl/bio.h
252eng_table.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 216tb_cipher.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
253eng_table.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 217tb_cipher.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
254eng_table.o: eng_int.h eng_table.c 218tb_cipher.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
255hw_4758_cca.o: ../../e_os.h ../../include/openssl/aes.h
256hw_4758_cca.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
257hw_4758_cca.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
258hw_4758_cca.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
259hw_4758_cca.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
260hw_4758_cca.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
261hw_4758_cca.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
262hw_4758_cca.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
263hw_4758_cca.o: ../../include/openssl/err.h ../../include/openssl/evp.h
264hw_4758_cca.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
265hw_4758_cca.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
266hw_4758_cca.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
267hw_4758_cca.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
268hw_4758_cca.o: ../../include/openssl/opensslconf.h
269hw_4758_cca.o: ../../include/openssl/opensslv.h
270hw_4758_cca.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
271hw_4758_cca.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
272hw_4758_cca.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
273hw_4758_cca.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
274hw_4758_cca.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
275hw_4758_cca.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
276hw_4758_cca.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
277hw_4758_cca.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
278hw_4758_cca.o: ../cryptlib.h hw_4758_cca.c hw_4758_cca_err.c hw_4758_cca_err.h
279hw_4758_cca.o: vendor_defns/hw_4758_cca.h
280hw_aep.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
281hw_aep.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
282hw_aep.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
283hw_aep.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
284hw_aep.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
285hw_aep.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
286hw_aep.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
287hw_aep.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
288hw_aep.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
289hw_aep.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
290hw_aep.o: ../../include/openssl/ui.h hw_aep.c hw_aep_err.c hw_aep_err.h
291hw_aep.o: vendor_defns/aep.h
292hw_atalla.o: ../../e_os.h ../../include/openssl/asn1.h
293hw_atalla.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
294hw_atalla.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
295hw_atalla.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
296hw_atalla.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
297hw_atalla.o: ../../include/openssl/engine.h ../../include/openssl/err.h
298hw_atalla.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
299hw_atalla.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
300hw_atalla.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
301hw_atalla.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
302hw_atalla.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
303hw_atalla.o: ../cryptlib.h hw_atalla.c hw_atalla_err.c hw_atalla_err.h
304hw_atalla.o: vendor_defns/atalla.h
305hw_cryptodev.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
306hw_cryptodev.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
307hw_cryptodev.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
308hw_cryptodev.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
309hw_cryptodev.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
310hw_cryptodev.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
311hw_cryptodev.o: ../../include/openssl/engine.h ../../include/openssl/err.h
312hw_cryptodev.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
313hw_cryptodev.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
314hw_cryptodev.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
315hw_cryptodev.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
316hw_cryptodev.o: ../../include/openssl/objects.h
317hw_cryptodev.o: ../../include/openssl/opensslconf.h
318hw_cryptodev.o: ../../include/openssl/opensslv.h
319hw_cryptodev.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
320hw_cryptodev.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
321hw_cryptodev.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
322hw_cryptodev.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
323hw_cryptodev.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
324hw_cryptodev.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
325hw_cryptodev.o: ../../include/openssl/ui_compat.h hw_cryptodev.c
326hw_cswift.o: ../../e_os.h ../../include/openssl/asn1.h
327hw_cswift.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
328hw_cswift.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
329hw_cswift.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
330hw_cswift.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
331hw_cswift.o: ../../include/openssl/engine.h ../../include/openssl/err.h
332hw_cswift.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
333hw_cswift.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
334hw_cswift.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
335hw_cswift.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
336hw_cswift.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
337hw_cswift.o: ../cryptlib.h hw_cswift.c hw_cswift_err.c hw_cswift_err.h
338hw_cswift.o: vendor_defns/cswift.h
339hw_ncipher.o: ../../e_os.h ../../include/openssl/aes.h
340hw_ncipher.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
341hw_ncipher.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
342hw_ncipher.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
343hw_ncipher.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
344hw_ncipher.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
345hw_ncipher.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
346hw_ncipher.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
347hw_ncipher.o: ../../include/openssl/err.h ../../include/openssl/evp.h
348hw_ncipher.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
349hw_ncipher.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
350hw_ncipher.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
351hw_ncipher.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
352hw_ncipher.o: ../../include/openssl/opensslconf.h
353hw_ncipher.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
354hw_ncipher.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
355hw_ncipher.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
356hw_ncipher.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
357hw_ncipher.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
358hw_ncipher.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
359hw_ncipher.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
360hw_ncipher.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
361hw_ncipher.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
362hw_ncipher.o: ../../include/openssl/x509_vfy.h ../cryptlib.h hw_ncipher.c
363hw_ncipher.o: hw_ncipher_err.c hw_ncipher_err.h vendor_defns/hwcryptohook.h
364hw_nuron.o: ../../e_os.h ../../include/openssl/asn1.h
365hw_nuron.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
366hw_nuron.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
367hw_nuron.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
368hw_nuron.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
369hw_nuron.o: ../../include/openssl/engine.h ../../include/openssl/err.h
370hw_nuron.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
371hw_nuron.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
372hw_nuron.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
373hw_nuron.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
374hw_nuron.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
375hw_nuron.o: ../cryptlib.h hw_nuron.c hw_nuron_err.c hw_nuron_err.h
376hw_sureware.o: ../../e_os.h ../../include/openssl/aes.h
377hw_sureware.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
378hw_sureware.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
379hw_sureware.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
380hw_sureware.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
381hw_sureware.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
382hw_sureware.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
383hw_sureware.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
384hw_sureware.o: ../../include/openssl/err.h ../../include/openssl/evp.h
385hw_sureware.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
386hw_sureware.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
387hw_sureware.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
388hw_sureware.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
389hw_sureware.o: ../../include/openssl/opensslconf.h
390hw_sureware.o: ../../include/openssl/opensslv.h
391hw_sureware.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
392hw_sureware.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
393hw_sureware.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
394hw_sureware.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
395hw_sureware.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
396hw_sureware.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
397hw_sureware.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
398hw_sureware.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
399hw_sureware.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
400hw_sureware.o: ../cryptlib.h eng_int.h engine.h hw_sureware.c hw_sureware_err.c
401hw_sureware.o: hw_sureware_err.h vendor_defns/sureware.h
402hw_ubsec.o: ../../e_os.h ../../include/openssl/asn1.h
403hw_ubsec.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
404hw_ubsec.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
405hw_ubsec.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
406hw_ubsec.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
407hw_ubsec.o: ../../include/openssl/engine.h ../../include/openssl/err.h
408hw_ubsec.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
409hw_ubsec.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
410hw_ubsec.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
411hw_ubsec.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
412hw_ubsec.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
413hw_ubsec.o: ../cryptlib.h hw_ubsec.c hw_ubsec_err.c hw_ubsec_err.h
414hw_ubsec.o: vendor_defns/hw_ubsec.h
415tb_cipher.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
416tb_cipher.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
417tb_cipher.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
418tb_cipher.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
419tb_cipher.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
420tb_cipher.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
421tb_cipher.o: ../../include/openssl/engine.h ../../include/openssl/err.h
422tb_cipher.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
423tb_cipher.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
424tb_cipher.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
425tb_cipher.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
426tb_cipher.o: ../../include/openssl/objects.h
427tb_cipher.o: ../../include/openssl/opensslconf.h 219tb_cipher.o: ../../include/openssl/opensslconf.h
428tb_cipher.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 220tb_cipher.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
429tb_cipher.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h 221tb_cipher.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
430tb_cipher.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 222tb_cipher.o: ../../include/openssl/symhacks.h ../cryptlib.h eng_int.h
431tb_cipher.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 223tb_cipher.o: tb_cipher.c
432tb_cipher.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 224tb_dh.o: ../../e_os.h ../../include/openssl/bio.h
433tb_cipher.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 225tb_dh.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
434tb_cipher.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 226tb_dh.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
435tb_cipher.o: eng_int.h tb_cipher.c 227tb_dh.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
436tb_dh.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h 228tb_dh.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
437tb_dh.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 229tb_dh.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
438tb_dh.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
439tb_dh.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
440tb_dh.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
441tb_dh.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
442tb_dh.o: ../../include/openssl/engine.h ../../include/openssl/err.h
443tb_dh.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
444tb_dh.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
445tb_dh.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
446tb_dh.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
447tb_dh.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
448tb_dh.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
449tb_dh.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
450tb_dh.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
451tb_dh.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
452tb_dh.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
453tb_dh.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 230tb_dh.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
454tb_dh.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h eng_int.h 231tb_dh.o: ../cryptlib.h eng_int.h tb_dh.c
455tb_dh.o: tb_dh.c 232tb_digest.o: ../../e_os.h ../../include/openssl/bio.h
456tb_digest.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h 233tb_digest.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
457tb_digest.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 234tb_digest.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
458tb_digest.o: ../../include/openssl/bn.h ../../include/openssl/cast.h 235tb_digest.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
459tb_digest.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
460tb_digest.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
461tb_digest.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
462tb_digest.o: ../../include/openssl/engine.h ../../include/openssl/err.h
463tb_digest.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
464tb_digest.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
465tb_digest.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
466tb_digest.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
467tb_digest.o: ../../include/openssl/objects.h
468tb_digest.o: ../../include/openssl/opensslconf.h 236tb_digest.o: ../../include/openssl/opensslconf.h
469tb_digest.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 237tb_digest.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
470tb_digest.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h 238tb_digest.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
471tb_digest.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 239tb_digest.o: ../../include/openssl/symhacks.h ../cryptlib.h eng_int.h
472tb_digest.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 240tb_digest.o: tb_digest.c
473tb_digest.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 241tb_dsa.o: ../../e_os.h ../../include/openssl/bio.h
474tb_digest.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 242tb_dsa.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
475tb_digest.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 243tb_dsa.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
476tb_digest.o: eng_int.h tb_digest.c 244tb_dsa.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
477tb_dsa.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h 245tb_dsa.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
478tb_dsa.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 246tb_dsa.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
479tb_dsa.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
480tb_dsa.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
481tb_dsa.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
482tb_dsa.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
483tb_dsa.o: ../../include/openssl/engine.h ../../include/openssl/err.h
484tb_dsa.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
485tb_dsa.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
486tb_dsa.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
487tb_dsa.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
488tb_dsa.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
489tb_dsa.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
490tb_dsa.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
491tb_dsa.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
492tb_dsa.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
493tb_dsa.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
494tb_dsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 247tb_dsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
495tb_dsa.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 248tb_dsa.o: ../cryptlib.h eng_int.h tb_dsa.c
496tb_dsa.o: eng_int.h tb_dsa.c 249tb_ecdh.o: ../../e_os.h ../../include/openssl/bio.h
497tb_rand.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h 250tb_ecdh.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
498tb_rand.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 251tb_ecdh.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
499tb_rand.o: ../../include/openssl/bn.h ../../include/openssl/cast.h 252tb_ecdh.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
500tb_rand.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 253tb_ecdh.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
501tb_rand.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h 254tb_ecdh.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
502tb_rand.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h 255tb_ecdh.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
503tb_rand.o: ../../include/openssl/engine.h ../../include/openssl/err.h 256tb_ecdh.o: ../cryptlib.h eng_int.h tb_ecdh.c
504tb_rand.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 257tb_ecdsa.o: ../../e_os.h ../../include/openssl/bio.h
505tb_rand.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 258tb_ecdsa.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
506tb_rand.o: ../../include/openssl/md4.h ../../include/openssl/md5.h 259tb_ecdsa.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
507tb_rand.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h 260tb_ecdsa.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
508tb_rand.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 261tb_ecdsa.o: ../../include/openssl/opensslconf.h
509tb_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 262tb_ecdsa.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
510tb_rand.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h 263tb_ecdsa.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
511tb_rand.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 264tb_ecdsa.o: ../../include/openssl/symhacks.h ../cryptlib.h eng_int.h tb_ecdsa.c
512tb_rand.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 265tb_rand.o: ../../e_os.h ../../include/openssl/bio.h
513tb_rand.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 266tb_rand.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
267tb_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
268tb_rand.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
269tb_rand.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
270tb_rand.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
514tb_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 271tb_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
515tb_rand.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 272tb_rand.o: ../cryptlib.h eng_int.h tb_rand.c
516tb_rand.o: eng_int.h tb_rand.c 273tb_rsa.o: ../../e_os.h ../../include/openssl/bio.h
517tb_rsa.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h 274tb_rsa.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
518tb_rsa.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 275tb_rsa.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
519tb_rsa.o: ../../include/openssl/bn.h ../../include/openssl/cast.h 276tb_rsa.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
520tb_rsa.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 277tb_rsa.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
521tb_rsa.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h 278tb_rsa.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
522tb_rsa.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
523tb_rsa.o: ../../include/openssl/engine.h ../../include/openssl/err.h
524tb_rsa.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
525tb_rsa.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
526tb_rsa.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
527tb_rsa.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
528tb_rsa.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
529tb_rsa.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
530tb_rsa.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
531tb_rsa.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
532tb_rsa.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
533tb_rsa.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
534tb_rsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 279tb_rsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
535tb_rsa.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 280tb_rsa.o: ../cryptlib.h eng_int.h tb_rsa.c
536tb_rsa.o: eng_int.h tb_rsa.c 281tb_store.o: ../../e_os.h ../../include/openssl/bio.h
282tb_store.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
283tb_store.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
284tb_store.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
285tb_store.o: ../../include/openssl/opensslconf.h
286tb_store.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
287tb_store.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
288tb_store.o: ../../include/openssl/symhacks.h ../cryptlib.h eng_int.h tb_store.c
diff --git a/src/lib/libcrypto/engine/eng_cryptodev.c b/src/lib/libcrypto/engine/eng_cryptodev.c
new file mode 100644
index 0000000000..ab38cd52f0
--- /dev/null
+++ b/src/lib/libcrypto/engine/eng_cryptodev.c
@@ -0,0 +1,1133 @@
1/*
2 * Copyright (c) 2002 Bob Beck <beck@openbsd.org>
3 * Copyright (c) 2002 Theo de Raadt
4 * Copyright (c) 2002 Markus Friedl
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:
10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 *
27 */
28
29#include <openssl/objects.h>
30#include <openssl/engine.h>
31#include <openssl/evp.h>
32#include <openssl/bn.h>
33
34#if (defined(__unix__) || defined(unix)) && !defined(USG) && \
35 (defined(OpenBSD) || defined(__FreeBSD_version))
36#include <sys/param.h>
37# if (OpenBSD >= 200112) || ((__FreeBSD_version >= 470101 && __FreeBSD_version < 500000) || __FreeBSD_version >= 500041)
38# define HAVE_CRYPTODEV
39# endif
40# if (OpenBSD >= 200110)
41# define HAVE_SYSLOG_R
42# endif
43#endif
44
45#ifndef HAVE_CRYPTODEV
46
47void
48ENGINE_load_cryptodev(void)
49{
50 /* This is a NOP on platforms without /dev/crypto */
51 return;
52}
53
54#else
55
56#include <sys/types.h>
57#include <crypto/cryptodev.h>
58#include <sys/ioctl.h>
59#include <errno.h>
60#include <stdio.h>
61#include <unistd.h>
62#include <fcntl.h>
63#include <stdarg.h>
64#include <syslog.h>
65#include <errno.h>
66#include <string.h>
67
68struct dev_crypto_state {
69 struct session_op d_sess;
70 int d_fd;
71};
72
73static u_int32_t cryptodev_asymfeat = 0;
74
75static int get_asym_dev_crypto(void);
76static int open_dev_crypto(void);
77static int get_dev_crypto(void);
78static int cryptodev_max_iv(int cipher);
79static int cryptodev_key_length_valid(int cipher, int len);
80static int cipher_nid_to_cryptodev(int nid);
81static int get_cryptodev_ciphers(const int **cnids);
82static int get_cryptodev_digests(const int **cnids);
83static int cryptodev_usable_ciphers(const int **nids);
84static int cryptodev_usable_digests(const int **nids);
85static int cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
86 const unsigned char *in, unsigned int inl);
87static int cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
88 const unsigned char *iv, int enc);
89static int cryptodev_cleanup(EVP_CIPHER_CTX *ctx);
90static int cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
91 const int **nids, int nid);
92static int cryptodev_engine_digests(ENGINE *e, const EVP_MD **digest,
93 const int **nids, int nid);
94static int bn2crparam(const BIGNUM *a, struct crparam *crp);
95static int crparam2bn(struct crparam *crp, BIGNUM *a);
96static void zapparams(struct crypt_kop *kop);
97static int cryptodev_asym(struct crypt_kop *kop, int rlen, BIGNUM *r,
98 int slen, BIGNUM *s);
99
100static int cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a,
101 const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
102static int cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I,
103 RSA *rsa);
104static int cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx);
105static int cryptodev_dsa_bn_mod_exp(DSA *dsa, BIGNUM *r, BIGNUM *a,
106 const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
107static int cryptodev_dsa_dsa_mod_exp(DSA *dsa, BIGNUM *t1, BIGNUM *g,
108 BIGNUM *u1, BIGNUM *pub_key, BIGNUM *u2, BIGNUM *p,
109 BN_CTX *ctx, BN_MONT_CTX *mont);
110static DSA_SIG *cryptodev_dsa_do_sign(const unsigned char *dgst,
111 int dlen, DSA *dsa);
112static int cryptodev_dsa_verify(const unsigned char *dgst, int dgst_len,
113 DSA_SIG *sig, DSA *dsa);
114static int cryptodev_mod_exp_dh(const DH *dh, BIGNUM *r, const BIGNUM *a,
115 const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,
116 BN_MONT_CTX *m_ctx);
117static int cryptodev_dh_compute_key(unsigned char *key,
118 const BIGNUM *pub_key, DH *dh);
119static int cryptodev_ctrl(ENGINE *e, int cmd, long i, void *p,
120 void (*f)());
121void ENGINE_load_cryptodev(void);
122
123static const ENGINE_CMD_DEFN cryptodev_defns[] = {
124 { 0, NULL, NULL, 0 }
125};
126
127static struct {
128 int id;
129 int nid;
130 int ivmax;
131 int keylen;
132} ciphers[] = {
133 { CRYPTO_DES_CBC, NID_des_cbc, 8, 8, },
134 { CRYPTO_3DES_CBC, NID_des_ede3_cbc, 8, 24, },
135 { CRYPTO_AES_CBC, NID_aes_128_cbc, 16, 16, },
136 { CRYPTO_BLF_CBC, NID_bf_cbc, 8, 16, },
137 { CRYPTO_CAST_CBC, NID_cast5_cbc, 8, 16, },
138 { CRYPTO_SKIPJACK_CBC, NID_undef, 0, 0, },
139 { 0, NID_undef, 0, 0, },
140};
141
142static struct {
143 int id;
144 int nid;
145} digests[] = {
146 { CRYPTO_SHA1_HMAC, NID_hmacWithSHA1, },
147 { CRYPTO_RIPEMD160_HMAC, NID_ripemd160, },
148 { CRYPTO_MD5_KPDK, NID_undef, },
149 { CRYPTO_SHA1_KPDK, NID_undef, },
150 { CRYPTO_MD5, NID_md5, },
151 { CRYPTO_SHA1, NID_undef, },
152 { 0, NID_undef, },
153};
154
155/*
156 * Return a fd if /dev/crypto seems usable, 0 otherwise.
157 */
158static int
159open_dev_crypto(void)
160{
161 static int fd = -1;
162
163 if (fd == -1) {
164 if ((fd = open("/dev/crypto", O_RDWR, 0)) == -1)
165 return (-1);
166 /* close on exec */
167 if (fcntl(fd, F_SETFD, 1) == -1) {
168 close(fd);
169 fd = -1;
170 return (-1);
171 }
172 }
173 return (fd);
174}
175
176static int
177get_dev_crypto(void)
178{
179 int fd, retfd;
180
181 if ((fd = open_dev_crypto()) == -1)
182 return (-1);
183 if (ioctl(fd, CRIOGET, &retfd) == -1)
184 return (-1);
185
186 /* close on exec */
187 if (fcntl(retfd, F_SETFD, 1) == -1) {
188 close(retfd);
189 return (-1);
190 }
191 return (retfd);
192}
193
194/* Caching version for asym operations */
195static int
196get_asym_dev_crypto(void)
197{
198 static int fd = -1;
199
200 if (fd == -1)
201 fd = get_dev_crypto();
202 return fd;
203}
204
205/*
206 * XXXX this needs to be set for each alg - and determined from
207 * a running card.
208 */
209static int
210cryptodev_max_iv(int cipher)
211{
212 int i;
213
214 for (i = 0; ciphers[i].id; i++)
215 if (ciphers[i].id == cipher)
216 return (ciphers[i].ivmax);
217 return (0);
218}
219
220/*
221 * XXXX this needs to be set for each alg - and determined from
222 * a running card. For now, fake it out - but most of these
223 * for real devices should return 1 for the supported key
224 * sizes the device can handle.
225 */
226static int
227cryptodev_key_length_valid(int cipher, int len)
228{
229 int i;
230
231 for (i = 0; ciphers[i].id; i++)
232 if (ciphers[i].id == cipher)
233 return (ciphers[i].keylen == len);
234 return (0);
235}
236
237/* convert libcrypto nids to cryptodev */
238static int
239cipher_nid_to_cryptodev(int nid)
240{
241 int i;
242
243 for (i = 0; ciphers[i].id; i++)
244 if (ciphers[i].nid == nid)
245 return (ciphers[i].id);
246 return (0);
247}
248
249/*
250 * Find out what ciphers /dev/crypto will let us have a session for.
251 * XXX note, that some of these openssl doesn't deal with yet!
252 * returning them here is harmless, as long as we return NULL
253 * when asked for a handler in the cryptodev_engine_ciphers routine
254 */
255static int
256get_cryptodev_ciphers(const int **cnids)
257{
258 static int nids[CRYPTO_ALGORITHM_MAX];
259 struct session_op sess;
260 int fd, i, count = 0;
261
262 if ((fd = get_dev_crypto()) < 0) {
263 *cnids = NULL;
264 return (0);
265 }
266 memset(&sess, 0, sizeof(sess));
267 sess.key = (caddr_t)"123456781234567812345678";
268
269 for (i = 0; ciphers[i].id && count < CRYPTO_ALGORITHM_MAX; i++) {
270 if (ciphers[i].nid == NID_undef)
271 continue;
272 sess.cipher = ciphers[i].id;
273 sess.keylen = ciphers[i].keylen;
274 sess.mac = 0;
275 if (ioctl(fd, CIOCGSESSION, &sess) != -1 &&
276 ioctl(fd, CIOCFSESSION, &sess.ses) != -1)
277 nids[count++] = ciphers[i].nid;
278 }
279 close(fd);
280
281 if (count > 0)
282 *cnids = nids;
283 else
284 *cnids = NULL;
285 return (count);
286}
287
288/*
289 * Find out what digests /dev/crypto will let us have a session for.
290 * XXX note, that some of these openssl doesn't deal with yet!
291 * returning them here is harmless, as long as we return NULL
292 * when asked for a handler in the cryptodev_engine_digests routine
293 */
294static int
295get_cryptodev_digests(const int **cnids)
296{
297 static int nids[CRYPTO_ALGORITHM_MAX];
298 struct session_op sess;
299 int fd, i, count = 0;
300
301 if ((fd = get_dev_crypto()) < 0) {
302 *cnids = NULL;
303 return (0);
304 }
305 memset(&sess, 0, sizeof(sess));
306 for (i = 0; digests[i].id && count < CRYPTO_ALGORITHM_MAX; i++) {
307 if (digests[i].nid == NID_undef)
308 continue;
309 sess.mac = digests[i].id;
310 sess.cipher = 0;
311 if (ioctl(fd, CIOCGSESSION, &sess) != -1 &&
312 ioctl(fd, CIOCFSESSION, &sess.ses) != -1)
313 nids[count++] = digests[i].nid;
314 }
315 close(fd);
316
317 if (count > 0)
318 *cnids = nids;
319 else
320 *cnids = NULL;
321 return (count);
322}
323
324/*
325 * Find the useable ciphers|digests from dev/crypto - this is the first
326 * thing called by the engine init crud which determines what it
327 * can use for ciphers from this engine. We want to return
328 * only what we can do, anythine else is handled by software.
329 *
330 * If we can't initialize the device to do anything useful for
331 * any reason, we want to return a NULL array, and 0 length,
332 * which forces everything to be done is software. By putting
333 * the initalization of the device in here, we ensure we can
334 * use this engine as the default, and if for whatever reason
335 * /dev/crypto won't do what we want it will just be done in
336 * software
337 *
338 * This can (should) be greatly expanded to perhaps take into
339 * account speed of the device, and what we want to do.
340 * (although the disabling of particular alg's could be controlled
341 * by the device driver with sysctl's.) - this is where we
342 * want most of the decisions made about what we actually want
343 * to use from /dev/crypto.
344 */
345static int
346cryptodev_usable_ciphers(const int **nids)
347{
348 return (get_cryptodev_ciphers(nids));
349}
350
351static int
352cryptodev_usable_digests(const int **nids)
353{
354 /*
355 * XXXX just disable all digests for now, because it sucks.
356 * we need a better way to decide this - i.e. I may not
357 * want digests on slow cards like hifn on fast machines,
358 * but might want them on slow or loaded machines, etc.
359 * will also want them when using crypto cards that don't
360 * suck moose gonads - would be nice to be able to decide something
361 * as reasonable default without having hackery that's card dependent.
362 * of course, the default should probably be just do everything,
363 * with perhaps a sysctl to turn algoritms off (or have them off
364 * by default) on cards that generally suck like the hifn.
365 */
366 *nids = NULL;
367 return (0);
368}
369
370static int
371cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
372 const unsigned char *in, unsigned int inl)
373{
374 struct crypt_op cryp;
375 struct dev_crypto_state *state = ctx->cipher_data;
376 struct session_op *sess = &state->d_sess;
377 void *iiv;
378 unsigned char save_iv[EVP_MAX_IV_LENGTH];
379
380 if (state->d_fd < 0)
381 return (0);
382 if (!inl)
383 return (1);
384 if ((inl % ctx->cipher->block_size) != 0)
385 return (0);
386
387 memset(&cryp, 0, sizeof(cryp));
388
389 cryp.ses = sess->ses;
390 cryp.flags = 0;
391 cryp.len = inl;
392 cryp.src = (caddr_t) in;
393 cryp.dst = (caddr_t) out;
394 cryp.mac = 0;
395
396 cryp.op = ctx->encrypt ? COP_ENCRYPT : COP_DECRYPT;
397
398 if (ctx->cipher->iv_len) {
399 cryp.iv = (caddr_t) ctx->iv;
400 if (!ctx->encrypt) {
401 iiv = (void *) in + inl - ctx->cipher->iv_len;
402 memcpy(save_iv, iiv, ctx->cipher->iv_len);
403 }
404 } else
405 cryp.iv = NULL;
406
407 if (ioctl(state->d_fd, CIOCCRYPT, &cryp) == -1) {
408 /* XXX need better errror handling
409 * this can fail for a number of different reasons.
410 */
411 return (0);
412 }
413
414 if (ctx->cipher->iv_len) {
415 if (ctx->encrypt)
416 iiv = (void *) out + inl - ctx->cipher->iv_len;
417 else
418 iiv = save_iv;
419 memcpy(ctx->iv, iiv, ctx->cipher->iv_len);
420 }
421 return (1);
422}
423
424static int
425cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
426 const unsigned char *iv, int enc)
427{
428 struct dev_crypto_state *state = ctx->cipher_data;
429 struct session_op *sess = &state->d_sess;
430 int cipher;
431
432 if ((cipher = cipher_nid_to_cryptodev(ctx->cipher->nid)) == NID_undef)
433 return (0);
434
435 if (ctx->cipher->iv_len > cryptodev_max_iv(cipher))
436 return (0);
437
438 if (!cryptodev_key_length_valid(cipher, ctx->key_len))
439 return (0);
440
441 memset(sess, 0, sizeof(struct session_op));
442
443 if ((state->d_fd = get_dev_crypto()) < 0)
444 return (0);
445
446 sess->key = (unsigned char *)key;
447 sess->keylen = ctx->key_len;
448 sess->cipher = cipher;
449
450 if (ioctl(state->d_fd, CIOCGSESSION, sess) == -1) {
451 close(state->d_fd);
452 state->d_fd = -1;
453 return (0);
454 }
455 return (1);
456}
457
458/*
459 * free anything we allocated earlier when initting a
460 * session, and close the session.
461 */
462static int
463cryptodev_cleanup(EVP_CIPHER_CTX *ctx)
464{
465 int ret = 0;
466 struct dev_crypto_state *state = ctx->cipher_data;
467 struct session_op *sess = &state->d_sess;
468
469 if (state->d_fd < 0)
470 return (0);
471
472 /* XXX if this ioctl fails, someting's wrong. the invoker
473 * may have called us with a bogus ctx, or we could
474 * have a device that for whatever reason just doesn't
475 * want to play ball - it's not clear what's right
476 * here - should this be an error? should it just
477 * increase a counter, hmm. For right now, we return
478 * 0 - I don't believe that to be "right". we could
479 * call the gorpy openssl lib error handlers that
480 * print messages to users of the library. hmm..
481 */
482
483 if (ioctl(state->d_fd, CIOCFSESSION, &sess->ses) == -1) {
484 ret = 0;
485 } else {
486 ret = 1;
487 }
488 close(state->d_fd);
489 state->d_fd = -1;
490
491 return (ret);
492}
493
494/*
495 * libcrypto EVP stuff - this is how we get wired to EVP so the engine
496 * gets called when libcrypto requests a cipher NID.
497 */
498
499/* DES CBC EVP */
500const EVP_CIPHER cryptodev_des_cbc = {
501 NID_des_cbc,
502 8, 8, 8,
503 EVP_CIPH_CBC_MODE,
504 cryptodev_init_key,
505 cryptodev_cipher,
506 cryptodev_cleanup,
507 sizeof(struct dev_crypto_state),
508 EVP_CIPHER_set_asn1_iv,
509 EVP_CIPHER_get_asn1_iv,
510 NULL
511};
512
513/* 3DES CBC EVP */
514const EVP_CIPHER cryptodev_3des_cbc = {
515 NID_des_ede3_cbc,
516 8, 24, 8,
517 EVP_CIPH_CBC_MODE,
518 cryptodev_init_key,
519 cryptodev_cipher,
520 cryptodev_cleanup,
521 sizeof(struct dev_crypto_state),
522 EVP_CIPHER_set_asn1_iv,
523 EVP_CIPHER_get_asn1_iv,
524 NULL
525};
526
527const EVP_CIPHER cryptodev_bf_cbc = {
528 NID_bf_cbc,
529 8, 16, 8,
530 EVP_CIPH_CBC_MODE,
531 cryptodev_init_key,
532 cryptodev_cipher,
533 cryptodev_cleanup,
534 sizeof(struct dev_crypto_state),
535 EVP_CIPHER_set_asn1_iv,
536 EVP_CIPHER_get_asn1_iv,
537 NULL
538};
539
540const EVP_CIPHER cryptodev_cast_cbc = {
541 NID_cast5_cbc,
542 8, 16, 8,
543 EVP_CIPH_CBC_MODE,
544 cryptodev_init_key,
545 cryptodev_cipher,
546 cryptodev_cleanup,
547 sizeof(struct dev_crypto_state),
548 EVP_CIPHER_set_asn1_iv,
549 EVP_CIPHER_get_asn1_iv,
550 NULL
551};
552
553const EVP_CIPHER cryptodev_aes_cbc = {
554 NID_aes_128_cbc,
555 16, 16, 16,
556 EVP_CIPH_CBC_MODE,
557 cryptodev_init_key,
558 cryptodev_cipher,
559 cryptodev_cleanup,
560 sizeof(struct dev_crypto_state),
561 EVP_CIPHER_set_asn1_iv,
562 EVP_CIPHER_get_asn1_iv,
563 NULL
564};
565
566/*
567 * Registered by the ENGINE when used to find out how to deal with
568 * a particular NID in the ENGINE. this says what we'll do at the
569 * top level - note, that list is restricted by what we answer with
570 */
571static int
572cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
573 const int **nids, int nid)
574{
575 if (!cipher)
576 return (cryptodev_usable_ciphers(nids));
577
578 switch (nid) {
579 case NID_des_ede3_cbc:
580 *cipher = &cryptodev_3des_cbc;
581 break;
582 case NID_des_cbc:
583 *cipher = &cryptodev_des_cbc;
584 break;
585 case NID_bf_cbc:
586 *cipher = &cryptodev_bf_cbc;
587 break;
588 case NID_cast5_cbc:
589 *cipher = &cryptodev_cast_cbc;
590 break;
591 case NID_aes_128_cbc:
592 *cipher = &cryptodev_aes_cbc;
593 break;
594 default:
595 *cipher = NULL;
596 break;
597 }
598 return (*cipher != NULL);
599}
600
601static int
602cryptodev_engine_digests(ENGINE *e, const EVP_MD **digest,
603 const int **nids, int nid)
604{
605 if (!digest)
606 return (cryptodev_usable_digests(nids));
607
608 switch (nid) {
609 case NID_md5:
610 *digest = NULL; /* need to make a clean md5 critter */
611 break;
612 default:
613 *digest = NULL;
614 break;
615 }
616 return (*digest != NULL);
617}
618
619/*
620 * Convert a BIGNUM to the representation that /dev/crypto needs.
621 * Upon completion of use, the caller is responsible for freeing
622 * crp->crp_p.
623 */
624static int
625bn2crparam(const BIGNUM *a, struct crparam *crp)
626{
627 int i, j, k;
628 ssize_t words, bytes, bits;
629 u_char *b;
630
631 crp->crp_p = NULL;
632 crp->crp_nbits = 0;
633
634 bits = BN_num_bits(a);
635 bytes = (bits + 7) / 8;
636
637 b = malloc(bytes);
638 if (b == NULL)
639 return (1);
640
641 crp->crp_p = b;
642 crp->crp_nbits = bits;
643
644 for (i = 0, j = 0; i < a->top; i++) {
645 for (k = 0; k < BN_BITS2 / 8; k++) {
646 if ((j + k) >= bytes)
647 return (0);
648 b[j + k] = a->d[i] >> (k * 8);
649 }
650 j += BN_BITS2 / 8;
651 }
652 return (0);
653}
654
655/* Convert a /dev/crypto parameter to a BIGNUM */
656static int
657crparam2bn(struct crparam *crp, BIGNUM *a)
658{
659 u_int8_t *pd;
660 int i, bytes;
661
662 bytes = (crp->crp_nbits + 7) / 8;
663
664 if (bytes == 0)
665 return (-1);
666
667 if ((pd = (u_int8_t *) malloc(bytes)) == NULL)
668 return (-1);
669
670 for (i = 0; i < bytes; i++)
671 pd[i] = crp->crp_p[bytes - i - 1];
672
673 BN_bin2bn(pd, bytes, a);
674 free(pd);
675
676 return (0);
677}
678
679static void
680zapparams(struct crypt_kop *kop)
681{
682 int i;
683
684 for (i = 0; i <= kop->crk_iparams + kop->crk_oparams; i++) {
685 if (kop->crk_param[i].crp_p)
686 free(kop->crk_param[i].crp_p);
687 kop->crk_param[i].crp_p = NULL;
688 kop->crk_param[i].crp_nbits = 0;
689 }
690}
691
692static int
693cryptodev_asym(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen, BIGNUM *s)
694{
695 int fd, ret = -1;
696
697 if ((fd = get_asym_dev_crypto()) < 0)
698 return (ret);
699
700 if (r) {
701 kop->crk_param[kop->crk_iparams].crp_p = calloc(rlen, sizeof(char));
702 kop->crk_param[kop->crk_iparams].crp_nbits = rlen * 8;
703 kop->crk_oparams++;
704 }
705 if (s) {
706 kop->crk_param[kop->crk_iparams+1].crp_p = calloc(slen, sizeof(char));
707 kop->crk_param[kop->crk_iparams+1].crp_nbits = slen * 8;
708 kop->crk_oparams++;
709 }
710
711 if (ioctl(fd, CIOCKEY, kop) == 0) {
712 if (r)
713 crparam2bn(&kop->crk_param[kop->crk_iparams], r);
714 if (s)
715 crparam2bn(&kop->crk_param[kop->crk_iparams+1], s);
716 ret = 0;
717 }
718
719 return (ret);
720}
721
722static int
723cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
724 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont)
725{
726 struct crypt_kop kop;
727 int ret = 1;
728
729 /* Currently, we know we can do mod exp iff we can do any
730 * asymmetric operations at all.
731 */
732 if (cryptodev_asymfeat == 0) {
733 ret = BN_mod_exp(r, a, p, m, ctx);
734 return (ret);
735 }
736
737 memset(&kop, 0, sizeof kop);
738 kop.crk_op = CRK_MOD_EXP;
739
740 /* inputs: a^p % m */
741 if (bn2crparam(a, &kop.crk_param[0]))
742 goto err;
743 if (bn2crparam(p, &kop.crk_param[1]))
744 goto err;
745 if (bn2crparam(m, &kop.crk_param[2]))
746 goto err;
747 kop.crk_iparams = 3;
748
749 if (cryptodev_asym(&kop, BN_num_bytes(m), r, 0, NULL) == -1) {
750 const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
751 ret = meth->bn_mod_exp(r, a, p, m, ctx, in_mont);
752 }
753err:
754 zapparams(&kop);
755 return (ret);
756}
757
758static int
759cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
760{
761 int r;
762 BN_CTX *ctx;
763
764 ctx = BN_CTX_new();
765 r = cryptodev_bn_mod_exp(r0, I, rsa->d, rsa->n, ctx, NULL);
766 BN_CTX_free(ctx);
767 return (r);
768}
769
770static int
771cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
772{
773 struct crypt_kop kop;
774 int ret = 1;
775
776 if (!rsa->p || !rsa->q || !rsa->dmp1 || !rsa->dmq1 || !rsa->iqmp) {
777 /* XXX 0 means failure?? */
778 return (0);
779 }
780
781 memset(&kop, 0, sizeof kop);
782 kop.crk_op = CRK_MOD_EXP_CRT;
783 /* inputs: rsa->p rsa->q I rsa->dmp1 rsa->dmq1 rsa->iqmp */
784 if (bn2crparam(rsa->p, &kop.crk_param[0]))
785 goto err;
786 if (bn2crparam(rsa->q, &kop.crk_param[1]))
787 goto err;
788 if (bn2crparam(I, &kop.crk_param[2]))
789 goto err;
790 if (bn2crparam(rsa->dmp1, &kop.crk_param[3]))
791 goto err;
792 if (bn2crparam(rsa->dmq1, &kop.crk_param[4]))
793 goto err;
794 if (bn2crparam(rsa->iqmp, &kop.crk_param[5]))
795 goto err;
796 kop.crk_iparams = 6;
797
798 if (cryptodev_asym(&kop, BN_num_bytes(rsa->n), r0, 0, NULL) == -1) {
799 const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
800 ret = (*meth->rsa_mod_exp)(r0, I, rsa, ctx);
801 }
802err:
803 zapparams(&kop);
804 return (ret);
805}
806
807static RSA_METHOD cryptodev_rsa = {
808 "cryptodev RSA method",
809 NULL, /* rsa_pub_enc */
810 NULL, /* rsa_pub_dec */
811 NULL, /* rsa_priv_enc */
812 NULL, /* rsa_priv_dec */
813 NULL,
814 NULL,
815 NULL, /* init */
816 NULL, /* finish */
817 0, /* flags */
818 NULL, /* app_data */
819 NULL, /* rsa_sign */
820 NULL /* rsa_verify */
821};
822
823static int
824cryptodev_dsa_bn_mod_exp(DSA *dsa, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
825 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
826{
827 return (cryptodev_bn_mod_exp(r, a, p, m, ctx, m_ctx));
828}
829
830static int
831cryptodev_dsa_dsa_mod_exp(DSA *dsa, BIGNUM *t1, BIGNUM *g,
832 BIGNUM *u1, BIGNUM *pub_key, BIGNUM *u2, BIGNUM *p,
833 BN_CTX *ctx, BN_MONT_CTX *mont)
834{
835 BIGNUM t2;
836 int ret = 0;
837
838 BN_init(&t2);
839
840 /* v = ( g^u1 * y^u2 mod p ) mod q */
841 /* let t1 = g ^ u1 mod p */
842 ret = 0;
843
844 if (!dsa->meth->bn_mod_exp(dsa,t1,dsa->g,u1,dsa->p,ctx,mont))
845 goto err;
846
847 /* let t2 = y ^ u2 mod p */
848 if (!dsa->meth->bn_mod_exp(dsa,&t2,dsa->pub_key,u2,dsa->p,ctx,mont))
849 goto err;
850 /* let u1 = t1 * t2 mod p */
851 if (!BN_mod_mul(u1,t1,&t2,dsa->p,ctx))
852 goto err;
853
854 BN_copy(t1,u1);
855
856 ret = 1;
857err:
858 BN_free(&t2);
859 return(ret);
860}
861
862static DSA_SIG *
863cryptodev_dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
864{
865 struct crypt_kop kop;
866 BIGNUM *r = NULL, *s = NULL;
867 DSA_SIG *dsaret = NULL;
868
869 if ((r = BN_new()) == NULL)
870 goto err;
871 if ((s = BN_new()) == NULL) {
872 BN_free(r);
873 goto err;
874 }
875
876 memset(&kop, 0, sizeof kop);
877 kop.crk_op = CRK_DSA_SIGN;
878
879 /* inputs: dgst dsa->p dsa->q dsa->g dsa->priv_key */
880 kop.crk_param[0].crp_p = (caddr_t)dgst;
881 kop.crk_param[0].crp_nbits = dlen * 8;
882 if (bn2crparam(dsa->p, &kop.crk_param[1]))
883 goto err;
884 if (bn2crparam(dsa->q, &kop.crk_param[2]))
885 goto err;
886 if (bn2crparam(dsa->g, &kop.crk_param[3]))
887 goto err;
888 if (bn2crparam(dsa->priv_key, &kop.crk_param[4]))
889 goto err;
890 kop.crk_iparams = 5;
891
892 if (cryptodev_asym(&kop, BN_num_bytes(dsa->q), r,
893 BN_num_bytes(dsa->q), s) == 0) {
894 dsaret = DSA_SIG_new();
895 dsaret->r = r;
896 dsaret->s = s;
897 } else {
898 const DSA_METHOD *meth = DSA_OpenSSL();
899 BN_free(r);
900 BN_free(s);
901 dsaret = (meth->dsa_do_sign)(dgst, dlen, dsa);
902 }
903err:
904 kop.crk_param[0].crp_p = NULL;
905 zapparams(&kop);
906 return (dsaret);
907}
908
909static int
910cryptodev_dsa_verify(const unsigned char *dgst, int dlen,
911 DSA_SIG *sig, DSA *dsa)
912{
913 struct crypt_kop kop;
914 int dsaret = 1;
915
916 memset(&kop, 0, sizeof kop);
917 kop.crk_op = CRK_DSA_VERIFY;
918
919 /* inputs: dgst dsa->p dsa->q dsa->g dsa->pub_key sig->r sig->s */
920 kop.crk_param[0].crp_p = (caddr_t)dgst;
921 kop.crk_param[0].crp_nbits = dlen * 8;
922 if (bn2crparam(dsa->p, &kop.crk_param[1]))
923 goto err;
924 if (bn2crparam(dsa->q, &kop.crk_param[2]))
925 goto err;
926 if (bn2crparam(dsa->g, &kop.crk_param[3]))
927 goto err;
928 if (bn2crparam(dsa->pub_key, &kop.crk_param[4]))
929 goto err;
930 if (bn2crparam(sig->r, &kop.crk_param[5]))
931 goto err;
932 if (bn2crparam(sig->s, &kop.crk_param[6]))
933 goto err;
934 kop.crk_iparams = 7;
935
936 if (cryptodev_asym(&kop, 0, NULL, 0, NULL) == 0) {
937 dsaret = kop.crk_status;
938 } else {
939 const DSA_METHOD *meth = DSA_OpenSSL();
940
941 dsaret = (meth->dsa_do_verify)(dgst, dlen, sig, dsa);
942 }
943err:
944 kop.crk_param[0].crp_p = NULL;
945 zapparams(&kop);
946 return (dsaret);
947}
948
949static DSA_METHOD cryptodev_dsa = {
950 "cryptodev DSA method",
951 NULL,
952 NULL, /* dsa_sign_setup */
953 NULL,
954 NULL, /* dsa_mod_exp */
955 NULL,
956 NULL, /* init */
957 NULL, /* finish */
958 0, /* flags */
959 NULL /* app_data */
960};
961
962static int
963cryptodev_mod_exp_dh(const DH *dh, BIGNUM *r, const BIGNUM *a,
964 const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,
965 BN_MONT_CTX *m_ctx)
966{
967 return (cryptodev_bn_mod_exp(r, a, p, m, ctx, m_ctx));
968}
969
970static int
971cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
972{
973 struct crypt_kop kop;
974 int dhret = 1;
975 int fd, keylen;
976
977 if ((fd = get_asym_dev_crypto()) < 0) {
978 const DH_METHOD *meth = DH_OpenSSL();
979
980 return ((meth->compute_key)(key, pub_key, dh));
981 }
982
983 keylen = BN_num_bits(dh->p);
984
985 memset(&kop, 0, sizeof kop);
986 kop.crk_op = CRK_DH_COMPUTE_KEY;
987
988 /* inputs: dh->priv_key pub_key dh->p key */
989 if (bn2crparam(dh->priv_key, &kop.crk_param[0]))
990 goto err;
991 if (bn2crparam(pub_key, &kop.crk_param[1]))
992 goto err;
993 if (bn2crparam(dh->p, &kop.crk_param[2]))
994 goto err;
995 kop.crk_iparams = 3;
996
997 kop.crk_param[3].crp_p = key;
998 kop.crk_param[3].crp_nbits = keylen * 8;
999 kop.crk_oparams = 1;
1000
1001 if (ioctl(fd, CIOCKEY, &kop) == -1) {
1002 const DH_METHOD *meth = DH_OpenSSL();
1003
1004 dhret = (meth->compute_key)(key, pub_key, dh);
1005 }
1006err:
1007 kop.crk_param[3].crp_p = NULL;
1008 zapparams(&kop);
1009 return (dhret);
1010}
1011
1012static DH_METHOD cryptodev_dh = {
1013 "cryptodev DH method",
1014 NULL, /* cryptodev_dh_generate_key */
1015 NULL,
1016 NULL,
1017 NULL,
1018 NULL,
1019 0, /* flags */
1020 NULL /* app_data */
1021};
1022
1023/*
1024 * ctrl right now is just a wrapper that doesn't do much
1025 * but I expect we'll want some options soon.
1026 */
1027static int
1028cryptodev_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
1029{
1030#ifdef HAVE_SYSLOG_R
1031 struct syslog_data sd = SYSLOG_DATA_INIT;
1032#endif
1033
1034 switch (cmd) {
1035 default:
1036#ifdef HAVE_SYSLOG_R
1037 syslog_r(LOG_ERR, &sd,
1038 "cryptodev_ctrl: unknown command %d", cmd);
1039#else
1040 syslog(LOG_ERR, "cryptodev_ctrl: unknown command %d", cmd);
1041#endif
1042 break;
1043 }
1044 return (1);
1045}
1046
1047void
1048ENGINE_load_cryptodev(void)
1049{
1050 ENGINE *engine = ENGINE_new();
1051 int fd;
1052
1053 if (engine == NULL)
1054 return;
1055 if ((fd = get_dev_crypto()) < 0) {
1056 ENGINE_free(engine);
1057 return;
1058 }
1059
1060 /*
1061 * find out what asymmetric crypto algorithms we support
1062 */
1063 if (ioctl(fd, CIOCASYMFEAT, &cryptodev_asymfeat) == -1) {
1064 close(fd);
1065 ENGINE_free(engine);
1066 return;
1067 }
1068 close(fd);
1069
1070 if (!ENGINE_set_id(engine, "cryptodev") ||
1071 !ENGINE_set_name(engine, "BSD cryptodev engine") ||
1072 !ENGINE_set_ciphers(engine, cryptodev_engine_ciphers) ||
1073 !ENGINE_set_digests(engine, cryptodev_engine_digests) ||
1074 !ENGINE_set_ctrl_function(engine, cryptodev_ctrl) ||
1075 !ENGINE_set_cmd_defns(engine, cryptodev_defns)) {
1076 ENGINE_free(engine);
1077 return;
1078 }
1079
1080 if (ENGINE_set_RSA(engine, &cryptodev_rsa)) {
1081 const RSA_METHOD *rsa_meth = RSA_PKCS1_SSLeay();
1082
1083 cryptodev_rsa.bn_mod_exp = rsa_meth->bn_mod_exp;
1084 cryptodev_rsa.rsa_mod_exp = rsa_meth->rsa_mod_exp;
1085 cryptodev_rsa.rsa_pub_enc = rsa_meth->rsa_pub_enc;
1086 cryptodev_rsa.rsa_pub_dec = rsa_meth->rsa_pub_dec;
1087 cryptodev_rsa.rsa_priv_enc = rsa_meth->rsa_priv_enc;
1088 cryptodev_rsa.rsa_priv_dec = rsa_meth->rsa_priv_dec;
1089 if (cryptodev_asymfeat & CRF_MOD_EXP) {
1090 cryptodev_rsa.bn_mod_exp = cryptodev_bn_mod_exp;
1091 if (cryptodev_asymfeat & CRF_MOD_EXP_CRT)
1092 cryptodev_rsa.rsa_mod_exp =
1093 cryptodev_rsa_mod_exp;
1094 else
1095 cryptodev_rsa.rsa_mod_exp =
1096 cryptodev_rsa_nocrt_mod_exp;
1097 }
1098 }
1099
1100 if (ENGINE_set_DSA(engine, &cryptodev_dsa)) {
1101 const DSA_METHOD *meth = DSA_OpenSSL();
1102
1103 memcpy(&cryptodev_dsa, meth, sizeof(DSA_METHOD));
1104 if (cryptodev_asymfeat & CRF_DSA_SIGN)
1105 cryptodev_dsa.dsa_do_sign = cryptodev_dsa_do_sign;
1106 if (cryptodev_asymfeat & CRF_MOD_EXP) {
1107 cryptodev_dsa.bn_mod_exp = cryptodev_dsa_bn_mod_exp;
1108 cryptodev_dsa.dsa_mod_exp = cryptodev_dsa_dsa_mod_exp;
1109 }
1110 if (cryptodev_asymfeat & CRF_DSA_VERIFY)
1111 cryptodev_dsa.dsa_do_verify = cryptodev_dsa_verify;
1112 }
1113
1114 if (ENGINE_set_DH(engine, &cryptodev_dh)){
1115 const DH_METHOD *dh_meth = DH_OpenSSL();
1116
1117 cryptodev_dh.generate_key = dh_meth->generate_key;
1118 cryptodev_dh.compute_key = dh_meth->compute_key;
1119 cryptodev_dh.bn_mod_exp = dh_meth->bn_mod_exp;
1120 if (cryptodev_asymfeat & CRF_MOD_EXP) {
1121 cryptodev_dh.bn_mod_exp = cryptodev_mod_exp_dh;
1122 if (cryptodev_asymfeat & CRF_DH_COMPUTE_KEY)
1123 cryptodev_dh.compute_key =
1124 cryptodev_dh_compute_key;
1125 }
1126 }
1127
1128 ENGINE_add(engine);
1129 ENGINE_free(engine);
1130 ERR_clear_error();
1131}
1132
1133#endif /* HAVE_CRYPTODEV */
diff --git a/src/lib/libcrypto/engine/enginetest.c b/src/lib/libcrypto/engine/enginetest.c
index c2d0297392..cf82f490db 100644
--- a/src/lib/libcrypto/engine/enginetest.c
+++ b/src/lib/libcrypto/engine/enginetest.c
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
72#include <openssl/engine.h> 72#include <openssl/engine.h>
73#include <openssl/err.h> 73#include <openssl/err.h>
74 74
75static void display_engine_list() 75static void display_engine_list(void)
76 { 76 {
77 ENGINE *h; 77 ENGINE *h;
78 int loop; 78 int loop;
diff --git a/src/lib/libcrypto/err/Makefile b/src/lib/libcrypto/err/Makefile
index 4adec55302..23e38409c8 100644
--- a/src/lib/libcrypto/err/Makefile
+++ b/src/lib/libcrypto/err/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include 8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -51,6 +46,7 @@ links:
51 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 46 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
52 47
53install: 48install:
49 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
54 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 50 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
55 do \ 51 do \
56 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 52 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -66,6 +62,7 @@ lint:
66 lint -DLINT $(INCLUDES) $(SRC)>fluff 62 lint -DLINT $(INCLUDES) $(SRC)>fluff
67 63
68depend: 64depend:
65 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
69 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 66 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
70 67
71dclean: 68dclean:
@@ -81,38 +78,32 @@ err.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/buffer.h
81err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 78err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
82err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 79err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
83err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 80err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
84err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 81err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
85err.o: ../../include/openssl/symhacks.h ../cryptlib.h err.c 82err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
86err_all.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h 83err.o: ../cryptlib.h err.c
87err_all.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 84err_all.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
88err_all.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 85err_all.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
89err_all.o: ../../include/openssl/cast.h ../../include/openssl/conf.h 86err_all.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
90err_all.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 87err_all.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
91err_all.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h 88err_all.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
92err_all.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h 89err_all.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
93err_all.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h 90err_all.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
94err_all.o: ../../include/openssl/engine.h ../../include/openssl/err.h 91err_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h
95err_all.o: ../../include/openssl/evp.h ../../include/openssl/fips.h 92err_all.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
96err_all.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 93err_all.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
97err_all.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 94err_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
98err_all.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h 95err_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem2.h
99err_all.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 96err_all.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
100err_all.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h 97err_all.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
101err_all.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 98err_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
102err_all.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h 99err_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
103err_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h 100err_all.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
104err_all.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
105err_all.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
106err_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
107err_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
108err_all.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
109err_all.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
110err_all.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h 101err_all.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
111err_all.o: err_all.c 102err_all.o: err_all.c
112err_prn.o: ../../e_os.h ../../include/openssl/bio.h 103err_prn.o: ../../e_os.h ../../include/openssl/bio.h
113err_prn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 104err_prn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
114err_prn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 105err_prn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
115err_prn.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 106err_prn.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
116err_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 107err_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
117err_prn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 108err_prn.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
118err_prn.o: ../cryptlib.h err_prn.c 109err_prn.o: ../../include/openssl/symhacks.h ../cryptlib.h err_prn.c
diff --git a/src/lib/libcrypto/evp/Makefile b/src/lib/libcrypto/evp/Makefile
index d1c2a272bb..8f2555c7e5 100644
--- a/src/lib/libcrypto/evp/Makefile
+++ b/src/lib/libcrypto/evp/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include 8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -24,11 +19,11 @@ APPS=
24 19
25LIB=$(TOP)/libcrypto.a 20LIB=$(TOP)/libcrypto.a
26LIBSRC= encode.c digest.c evp_enc.c evp_key.c evp_acnf.c \ 21LIBSRC= encode.c digest.c evp_enc.c evp_key.c evp_acnf.c \
27 e_des.c e_bf.c e_idea.c e_des3.c \ 22 e_des.c e_bf.c e_idea.c e_des3.c e_camellia.c\
28 e_rc4.c e_aes.c names.c \ 23 e_rc4.c e_aes.c names.c e_seed.c \
29 e_xcbc_d.c e_rc2.c e_cast.c e_rc5.c \ 24 e_xcbc_d.c e_rc2.c e_cast.c e_rc5.c \
30 m_null.c m_md2.c m_md4.c m_md5.c m_sha.c m_sha1.c \ 25 m_null.c m_md2.c m_md4.c m_md5.c m_sha.c m_sha1.c \
31 m_dss.c m_dss1.c m_mdc2.c m_ripemd.c \ 26 m_dss.c m_dss1.c m_mdc2.c m_ripemd.c m_ecdsa.c\
32 p_open.c p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c p_dec.c \ 27 p_open.c p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c p_dec.c \
33 bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c \ 28 bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c \
34 c_all.c c_allc.c c_alld.c evp_lib.c bio_ok.c \ 29 c_all.c c_allc.c c_alld.c evp_lib.c bio_ok.c \
@@ -36,11 +31,11 @@ LIBSRC= encode.c digest.c evp_enc.c evp_key.c evp_acnf.c \
36 e_old.c 31 e_old.c
37 32
38LIBOBJ= encode.o digest.o evp_enc.o evp_key.o evp_acnf.o \ 33LIBOBJ= encode.o digest.o evp_enc.o evp_key.o evp_acnf.o \
39 e_des.o e_bf.o e_idea.o e_des3.o \ 34 e_des.o e_bf.o e_idea.o e_des3.o e_camellia.o\
40 e_rc4.o e_aes.o names.o \ 35 e_rc4.o e_aes.o names.o e_seed.o \
41 e_xcbc_d.o e_rc2.o e_cast.o e_rc5.o \ 36 e_xcbc_d.o e_rc2.o e_cast.o e_rc5.o \
42 m_null.o m_md2.o m_md4.o m_md5.o m_sha.o m_sha1.o \ 37 m_null.o m_md2.o m_md4.o m_md5.o m_sha.o m_sha1.o \
43 m_dss.o m_dss1.o m_mdc2.o m_ripemd.o \ 38 m_dss.o m_dss1.o m_mdc2.o m_ripemd.o m_ecdsa.o\
44 p_open.o p_seal.o p_sign.o p_verify.o p_lib.o p_enc.o p_dec.o \ 39 p_open.o p_seal.o p_sign.o p_verify.o p_lib.o p_enc.o p_dec.o \
45 bio_md.o bio_b64.o bio_enc.o evp_err.o e_null.o \ 40 bio_md.o bio_b64.o bio_enc.o evp_err.o e_null.o \
46 c_all.o c_allc.o c_alld.o evp_lib.o bio_ok.o \ 41 c_all.o c_allc.o c_alld.o evp_lib.o bio_ok.o \
@@ -74,6 +69,7 @@ links:
74 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 69 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
75 70
76install: 71install:
72 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
77 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 73 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
78 do \ 74 do \
79 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 75 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -89,6 +85,7 @@ lint:
89 lint -DLINT $(INCLUDES) $(SRC)>fluff 85 lint -DLINT $(INCLUDES) $(SRC)>fluff
90 86
91depend: 87depend:
88 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
92 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC) 89 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
93 90
94dclean: 91dclean:
@@ -100,977 +97,550 @@ clean:
100 97
101# DO NOT DELETE THIS LINE -- make depend depends on it. 98# DO NOT DELETE THIS LINE -- make depend depends on it.
102 99
103bio_b64.o: ../../e_os.h ../../include/openssl/aes.h 100bio_b64.o: ../../e_os.h ../../include/openssl/asn1.h
104bio_b64.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 101bio_b64.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
105bio_b64.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 102bio_b64.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
106bio_b64.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
107bio_b64.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
108bio_b64.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
109bio_b64.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
110bio_b64.o: ../../include/openssl/err.h ../../include/openssl/evp.h 103bio_b64.o: ../../include/openssl/err.h ../../include/openssl/evp.h
111bio_b64.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 104bio_b64.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
112bio_b64.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 105bio_b64.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
113bio_b64.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h 106bio_b64.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
114bio_b64.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 107bio_b64.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
115bio_b64.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 108bio_b64.o: ../../include/openssl/symhacks.h ../cryptlib.h bio_b64.c
116bio_b64.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rc2.h 109bio_enc.o: ../../e_os.h ../../include/openssl/asn1.h
117bio_b64.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 110bio_enc.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
118bio_b64.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 111bio_enc.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
119bio_b64.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
120bio_b64.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
121bio_b64.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
122bio_b64.o: ../cryptlib.h bio_b64.c
123bio_enc.o: ../../e_os.h ../../include/openssl/aes.h
124bio_enc.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
125bio_enc.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
126bio_enc.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
127bio_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
128bio_enc.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
129bio_enc.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
130bio_enc.o: ../../include/openssl/err.h ../../include/openssl/evp.h 112bio_enc.o: ../../include/openssl/err.h ../../include/openssl/evp.h
131bio_enc.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 113bio_enc.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
132bio_enc.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 114bio_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
133bio_enc.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h 115bio_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
134bio_enc.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 116bio_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
135bio_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 117bio_enc.o: ../../include/openssl/symhacks.h ../cryptlib.h bio_enc.c
136bio_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rc2.h 118bio_md.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
137bio_enc.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 119bio_md.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
138bio_enc.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
139bio_enc.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
140bio_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
141bio_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
142bio_enc.o: ../cryptlib.h bio_enc.c
143bio_md.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h
144bio_md.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
145bio_md.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
146bio_md.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
147bio_md.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
148bio_md.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
149bio_md.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 120bio_md.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
150bio_md.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 121bio_md.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
151bio_md.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 122bio_md.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
152bio_md.o: ../../include/openssl/md4.h ../../include/openssl/md5.h 123bio_md.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
153bio_md.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h 124bio_md.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
154bio_md.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 125bio_md.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
155bio_md.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 126bio_md.o: ../cryptlib.h bio_md.c
156bio_md.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 127bio_ok.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
157bio_md.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 128bio_ok.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
158bio_md.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
159bio_md.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
160bio_md.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
161bio_md.o: ../../include/openssl/ui_compat.h ../cryptlib.h bio_md.c
162bio_ok.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h
163bio_ok.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
164bio_ok.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
165bio_ok.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
166bio_ok.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
167bio_ok.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
168bio_ok.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 129bio_ok.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
169bio_ok.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 130bio_ok.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
170bio_ok.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 131bio_ok.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
171bio_ok.o: ../../include/openssl/md4.h ../../include/openssl/md5.h 132bio_ok.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
172bio_ok.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h 133bio_ok.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
173bio_ok.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 134bio_ok.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
174bio_ok.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 135bio_ok.o: ../../include/openssl/symhacks.h ../cryptlib.h bio_ok.c
175bio_ok.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h 136c_all.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
176bio_ok.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 137c_all.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
177bio_ok.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
178bio_ok.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
179bio_ok.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
180bio_ok.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
181bio_ok.o: ../cryptlib.h bio_ok.c
182c_all.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h
183c_all.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
184c_all.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
185c_all.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
186c_all.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
187c_all.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
188c_all.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h 138c_all.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
189c_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h 139c_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h
190c_all.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 140c_all.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
191c_all.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 141c_all.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
192c_all.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h 142c_all.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
193c_all.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 143c_all.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
194c_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 144c_all.o: ../../include/openssl/symhacks.h ../cryptlib.h c_all.c
195c_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h 145c_allc.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
196c_all.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 146c_allc.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
197c_all.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 147c_allc.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
198c_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 148c_allc.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
199c_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 149c_allc.o: ../../include/openssl/err.h ../../include/openssl/evp.h
200c_all.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 150c_allc.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
201c_all.o: ../../include/openssl/ui_compat.h ../cryptlib.h c_all.c
202c_allc.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h
203c_allc.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
204c_allc.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
205c_allc.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
206c_allc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
207c_allc.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
208c_allc.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
209c_allc.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
210c_allc.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
211c_allc.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
212c_allc.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
213c_allc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 151c_allc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
214c_allc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 152c_allc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
215c_allc.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h 153c_allc.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
216c_allc.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 154c_allc.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
217c_allc.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 155c_allc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
218c_allc.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 156c_allc.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
219c_allc.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 157c_allc.o: ../cryptlib.h c_allc.c
220c_allc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 158c_alld.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
221c_allc.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 159c_alld.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
222c_allc.o: ../../include/openssl/x509_vfy.h ../cryptlib.h c_allc.c 160c_alld.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
223c_alld.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 161c_alld.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
224c_alld.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 162c_alld.o: ../../include/openssl/err.h ../../include/openssl/evp.h
225c_alld.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 163c_alld.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
226c_alld.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
227c_alld.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
228c_alld.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
229c_alld.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
230c_alld.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
231c_alld.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
232c_alld.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
233c_alld.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
234c_alld.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 164c_alld.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
235c_alld.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 165c_alld.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
236c_alld.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h 166c_alld.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
237c_alld.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 167c_alld.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
238c_alld.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 168c_alld.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
239c_alld.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 169c_alld.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
240c_alld.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 170c_alld.o: ../cryptlib.h c_alld.c
241c_alld.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 171digest.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
242c_alld.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 172digest.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
243c_alld.o: ../../include/openssl/x509_vfy.h ../cryptlib.h c_alld.c
244digest.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h
245digest.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
246digest.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
247digest.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
248digest.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
249digest.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
250digest.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h 173digest.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
251digest.o: ../../include/openssl/err.h ../../include/openssl/evp.h 174digest.o: ../../include/openssl/err.h ../../include/openssl/evp.h
252digest.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 175digest.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
253digest.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 176digest.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
254digest.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h 177digest.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
255digest.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 178digest.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
256digest.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 179digest.o: ../../include/openssl/symhacks.h ../cryptlib.h digest.c
257digest.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
258digest.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
259digest.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
260digest.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
261digest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
262digest.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
263digest.o: ../../include/openssl/ui_compat.h ../cryptlib.h digest.c
264e_aes.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h 180e_aes.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
265e_aes.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 181e_aes.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
266e_aes.o: ../../include/openssl/bn.h ../../include/openssl/cast.h 182e_aes.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
267e_aes.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 183e_aes.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
268e_aes.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
269e_aes.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
270e_aes.o: ../../include/openssl/err.h ../../include/openssl/evp.h
271e_aes.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
272e_aes.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
273e_aes.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
274e_aes.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 184e_aes.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
275e_aes.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 185e_aes.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
276e_aes.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rc2.h 186e_aes.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
277e_aes.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 187e_aes.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h e_aes.c
278e_aes.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
279e_aes.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
280e_aes.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
281e_aes.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h e_aes.c
282e_aes.o: evp_locl.h 188e_aes.o: evp_locl.h
283e_bf.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 189e_bf.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
284e_bf.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 190e_bf.o: ../../include/openssl/blowfish.h ../../include/openssl/buffer.h
285e_bf.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 191e_bf.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
286e_bf.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 192e_bf.o: ../../include/openssl/err.h ../../include/openssl/evp.h
287e_bf.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 193e_bf.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
288e_bf.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
289e_bf.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
290e_bf.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
291e_bf.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
292e_bf.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
293e_bf.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
294e_bf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 194e_bf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
295e_bf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 195e_bf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
296e_bf.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 196e_bf.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
297e_bf.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 197e_bf.o: ../../include/openssl/symhacks.h ../cryptlib.h e_bf.c evp_locl.h
298e_bf.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 198e_camellia.o: ../../include/openssl/opensslconf.h e_camellia.c
299e_bf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 199e_cast.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
300e_bf.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 200e_cast.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
301e_bf.o: ../../include/openssl/ui_compat.h ../cryptlib.h e_bf.c evp_locl.h 201e_cast.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
302e_cast.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 202e_cast.o: ../../include/openssl/err.h ../../include/openssl/evp.h
303e_cast.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 203e_cast.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
304e_cast.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
305e_cast.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
306e_cast.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
307e_cast.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
308e_cast.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
309e_cast.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
310e_cast.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
311e_cast.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
312e_cast.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
313e_cast.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 204e_cast.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
314e_cast.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 205e_cast.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
315e_cast.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 206e_cast.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
316e_cast.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 207e_cast.o: ../../include/openssl/symhacks.h ../cryptlib.h e_cast.c evp_locl.h
317e_cast.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 208e_des.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
318e_cast.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 209e_des.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
319e_cast.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
320e_cast.o: ../../include/openssl/ui_compat.h ../cryptlib.h e_cast.c evp_locl.h
321e_des.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h
322e_des.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
323e_des.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
324e_des.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
325e_des.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 210e_des.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
326e_des.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
327e_des.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 211e_des.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
328e_des.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 212e_des.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
329e_des.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 213e_des.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
330e_des.o: ../../include/openssl/md4.h ../../include/openssl/md5.h 214e_des.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
331e_des.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h 215e_des.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
332e_des.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 216e_des.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
333e_des.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
334e_des.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
335e_des.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
336e_des.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
337e_des.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
338e_des.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 217e_des.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
339e_des.o: ../../include/openssl/ui_compat.h ../cryptlib.h e_des.c evp_locl.h 218e_des.o: ../../include/openssl/ui_compat.h ../cryptlib.h e_des.c evp_locl.h
340e_des3.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 219e_des3.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
341e_des3.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 220e_des3.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
342e_des3.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
343e_des3.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
344e_des3.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 221e_des3.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
345e_des3.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
346e_des3.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 222e_des3.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
347e_des3.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 223e_des3.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
348e_des3.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 224e_des3.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
349e_des3.o: ../../include/openssl/md4.h ../../include/openssl/md5.h 225e_des3.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
350e_des3.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h 226e_des3.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
351e_des3.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 227e_des3.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
352e_des3.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
353e_des3.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
354e_des3.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
355e_des3.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
356e_des3.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
357e_des3.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 228e_des3.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
358e_des3.o: ../../include/openssl/ui_compat.h ../cryptlib.h e_des3.c evp_locl.h 229e_des3.o: ../../include/openssl/ui_compat.h ../cryptlib.h e_des3.c evp_locl.h
359e_idea.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 230e_idea.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
360e_idea.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 231e_idea.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
361e_idea.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
362e_idea.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
363e_idea.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
364e_idea.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
365e_idea.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 232e_idea.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
366e_idea.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 233e_idea.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
367e_idea.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 234e_idea.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
368e_idea.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
369e_idea.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
370e_idea.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 235e_idea.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
371e_idea.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 236e_idea.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
372e_idea.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 237e_idea.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
373e_idea.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 238e_idea.o: ../../include/openssl/symhacks.h ../cryptlib.h e_idea.c evp_locl.h
374e_idea.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 239e_null.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
375e_idea.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 240e_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
376e_idea.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
377e_idea.o: ../../include/openssl/ui_compat.h ../cryptlib.h e_idea.c evp_locl.h
378e_null.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h
379e_null.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
380e_null.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
381e_null.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
382e_null.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
383e_null.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
384e_null.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 241e_null.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
385e_null.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 242e_null.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
386e_null.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 243e_null.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
387e_null.o: ../../include/openssl/md4.h ../../include/openssl/md5.h 244e_null.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
388e_null.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h 245e_null.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
389e_null.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 246e_null.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
390e_null.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 247e_null.o: ../cryptlib.h e_null.c
391e_null.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 248e_old.o: e_old.c
392e_null.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 249e_rc2.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
393e_null.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 250e_rc2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
394e_null.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
395e_null.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
396e_null.o: ../../include/openssl/ui_compat.h ../cryptlib.h e_null.c
397e_old.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
398e_old.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
399e_old.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
400e_old.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
401e_old.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
402e_old.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
403e_old.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
404e_old.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
405e_old.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
406e_old.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
407e_old.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
408e_old.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rc2.h
409e_old.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
410e_old.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
411e_old.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
412e_old.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
413e_old.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h e_old.c
414e_rc2.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h
415e_rc2.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
416e_rc2.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
417e_rc2.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
418e_rc2.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
419e_rc2.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
420e_rc2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 251e_rc2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
421e_rc2.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 252e_rc2.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
422e_rc2.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 253e_rc2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
423e_rc2.o: ../../include/openssl/md4.h ../../include/openssl/md5.h 254e_rc2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
424e_rc2.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h 255e_rc2.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rc2.h
425e_rc2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 256e_rc2.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
426e_rc2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 257e_rc2.o: ../../include/openssl/symhacks.h ../cryptlib.h e_rc2.c evp_locl.h
427e_rc2.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 258e_rc4.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
428e_rc2.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 259e_rc4.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
429e_rc2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
430e_rc2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
431e_rc2.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
432e_rc2.o: ../../include/openssl/ui_compat.h ../cryptlib.h e_rc2.c evp_locl.h
433e_rc4.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h
434e_rc4.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
435e_rc4.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
436e_rc4.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
437e_rc4.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
438e_rc4.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
439e_rc4.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 260e_rc4.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
440e_rc4.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 261e_rc4.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
441e_rc4.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 262e_rc4.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
442e_rc4.o: ../../include/openssl/md4.h ../../include/openssl/md5.h 263e_rc4.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
443e_rc4.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h 264e_rc4.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rc4.h
444e_rc4.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 265e_rc4.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
445e_rc4.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 266e_rc4.o: ../../include/openssl/symhacks.h ../cryptlib.h e_rc4.c
446e_rc4.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 267e_rc5.o: ../../e_os.h ../../include/openssl/bio.h
447e_rc4.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 268e_rc5.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
448e_rc4.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
449e_rc4.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
450e_rc4.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
451e_rc4.o: ../../include/openssl/ui_compat.h ../cryptlib.h e_rc4.c evp_locl.h
452e_rc5.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h
453e_rc5.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
454e_rc5.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
455e_rc5.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
456e_rc5.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
457e_rc5.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
458e_rc5.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 269e_rc5.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
459e_rc5.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 270e_rc5.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
460e_rc5.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
461e_rc5.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
462e_rc5.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
463e_rc5.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
464e_rc5.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 271e_rc5.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
465e_rc5.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 272e_rc5.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
466e_rc5.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 273e_rc5.o: ../../include/openssl/symhacks.h ../cryptlib.h e_rc5.c
467e_rc5.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 274e_seed.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
468e_rc5.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 275e_seed.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
469e_rc5.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 276e_seed.o: ../../include/openssl/err.h ../../include/openssl/evp.h
470e_rc5.o: ../../include/openssl/ui_compat.h ../cryptlib.h e_rc5.c evp_locl.h 277e_seed.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
471e_xcbc_d.o: ../../e_os.h ../../include/openssl/aes.h 278e_seed.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
472e_xcbc_d.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 279e_seed.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
473e_xcbc_d.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 280e_seed.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
474e_xcbc_d.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 281e_seed.o: ../../include/openssl/symhacks.h e_seed.c
282e_xcbc_d.o: ../../e_os.h ../../include/openssl/asn1.h
283e_xcbc_d.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
475e_xcbc_d.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 284e_xcbc_d.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
476e_xcbc_d.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h 285e_xcbc_d.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
477e_xcbc_d.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
478e_xcbc_d.o: ../../include/openssl/err.h ../../include/openssl/evp.h 286e_xcbc_d.o: ../../include/openssl/err.h ../../include/openssl/evp.h
479e_xcbc_d.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 287e_xcbc_d.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
480e_xcbc_d.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 288e_xcbc_d.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
481e_xcbc_d.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
482e_xcbc_d.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
483e_xcbc_d.o: ../../include/openssl/opensslconf.h
484e_xcbc_d.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 289e_xcbc_d.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
485e_xcbc_d.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 290e_xcbc_d.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
486e_xcbc_d.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
487e_xcbc_d.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
488e_xcbc_d.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
489e_xcbc_d.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 291e_xcbc_d.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
490e_xcbc_d.o: ../../include/openssl/ui_compat.h ../cryptlib.h e_xcbc_d.c 292e_xcbc_d.o: ../../include/openssl/ui_compat.h ../cryptlib.h e_xcbc_d.c
491encode.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 293encode.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
492encode.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 294encode.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
493encode.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
494encode.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
495encode.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
496encode.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
497encode.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 295encode.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
498encode.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 296encode.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
499encode.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 297encode.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
500encode.o: ../../include/openssl/md4.h ../../include/openssl/md5.h 298encode.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
501encode.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h 299encode.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
502encode.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 300encode.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
503encode.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 301encode.o: ../cryptlib.h encode.c
504encode.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 302evp_acnf.o: ../../e_os.h ../../include/openssl/asn1.h
505encode.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 303evp_acnf.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
506encode.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
507encode.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
508encode.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
509encode.o: ../../include/openssl/ui_compat.h ../cryptlib.h encode.c
510evp_acnf.o: ../../e_os.h ../../include/openssl/aes.h
511evp_acnf.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
512evp_acnf.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
513evp_acnf.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
514evp_acnf.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 304evp_acnf.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
515evp_acnf.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
516evp_acnf.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
517evp_acnf.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 305evp_acnf.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
518evp_acnf.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 306evp_acnf.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
519evp_acnf.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 307evp_acnf.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
520evp_acnf.o: ../../include/openssl/md4.h ../../include/openssl/md5.h 308evp_acnf.o: ../../include/openssl/opensslconf.h
521evp_acnf.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
522evp_acnf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
523evp_acnf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 309evp_acnf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
524evp_acnf.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 310evp_acnf.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
525evp_acnf.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 311evp_acnf.o: ../../include/openssl/symhacks.h ../cryptlib.h evp_acnf.c
526evp_acnf.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 312evp_enc.o: ../../e_os.h ../../include/openssl/asn1.h
527evp_acnf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 313evp_enc.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
528evp_acnf.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 314evp_enc.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
529evp_acnf.o: ../../include/openssl/ui_compat.h ../cryptlib.h evp_acnf.c
530evp_enc.o: ../../e_os.h ../../include/openssl/aes.h
531evp_enc.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
532evp_enc.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
533evp_enc.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
534evp_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
535evp_enc.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
536evp_enc.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
537evp_enc.o: ../../include/openssl/engine.h ../../include/openssl/err.h 315evp_enc.o: ../../include/openssl/engine.h ../../include/openssl/err.h
538evp_enc.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 316evp_enc.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
539evp_enc.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 317evp_enc.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
540evp_enc.o: ../../include/openssl/md4.h ../../include/openssl/md5.h 318evp_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
541evp_enc.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h 319evp_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
542evp_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 320evp_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
543evp_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 321evp_enc.o: ../../include/openssl/symhacks.h ../cryptlib.h evp_enc.c evp_locl.h
544evp_enc.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h 322evp_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
545evp_enc.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 323evp_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
546evp_enc.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
547evp_enc.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
548evp_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
549evp_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
550evp_enc.o: ../cryptlib.h evp_enc.c evp_locl.h
551evp_err.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
552evp_err.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
553evp_err.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
554evp_err.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
555evp_err.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
556evp_err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
557evp_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h 324evp_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
558evp_err.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 325evp_err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
559evp_err.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 326evp_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
560evp_err.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h 327evp_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
561evp_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 328evp_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
562evp_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 329evp_err.o: ../../include/openssl/symhacks.h evp_err.c
563evp_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rc2.h 330evp_key.o: ../../e_os.h ../../include/openssl/asn1.h
564evp_err.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 331evp_key.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
565evp_err.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 332evp_key.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
566evp_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 333evp_key.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
567evp_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 334evp_key.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
568evp_err.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 335evp_key.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
569evp_err.o: evp_err.c
570evp_key.o: ../../e_os.h ../../include/openssl/aes.h
571evp_key.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
572evp_key.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
573evp_key.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
574evp_key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
575evp_key.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
576evp_key.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
577evp_key.o: ../../include/openssl/err.h ../../include/openssl/evp.h
578evp_key.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
579evp_key.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
580evp_key.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
581evp_key.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 336evp_key.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
582evp_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 337evp_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
583evp_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 338evp_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
584evp_key.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 339evp_key.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
585evp_key.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 340evp_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
586evp_key.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 341evp_key.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
587evp_key.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
588evp_key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
589evp_key.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
590evp_key.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_key.c 342evp_key.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_key.c
591evp_lib.o: ../../e_os.h ../../include/openssl/aes.h 343evp_lib.o: ../../e_os.h ../../include/openssl/asn1.h
592evp_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 344evp_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
593evp_lib.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 345evp_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
594evp_lib.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
595evp_lib.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
596evp_lib.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
597evp_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
598evp_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h 346evp_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
599evp_lib.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 347evp_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
600evp_lib.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 348evp_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
601evp_lib.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h 349evp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
602evp_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 350evp_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
603evp_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 351evp_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h evp_lib.c
604evp_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rc2.h 352evp_pbe.o: ../../e_os.h ../../include/openssl/asn1.h
605evp_lib.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 353evp_pbe.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
606evp_lib.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 354evp_pbe.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
607evp_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 355evp_pbe.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
608evp_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 356evp_pbe.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
609evp_lib.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 357evp_pbe.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
610evp_lib.o: ../cryptlib.h evp_lib.c
611evp_pbe.o: ../../e_os.h ../../include/openssl/aes.h
612evp_pbe.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
613evp_pbe.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
614evp_pbe.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
615evp_pbe.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
616evp_pbe.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
617evp_pbe.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
618evp_pbe.o: ../../include/openssl/err.h ../../include/openssl/evp.h
619evp_pbe.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
620evp_pbe.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
621evp_pbe.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
622evp_pbe.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 358evp_pbe.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
623evp_pbe.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 359evp_pbe.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
624evp_pbe.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 360evp_pbe.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
625evp_pbe.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 361evp_pbe.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
626evp_pbe.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 362evp_pbe.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
627evp_pbe.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 363evp_pbe.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
628evp_pbe.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 364evp_pbe.o: ../cryptlib.h evp_pbe.c
629evp_pbe.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 365evp_pkey.o: ../../e_os.h ../../include/openssl/asn1.h
630evp_pbe.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 366evp_pkey.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
631evp_pbe.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_pbe.c 367evp_pkey.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
632evp_pkey.o: ../../e_os.h ../../include/openssl/aes.h
633evp_pkey.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
634evp_pkey.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
635evp_pkey.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
636evp_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
637evp_pkey.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
638evp_pkey.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h 368evp_pkey.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
639evp_pkey.o: ../../include/openssl/err.h ../../include/openssl/evp.h 369evp_pkey.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
640evp_pkey.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 370evp_pkey.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
641evp_pkey.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 371evp_pkey.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
642evp_pkey.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
643evp_pkey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 372evp_pkey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
644evp_pkey.o: ../../include/openssl/opensslconf.h 373evp_pkey.o: ../../include/openssl/opensslconf.h
645evp_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 374evp_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
646evp_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h 375evp_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
647evp_pkey.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
648evp_pkey.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
649evp_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 376evp_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
650evp_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 377evp_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
651evp_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 378evp_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
652evp_pkey.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
653evp_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_pkey.c 379evp_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_pkey.c
654m_dss.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 380m_dss.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
655m_dss.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 381m_dss.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
656m_dss.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 382m_dss.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
657m_dss.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 383m_dss.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
658m_dss.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 384m_dss.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
659m_dss.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 385m_dss.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
660m_dss.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 386m_dss.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
661m_dss.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 387m_dss.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
662m_dss.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 388m_dss.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
663m_dss.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
664m_dss.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
665m_dss.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
666m_dss.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
667m_dss.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
668m_dss.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
669m_dss.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
670m_dss.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 389m_dss.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
671m_dss.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 390m_dss.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
672m_dss.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
673m_dss.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 391m_dss.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
674m_dss.o: ../cryptlib.h m_dss.c 392m_dss.o: ../cryptlib.h m_dss.c
675m_dss1.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 393m_dss1.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
676m_dss1.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 394m_dss1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
677m_dss1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 395m_dss1.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
678m_dss1.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 396m_dss1.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
679m_dss1.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 397m_dss1.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
680m_dss1.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 398m_dss1.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
681m_dss1.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 399m_dss1.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
682m_dss1.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 400m_dss1.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
683m_dss1.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 401m_dss1.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
684m_dss1.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
685m_dss1.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
686m_dss1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
687m_dss1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
688m_dss1.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
689m_dss1.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
690m_dss1.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
691m_dss1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 402m_dss1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
692m_dss1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 403m_dss1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
693m_dss1.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
694m_dss1.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 404m_dss1.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
695m_dss1.o: ../cryptlib.h m_dss1.c 405m_dss1.o: ../cryptlib.h m_dss1.c
696m_md2.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 406m_ecdsa.o: ../../e_os.h ../../include/openssl/asn1.h
697m_md2.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 407m_ecdsa.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
698m_md2.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 408m_ecdsa.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
699m_md2.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 409m_ecdsa.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
700m_md2.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 410m_ecdsa.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
701m_md2.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 411m_ecdsa.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
702m_md2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 412m_ecdsa.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
703m_md2.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 413m_ecdsa.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
414m_ecdsa.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
415m_ecdsa.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
416m_ecdsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
417m_ecdsa.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
418m_ecdsa.o: ../cryptlib.h m_ecdsa.c
419m_md2.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
420m_md2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
421m_md2.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
422m_md2.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
423m_md2.o: ../../include/openssl/err.h ../../include/openssl/evp.h
704m_md2.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 424m_md2.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
705m_md2.o: ../../include/openssl/md4.h ../../include/openssl/md5.h 425m_md2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
706m_md2.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h 426m_md2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
707m_md2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 427m_md2.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
708m_md2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 428m_md2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
709m_md2.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 429m_md2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
710m_md2.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 430m_md2.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
711m_md2.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 431m_md2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_md2.c
712m_md2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 432m_md4.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
713m_md2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 433m_md4.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
714m_md2.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 434m_md4.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
715m_md2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 435m_md4.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
716m_md2.o: ../cryptlib.h evp_locl.h m_md2.c 436m_md4.o: ../../include/openssl/err.h ../../include/openssl/evp.h
717m_md4.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 437m_md4.o: ../../include/openssl/lhash.h ../../include/openssl/md4.h
718m_md4.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 438m_md4.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
719m_md4.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 439m_md4.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
720m_md4.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 440m_md4.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
721m_md4.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 441m_md4.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
722m_md4.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 442m_md4.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
723m_md4.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 443m_md4.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
724m_md4.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 444m_md4.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_md4.c
725m_md4.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 445m_md5.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
726m_md4.o: ../../include/openssl/md4.h ../../include/openssl/md5.h 446m_md5.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
727m_md4.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h 447m_md5.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
728m_md4.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 448m_md5.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
729m_md4.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 449m_md5.o: ../../include/openssl/err.h ../../include/openssl/evp.h
730m_md4.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 450m_md5.o: ../../include/openssl/lhash.h ../../include/openssl/md5.h
731m_md4.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 451m_md5.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
732m_md4.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 452m_md5.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
733m_md4.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 453m_md5.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
734m_md4.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 454m_md5.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
735m_md4.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 455m_md5.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
736m_md4.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 456m_md5.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
737m_md4.o: ../cryptlib.h evp_locl.h m_md4.c 457m_md5.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_md5.c
738m_md5.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 458m_mdc2.o: ../../e_os.h ../../include/openssl/bio.h
739m_md5.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 459m_mdc2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
740m_md5.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
741m_md5.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
742m_md5.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
743m_md5.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
744m_md5.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
745m_md5.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
746m_md5.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
747m_md5.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
748m_md5.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
749m_md5.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
750m_md5.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
751m_md5.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
752m_md5.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
753m_md5.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
754m_md5.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
755m_md5.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
756m_md5.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
757m_md5.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
758m_md5.o: ../cryptlib.h evp_locl.h m_md5.c
759m_mdc2.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h
760m_mdc2.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
761m_mdc2.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
762m_mdc2.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
763m_mdc2.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
764m_mdc2.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
765m_mdc2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 460m_mdc2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
766m_mdc2.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 461m_mdc2.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
767m_mdc2.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
768m_mdc2.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
769m_mdc2.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
770m_mdc2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
771m_mdc2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 462m_mdc2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
772m_mdc2.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 463m_mdc2.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
773m_mdc2.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 464m_mdc2.o: ../../include/openssl/symhacks.h ../cryptlib.h m_mdc2.c
774m_mdc2.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 465m_null.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
775m_mdc2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 466m_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
776m_mdc2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 467m_null.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
777m_mdc2.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 468m_null.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
778m_mdc2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 469m_null.o: ../../include/openssl/err.h ../../include/openssl/evp.h
779m_mdc2.o: ../cryptlib.h evp_locl.h m_mdc2.c 470m_null.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
780m_null.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h
781m_null.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
782m_null.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
783m_null.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
784m_null.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
785m_null.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
786m_null.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
787m_null.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
788m_null.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
789m_null.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
790m_null.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
791m_null.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 471m_null.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
792m_null.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 472m_null.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
793m_null.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 473m_null.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
794m_null.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 474m_null.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
795m_null.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 475m_null.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
796m_null.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 476m_null.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_null.c
797m_null.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 477m_ripemd.o: ../../e_os.h ../../include/openssl/asn1.h
798m_null.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 478m_ripemd.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
799m_null.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 479m_ripemd.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
800m_null.o: ../cryptlib.h m_null.c 480m_ripemd.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
801m_ripemd.o: ../../e_os.h ../../include/openssl/aes.h 481m_ripemd.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
802m_ripemd.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 482m_ripemd.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
803m_ripemd.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
804m_ripemd.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
805m_ripemd.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
806m_ripemd.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
807m_ripemd.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
808m_ripemd.o: ../../include/openssl/err.h ../../include/openssl/evp.h
809m_ripemd.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
810m_ripemd.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
811m_ripemd.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
812m_ripemd.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 483m_ripemd.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
813m_ripemd.o: ../../include/openssl/opensslconf.h 484m_ripemd.o: ../../include/openssl/opensslconf.h
814m_ripemd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 485m_ripemd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
815m_ripemd.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 486m_ripemd.o: ../../include/openssl/pkcs7.h ../../include/openssl/ripemd.h
816m_ripemd.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 487m_ripemd.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
817m_ripemd.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 488m_ripemd.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
818m_ripemd.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 489m_ripemd.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
819m_ripemd.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 490m_ripemd.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_ripemd.c
820m_ripemd.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 491m_sha.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
821m_ripemd.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 492m_sha.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
822m_ripemd.o: ../cryptlib.h m_ripemd.c 493m_sha.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
823m_sha.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 494m_sha.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
824m_sha.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 495m_sha.o: ../../include/openssl/err.h ../../include/openssl/evp.h
825m_sha.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 496m_sha.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
826m_sha.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
827m_sha.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
828m_sha.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
829m_sha.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
830m_sha.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
831m_sha.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
832m_sha.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
833m_sha.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
834m_sha.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 497m_sha.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
835m_sha.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 498m_sha.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
836m_sha.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 499m_sha.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
837m_sha.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
838m_sha.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
839m_sha.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 500m_sha.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
840m_sha.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 501m_sha.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
841m_sha.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
842m_sha.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 502m_sha.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
843m_sha.o: ../cryptlib.h evp_locl.h m_sha.c 503m_sha.o: ../cryptlib.h m_sha.c
844m_sha1.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 504m_sha1.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
845m_sha1.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 505m_sha1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
846m_sha1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 506m_sha1.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
847m_sha1.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 507m_sha1.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
848m_sha1.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 508m_sha1.o: ../../include/openssl/err.h ../../include/openssl/evp.h
849m_sha1.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 509m_sha1.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
850m_sha1.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
851m_sha1.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
852m_sha1.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
853m_sha1.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
854m_sha1.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
855m_sha1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 510m_sha1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
856m_sha1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 511m_sha1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
857m_sha1.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 512m_sha1.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
858m_sha1.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
859m_sha1.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
860m_sha1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 513m_sha1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
861m_sha1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 514m_sha1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
862m_sha1.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
863m_sha1.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 515m_sha1.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
864m_sha1.o: ../cryptlib.h m_sha1.c 516m_sha1.o: ../cryptlib.h m_sha1.c
865names.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 517names.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
866names.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 518names.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
867names.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 519names.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
868names.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 520names.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
869names.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 521names.o: ../../include/openssl/err.h ../../include/openssl/evp.h
870names.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 522names.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
871names.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
872names.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
873names.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
874names.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
875names.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
876names.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 523names.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
877names.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 524names.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
878names.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 525names.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
879names.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 526names.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
880names.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 527names.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
881names.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 528names.o: ../../include/openssl/x509_vfy.h ../cryptlib.h names.c
882names.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 529p5_crpt.o: ../../e_os.h ../../include/openssl/asn1.h
883names.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 530p5_crpt.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
884names.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 531p5_crpt.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
885names.o: ../cryptlib.h names.c 532p5_crpt.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
886p5_crpt.o: ../../e_os.h ../../include/openssl/aes.h 533p5_crpt.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
887p5_crpt.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 534p5_crpt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
888p5_crpt.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
889p5_crpt.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
890p5_crpt.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
891p5_crpt.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
892p5_crpt.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
893p5_crpt.o: ../../include/openssl/err.h ../../include/openssl/evp.h
894p5_crpt.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
895p5_crpt.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
896p5_crpt.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
897p5_crpt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 535p5_crpt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
898p5_crpt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 536p5_crpt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
899p5_crpt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 537p5_crpt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
900p5_crpt.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 538p5_crpt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
901p5_crpt.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 539p5_crpt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
902p5_crpt.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 540p5_crpt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
903p5_crpt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 541p5_crpt.o: ../cryptlib.h p5_crpt.c
904p5_crpt.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 542p5_crpt2.o: ../../e_os.h ../../include/openssl/asn1.h
905p5_crpt.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 543p5_crpt2.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
906p5_crpt.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p5_crpt.c 544p5_crpt2.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
907p5_crpt2.o: ../../e_os.h ../../include/openssl/aes.h 545p5_crpt2.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
908p5_crpt2.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 546p5_crpt2.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
909p5_crpt2.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 547p5_crpt2.o: ../../include/openssl/evp.h ../../include/openssl/hmac.h
910p5_crpt2.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 548p5_crpt2.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
911p5_crpt2.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
912p5_crpt2.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
913p5_crpt2.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
914p5_crpt2.o: ../../include/openssl/err.h ../../include/openssl/evp.h
915p5_crpt2.o: ../../include/openssl/hmac.h ../../include/openssl/idea.h
916p5_crpt2.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
917p5_crpt2.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
918p5_crpt2.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
919p5_crpt2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 549p5_crpt2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
920p5_crpt2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 550p5_crpt2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
921p5_crpt2.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 551p5_crpt2.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
922p5_crpt2.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 552p5_crpt2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
923p5_crpt2.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 553p5_crpt2.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
924p5_crpt2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 554p5_crpt2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p5_crpt2.c
925p5_crpt2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 555p_dec.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
926p5_crpt2.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 556p_dec.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
927p5_crpt2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 557p_dec.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
928p5_crpt2.o: ../cryptlib.h p5_crpt2.c 558p_dec.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
929p_dec.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 559p_dec.o: ../../include/openssl/err.h ../../include/openssl/evp.h
930p_dec.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 560p_dec.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
931p_dec.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
932p_dec.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
933p_dec.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
934p_dec.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
935p_dec.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
936p_dec.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
937p_dec.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
938p_dec.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
939p_dec.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
940p_dec.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 561p_dec.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
941p_dec.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 562p_dec.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
942p_dec.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h 563p_dec.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
943p_dec.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
944p_dec.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
945p_dec.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 564p_dec.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
946p_dec.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 565p_dec.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
947p_dec.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 566p_dec.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
948p_dec.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
949p_dec.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p_dec.c 567p_dec.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p_dec.c
950p_enc.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 568p_enc.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
951p_enc.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 569p_enc.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
952p_enc.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 570p_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
953p_enc.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 571p_enc.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
954p_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 572p_enc.o: ../../include/openssl/err.h ../../include/openssl/evp.h
955p_enc.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 573p_enc.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
956p_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
957p_enc.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
958p_enc.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
959p_enc.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
960p_enc.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
961p_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 574p_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
962p_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 575p_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
963p_enc.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h 576p_enc.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
964p_enc.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
965p_enc.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
966p_enc.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 577p_enc.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
967p_enc.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 578p_enc.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
968p_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 579p_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
969p_enc.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
970p_enc.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p_enc.c 580p_enc.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p_enc.c
971p_lib.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 581p_lib.o: ../../e_os.h ../../include/openssl/asn1.h
972p_lib.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h 582p_lib.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h
973p_lib.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 583p_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
974p_lib.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 584p_lib.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
975p_lib.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
976p_lib.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
977p_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h 585p_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
978p_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h 586p_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
979p_lib.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 587p_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
980p_lib.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 588p_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
981p_lib.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
982p_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 589p_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
983p_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 590p_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
984p_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 591p_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
985p_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
986p_lib.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
987p_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 592p_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
988p_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 593p_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
989p_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 594p_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
990p_lib.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
991p_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p_lib.c 595p_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p_lib.c
992p_open.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 596p_open.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
993p_open.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 597p_open.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
994p_open.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 598p_open.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
995p_open.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 599p_open.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
996p_open.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 600p_open.o: ../../include/openssl/err.h ../../include/openssl/evp.h
997p_open.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 601p_open.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
998p_open.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
999p_open.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
1000p_open.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
1001p_open.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
1002p_open.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
1003p_open.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 602p_open.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
1004p_open.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 603p_open.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
1005p_open.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 604p_open.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
1006p_open.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
1007p_open.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
1008p_open.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 605p_open.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
1009p_open.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 606p_open.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
1010p_open.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
1011p_open.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 607p_open.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
1012p_open.o: ../cryptlib.h p_open.c 608p_open.o: ../cryptlib.h p_open.c
1013p_seal.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 609p_seal.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
1014p_seal.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 610p_seal.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
1015p_seal.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 611p_seal.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
1016p_seal.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 612p_seal.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
1017p_seal.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 613p_seal.o: ../../include/openssl/err.h ../../include/openssl/evp.h
1018p_seal.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 614p_seal.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
1019p_seal.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
1020p_seal.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
1021p_seal.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
1022p_seal.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
1023p_seal.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
1024p_seal.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 615p_seal.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
1025p_seal.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 616p_seal.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
1026p_seal.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h 617p_seal.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
1027p_seal.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
1028p_seal.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
1029p_seal.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 618p_seal.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
1030p_seal.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 619p_seal.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
1031p_seal.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 620p_seal.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
1032p_seal.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
1033p_seal.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p_seal.c 621p_seal.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p_seal.c
1034p_sign.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 622p_sign.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
1035p_sign.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 623p_sign.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
1036p_sign.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 624p_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
1037p_sign.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 625p_sign.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
1038p_sign.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 626p_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h
1039p_sign.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 627p_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
1040p_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
1041p_sign.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
1042p_sign.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
1043p_sign.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
1044p_sign.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
1045p_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 628p_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
1046p_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 629p_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
1047p_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 630p_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
1048p_sign.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 631p_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
1049p_sign.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 632p_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
1050p_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 633p_sign.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p_sign.c
1051p_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 634p_verify.o: ../../e_os.h ../../include/openssl/asn1.h
1052p_sign.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 635p_verify.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
1053p_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 636p_verify.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
1054p_sign.o: ../cryptlib.h p_sign.c 637p_verify.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
1055p_verify.o: ../../e_os.h ../../include/openssl/aes.h 638p_verify.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
1056p_verify.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 639p_verify.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
1057p_verify.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
1058p_verify.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
1059p_verify.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
1060p_verify.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
1061p_verify.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
1062p_verify.o: ../../include/openssl/err.h ../../include/openssl/evp.h
1063p_verify.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
1064p_verify.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
1065p_verify.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
1066p_verify.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 640p_verify.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
1067p_verify.o: ../../include/openssl/opensslconf.h 641p_verify.o: ../../include/openssl/opensslconf.h
1068p_verify.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 642p_verify.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
1069p_verify.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 643p_verify.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
1070p_verify.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 644p_verify.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
1071p_verify.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 645p_verify.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
1072p_verify.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 646p_verify.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p_verify.c
1073p_verify.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
1074p_verify.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
1075p_verify.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
1076p_verify.o: ../cryptlib.h p_verify.c
diff --git a/src/lib/libcrypto/evp/bio_ok.c b/src/lib/libcrypto/evp/bio_ok.c
index 4e3f10141b..98bc1ab409 100644
--- a/src/lib/libcrypto/evp/bio_ok.c
+++ b/src/lib/libcrypto/evp/bio_ok.c
@@ -119,6 +119,7 @@
119 119
120#include <stdio.h> 120#include <stdio.h>
121#include <errno.h> 121#include <errno.h>
122#include <assert.h>
122#include "cryptlib.h" 123#include "cryptlib.h"
123#include <openssl/buffer.h> 124#include <openssl/buffer.h>
124#include <openssl/bio.h> 125#include <openssl/bio.h>
@@ -141,22 +142,12 @@ static void block_in(BIO* b);
141#define IOBS (OK_BLOCK_SIZE+ OK_BLOCK_BLOCK+ 3*EVP_MAX_MD_SIZE) 142#define IOBS (OK_BLOCK_SIZE+ OK_BLOCK_BLOCK+ 3*EVP_MAX_MD_SIZE)
142#define WELLKNOWN "The quick brown fox jumped over the lazy dog's back." 143#define WELLKNOWN "The quick brown fox jumped over the lazy dog's back."
143 144
144#ifndef L_ENDIAN
145#define swapem(x) \
146 ((unsigned long int)((((unsigned long int)(x) & 0x000000ffU) << 24) | \
147 (((unsigned long int)(x) & 0x0000ff00U) << 8) | \
148 (((unsigned long int)(x) & 0x00ff0000U) >> 8) | \
149 (((unsigned long int)(x) & 0xff000000U) >> 24)))
150#else
151#define swapem(x) (x)
152#endif
153
154typedef struct ok_struct 145typedef struct ok_struct
155 { 146 {
156 int buf_len; 147 size_t buf_len;
157 int buf_off; 148 size_t buf_off;
158 int buf_len_save; 149 size_t buf_len_save;
159 int buf_off_save; 150 size_t buf_off_save;
160 int cont; /* <= 0 when finished */ 151 int cont; /* <= 0 when finished */
161 int finished; 152 int finished;
162 EVP_MD_CTX md; 153 EVP_MD_CTX md;
@@ -295,6 +286,8 @@ static int ok_write(BIO *b, const char *in, int inl)
295 int ret=0,n,i; 286 int ret=0,n,i;
296 BIO_OK_CTX *ctx; 287 BIO_OK_CTX *ctx;
297 288
289 if (inl <= 0) return inl;
290
298 ctx=(BIO_OK_CTX *)b->ptr; 291 ctx=(BIO_OK_CTX *)b->ptr;
299 ret=inl; 292 ret=inl;
300 293
@@ -330,7 +323,7 @@ static int ok_write(BIO *b, const char *in, int inl)
330 if ((in == NULL) || (inl <= 0)) return(0); 323 if ((in == NULL) || (inl <= 0)) return(0);
331 324
332 n= (inl+ ctx->buf_len > OK_BLOCK_SIZE+ OK_BLOCK_BLOCK) ? 325 n= (inl+ ctx->buf_len > OK_BLOCK_SIZE+ OK_BLOCK_BLOCK) ?
333 OK_BLOCK_SIZE+ OK_BLOCK_BLOCK- ctx->buf_len : inl; 326 (int)(OK_BLOCK_SIZE+OK_BLOCK_BLOCK-ctx->buf_len) : inl;
334 327
335 memcpy((unsigned char *)(&(ctx->buf[ctx->buf_len])),(unsigned char *)in,n); 328 memcpy((unsigned char *)(&(ctx->buf[ctx->buf_len])),(unsigned char *)in,n);
336 ctx->buf_len+= n; 329 ctx->buf_len+= n;
@@ -448,16 +441,18 @@ static long ok_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp)
448 return(ret); 441 return(ret);
449 } 442 }
450 443
451static void longswap(void *_ptr, int len) 444static void longswap(void *_ptr, size_t len)
452{ 445{ const union { long one; char little; } is_endian = {1};
453#ifndef L_ENDIAN
454 int i;
455 char *ptr=_ptr;
456 446
457 for(i= 0;i < len;i+= 4){ 447 if (is_endian.little) {
458 *((unsigned long *)&(ptr[i]))= swapem(*((unsigned long *)&(ptr[i]))); 448 size_t i;
449 unsigned char *p=_ptr,c;
450
451 for(i= 0;i < len;i+= 4) {
452 c=p[0],p[0]=p[3],p[3]=c;
453 c=p[1],p[1]=p[2],p[2]=c;
454 }
459 } 455 }
460#endif
461} 456}
462 457
463static void sig_out(BIO* b) 458static void sig_out(BIO* b)
@@ -496,7 +491,7 @@ static void sig_in(BIO* b)
496 ctx=b->ptr; 491 ctx=b->ptr;
497 md=&ctx->md; 492 md=&ctx->md;
498 493
499 if(ctx->buf_len- ctx->buf_off < 2* md->digest->md_size) return; 494 if((int)(ctx->buf_len-ctx->buf_off) < 2*md->digest->md_size) return;
500 495
501 EVP_DigestInit_ex(md, md->digest, NULL); 496 EVP_DigestInit_ex(md, md->digest, NULL);
502 memcpy(md->md_data, &(ctx->buf[ctx->buf_off]), md->digest->md_size); 497 memcpy(md->md_data, &(ctx->buf[ctx->buf_off]), md->digest->md_size);
@@ -533,9 +528,10 @@ static void block_out(BIO* b)
533 md=&ctx->md; 528 md=&ctx->md;
534 529
535 tl= ctx->buf_len- OK_BLOCK_BLOCK; 530 tl= ctx->buf_len- OK_BLOCK_BLOCK;
536 tl= swapem(tl); 531 ctx->buf[0]=(unsigned char)(tl>>24);
537 memcpy(ctx->buf, &tl, OK_BLOCK_BLOCK); 532 ctx->buf[1]=(unsigned char)(tl>>16);
538 tl= swapem(tl); 533 ctx->buf[2]=(unsigned char)(tl>>8);
534 ctx->buf[3]=(unsigned char)(tl);
539 EVP_DigestUpdate(md, (unsigned char*) &(ctx->buf[OK_BLOCK_BLOCK]), tl); 535 EVP_DigestUpdate(md, (unsigned char*) &(ctx->buf[OK_BLOCK_BLOCK]), tl);
540 EVP_DigestFinal_ex(md, &(ctx->buf[ctx->buf_len]), NULL); 536 EVP_DigestFinal_ex(md, &(ctx->buf[ctx->buf_len]), NULL);
541 ctx->buf_len+= md->digest->md_size; 537 ctx->buf_len+= md->digest->md_size;
@@ -546,14 +542,18 @@ static void block_in(BIO* b)
546 { 542 {
547 BIO_OK_CTX *ctx; 543 BIO_OK_CTX *ctx;
548 EVP_MD_CTX *md; 544 EVP_MD_CTX *md;
549 long tl= 0; 545 unsigned long tl= 0;
550 unsigned char tmp[EVP_MAX_MD_SIZE]; 546 unsigned char tmp[EVP_MAX_MD_SIZE];
551 547
552 ctx=b->ptr; 548 ctx=b->ptr;
553 md=&ctx->md; 549 md=&ctx->md;
554 550
555 memcpy(&tl, ctx->buf, OK_BLOCK_BLOCK); 551 assert(sizeof(tl)>=OK_BLOCK_BLOCK); /* always true */
556 tl= swapem(tl); 552 tl =ctx->buf[0]; tl<<=8;
553 tl|=ctx->buf[1]; tl<<=8;
554 tl|=ctx->buf[2]; tl<<=8;
555 tl|=ctx->buf[3];
556
557 if (ctx->buf_len < tl+ OK_BLOCK_BLOCK+ md->digest->md_size) return; 557 if (ctx->buf_len < tl+ OK_BLOCK_BLOCK+ md->digest->md_size) return;
558 558
559 EVP_DigestUpdate(md, (unsigned char*) &(ctx->buf[OK_BLOCK_BLOCK]), tl); 559 EVP_DigestUpdate(md, (unsigned char*) &(ctx->buf[OK_BLOCK_BLOCK]), tl);
diff --git a/src/lib/libcrypto/evp/c_allc.c b/src/lib/libcrypto/evp/c_allc.c
index fc96812365..7054d8125d 100644
--- a/src/lib/libcrypto/evp/c_allc.c
+++ b/src/lib/libcrypto/evp/c_allc.c
@@ -107,6 +107,15 @@ void OpenSSL_add_all_ciphers(void)
107 EVP_add_cipher_alias(SN_idea_cbc,"idea"); 107 EVP_add_cipher_alias(SN_idea_cbc,"idea");
108#endif 108#endif
109 109
110#ifndef OPENSSL_NO_SEED
111 EVP_add_cipher(EVP_seed_ecb());
112 EVP_add_cipher(EVP_seed_cfb());
113 EVP_add_cipher(EVP_seed_ofb());
114 EVP_add_cipher(EVP_seed_cbc());
115 EVP_add_cipher_alias(SN_seed_cbc,"SEED");
116 EVP_add_cipher_alias(SN_seed_cbc,"seed");
117#endif
118
110#ifndef OPENSSL_NO_RC2 119#ifndef OPENSSL_NO_RC2
111 EVP_add_cipher(EVP_rc2_ecb()); 120 EVP_add_cipher(EVP_rc2_ecb());
112 EVP_add_cipher(EVP_rc2_cfb()); 121 EVP_add_cipher(EVP_rc2_cfb());
@@ -183,6 +192,34 @@ void OpenSSL_add_all_ciphers(void)
183 EVP_add_cipher_alias(SN_aes_256_cbc,"AES256"); 192 EVP_add_cipher_alias(SN_aes_256_cbc,"AES256");
184 EVP_add_cipher_alias(SN_aes_256_cbc,"aes256"); 193 EVP_add_cipher_alias(SN_aes_256_cbc,"aes256");
185#endif 194#endif
195
196#ifndef OPENSSL_NO_CAMELLIA
197 EVP_add_cipher(EVP_camellia_128_ecb());
198 EVP_add_cipher(EVP_camellia_128_cbc());
199 EVP_add_cipher(EVP_camellia_128_cfb());
200 EVP_add_cipher(EVP_camellia_128_cfb1());
201 EVP_add_cipher(EVP_camellia_128_cfb8());
202 EVP_add_cipher(EVP_camellia_128_ofb());
203 EVP_add_cipher_alias(SN_camellia_128_cbc,"CAMELLIA128");
204 EVP_add_cipher_alias(SN_camellia_128_cbc,"camellia128");
205 EVP_add_cipher(EVP_camellia_192_ecb());
206 EVP_add_cipher(EVP_camellia_192_cbc());
207 EVP_add_cipher(EVP_camellia_192_cfb());
208 EVP_add_cipher(EVP_camellia_192_cfb1());
209 EVP_add_cipher(EVP_camellia_192_cfb8());
210 EVP_add_cipher(EVP_camellia_192_ofb());
211 EVP_add_cipher_alias(SN_camellia_192_cbc,"CAMELLIA192");
212 EVP_add_cipher_alias(SN_camellia_192_cbc,"camellia192");
213 EVP_add_cipher(EVP_camellia_256_ecb());
214 EVP_add_cipher(EVP_camellia_256_cbc());
215 EVP_add_cipher(EVP_camellia_256_cfb());
216 EVP_add_cipher(EVP_camellia_256_cfb1());
217 EVP_add_cipher(EVP_camellia_256_cfb8());
218 EVP_add_cipher(EVP_camellia_256_ofb());
219 EVP_add_cipher_alias(SN_camellia_256_cbc,"CAMELLIA256");
220 EVP_add_cipher_alias(SN_camellia_256_cbc,"camellia256");
221#endif
222
186 PKCS12_PBE_add(); 223 PKCS12_PBE_add();
187 PKCS5_PBE_add(); 224 PKCS5_PBE_add();
188 } 225 }
diff --git a/src/lib/libcrypto/evp/c_alld.c b/src/lib/libcrypto/evp/c_alld.c
index 929ea56a3e..d270b0ee03 100644
--- a/src/lib/libcrypto/evp/c_alld.c
+++ b/src/lib/libcrypto/evp/c_alld.c
@@ -91,6 +91,9 @@ void OpenSSL_add_all_digests(void)
91 EVP_add_digest_alias(SN_dsaWithSHA1,"DSS1"); 91 EVP_add_digest_alias(SN_dsaWithSHA1,"DSS1");
92 EVP_add_digest_alias(SN_dsaWithSHA1,"dss1"); 92 EVP_add_digest_alias(SN_dsaWithSHA1,"dss1");
93#endif 93#endif
94#ifndef OPENSSL_NO_ECDSA
95 EVP_add_digest(EVP_ecdsa());
96#endif
94#endif 97#endif
95#if !defined(OPENSSL_NO_MDC2) && !defined(OPENSSL_NO_DES) 98#if !defined(OPENSSL_NO_MDC2) && !defined(OPENSSL_NO_DES)
96 EVP_add_digest(EVP_mdc2()); 99 EVP_add_digest(EVP_mdc2());
@@ -100,7 +103,6 @@ void OpenSSL_add_all_digests(void)
100 EVP_add_digest_alias(SN_ripemd160,"ripemd"); 103 EVP_add_digest_alias(SN_ripemd160,"ripemd");
101 EVP_add_digest_alias(SN_ripemd160,"rmd160"); 104 EVP_add_digest_alias(SN_ripemd160,"rmd160");
102#endif 105#endif
103#ifdef OPENSSL_FIPS
104#ifndef OPENSSL_NO_SHA256 106#ifndef OPENSSL_NO_SHA256
105 EVP_add_digest(EVP_sha224()); 107 EVP_add_digest(EVP_sha224());
106 EVP_add_digest(EVP_sha256()); 108 EVP_add_digest(EVP_sha256());
@@ -109,5 +111,4 @@ void OpenSSL_add_all_digests(void)
109 EVP_add_digest(EVP_sha384()); 111 EVP_add_digest(EVP_sha384());
110 EVP_add_digest(EVP_sha512()); 112 EVP_add_digest(EVP_sha512());
111#endif 113#endif
112#endif
113 } 114 }
diff --git a/src/lib/libcrypto/evp/e_rc5.c b/src/lib/libcrypto/evp/e_rc5.c
index 3c7713b181..19a10c6402 100644
--- a/src/lib/libcrypto/evp/e_rc5.c
+++ b/src/lib/libcrypto/evp/e_rc5.c
@@ -56,10 +56,11 @@
56 * [including the GNU Public Licence.] 56 * [including the GNU Public Licence.]
57 */ 57 */
58 58
59#ifndef OPENSSL_NO_RC5
60
61#include <stdio.h> 59#include <stdio.h>
62#include "cryptlib.h" 60#include "cryptlib.h"
61
62#ifndef OPENSSL_NO_RC5
63
63#include <openssl/evp.h> 64#include <openssl/evp.h>
64#include <openssl/objects.h> 65#include <openssl/objects.h>
65#include "evp_locl.h" 66#include "evp_locl.h"
diff --git a/src/lib/libcrypto/evp/evp_test.c b/src/lib/libcrypto/evp/evp_test.c
index a624cfd248..bb6f02c2e9 100644
--- a/src/lib/libcrypto/evp/evp_test.c
+++ b/src/lib/libcrypto/evp/evp_test.c
@@ -52,6 +52,7 @@
52 52
53#include "../e_os.h" 53#include "../e_os.h"
54 54
55#include <openssl/opensslconf.h>
55#include <openssl/evp.h> 56#include <openssl/evp.h>
56#ifndef OPENSSL_NO_ENGINE 57#ifndef OPENSSL_NO_ENGINE
57#include <openssl/engine.h> 58#include <openssl/engine.h>
@@ -136,7 +137,7 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
136 const unsigned char *iv,int in, 137 const unsigned char *iv,int in,
137 const unsigned char *plaintext,int pn, 138 const unsigned char *plaintext,int pn,
138 const unsigned char *ciphertext,int cn, 139 const unsigned char *ciphertext,int cn,
139 int encdec,int multiplier) 140 int encdec)
140 { 141 {
141 EVP_CIPHER_CTX ctx; 142 EVP_CIPHER_CTX ctx;
142 unsigned char out[4096]; 143 unsigned char out[4096];
@@ -167,7 +168,7 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
167 } 168 }
168 EVP_CIPHER_CTX_set_padding(&ctx,0); 169 EVP_CIPHER_CTX_set_padding(&ctx,0);
169 170
170 if(!EVP_EncryptUpdate(&ctx,out,&outl,plaintext,pn*multiplier)) 171 if(!EVP_EncryptUpdate(&ctx,out,&outl,plaintext,pn))
171 { 172 {
172 fprintf(stderr,"Encrypt failed\n"); 173 fprintf(stderr,"Encrypt failed\n");
173 ERR_print_errors_fp(stderr); 174 ERR_print_errors_fp(stderr);
@@ -180,7 +181,7 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
180 test1_exit(7); 181 test1_exit(7);
181 } 182 }
182 183
183 if(outl+outl2 != cn*multiplier) 184 if(outl+outl2 != cn)
184 { 185 {
185 fprintf(stderr,"Ciphertext length mismatch got %d expected %d\n", 186 fprintf(stderr,"Ciphertext length mismatch got %d expected %d\n",
186 outl+outl2,cn); 187 outl+outl2,cn);
@@ -206,7 +207,7 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
206 } 207 }
207 EVP_CIPHER_CTX_set_padding(&ctx,0); 208 EVP_CIPHER_CTX_set_padding(&ctx,0);
208 209
209 if(!EVP_DecryptUpdate(&ctx,out,&outl,ciphertext,cn*multiplier)) 210 if(!EVP_DecryptUpdate(&ctx,out,&outl,ciphertext,cn))
210 { 211 {
211 fprintf(stderr,"Decrypt failed\n"); 212 fprintf(stderr,"Decrypt failed\n");
212 ERR_print_errors_fp(stderr); 213 ERR_print_errors_fp(stderr);
@@ -219,7 +220,7 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
219 test1_exit(7); 220 test1_exit(7);
220 } 221 }
221 222
222 if(outl+outl2 != cn*multiplier) 223 if(outl+outl2 != cn)
223 { 224 {
224 fprintf(stderr,"Plaintext length mismatch got %d expected %d\n", 225 fprintf(stderr,"Plaintext length mismatch got %d expected %d\n",
225 outl+outl2,cn); 226 outl+outl2,cn);
@@ -244,7 +245,7 @@ static int test_cipher(const char *cipher,const unsigned char *key,int kn,
244 const unsigned char *iv,int in, 245 const unsigned char *iv,int in,
245 const unsigned char *plaintext,int pn, 246 const unsigned char *plaintext,int pn,
246 const unsigned char *ciphertext,int cn, 247 const unsigned char *ciphertext,int cn,
247 int encdec,int multiplier) 248 int encdec)
248 { 249 {
249 const EVP_CIPHER *c; 250 const EVP_CIPHER *c;
250 251
@@ -252,7 +253,7 @@ static int test_cipher(const char *cipher,const unsigned char *key,int kn,
252 if(!c) 253 if(!c)
253 return 0; 254 return 0;
254 255
255 test1(c,key,kn,iv,in,plaintext,pn,ciphertext,cn,encdec,multiplier); 256 test1(c,key,kn,iv,in,plaintext,pn,ciphertext,cn,encdec);
256 257
257 return 1; 258 return 1;
258 } 259 }
@@ -368,7 +369,6 @@ int main(int argc,char **argv)
368 unsigned char *iv,*key,*plaintext,*ciphertext; 369 unsigned char *iv,*key,*plaintext,*ciphertext;
369 int encdec; 370 int encdec;
370 int kn,in,pn,cn; 371 int kn,in,pn,cn;
371 int multiplier=1;
372 372
373 if(!fgets((char *)line,sizeof line,f)) 373 if(!fgets((char *)line,sizeof line,f))
374 break; 374 break;
@@ -393,17 +393,44 @@ int main(int argc,char **argv)
393 pn=convert(plaintext); 393 pn=convert(plaintext);
394 cn=convert(ciphertext); 394 cn=convert(ciphertext);
395 395
396 if(strchr(cipher,'*')) 396 if(!test_cipher(cipher,key,kn,iv,in,plaintext,pn,ciphertext,cn,encdec)
397 {
398 p=cipher;
399 sstrsep(&p,"*");
400 multiplier=atoi(sstrsep(&p,"*"));
401 }
402
403 if(!test_cipher(cipher,key,kn,iv,in,plaintext,pn,ciphertext,cn,encdec,
404 multiplier)
405 && !test_digest(cipher,plaintext,pn,ciphertext,cn)) 397 && !test_digest(cipher,plaintext,pn,ciphertext,cn))
406 { 398 {
399#ifdef OPENSSL_NO_AES
400 if (strstr(cipher, "AES") == cipher)
401 {
402 fprintf(stdout, "Cipher disabled, skipping %s\n", cipher);
403 continue;
404 }
405#endif
406#ifdef OPENSSL_NO_DES
407 if (strstr(cipher, "DES") == cipher)
408 {
409 fprintf(stdout, "Cipher disabled, skipping %s\n", cipher);
410 continue;
411 }
412#endif
413#ifdef OPENSSL_NO_RC4
414 if (strstr(cipher, "RC4") == cipher)
415 {
416 fprintf(stdout, "Cipher disabled, skipping %s\n", cipher);
417 continue;
418 }
419#endif
420#ifdef OPENSSL_NO_CAMELLIA
421 if (strstr(cipher, "CAMELLIA") == cipher)
422 {
423 fprintf(stdout, "Cipher disabled, skipping %s\n", cipher);
424 continue;
425 }
426#endif
427#ifdef OPENSSL_NO_SEED
428 if (strstr(cipher, "SEED") == cipher)
429 {
430 fprintf(stdout, "Cipher disabled, skipping %s\n", cipher);
431 continue;
432 }
433#endif
407 fprintf(stderr,"Can't find %s\n",cipher); 434 fprintf(stderr,"Can't find %s\n",cipher);
408 EXIT(3); 435 EXIT(3);
409 } 436 }
diff --git a/src/lib/libcrypto/evp/evptests.txt b/src/lib/libcrypto/evp/evptests.txt
index dfe91a5bc0..beb12144b6 100644
--- a/src/lib/libcrypto/evp/evptests.txt
+++ b/src/lib/libcrypto/evp/evptests.txt
@@ -92,102 +92,7 @@ AES-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000
92AES-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:F58C4C04D6E5F1BA779EABFB5F7BFBD6:AE2D8A571E03AC9C9EB76FAC45AF8E51:9CFC4E967EDB808D679F777BC6702C7D 92AES-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:F58C4C04D6E5F1BA779EABFB5F7BFBD6:AE2D8A571E03AC9C9EB76FAC45AF8E51:9CFC4E967EDB808D679F777BC6702C7D
93AES-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:9CFC4E967EDB808D679F777BC6702C7D:30C81C46A35CE411E5FBC1191A0A52EF:39F23369A9D9BACFA530E26304231461 93AES-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:9CFC4E967EDB808D679F777BC6702C7D:30C81C46A35CE411E5FBC1191A0A52EF:39F23369A9D9BACFA530E26304231461
94AES-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:39F23369A9D9BACFA530E26304231461:F69F2445DF4F9B17AD2B417BE66C3710:B2EB05E2C39BE9FCDA6C19078C6A9D1B 94AES-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:39F23369A9D9BACFA530E26304231461:F69F2445DF4F9B17AD2B417BE66C3710:B2EB05E2C39BE9FCDA6C19078C6A9D1B
95 95# We don't support CFB{1,8}-AESxxx.{En,De}crypt
96# CFB1-AES128.Encrypt
97
98AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:000102030405060708090a0b0c0d0e0f:00:00:1
99AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:00020406080a0c0e10121416181a1c1e:80:80:1
100AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:0004080c1014181c2024282c3034383d:80:80:1
101AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:0008101820283038404850586068707b:00:00:1
102AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:00102030405060708090a0b0c0d0e0f6:80:80:1
103AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:0020406080a0c0e10121416181a1c1ed:00:00:1
104AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:004080c1014181c2024282c3034383da:80:00:1
105AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:008101820283038404850586068707b4:80:00:1
106AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:0102030405060708090a0b0c0d0e0f68:80:80:1
107AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:020406080a0c0e10121416181a1c1ed1:80:00:1
108AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:04080c1014181c2024282c3034383da2:00:80:1
109AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:08101820283038404850586068707b45:00:80:1
110AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:102030405060708090a0b0c0d0e0f68b:00:00:1
111AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:20406080a0c0e10121416181a1c1ed16:00:00:1
112AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:4080c1014181c2024282c3034383da2c:00:80:1
113AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:8101820283038404850586068707b459:80:80:1
114# all of the above packed into one...
115# in: 0110 1011 1100 0001 = 6bc1
116# out: 0110 1000 1011 0011 = 68b3
117AES-128-CFB1*8:2b7e151628aed2a6abf7158809cf4f3c:000102030405060708090a0b0c0d0e0f:6bc1:68b3:1
118
119# CFB1-AES128.Decrypt
120AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:000102030405060708090a0b0c0d0e0f:00:00:0
121AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:00020406080a0c0e10121416181a1c1e:80:80:0
122AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:0004080c1014181c2024282c3034383d:80:80:0
123AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:0008101820283038404850586068707b:00:00:0
124AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:00102030405060708090a0b0c0d0e0f6:80:80:0
125AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:0020406080a0c0e10121416181a1c1ed:00:00:0
126AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:004080c1014181c2024282c3034383da:80:00:0
127AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:008101820283038404850586068707b4:80:00:0
128AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:0102030405060708090a0b0c0d0e0f68:80:80:0
129AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:020406080a0c0e10121416181a1c1ed1:80:00:0
130AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:04080c1014181c2024282c3034383da2:00:80:0
131AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:08101820283038404850586068707b45:00:80:0
132AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:102030405060708090a0b0c0d0e0f68b:00:00:0
133AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:20406080a0c0e10121416181a1c1ed16:00:00:0
134AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:4080c1014181c2024282c3034383da2c:00:80:0
135AES-128-CFB1:2b7e151628aed2a6abf7158809cf4f3c:8101820283038404850586068707b459:80:80:0
136# all of the above packed into one...
137# in: 0110 1000 1011 0011 = 68b3
138# out: 0110 1011 1100 0001 = 6bc1
139AES-128-CFB1*8:2b7e151628aed2a6abf7158809cf4f3c:000102030405060708090a0b0c0d0e0f:6bc1:68b3:0
140
141# TODO: CFB1-AES192 and 256
142
143# CFB8-AES128.Encrypt
144
145AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:000102030405060708090a0b0c0d0e0f:6b:3b:1
146AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:0102030405060708090a0b0c0d0e0f3b:c1:79:1
147AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:02030405060708090a0b0c0d0e0f3b79:be:42:1
148AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:030405060708090a0b0c0d0e0f3b7942:e2:4c:1
149AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:0405060708090a0b0c0d0e0f3b79424c:2e:9c:1
150AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:05060708090a0b0c0d0e0f3b79424c9c:40:0d:1
151AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:060708090a0b0c0d0e0f3b79424c9c0d:9f:d4:1
152AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:0708090a0b0c0d0e0f3b79424c9c0dd4:96:36:1
153AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:08090a0b0c0d0e0f3b79424c9c0dd436:e9:ba:1
154AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:090a0b0c0d0e0f3b79424c9c0dd436ba:3d:ce:1
155AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:0a0b0c0d0e0f3b79424c9c0dd436bace:7e:9e:1
156AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:0b0c0d0e0f3b79424c9c0dd436bace9e:11:0e:1
157AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:0c0d0e0f3b79424c9c0dd436bace9e0e:73:d4:1
158AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:0d0e0f3b79424c9c0dd436bace9e0ed4:93:58:1
159AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:0e0f3b79424c9c0dd436bace9e0ed458:17:6a:1
160AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:0f3b79424c9c0dd436bace9e0ed4586a:2a:4f:1
161AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:3b79424c9c0dd436bace9e0ed4586a4f:ae:32:1
162AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:79424c9c0dd436bace9e0ed4586a4f32:2d:b9:1
163# all of the above packed into one
164AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:000102030405060708090a0b0c0d0e0f:6bc1bee22e409f96e93d7e117393172aae2d:3b79424c9c0dd436bace9e0ed4586a4f32b9:1
165
166# CFB8-AES128.Decrypt
167
168AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:000102030405060708090a0b0c0d0e0f:6b:3b:0
169AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:0102030405060708090a0b0c0d0e0f3b:c1:79:0
170AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:02030405060708090a0b0c0d0e0f3b79:be:42:0
171AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:030405060708090a0b0c0d0e0f3b7942:e2:4c:0
172AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:0405060708090a0b0c0d0e0f3b79424c:2e:9c:0
173AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:05060708090a0b0c0d0e0f3b79424c9c:40:0d:0
174AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:060708090a0b0c0d0e0f3b79424c9c0d:9f:d4:0
175AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:0708090a0b0c0d0e0f3b79424c9c0dd4:96:36:0
176AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:08090a0b0c0d0e0f3b79424c9c0dd436:e9:ba:0
177AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:090a0b0c0d0e0f3b79424c9c0dd436ba:3d:ce:0
178AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:0a0b0c0d0e0f3b79424c9c0dd436bace:7e:9e:0
179AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:0b0c0d0e0f3b79424c9c0dd436bace9e:11:0e:0
180AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:0c0d0e0f3b79424c9c0dd436bace9e0e:73:d4:0
181AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:0d0e0f3b79424c9c0dd436bace9e0ed4:93:58:0
182AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:0e0f3b79424c9c0dd436bace9e0ed458:17:6a:0
183AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:0f3b79424c9c0dd436bace9e0ed4586a:2a:4f:0
184AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:3b79424c9c0dd436bace9e0ed4586a4f:ae:32:0
185AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:79424c9c0dd436bace9e0ed4586a4f32:2d:b9:0
186# all of the above packed into one
187AES-128-CFB8:2b7e151628aed2a6abf7158809cf4f3c:000102030405060708090a0b0c0d0e0f:6bc1bee22e409f96e93d7e117393172aae2d:3b79424c9c0dd436bace9e0ed4586a4f32b9:0
188
189# TODO: 192 and 256 bit keys
190
191# For all CFB128 encrypts and decrypts, the transformed sequence is 96# For all CFB128 encrypts and decrypts, the transformed sequence is
192# AES-bits-CFB:key:IV/ciphertext':plaintext:ciphertext:encdec 97# AES-bits-CFB:key:IV/ciphertext':plaintext:ciphertext:encdec
193# CFB128-AES128.Encrypt 98# CFB128-AES128.Encrypt
@@ -269,16 +174,6 @@ DESX-CBC:0123456789abcdeff1e0d3c2b5a49786fedcba9876543210:fedcba9876543210:37363
269# DES EDE3 CBC tests (from destest) 174# DES EDE3 CBC tests (from destest)
270DES-EDE3-CBC:0123456789abcdeff1e0d3c2b5a49786fedcba9876543210:fedcba9876543210:37363534333231204E6F77206973207468652074696D6520666F722000000000:3FE301C962AC01D02213763C1CBD4CDC799657C064ECF5D41C673812CFDE9675 175DES-EDE3-CBC:0123456789abcdeff1e0d3c2b5a49786fedcba9876543210:fedcba9876543210:37363534333231204E6F77206973207468652074696D6520666F722000000000:3FE301C962AC01D02213763C1CBD4CDC799657C064ECF5D41C673812CFDE9675
271 176
272# DES CFB1 from FIPS 81
273# plaintext: 0100 1110 0110 1111 0111 0111 = 4e6f77
274# ciphertext: 1100 1101 0001 1110 1100 1001 = cd1ec9
275
276DES-CFB1*8:0123456789abcdef:1234567890abcdef:4e6f77:cd1ec9
277
278# DES CFB8 from FIPS 81
279
280DES-CFB8:0123456789abcdef:1234567890abcdef:4e6f7720697320746865:f31fda07011462ee187f
281
282# RC4 tests (from rc4test) 177# RC4 tests (from rc4test)
283RC4:0123456789abcdef0123456789abcdef::0123456789abcdef:75b7878099e0c596 178RC4:0123456789abcdef0123456789abcdef::0123456789abcdef:75b7878099e0c596
284RC4:0123456789abcdef0123456789abcdef::0000000000000000:7494c2e7104b0879 179RC4:0123456789abcdef0123456789abcdef::0000000000000000:7494c2e7104b0879
@@ -286,3 +181,141 @@ RC4:00000000000000000000000000000000::0000000000000000:de188941a3375d3a
286RC4:ef012345ef012345ef012345ef012345::0000000000000000000000000000000000000000:d6a141a7ec3c38dfbd615a1162e1c7ba36b67858 181RC4:ef012345ef012345ef012345ef012345::0000000000000000000000000000000000000000:d6a141a7ec3c38dfbd615a1162e1c7ba36b67858
287RC4:0123456789abcdef0123456789abcdef::123456789ABCDEF0123456789ABCDEF0123456789ABCDEF012345678:66a0949f8af7d6891f7f832ba833c00c892ebe30143ce28740011ecf 182RC4:0123456789abcdef0123456789abcdef::123456789ABCDEF0123456789ABCDEF0123456789ABCDEF012345678:66a0949f8af7d6891f7f832ba833c00c892ebe30143ce28740011ecf
288RC4:ef012345ef012345ef012345ef012345::00000000000000000000:d6a141a7ec3c38dfbd61 183RC4:ef012345ef012345ef012345ef012345::00000000000000000000:d6a141a7ec3c38dfbd61
184
185
186# Camellia tests from RFC3713
187# For all ECB encrypts and decrypts, the transformed sequence is
188# CAMELLIA-bits-ECB:key::plaintext:ciphertext:encdec
189CAMELLIA-128-ECB:0123456789abcdeffedcba9876543210::0123456789abcdeffedcba9876543210:67673138549669730857065648eabe43
190CAMELLIA-192-ECB:0123456789abcdeffedcba98765432100011223344556677::0123456789abcdeffedcba9876543210:b4993401b3e996f84ee5cee7d79b09b9
191CAMELLIA-256-ECB:0123456789abcdeffedcba987654321000112233445566778899aabbccddeeff::0123456789abcdeffedcba9876543210:9acc237dff16d76c20ef7c919e3a7509
192
193# ECB-CAMELLIA128.Encrypt
194CAMELLIA-128-ECB:000102030405060708090A0B0C0D0E0F::00112233445566778899AABBCCDDEEFF:77CF412067AF8270613529149919546F:1
195CAMELLIA-192-ECB:000102030405060708090A0B0C0D0E0F1011121314151617::00112233445566778899AABBCCDDEEFF:B22F3C36B72D31329EEE8ADDC2906C68:1
196CAMELLIA-256-ECB:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F::00112233445566778899AABBCCDDEEFF:2EDF1F3418D53B88841FC8985FB1ECF2:1
197
198# ECB-CAMELLIA128.Encrypt and ECB-CAMELLIA128.Decrypt
199CAMELLIA-128-ECB:2B7E151628AED2A6ABF7158809CF4F3C::6BC1BEE22E409F96E93D7E117393172A:432FC5DCD628115B7C388D770B270C96
200CAMELLIA-128-ECB:2B7E151628AED2A6ABF7158809CF4F3C::AE2D8A571E03AC9C9EB76FAC45AF8E51:0BE1F14023782A22E8384C5ABB7FAB2B
201CAMELLIA-128-ECB:2B7E151628AED2A6ABF7158809CF4F3C::30C81C46A35CE411E5FBC1191A0A52EF:A0A1ABCD1893AB6FE0FE5B65DF5F8636
202CAMELLIA-128-ECB:2B7E151628AED2A6ABF7158809CF4F3C::F69F2445DF4F9B17AD2B417BE66C3710:E61925E0D5DFAA9BB29F815B3076E51A
203
204# ECB-CAMELLIA192.Encrypt and ECB-CAMELLIA192.Decrypt
205CAMELLIA-192-ECB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B::6BC1BEE22E409F96E93D7E117393172A:CCCC6C4E138B45848514D48D0D3439D3
206CAMELLIA-192-ECB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B::AE2D8A571E03AC9C9EB76FAC45AF8E51:5713C62C14B2EC0F8393B6AFD6F5785A
207CAMELLIA-192-ECB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B::30C81C46A35CE411E5FBC1191A0A52EF:B40ED2B60EB54D09D030CF511FEEF366
208CAMELLIA-192-ECB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B::F69F2445DF4F9B17AD2B417BE66C3710:909DBD95799096748CB27357E73E1D26
209
210# ECB-CAMELLIA256.Encrypt and ECB-CAMELLIA256.Decrypt
211CAMELLIA-256-ECB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4::6BC1BEE22E409F96E93D7E117393172A:BEFD219B112FA00098919CD101C9CCFA
212CAMELLIA-256-ECB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4::AE2D8A571E03AC9C9EB76FAC45AF8E51:C91D3A8F1AEA08A9386CF4B66C0169EA
213CAMELLIA-256-ECB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4::30C81C46A35CE411E5FBC1191A0A52EF:A623D711DC5F25A51BB8A80D56397D28
214CAMELLIA-256-ECB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4::F69F2445DF4F9B17AD2B417BE66C3710:7960109FB6DC42947FCFE59EA3C5EB6B
215
216# For all CBC encrypts and decrypts, the transformed sequence is
217# CAMELLIA-bits-CBC:key:IV/ciphertext':plaintext:ciphertext:encdec
218# CBC-CAMELLIA128.Encrypt and CBC-CAMELLIA128.Decrypt
219CAMELLIA-128-CBC:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:1607CF494B36BBF00DAEB0B503C831AB
220CAMELLIA-128-CBC:2B7E151628AED2A6ABF7158809CF4F3C:1607CF494B36BBF00DAEB0B503C831AB:AE2D8A571E03AC9C9EB76FAC45AF8E51:A2F2CF671629EF7840C5A5DFB5074887
221CAMELLIA-128-CBC:2B7E151628AED2A6ABF7158809CF4F3C:A2F2CF671629EF7840C5A5DFB5074887:30C81C46A35CE411E5FBC1191A0A52EF:0F06165008CF8B8B5A63586362543E54
222CAMELLIA-128-CBC:2B7E151628AED2A6ABF7158809CF4F3C:36A84CDAFD5F9A85ADA0F0A993D6D577:F69F2445DF4F9B17AD2B417BE66C3710:74C64268CDB8B8FAF5B34E8AF3732980
223
224# CBC-CAMELLIA192.Encrypt and CBC-CAMELLIA192.Decrypt
225CAMELLIA-192-CBC:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:2A4830AB5AC4A1A2405955FD2195CF93
226CAMELLIA-192-CBC:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:2A4830AB5AC4A1A2405955FD2195CF93:AE2D8A571E03AC9C9EB76FAC45AF8E51:5D5A869BD14CE54264F892A6DD2EC3D5
227CAMELLIA-192-CBC:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:5D5A869BD14CE54264F892A6DD2EC3D5:30C81C46A35CE411E5FBC1191A0A52EF:37D359C3349836D884E310ADDF68C449
228CAMELLIA-192-CBC:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:37D359C3349836D884E310ADDF68C449:F69F2445DF4F9B17AD2B417BE66C3710:01FAAA930B4AB9916E9668E1428C6B08
229
230# CBC-CAMELLIA256.Encrypt and CBC-CAMELLIA256.Decrypt
231CAMELLIA-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:E6CFA35FC02B134A4D2C0B6737AC3EDA
232CAMELLIA-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:E6CFA35FC02B134A4D2C0B6737AC3EDA:AE2D8A571E03AC9C9EB76FAC45AF8E51:36CBEB73BD504B4070B1B7DE2B21EB50
233CAMELLIA-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:36CBEB73BD504B4070B1B7DE2B21EB50:30C81C46A35CE411E5FBC1191A0A52EF:E31A6055297D96CA3330CDF1B1860A83
234CAMELLIA-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:E31A6055297D96CA3330CDF1B1860A83:F69F2445DF4F9B17AD2B417BE66C3710:5D563F6D1CCCF236051C0C5C1C58F28F
235
236# We don't support CFB{1,8}-CAMELLIAxxx.{En,De}crypt
237# For all CFB128 encrypts and decrypts, the transformed sequence is
238# CAMELLIA-bits-CFB:key:IV/ciphertext':plaintext:ciphertext:encdec
239# CFB128-CAMELLIA128.Encrypt
240CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:14F7646187817EB586599146B82BD719:1
241CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:14F7646187817EB586599146B82BD719:AE2D8A571E03AC9C9EB76FAC45AF8E51:A53D28BB82DF741103EA4F921A44880B:1
242CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:A53D28BB82DF741103EA4F921A44880B:30C81C46A35CE411E5FBC1191A0A52EF:9C2157A664626D1DEF9EA420FDE69B96:1
243CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:9C2157A664626D1DEF9EA420FDE69B96:F69F2445DF4F9B17AD2B417BE66C3710:742A25F0542340C7BAEF24CA8482BB09:1
244
245# CFB128-CAMELLIA128.Decrypt
246CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:14F7646187817EB586599146B82BD719:0
247CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:14F7646187817EB586599146B82BD719:AE2D8A571E03AC9C9EB76FAC45AF8E51:A53D28BB82DF741103EA4F921A44880B:0
248CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:A53D28BB82DF741103EA4F921A44880B:30C81C46A35CE411E5FBC1191A0A52EF:9C2157A664626D1DEF9EA420FDE69B96:0
249CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:9C2157A664626D1DEF9EA420FDE69B96:F69F2445DF4F9B17AD2B417BE66C3710:742A25F0542340C7BAEF24CA8482BB09:0
250
251# CFB128-CAMELLIA192.Encrypt
252CAMELLIA-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:C832BB9780677DAA82D9B6860DCD565E:1
253CAMELLIA-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:C832BB9780677DAA82D9B6860DCD565E:AE2D8A571E03AC9C9EB76FAC45AF8E51:86F8491627906D780C7A6D46EA331F98:1
254CAMELLIA-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:86F8491627906D780C7A6D46EA331F98:30C81C46A35CE411E5FBC1191A0A52EF:69511CCE594CF710CB98BB63D7221F01:1
255CAMELLIA-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:69511CCE594CF710CB98BB63D7221F01:F69F2445DF4F9B17AD2B417BE66C3710:D5B5378A3ABED55803F25565D8907B84:1
256
257# CFB128-CAMELLIA192.Decrypt
258CAMELLIA-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:C832BB9780677DAA82D9B6860DCD565E:0
259CAMELLIA-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:C832BB9780677DAA82D9B6860DCD565E:AE2D8A571E03AC9C9EB76FAC45AF8E51:86F8491627906D780C7A6D46EA331F98:0
260CAMELLIA-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:86F8491627906D780C7A6D46EA331F98:30C81C46A35CE411E5FBC1191A0A52EF:69511CCE594CF710CB98BB63D7221F01:0
261CAMELLIA-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:69511CCE594CF710CB98BB63D7221F01:F69F2445DF4F9B17AD2B417BE66C3710:D5B5378A3ABED55803F25565D8907B84:0
262
263# CFB128-CAMELLIA256.Encrypt
264CAMELLIA-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:CF6107BB0CEA7D7FB1BD31F5E7B06C93:1
265CAMELLIA-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:CF6107BB0CEA7D7FB1BD31F5E7B06C93:AE2D8A571E03AC9C9EB76FAC45AF8E51:89BEDB4CCDD864EA11BA4CBE849B5E2B:1
266CAMELLIA-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:89BEDB4CCDD864EA11BA4CBE849B5E2B:30C81C46A35CE411E5FBC1191A0A52EF:555FC3F34BDD2D54C62D9E3BF338C1C4:1
267CAMELLIA-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:555FC3F34BDD2D54C62D9E3BF338C1C4:F69F2445DF4F9B17AD2B417BE66C3710:5953ADCE14DB8C7F39F1BD39F359BFFA:1
268
269# CFB128-CAMELLIA256.Decrypt
270CAMELLIA-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:CF6107BB0CEA7D7FB1BD31F5E7B06C93:0
271CAMELLIA-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:CF6107BB0CEA7D7FB1BD31F5E7B06C93:AE2D8A571E03AC9C9EB76FAC45AF8E51:89BEDB4CCDD864EA11BA4CBE849B5E2B:0
272CAMELLIA-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:89BEDB4CCDD864EA11BA4CBE849B5E2B:30C81C46A35CE411E5FBC1191A0A52EF:555FC3F34BDD2D54C62D9E3BF338C1C4:0
273CAMELLIA-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:555FC3F34BDD2D54C62D9E3BF338C1C4:F69F2445DF4F9B17AD2B417BE66C3710:5953ADCE14DB8C7F39F1BD39F359BFFA:0
274
275# For all OFB encrypts and decrypts, the transformed sequence is
276# CAMELLIA-bits-OFB:key:IV/output':plaintext:ciphertext:encdec
277# OFB-CAMELLIA128.Encrypt
278CAMELLIA-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:14F7646187817EB586599146B82BD719:1
279CAMELLIA-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:50FE67CC996D32B6DA0937E99BAFEC60:AE2D8A571E03AC9C9EB76FAC45AF8E51:25623DB569CA51E01482649977E28D84:1
280CAMELLIA-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:D9A4DADA0892239F6B8B3D7680E15674:30C81C46A35CE411E5FBC1191A0A52EF:C776634A60729DC657D12B9FCA801E98:1
281CAMELLIA-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:A78819583F0308E7A6BF36B1386ABF23:F69F2445DF4F9B17AD2B417BE66C3710:D776379BE0E50825E681DA1A4C980E8E:1
282
283# OFB-CAMELLIA128.Decrypt
284CAMELLIA-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:14F7646187817EB586599146B82BD719:0
285CAMELLIA-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:50FE67CC996D32B6DA0937E99BAFEC60:AE2D8A571E03AC9C9EB76FAC45AF8E51:25623DB569CA51E01482649977E28D84:0
286CAMELLIA-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:D9A4DADA0892239F6B8B3D7680E15674:30C81C46A35CE411E5FBC1191A0A52EF:C776634A60729DC657D12B9FCA801E98:0
287CAMELLIA-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:A78819583F0308E7A6BF36B1386ABF23:F69F2445DF4F9B17AD2B417BE66C3710:D776379BE0E50825E681DA1A4C980E8E:0
288
289# OFB-CAMELLIA192.Encrypt
290CAMELLIA-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:C832BB9780677DAA82D9B6860DCD565E:1
291CAMELLIA-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:A609B38DF3B1133DDDFF2718BA09565E:AE2D8A571E03AC9C9EB76FAC45AF8E51:8ECEB7D0350D72C7F78562AEBDF99339:1
292CAMELLIA-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:52EF01DA52602FE0975F78AC84BF8A50:30C81C46A35CE411E5FBC1191A0A52EF:BDD62DBBB9700846C53B507F544696F0:1
293CAMELLIA-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:BD5286AC63AABD7EB067AC54B553F71D:F69F2445DF4F9B17AD2B417BE66C3710:E28014E046B802F385C4C2E13EAD4A72:1
294
295# OFB-CAMELLIA192.Decrypt
296CAMELLIA-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:C832BB9780677DAA82D9B6860DCD565E:0
297CAMELLIA-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:A609B38DF3B1133DDDFF2718BA09565E:AE2D8A571E03AC9C9EB76FAC45AF8E51:8ECEB7D0350D72C7F78562AEBDF99339:0
298CAMELLIA-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:52EF01DA52602FE0975F78AC84BF8A50:30C81C46A35CE411E5FBC1191A0A52EF:BDD62DBBB9700846C53B507F544696F0:0
299CAMELLIA-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:BD5286AC63AABD7EB067AC54B553F71D:F69F2445DF4F9B17AD2B417BE66C3710:E28014E046B802F385C4C2E13EAD4A72:0
300
301# OFB-CAMELLIA256.Encrypt
302CAMELLIA-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:CF6107BB0CEA7D7FB1BD31F5E7B06C93:1
303CAMELLIA-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:B7BF3A5DF43989DD97F0FA97EBCE2F4A:AE2D8A571E03AC9C9EB76FAC45AF8E51:127AD97E8E3994E4820027D7BA109368:1
304CAMELLIA-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:E1C656305ED1A7A6563805746FE03EDC:30C81C46A35CE411E5FBC1191A0A52EF:6BFF6265A6A6B7A535BC65A80B17214E:1
305CAMELLIA-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:41635BE625B48AFC1666DD42A09D96E7:F69F2445DF4F9B17AD2B417BE66C3710:0A4A0404E26AA78A27CB271E8BF3CF20:1
306
307# OFB-CAMELLIA256.Decrypt
308CAMELLIA-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:CF6107BB0CEA7D7FB1BD31F5E7B06C93:0
309CAMELLIA-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:B7BF3A5DF43989DD97F0FA97EBCE2F4A:AE2D8A571E03AC9C9EB76FAC45AF8E51:127AD97E8E3994E4820027D7BA109368:0
310CAMELLIA-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:E1C656305ED1A7A6563805746FE03EDC:30C81C46A35CE411E5FBC1191A0A52EF:6BFF6265A6A6B7A535BC65A80B17214E:0
311CAMELLIA-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:41635BE625B48AFC1666DD42A09D96E7:F69F2445DF4F9B17AD2B417BE66C3710:0A4A0404E26AA78A27CB271E8BF3CF20:0
312
313# SEED test vectors from RFC4269
314SEED-ECB:00000000000000000000000000000000::000102030405060708090A0B0C0D0E0F:5EBAC6E0054E166819AFF1CC6D346CDB:0
315SEED-ECB:000102030405060708090A0B0C0D0E0F::00000000000000000000000000000000:C11F22F20140505084483597E4370F43:0
316SEED-ECB:4706480851E61BE85D74BFB3FD956185::83A2F8A288641FB9A4E9A5CC2F131C7D:EE54D13EBCAE706D226BC3142CD40D4A:0
317SEED-ECB:28DBC3BC49FFD87DCFA509B11D422BE7::B41E6BE2EBA84A148E2EED84593C5EC7:9B9B7BFCD1813CB95D0B3618F40F5122:0
318SEED-ECB:00000000000000000000000000000000::000102030405060708090A0B0C0D0E0F:5EBAC6E0054E166819AFF1CC6D346CDB:1
319SEED-ECB:000102030405060708090A0B0C0D0E0F::00000000000000000000000000000000:C11F22F20140505084483597E4370F43:1
320SEED-ECB:4706480851E61BE85D74BFB3FD956185::83A2F8A288641FB9A4E9A5CC2F131C7D:EE54D13EBCAE706D226BC3142CD40D4A:1
321SEED-ECB:28DBC3BC49FFD87DCFA509B11D422BE7::B41E6BE2EBA84A148E2EED84593C5EC7:9B9B7BFCD1813CB95D0B3618F40F5122:1
diff --git a/src/lib/libcrypto/evp/m_md2.c b/src/lib/libcrypto/evp/m_md2.c
index 0df48e5199..5ce849f161 100644
--- a/src/lib/libcrypto/evp/m_md2.c
+++ b/src/lib/libcrypto/evp/m_md2.c
@@ -56,19 +56,23 @@
56 * [including the GNU Public Licence.] 56 * [including the GNU Public Licence.]
57 */ 57 */
58 58
59#ifndef OPENSSL_NO_MD2
60#include <stdio.h> 59#include <stdio.h>
61#include "cryptlib.h" 60#include "cryptlib.h"
61
62#ifndef OPENSSL_NO_MD2
63
62#include <openssl/evp.h> 64#include <openssl/evp.h>
63#include "evp_locl.h"
64#include <openssl/objects.h> 65#include <openssl/objects.h>
65#include <openssl/x509.h> 66#include <openssl/x509.h>
66#include <openssl/md2.h> 67#include <openssl/md2.h>
68#ifndef OPENSSL_NO_RSA
69#include <openssl/rsa.h>
70#endif
67 71
68static int init(EVP_MD_CTX *ctx) 72static int init(EVP_MD_CTX *ctx)
69 { return MD2_Init(ctx->md_data); } 73 { return MD2_Init(ctx->md_data); }
70 74
71static int update(EVP_MD_CTX *ctx,const void *data,unsigned long count) 75static int update(EVP_MD_CTX *ctx,const void *data,size_t count)
72 { return MD2_Update(ctx->md_data,data,count); } 76 { return MD2_Update(ctx->md_data,data,count); }
73 77
74static int final(EVP_MD_CTX *ctx,unsigned char *md) 78static int final(EVP_MD_CTX *ctx,unsigned char *md)
diff --git a/src/lib/libcrypto/evp/m_mdc2.c b/src/lib/libcrypto/evp/m_mdc2.c
index 62de1336b8..36c4e9b134 100644
--- a/src/lib/libcrypto/evp/m_mdc2.c
+++ b/src/lib/libcrypto/evp/m_mdc2.c
@@ -56,19 +56,21 @@
56 * [including the GNU Public Licence.] 56 * [including the GNU Public Licence.]
57 */ 57 */
58 58
59#ifndef OPENSSL_NO_MDC2
60#include <stdio.h> 59#include <stdio.h>
61#include "cryptlib.h" 60#include "cryptlib.h"
61
62#ifndef OPENSSL_NO_MDC2
63
62#include <openssl/evp.h> 64#include <openssl/evp.h>
63#include "evp_locl.h"
64#include <openssl/objects.h> 65#include <openssl/objects.h>
65#include <openssl/x509.h> 66#include <openssl/x509.h>
66#include <openssl/mdc2.h> 67#include <openssl/mdc2.h>
68#include <openssl/rsa.h>
67 69
68static int init(EVP_MD_CTX *ctx) 70static int init(EVP_MD_CTX *ctx)
69 { return MDC2_Init(ctx->md_data); } 71 { return MDC2_Init(ctx->md_data); }
70 72
71static int update(EVP_MD_CTX *ctx,const void *data,unsigned long count) 73static int update(EVP_MD_CTX *ctx,const void *data,size_t count)
72 { return MDC2_Update(ctx->md_data,data,count); } 74 { return MDC2_Update(ctx->md_data,data,count); }
73 75
74static int final(EVP_MD_CTX *ctx,unsigned char *md) 76static int final(EVP_MD_CTX *ctx,unsigned char *md)
diff --git a/src/lib/libcrypto/evp/m_sha.c b/src/lib/libcrypto/evp/m_sha.c
index ed54909b16..acccc8f92d 100644
--- a/src/lib/libcrypto/evp/m_sha.c
+++ b/src/lib/libcrypto/evp/m_sha.c
@@ -56,21 +56,22 @@
56 * [including the GNU Public Licence.] 56 * [including the GNU Public Licence.]
57 */ 57 */
58 58
59#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA0)
60#include <stdio.h> 59#include <stdio.h>
61#include "cryptlib.h" 60#include "cryptlib.h"
62/* Including sha.h prior evp.h masks FIPS SHA declarations, but that's 61
63 * exactly what we want to achieve here... */ 62#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA0)
64#include <openssl/sha.h> 63
65#include <openssl/evp.h> 64#include <openssl/evp.h>
66#include "evp_locl.h"
67#include <openssl/objects.h> 65#include <openssl/objects.h>
68#include <openssl/x509.h> 66#include <openssl/x509.h>
67#ifndef OPENSSL_NO_RSA
68#include <openssl/rsa.h>
69#endif
69 70
70static int init(EVP_MD_CTX *ctx) 71static int init(EVP_MD_CTX *ctx)
71 { return SHA_Init(ctx->md_data); } 72 { return SHA_Init(ctx->md_data); }
72 73
73static int update(EVP_MD_CTX *ctx,const void *data,unsigned long count) 74static int update(EVP_MD_CTX *ctx,const void *data,size_t count)
74 { return SHA_Update(ctx->md_data,data,count); } 75 { return SHA_Update(ctx->md_data,data,count); }
75 76
76static int final(EVP_MD_CTX *ctx,unsigned char *md) 77static int final(EVP_MD_CTX *ctx,unsigned char *md)
diff --git a/src/lib/libcrypto/hmac/Makefile b/src/lib/libcrypto/hmac/Makefile
index 3d53d8240f..01f10c396f 100644
--- a/src/lib/libcrypto/hmac/Makefile
+++ b/src/lib/libcrypto/hmac/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= 8INCLUDES=
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -51,6 +46,7 @@ links:
51 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 46 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
52 47
53install: 48install:
49 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
54 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 50 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
55 do \ 51 do \
56 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 52 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -66,6 +62,7 @@ lint:
66 lint -DLINT $(INCLUDES) $(SRC)>fluff 62 lint -DLINT $(INCLUDES) $(SRC)>fluff
67 63
68depend: 64depend:
65 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
69 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 66 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
70 67
71dclean: 68dclean:
@@ -77,23 +74,12 @@ clean:
77 74
78# DO NOT DELETE THIS LINE -- make depend depends on it. 75# DO NOT DELETE THIS LINE -- make depend depends on it.
79 76
80hmac.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 77hmac.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
81hmac.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 78hmac.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
82hmac.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
83hmac.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
84hmac.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
85hmac.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
86hmac.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 79hmac.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
87hmac.o: ../../include/openssl/evp.h ../../include/openssl/hmac.h 80hmac.o: ../../include/openssl/evp.h ../../include/openssl/hmac.h
88hmac.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 81hmac.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
89hmac.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 82hmac.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
90hmac.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h 83hmac.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
91hmac.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 84hmac.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
92hmac.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 85hmac.o: ../../include/openssl/symhacks.h ../cryptlib.h hmac.c
93hmac.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rc2.h
94hmac.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
95hmac.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
96hmac.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
97hmac.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
98hmac.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
99hmac.o: ../cryptlib.h hmac.c
diff --git a/src/lib/libcrypto/idea/Makefile b/src/lib/libcrypto/idea/Makefile
index 6b8e530d9d..b2e7add666 100644
--- a/src/lib/libcrypto/idea/Makefile
+++ b/src/lib/libcrypto/idea/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= 8INCLUDES=
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -51,6 +46,7 @@ links:
51 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 46 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
52 47
53install: 48install:
49 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
54 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 50 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
55 do \ 51 do \
56 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 52 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -66,6 +62,7 @@ lint:
66 lint -DLINT $(INCLUDES) $(SRC)>fluff 62 lint -DLINT $(INCLUDES) $(SRC)>fluff
67 63
68depend: 64depend:
65 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
69 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 66 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
70 67
71dclean: 68dclean:
@@ -85,8 +82,5 @@ i_ecb.o: ../../include/openssl/idea.h ../../include/openssl/opensslconf.h
85i_ecb.o: ../../include/openssl/opensslv.h i_ecb.c idea_lcl.h 82i_ecb.o: ../../include/openssl/opensslv.h i_ecb.c idea_lcl.h
86i_ofb64.o: ../../include/openssl/idea.h ../../include/openssl/opensslconf.h 83i_ofb64.o: ../../include/openssl/idea.h ../../include/openssl/opensslconf.h
87i_ofb64.o: i_ofb64.c idea_lcl.h 84i_ofb64.o: i_ofb64.c idea_lcl.h
88i_skey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 85i_skey.o: ../../include/openssl/idea.h ../../include/openssl/opensslconf.h
89i_skey.o: ../../include/openssl/fips.h ../../include/openssl/idea.h 86i_skey.o: i_skey.c idea_lcl.h
90i_skey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
91i_skey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
92i_skey.o: ../../include/openssl/symhacks.h i_skey.c idea_lcl.h
diff --git a/src/lib/libcrypto/idea/ideatest.c b/src/lib/libcrypto/idea/ideatest.c
index 98f805d72a..e6ffc7025e 100644
--- a/src/lib/libcrypto/idea/ideatest.c
+++ b/src/lib/libcrypto/idea/ideatest.c
@@ -169,6 +169,9 @@ int main(int argc, char *argv[])
169 else 169 else
170 printf("ok\n"); 170 printf("ok\n");
171 171
172#ifdef OPENSSL_SYS_NETWARE
173 if (err) printf("ERROR: %d\n", err);
174#endif
172 EXIT(err); 175 EXIT(err);
173 return(err); 176 return(err);
174 } 177 }
diff --git a/src/lib/libcrypto/install.com b/src/lib/libcrypto/install.com
index b3d155e964..58a4fecdaa 100644
--- a/src/lib/libcrypto/install.com
+++ b/src/lib/libcrypto/install.com
@@ -32,14 +32,18 @@ $ IF F$PARSE("WRK_SSLALIB:") .EQS. "" THEN -
32$ IF F$PARSE("WRK_SSLINCLUDE:") .EQS. "" THEN - 32$ IF F$PARSE("WRK_SSLINCLUDE:") .EQS. "" THEN -
33 CREATE/DIR/LOG WRK_SSLINCLUDE: 33 CREATE/DIR/LOG WRK_SSLINCLUDE:
34$ 34$
35$ SDIRS := ,MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,- 35$ SDIRS := ,-
36 DES,RC2,RC4,RC5,IDEA,BF,CAST,- 36 OBJECTS,-
37 BN,EC,RSA,DSA,DH,DSO,ENGINE,AES,- 37 MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,-
38 BUFFER,BIO,STACK,LHASH,RAND,ERR,OBJECTS,- 38 DES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,SEED,-
39 BN,EC,RSA,DSA,ECDSA,DH,ECDH,DSO,ENGINE,AES,-
40 BUFFER,BIO,STACK,LHASH,RAND,ERR,-
39 EVP,ASN1,PEM,X509,X509V3,CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,- 41 EVP,ASN1,PEM,X509,X509V3,CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,-
40 UI,KRB5 42 UI,KRB5,-
43 STORE,CMS,PQUEUE
41$ EXHEADER_ := crypto.h,tmdiff.h,opensslv.h,opensslconf.h,ebcdic.h,- 44$ EXHEADER_ := crypto.h,tmdiff.h,opensslv.h,opensslconf.h,ebcdic.h,-
42 symhacks.h,ossl_typ.h 45 symhacks.h,ossl_typ.h
46$ EXHEADER_OBJECTS := objects.h,obj_mac.h
43$ EXHEADER_MD2 := md2.h 47$ EXHEADER_MD2 := md2.h
44$ EXHEADER_MD4 := md4.h 48$ EXHEADER_MD4 := md4.h
45$ EXHEADER_MD5 := md5.h 49$ EXHEADER_MD5 := md5.h
@@ -54,11 +58,15 @@ $ EXHEADER_RC5 := rc5.h
54$ EXHEADER_IDEA := idea.h 58$ EXHEADER_IDEA := idea.h
55$ EXHEADER_BF := blowfish.h 59$ EXHEADER_BF := blowfish.h
56$ EXHEADER_CAST := cast.h 60$ EXHEADER_CAST := cast.h
61$ EXHEADER_CAMELLIA := camellia.h
62$ EXHEADER_SEED := seed.h
57$ EXHEADER_BN := bn.h 63$ EXHEADER_BN := bn.h
58$ EXHEADER_EC := ec.h 64$ EXHEADER_EC := ec.h
59$ EXHEADER_RSA := rsa.h 65$ EXHEADER_RSA := rsa.h
60$ EXHEADER_DSA := dsa.h 66$ EXHEADER_DSA := dsa.h
67$ EXHEADER_ECDSA := ecdsa.h
61$ EXHEADER_DH := dh.h 68$ EXHEADER_DH := dh.h
69$ EXHEADER_ECDH := ecdh.h
62$ EXHEADER_DSO := dso.h 70$ EXHEADER_DSO := dso.h
63$ EXHEADER_ENGINE := engine.h 71$ EXHEADER_ENGINE := engine.h
64$ EXHEADER_AES := aes.h 72$ EXHEADER_AES := aes.h
@@ -68,7 +76,6 @@ $ EXHEADER_STACK := stack.h,safestack.h
68$ EXHEADER_LHASH := lhash.h 76$ EXHEADER_LHASH := lhash.h
69$ EXHEADER_RAND := rand.h 77$ EXHEADER_RAND := rand.h
70$ EXHEADER_ERR := err.h 78$ EXHEADER_ERR := err.h
71$ EXHEADER_OBJECTS := objects.h,obj_mac.h
72$ EXHEADER_EVP := evp.h 79$ EXHEADER_EVP := evp.h
73$ EXHEADER_ASN1 := asn1.h,asn1_mac.h,asn1t.h 80$ EXHEADER_ASN1 := asn1.h,asn1_mac.h,asn1t.h
74$ EXHEADER_PEM := pem.h,pem2.h 81$ EXHEADER_PEM := pem.h,pem2.h
@@ -82,6 +89,10 @@ $ EXHEADER_COMP := comp.h
82$ EXHEADER_OCSP := ocsp.h 89$ EXHEADER_OCSP := ocsp.h
83$ EXHEADER_UI := ui.h,ui_compat.h 90$ EXHEADER_UI := ui.h,ui_compat.h
84$ EXHEADER_KRB5 := krb5_asn.h 91$ EXHEADER_KRB5 := krb5_asn.h
92$! EXHEADER_STORE := store.h,str_compat.h
93$ EXHEADER_STORE := store.h
94$ EXHEADER_PQUEUE := pqueue.h,pq_compat.h
95$ EXHEADER_CMS := cms.h
85$ LIBS := LIBCRYPTO 96$ LIBS := LIBCRYPTO
86$ 97$
87$ VEXE_DIR := [-.VAX.EXE.CRYPTO] 98$ VEXE_DIR := [-.VAX.EXE.CRYPTO]
diff --git a/src/lib/libcrypto/krb5/Makefile b/src/lib/libcrypto/krb5/Makefile
index 25cc695e8d..14077390d6 100644
--- a/src/lib/libcrypto/krb5/Makefile
+++ b/src/lib/libcrypto/krb5/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include 8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -52,6 +47,7 @@ links:
52 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 47 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
53 48
54install: 49install:
50 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
55 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 51 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
56 do \ 52 do \
57 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 53 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -67,6 +63,7 @@ lint:
67 lint -DLINT $(INCLUDES) $(SRC)>fluff 63 lint -DLINT $(INCLUDES) $(SRC)>fluff
68 64
69depend: 65depend:
66 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
70 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC) 67 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
71 68
72dclean: 69dclean:
@@ -79,9 +76,8 @@ clean:
79# DO NOT DELETE THIS LINE -- make depend depends on it. 76# DO NOT DELETE THIS LINE -- make depend depends on it.
80 77
81krb5_asn.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h 78krb5_asn.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
82krb5_asn.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 79krb5_asn.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
83krb5_asn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 80krb5_asn.o: ../../include/openssl/e_os2.h ../../include/openssl/krb5_asn.h
84krb5_asn.o: ../../include/openssl/krb5_asn.h
85krb5_asn.o: ../../include/openssl/opensslconf.h 81krb5_asn.o: ../../include/openssl/opensslconf.h
86krb5_asn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 82krb5_asn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
87krb5_asn.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 83krb5_asn.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
diff --git a/src/lib/libcrypto/lhash/Makefile b/src/lib/libcrypto/lhash/Makefile
index cdb0e77fad..82bddac474 100644
--- a/src/lib/libcrypto/lhash/Makefile
+++ b/src/lib/libcrypto/lhash/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= 8INCLUDES=
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -51,6 +46,7 @@ links:
51 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 46 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
52 47
53install: 48install:
49 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
54 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 50 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
55 do \ 51 do \
56 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 52 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -66,6 +62,7 @@ lint:
66 lint -DLINT $(INCLUDES) $(SRC)>fluff 62 lint -DLINT $(INCLUDES) $(SRC)>fluff
67 63
68depend: 64depend:
65 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
69 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 66 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
70 67
71dclean: 68dclean:
@@ -81,11 +78,11 @@ lh_stats.o: ../../e_os.h ../../include/openssl/bio.h
81lh_stats.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 78lh_stats.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
82lh_stats.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 79lh_stats.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
83lh_stats.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 80lh_stats.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
84lh_stats.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 81lh_stats.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
85lh_stats.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 82lh_stats.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
86lh_stats.o: ../cryptlib.h lh_stats.c 83lh_stats.o: ../../include/openssl/symhacks.h ../cryptlib.h lh_stats.c
87lhash.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h 84lhash.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
88lhash.o: ../../include/openssl/e_os2.h ../../include/openssl/lhash.h 85lhash.o: ../../include/openssl/e_os2.h ../../include/openssl/lhash.h
89lhash.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 86lhash.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
90lhash.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 87lhash.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
91lhash.o: ../../include/openssl/symhacks.h lhash.c 88lhash.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h lhash.c
diff --git a/src/lib/libcrypto/md2/Makefile b/src/lib/libcrypto/md2/Makefile
index 9d0351bb2f..17f878aeb7 100644
--- a/src/lib/libcrypto/md2/Makefile
+++ b/src/lib/libcrypto/md2/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= 8INCLUDES=
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -51,6 +46,7 @@ links:
51 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 46 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
52 47
53install: 48install:
49 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
54 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 50 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
55 do \ 51 do \
56 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 52 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -66,6 +62,7 @@ lint:
66 lint -DLINT $(INCLUDES) $(SRC)>fluff 62 lint -DLINT $(INCLUDES) $(SRC)>fluff
67 63
68depend: 64depend:
65 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
69 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 66 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
70 67
71dclean: 68dclean:
@@ -77,17 +74,16 @@ clean:
77 74
78# DO NOT DELETE THIS LINE -- make depend depends on it. 75# DO NOT DELETE THIS LINE -- make depend depends on it.
79 76
80md2_dgst.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h 77md2_dgst.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
81md2_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
82md2_dgst.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
83md2_dgst.o: ../../include/openssl/md2.h ../../include/openssl/opensslconf.h 78md2_dgst.o: ../../include/openssl/md2.h ../../include/openssl/opensslconf.h
84md2_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 79md2_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
85md2_dgst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 80md2_dgst.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
86md2_dgst.o: md2_dgst.c 81md2_dgst.o: ../../include/openssl/symhacks.h md2_dgst.c
87md2_one.o: ../../e_os.h ../../include/openssl/bio.h 82md2_one.o: ../../e_os.h ../../include/openssl/bio.h
88md2_one.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 83md2_one.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
89md2_one.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 84md2_one.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
90md2_one.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 85md2_one.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
91md2_one.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 86md2_one.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
92md2_one.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 87md2_one.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
93md2_one.o: ../../include/openssl/symhacks.h ../cryptlib.h md2_one.c 88md2_one.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
89md2_one.o: ../cryptlib.h md2_one.c
diff --git a/src/lib/libcrypto/md2/md2.h b/src/lib/libcrypto/md2/md2.h
index d0ef9da08e..a46120e7d4 100644
--- a/src/lib/libcrypto/md2/md2.h
+++ b/src/lib/libcrypto/md2/md2.h
@@ -59,13 +59,14 @@
59#ifndef HEADER_MD2_H 59#ifndef HEADER_MD2_H
60#define HEADER_MD2_H 60#define HEADER_MD2_H
61 61
62#include <openssl/opensslconf.h> /* OPENSSL_NO_MD2, MD2_INT */
62#ifdef OPENSSL_NO_MD2 63#ifdef OPENSSL_NO_MD2
63#error MD2 is disabled. 64#error MD2 is disabled.
64#endif 65#endif
66#include <stddef.h>
65 67
66#define MD2_DIGEST_LENGTH 16 68#define MD2_DIGEST_LENGTH 16
67#define MD2_BLOCK 16 69#define MD2_BLOCK 16
68#include <openssl/opensslconf.h> /* MD2_INT */
69 70
70#ifdef __cplusplus 71#ifdef __cplusplus
71extern "C" { 72extern "C" {
@@ -73,20 +74,17 @@ extern "C" {
73 74
74typedef struct MD2state_st 75typedef struct MD2state_st
75 { 76 {
76 int num; 77 unsigned int num;
77 unsigned char data[MD2_BLOCK]; 78 unsigned char data[MD2_BLOCK];
78 MD2_INT cksm[MD2_BLOCK]; 79 MD2_INT cksm[MD2_BLOCK];
79 MD2_INT state[MD2_BLOCK]; 80 MD2_INT state[MD2_BLOCK];
80 } MD2_CTX; 81 } MD2_CTX;
81 82
82const char *MD2_options(void); 83const char *MD2_options(void);
83#ifdef OPENSSL_FIPS
84int private_MD2_Init(MD2_CTX *c);
85#endif
86int MD2_Init(MD2_CTX *c); 84int MD2_Init(MD2_CTX *c);
87int MD2_Update(MD2_CTX *c, const unsigned char *data, unsigned long len); 85int MD2_Update(MD2_CTX *c, const unsigned char *data, size_t len);
88int MD2_Final(unsigned char *md, MD2_CTX *c); 86int MD2_Final(unsigned char *md, MD2_CTX *c);
89unsigned char *MD2(const unsigned char *d, unsigned long n,unsigned char *md); 87unsigned char *MD2(const unsigned char *d, size_t n,unsigned char *md);
90#ifdef __cplusplus 88#ifdef __cplusplus
91} 89}
92#endif 90#endif
diff --git a/src/lib/libcrypto/md2/md2_dgst.c b/src/lib/libcrypto/md2/md2_dgst.c
index 8124acd687..6f68b25c6a 100644
--- a/src/lib/libcrypto/md2/md2_dgst.c
+++ b/src/lib/libcrypto/md2/md2_dgst.c
@@ -62,10 +62,8 @@
62#include <openssl/md2.h> 62#include <openssl/md2.h>
63#include <openssl/opensslv.h> 63#include <openssl/opensslv.h>
64#include <openssl/crypto.h> 64#include <openssl/crypto.h>
65#include <openssl/fips.h>
66#include <openssl/err.h>
67 65
68const char *MD2_version="MD2" OPENSSL_VERSION_PTEXT; 66const char MD2_version[]="MD2" OPENSSL_VERSION_PTEXT;
69 67
70/* Implemented from RFC1319 The MD2 Message-Digest Algorithm 68/* Implemented from RFC1319 The MD2 Message-Digest Algorithm
71 */ 69 */
@@ -118,7 +116,7 @@ const char *MD2_options(void)
118 return("md2(int)"); 116 return("md2(int)");
119 } 117 }
120 118
121FIPS_NON_FIPS_MD_Init(MD2) 119int MD2_Init(MD2_CTX *c)
122 { 120 {
123 c->num=0; 121 c->num=0;
124 memset(c->state,0,sizeof c->state); 122 memset(c->state,0,sizeof c->state);
@@ -127,7 +125,7 @@ FIPS_NON_FIPS_MD_Init(MD2)
127 return 1; 125 return 1;
128 } 126 }
129 127
130int MD2_Update(MD2_CTX *c, const unsigned char *data, unsigned long len) 128int MD2_Update(MD2_CTX *c, const unsigned char *data, size_t len)
131 { 129 {
132 register UCHAR *p; 130 register UCHAR *p;
133 131
@@ -147,7 +145,7 @@ int MD2_Update(MD2_CTX *c, const unsigned char *data, unsigned long len)
147 } 145 }
148 else 146 else
149 { 147 {
150 memcpy(&(p[c->num]),data,(int)len); 148 memcpy(&(p[c->num]),data,len);
151 /* data+=len; */ 149 /* data+=len; */
152 c->num+=(int)len; 150 c->num+=(int)len;
153 return 1; 151 return 1;
@@ -161,7 +159,7 @@ int MD2_Update(MD2_CTX *c, const unsigned char *data, unsigned long len)
161 data+=MD2_BLOCK; 159 data+=MD2_BLOCK;
162 len-=MD2_BLOCK; 160 len-=MD2_BLOCK;
163 } 161 }
164 memcpy(p,data,(int)len); 162 memcpy(p,data,len);
165 c->num=(int)len; 163 c->num=(int)len;
166 return 1; 164 return 1;
167 } 165 }
diff --git a/src/lib/libcrypto/md2/md2_one.c b/src/lib/libcrypto/md2/md2_one.c
index 8c36ba5779..f7fef5cc0a 100644
--- a/src/lib/libcrypto/md2/md2_one.c
+++ b/src/lib/libcrypto/md2/md2_one.c
@@ -63,7 +63,7 @@
63/* This is a separate file so that #defines in cryptlib.h can 63/* This is a separate file so that #defines in cryptlib.h can
64 * map my MD functions to different names */ 64 * map my MD functions to different names */
65 65
66unsigned char *MD2(const unsigned char *d, unsigned long n, unsigned char *md) 66unsigned char *MD2(const unsigned char *d, size_t n, unsigned char *md)
67 { 67 {
68 MD2_CTX c; 68 MD2_CTX c;
69 static unsigned char m[MD2_DIGEST_LENGTH]; 69 static unsigned char m[MD2_DIGEST_LENGTH];
diff --git a/src/lib/libcrypto/md2/md2test.c b/src/lib/libcrypto/md2/md2test.c
index 9c1e28b6ce..db5f5bc6d2 100644
--- a/src/lib/libcrypto/md2/md2test.c
+++ b/src/lib/libcrypto/md2/md2test.c
@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
110 i=1; 110 i=1;
111 while (*P != NULL) 111 while (*P != NULL)
112 { 112 {
113 EVP_Digest((unsigned char *)*P,(unsigned long)strlen(*P),md,NULL,EVP_md2(), NULL); 113 EVP_Digest((unsigned char *)*P,strlen(*P),md,NULL,EVP_md2(), NULL);
114 p=pt(md); 114 p=pt(md);
115 if (strcmp(p,*R) != 0) 115 if (strcmp(p,*R) != 0)
116 { 116 {
@@ -124,7 +124,11 @@ int main(int argc, char *argv[])
124 R++; 124 R++;
125 P++; 125 P++;
126 } 126 }
127#ifdef OPENSSL_SYS_NETWARE
128 if (err) printf("ERROR: %d\n", err);
129#endif
127 EXIT(err); 130 EXIT(err);
131 return err;
128 } 132 }
129 133
130static char *pt(unsigned char *md) 134static char *pt(unsigned char *md)
diff --git a/src/lib/libcrypto/md4/Makefile b/src/lib/libcrypto/md4/Makefile
index eeb457f20f..ef97bb0cbe 100644
--- a/src/lib/libcrypto/md4/Makefile
+++ b/src/lib/libcrypto/md4/Makefile
@@ -8,11 +8,6 @@ CC= cc
8CPP= $(CC) -E 8CPP= $(CC) -E
9INCLUDES= 9INCLUDES=
10CFLAG=-g 10CFLAG=-g
11INSTALL_PREFIX=
12OPENSSLDIR= /usr/local/ssl
13INSTALLTOP=/usr/local/ssl
14MAKEDEPPROG= makedepend
15MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
16MAKEFILE= Makefile 11MAKEFILE= Makefile
17AR= ar r 12AR= ar r
18 13
@@ -52,6 +47,7 @@ links:
52 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 47 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
53 48
54install: 49install:
50 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
55 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 51 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
56 do \ 52 do \
57 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 53 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -67,6 +63,7 @@ lint:
67 lint -DLINT $(INCLUDES) $(SRC)>fluff 63 lint -DLINT $(INCLUDES) $(SRC)>fluff
68 64
69depend: 65depend:
66 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
70 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 67 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
71 68
72dclean: 69dclean:
@@ -78,15 +75,12 @@ clean:
78 75
79# DO NOT DELETE THIS LINE -- make depend depends on it. 76# DO NOT DELETE THIS LINE -- make depend depends on it.
80 77
81md4_dgst.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h 78md4_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/md4.h
82md4_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 79md4_dgst.o: ../../include/openssl/opensslconf.h
83md4_dgst.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h 80md4_dgst.o: ../../include/openssl/opensslv.h ../md32_common.h md4_dgst.c
84md4_dgst.o: ../../include/openssl/md4.h ../../include/openssl/opensslconf.h 81md4_dgst.o: md4_locl.h
85md4_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
86md4_dgst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
87md4_dgst.o: ../md32_common.h md4_dgst.c md4_locl.h
88md4_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 82md4_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
89md4_one.o: ../../include/openssl/md4.h ../../include/openssl/opensslconf.h 83md4_one.o: ../../include/openssl/md4.h ../../include/openssl/opensslconf.h
90md4_one.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 84md4_one.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
91md4_one.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 85md4_one.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
92md4_one.o: md4_one.c 86md4_one.o: ../../include/openssl/symhacks.h md4_one.c
diff --git a/src/lib/libcrypto/md4/md4test.c b/src/lib/libcrypto/md4/md4test.c
index 21a77d96f7..56591728a1 100644
--- a/src/lib/libcrypto/md4/md4test.c
+++ b/src/lib/libcrypto/md4/md4test.c
@@ -97,16 +97,16 @@ static char *pt(unsigned char *md);
97int main(int argc, char *argv[]) 97int main(int argc, char *argv[])
98 { 98 {
99 int i,err=0; 99 int i,err=0;
100 unsigned char **P,**R; 100 char **P,**R;
101 char *p; 101 char *p;
102 unsigned char md[MD4_DIGEST_LENGTH]; 102 unsigned char md[MD4_DIGEST_LENGTH];
103 103
104 P=(unsigned char **)test; 104 P=test;
105 R=(unsigned char **)ret; 105 R=ret;
106 i=1; 106 i=1;
107 while (*P != NULL) 107 while (*P != NULL)
108 { 108 {
109 EVP_Digest(&(P[0][0]),(unsigned long)strlen((char *)*P),md,NULL,EVP_md4(), NULL); 109 EVP_Digest(&(P[0][0]),strlen((char *)*P),md,NULL,EVP_md4(), NULL);
110 p=pt(md); 110 p=pt(md);
111 if (strcmp(p,(char *)*R) != 0) 111 if (strcmp(p,(char *)*R) != 0)
112 { 112 {
diff --git a/src/lib/libcrypto/md5/Makefile b/src/lib/libcrypto/md5/Makefile
index 1ed018526f..ceb00e8956 100644
--- a/src/lib/libcrypto/md5/Makefile
+++ b/src/lib/libcrypto/md5/Makefile
@@ -8,11 +8,6 @@ CC= cc
8CPP= $(CC) -E 8CPP= $(CC) -E
9INCLUDES=-I.. -I$(TOP) -I../../include 9INCLUDES=-I.. -I$(TOP) -I../../include
10CFLAG=-g 10CFLAG=-g
11INSTALL_PREFIX=
12OPENSSLDIR= /usr/local/ssl
13INSTALLTOP=/usr/local/ssl
14MAKEDEPPROG= makedepend
15MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
16MAKEFILE= Makefile 11MAKEFILE= Makefile
17AR= ar r 12AR= ar r
18 13
@@ -20,6 +15,7 @@ MD5_ASM_OBJ=
20 15
21CFLAGS= $(INCLUDES) $(CFLAG) 16CFLAGS= $(INCLUDES) $(CFLAG)
22ASFLAGS= $(INCLUDES) $(ASFLAG) 17ASFLAGS= $(INCLUDES) $(ASFLAG)
18AFLAGS= $(ASFLAGS)
23 19
24GENERAL=Makefile 20GENERAL=Makefile
25TEST=md5test.c 21TEST=md5test.c
@@ -46,38 +42,17 @@ lib: $(LIBOBJ)
46 $(RANLIB) $(LIB) || echo Never mind. 42 $(RANLIB) $(LIB) || echo Never mind.
47 @touch lib 43 @touch lib
48 44
49# elf 45# ELF
50asm/mx86-elf.s: asm/md5-586.pl ../perlasm/x86asm.pl 46mx86-elf.s: asm/md5-586.pl ../perlasm/x86asm.pl
51 (cd asm; $(PERL) md5-586.pl elf $(CFLAGS) > mx86-elf.s) 47 (cd asm; $(PERL) md5-586.pl elf $(CFLAGS) > ../$@)
52 48# COFF
49mx86-cof.s: asm/md5-586.pl ../perlasm/x86asm.pl
50 (cd asm; $(PERL) md5-586.pl coff $(CFLAGS) > ../$@)
53# a.out 51# a.out
54asm/mx86-out.o: asm/mx86unix.cpp 52mx86-out.s: asm/md5-586.pl ../perlasm/x86asm.pl
55 $(CPP) -DOUT asm/mx86unix.cpp | as -o asm/mx86-out.o 53 (cd asm; $(PERL) md5-586.pl a.out $(CFLAGS) > ../$@)
56 54
57# bsdi 55md5-x86_64.s: asm/md5-x86_64.pl; $(PERL) asm/md5-x86_64.pl $@
58asm/mx86bsdi.o: asm/mx86unix.cpp
59 $(CPP) -DBSDI asm/mx86unix.cpp | sed 's/ :/:/' | as -o asm/mx86bsdi.o
60
61asm/mx86unix.cpp: asm/md5-586.pl ../perlasm/x86asm.pl
62 (cd asm; $(PERL) md5-586.pl cpp >mx86unix.cpp)
63
64asm/md5-sparcv8plus.o: asm/md5-sparcv9.S
65 $(CC) $(ASFLAGS) -DMD5_BLOCK_DATA_ORDER -c \
66 -o asm/md5-sparcv8plus.o asm/md5-sparcv9.S
67
68# Old GNU assembler doesn't understand V9 instructions, so we
69# hire /usr/ccs/bin/as to do the job. Note that option is called
70# *-gcc27, but even gcc 2>=8 users may experience similar problem
71# if they didn't bother to upgrade GNU assembler. Such users should
72# not choose this option, but be adviced to *remove* GNU assembler
73# or upgrade it.
74asm/md5-sparcv8plus-gcc27.o: asm/md5-sparcv9.S
75 $(CC) $(ASFLAGS) -DMD5_BLOCK_DATA_ORDER -E asm/md5-sparcv9.S | \
76 /usr/ccs/bin/as -xarch=v8plus - -o asm/md5-sparcv8plus-gcc27.o
77
78asm/md5-sparcv9.o: asm/md5-sparcv9.S
79 $(CC) $(ASFLAGS) -DMD5_BLOCK_DATA_ORDER -c \
80 -o asm/md5-sparcv9.o asm/md5-sparcv9.S
81 56
82files: 57files:
83 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO 58 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
@@ -88,6 +63,7 @@ links:
88 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 63 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
89 64
90install: 65install:
66 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
91 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 67 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
92 do \ 68 do \
93 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 69 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -103,6 +79,7 @@ lint:
103 lint -DLINT $(INCLUDES) $(SRC)>fluff 79 lint -DLINT $(INCLUDES) $(SRC)>fluff
104 80
105depend: 81depend:
82 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
106 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 83 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
107 84
108dclean: 85dclean:
@@ -110,19 +87,16 @@ dclean:
110 mv -f Makefile.new $(MAKEFILE) 87 mv -f Makefile.new $(MAKEFILE)
111 88
112clean: 89clean:
113 rm -f asm/mx86unix.cpp asm/*-elf.* *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff 90 rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
114 91
115# DO NOT DELETE THIS LINE -- make depend depends on it. 92# DO NOT DELETE THIS LINE -- make depend depends on it.
116 93
117md5_dgst.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h 94md5_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/md5.h
118md5_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 95md5_dgst.o: ../../include/openssl/opensslconf.h
119md5_dgst.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h 96md5_dgst.o: ../../include/openssl/opensslv.h ../md32_common.h md5_dgst.c
120md5_dgst.o: ../../include/openssl/md5.h ../../include/openssl/opensslconf.h 97md5_dgst.o: md5_locl.h
121md5_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
122md5_dgst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
123md5_dgst.o: ../md32_common.h md5_dgst.c md5_locl.h
124md5_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 98md5_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
125md5_one.o: ../../include/openssl/md5.h ../../include/openssl/opensslconf.h 99md5_one.o: ../../include/openssl/md5.h ../../include/openssl/opensslconf.h
126md5_one.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 100md5_one.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
127md5_one.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 101md5_one.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
128md5_one.o: md5_one.c 102md5_one.o: ../../include/openssl/symhacks.h md5_one.c
diff --git a/src/lib/libcrypto/md5/md5test.c b/src/lib/libcrypto/md5/md5test.c
index bfd62629ed..2b37190e32 100644
--- a/src/lib/libcrypto/md5/md5test.c
+++ b/src/lib/libcrypto/md5/md5test.c
@@ -97,16 +97,16 @@ static char *pt(unsigned char *md);
97int main(int argc, char *argv[]) 97int main(int argc, char *argv[])
98 { 98 {
99 int i,err=0; 99 int i,err=0;
100 unsigned char **P,**R; 100 char **P,**R;
101 char *p; 101 char *p;
102 unsigned char md[MD5_DIGEST_LENGTH]; 102 unsigned char md[MD5_DIGEST_LENGTH];
103 103
104 P=(unsigned char **)test; 104 P=test;
105 R=(unsigned char **)ret; 105 R=ret;
106 i=1; 106 i=1;
107 while (*P != NULL) 107 while (*P != NULL)
108 { 108 {
109 EVP_Digest(&(P[0][0]),(unsigned long)strlen((char *)*P),md,NULL,EVP_md5(), NULL); 109 EVP_Digest(&(P[0][0]),strlen((char *)*P),md,NULL,EVP_md5(), NULL);
110 p=pt(md); 110 p=pt(md);
111 if (strcmp(p,(char *)*R) != 0) 111 if (strcmp(p,(char *)*R) != 0)
112 { 112 {
@@ -120,6 +120,10 @@ int main(int argc, char *argv[])
120 R++; 120 R++;
121 P++; 121 P++;
122 } 122 }
123
124#ifdef OPENSSL_SYS_NETWARE
125 if (err) printf("ERROR: %d\n", err);
126#endif
123 EXIT(err); 127 EXIT(err);
124 return(0); 128 return(0);
125 } 129 }
diff --git a/src/lib/libcrypto/mdc2/Makefile b/src/lib/libcrypto/mdc2/Makefile
index b8e9a9a4fa..1d064f17a6 100644
--- a/src/lib/libcrypto/mdc2/Makefile
+++ b/src/lib/libcrypto/mdc2/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= 8INCLUDES=
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -51,6 +46,7 @@ links:
51 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 46 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
52 47
53install: 48install:
49 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
54 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 50 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
55 do \ 51 do \
56 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 52 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -66,6 +62,7 @@ lint:
66 lint -DLINT $(INCLUDES) $(SRC)>fluff 62 lint -DLINT $(INCLUDES) $(SRC)>fluff
67 63
68depend: 64depend:
65 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
69 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 66 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
70 67
71dclean: 68dclean:
@@ -83,16 +80,14 @@ mdc2_one.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
83mdc2_one.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 80mdc2_one.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
84mdc2_one.o: ../../include/openssl/lhash.h ../../include/openssl/mdc2.h 81mdc2_one.o: ../../include/openssl/lhash.h ../../include/openssl/mdc2.h
85mdc2_one.o: ../../include/openssl/opensslconf.h 82mdc2_one.o: ../../include/openssl/opensslconf.h
86mdc2_one.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 83mdc2_one.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
87mdc2_one.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 84mdc2_one.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
88mdc2_one.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 85mdc2_one.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
89mdc2_one.o: ../cryptlib.h mdc2_one.c 86mdc2_one.o: ../../include/openssl/ui_compat.h ../cryptlib.h mdc2_one.c
90mdc2dgst.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
91mdc2dgst.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 87mdc2dgst.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
92mdc2dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 88mdc2dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/mdc2.h
93mdc2dgst.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h 89mdc2dgst.o: ../../include/openssl/opensslconf.h
94mdc2dgst.o: ../../include/openssl/mdc2.h ../../include/openssl/opensslconf.h 90mdc2dgst.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
95mdc2dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
96mdc2dgst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 91mdc2dgst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
97mdc2dgst.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 92mdc2dgst.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
98mdc2dgst.o: mdc2dgst.c 93mdc2dgst.o: mdc2dgst.c
diff --git a/src/lib/libcrypto/mdc2/mdc2.h b/src/lib/libcrypto/mdc2/mdc2.h
index 4cba101f37..72778a5212 100644
--- a/src/lib/libcrypto/mdc2/mdc2.h
+++ b/src/lib/libcrypto/mdc2/mdc2.h
@@ -74,19 +74,17 @@ extern "C" {
74 74
75typedef struct mdc2_ctx_st 75typedef struct mdc2_ctx_st
76 { 76 {
77 int num; 77 unsigned int num;
78 unsigned char data[MDC2_BLOCK]; 78 unsigned char data[MDC2_BLOCK];
79 DES_cblock h,hh; 79 DES_cblock h,hh;
80 int pad_type; /* either 1 or 2, default 1 */ 80 int pad_type; /* either 1 or 2, default 1 */
81 } MDC2_CTX; 81 } MDC2_CTX;
82 82
83#ifdef OPENSSL_FIPS 83
84int private_MDC2_Init(MDC2_CTX *c);
85#endif
86int MDC2_Init(MDC2_CTX *c); 84int MDC2_Init(MDC2_CTX *c);
87int MDC2_Update(MDC2_CTX *c, const unsigned char *data, unsigned long len); 85int MDC2_Update(MDC2_CTX *c, const unsigned char *data, size_t len);
88int MDC2_Final(unsigned char *md, MDC2_CTX *c); 86int MDC2_Final(unsigned char *md, MDC2_CTX *c);
89unsigned char *MDC2(const unsigned char *d, unsigned long n, 87unsigned char *MDC2(const unsigned char *d, size_t n,
90 unsigned char *md); 88 unsigned char *md);
91 89
92#ifdef __cplusplus 90#ifdef __cplusplus
diff --git a/src/lib/libcrypto/mdc2/mdc2test.c b/src/lib/libcrypto/mdc2/mdc2test.c
index c9abe99d92..017b31add2 100644
--- a/src/lib/libcrypto/mdc2/mdc2test.c
+++ b/src/lib/libcrypto/mdc2/mdc2test.c
@@ -140,6 +140,9 @@ int main(int argc, char *argv[])
140 printf("pad2 - ok\n"); 140 printf("pad2 - ok\n");
141 141
142 EVP_MD_CTX_cleanup(&c); 142 EVP_MD_CTX_cleanup(&c);
143#ifdef OPENSSL_SYS_NETWARE
144 if (ret) printf("ERROR: %d\n", ret);
145#endif
143 EXIT(ret); 146 EXIT(ret);
144 return(ret); 147 return(ret);
145 } 148 }
diff --git a/src/lib/libcrypto/mem.c b/src/lib/libcrypto/mem.c
index dd86733b77..6635167228 100644
--- a/src/lib/libcrypto/mem.c
+++ b/src/lib/libcrypto/mem.c
@@ -324,8 +324,8 @@ void *CRYPTO_realloc(void *str, int num, const char *file, int line)
324 if (str == NULL) 324 if (str == NULL)
325 return CRYPTO_malloc(num, file, line); 325 return CRYPTO_malloc(num, file, line);
326 326
327 if (num <= 0) return NULL; 327 if (num <= 0) return NULL;
328 328
329 if (realloc_debug_func != NULL) 329 if (realloc_debug_func != NULL)
330 realloc_debug_func(str, NULL, num, file, line, 0); 330 realloc_debug_func(str, NULL, num, file, line, 0);
331 ret = realloc_ex_func(str,num,file,line); 331 ret = realloc_ex_func(str,num,file,line);
@@ -345,9 +345,9 @@ void *CRYPTO_realloc_clean(void *str, int old_len, int num, const char *file,
345 345
346 if (str == NULL) 346 if (str == NULL)
347 return CRYPTO_malloc(num, file, line); 347 return CRYPTO_malloc(num, file, line);
348 348
349 if (num <= 0) return NULL; 349 if (num <= 0) return NULL;
350 350
351 if (realloc_debug_func != NULL) 351 if (realloc_debug_func != NULL)
352 realloc_debug_func(str, NULL, num, file, line, 0); 352 realloc_debug_func(str, NULL, num, file, line, 0);
353 ret=malloc_ex_func(num,file,line); 353 ret=malloc_ex_func(num,file,line);
diff --git a/src/lib/libcrypto/o_str.h b/src/lib/libcrypto/o_str.h
index 4a70a9e00b..dfc98494c6 100644
--- a/src/lib/libcrypto/o_str.h
+++ b/src/lib/libcrypto/o_str.h
@@ -63,5 +63,6 @@
63 63
64int OPENSSL_strcasecmp(const char *str1, const char *str2); 64int OPENSSL_strcasecmp(const char *str1, const char *str2);
65int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n); 65int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n);
66int OPENSSL_memcmp(const void *p1,const void *p2,size_t n);
66 67
67#endif 68#endif
diff --git a/src/lib/libcrypto/objects/Makefile b/src/lib/libcrypto/objects/Makefile
index 23b2a69e6d..9c5615099c 100644
--- a/src/lib/libcrypto/objects/Makefile
+++ b/src/lib/libcrypto/objects/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include 8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17PERL= perl 12PERL= perl
@@ -60,6 +55,7 @@ links:
60 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 55 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
61 56
62install: 57install:
58 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
63 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 59 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
64 do \ 60 do \
65 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 61 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -75,6 +71,7 @@ lint:
75 lint -DLINT $(INCLUDES) $(SRC)>fluff 71 lint -DLINT $(INCLUDES) $(SRC)>fluff
76 72
77depend: 73depend:
74 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
78 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 75 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
79 76
80dclean: 77dclean:
@@ -87,13 +84,13 @@ clean:
87# DO NOT DELETE THIS LINE -- make depend depends on it. 84# DO NOT DELETE THIS LINE -- make depend depends on it.
88 85
89o_names.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 86o_names.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
90o_names.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h 87o_names.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
91o_names.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 88o_names.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
92o_names.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h 89o_names.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
93o_names.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 90o_names.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
94o_names.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 91o_names.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
95o_names.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 92o_names.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
96o_names.o: ../../include/openssl/symhacks.h o_names.c 93o_names.o: o_names.c
97obj_dat.o: ../../e_os.h ../../include/openssl/asn1.h 94obj_dat.o: ../../e_os.h ../../include/openssl/asn1.h
98obj_dat.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 95obj_dat.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
99obj_dat.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 96obj_dat.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -104,19 +101,19 @@ obj_dat.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
104obj_dat.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 101obj_dat.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
105obj_dat.o: ../../include/openssl/symhacks.h ../cryptlib.h obj_dat.c obj_dat.h 102obj_dat.o: ../../include/openssl/symhacks.h ../cryptlib.h obj_dat.c obj_dat.h
106obj_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 103obj_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
107obj_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h 104obj_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
108obj_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 105obj_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
109obj_err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h 106obj_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
110obj_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 107obj_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
111obj_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 108obj_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
112obj_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 109obj_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
113obj_err.o: ../../include/openssl/symhacks.h obj_err.c 110obj_err.o: obj_err.c
114obj_lib.o: ../../e_os.h ../../include/openssl/asn1.h 111obj_lib.o: ../../e_os.h ../../include/openssl/asn1.h
115obj_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 112obj_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
116obj_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 113obj_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
117obj_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 114obj_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
118obj_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h 115obj_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
119obj_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 116obj_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
120obj_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 117obj_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
121obj_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 118obj_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
122obj_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h obj_lib.c 119obj_lib.o: ../cryptlib.h obj_lib.c
diff --git a/src/lib/libcrypto/objects/obj_dat.h b/src/lib/libcrypto/objects/obj_dat.h
index cc22152682..99acf131f8 100644
--- a/src/lib/libcrypto/objects/obj_dat.h
+++ b/src/lib/libcrypto/objects/obj_dat.h
@@ -62,12 +62,12 @@
62 * [including the GNU Public Licence.] 62 * [including the GNU Public Licence.]
63 */ 63 */
64 64
65#define NUM_NID 676 65#define NUM_NID 791
66#define NUM_SN 669 66#define NUM_SN 784
67#define NUM_LN 669 67#define NUM_LN 784
68#define NUM_OBJ 633 68#define NUM_OBJ 740
69 69
70static unsigned char lvalues[4575]={ 70static unsigned char lvalues[5258]={
710x00, /* [ 0] OBJ_undef */ 710x00, /* [ 0] OBJ_undef */
720x2A,0x86,0x48,0x86,0xF7,0x0D, /* [ 1] OBJ_rsadsi */ 720x2A,0x86,0x48,0x86,0xF7,0x0D, /* [ 1] OBJ_rsadsi */
730x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, /* [ 7] OBJ_pkcs */ 730x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, /* [ 7] OBJ_pkcs */
@@ -166,541 +166,648 @@ static unsigned char lvalues[4575]={
1660x2B,0x24,0x03,0x03,0x01,0x02, /* [603] OBJ_ripemd160WithRSA */ 1660x2B,0x24,0x03,0x03,0x01,0x02, /* [603] OBJ_ripemd160WithRSA */
1670x2A,0x86,0x48,0x86,0xF7,0x0D,0x03,0x08, /* [609] OBJ_rc5_cbc */ 1670x2A,0x86,0x48,0x86,0xF7,0x0D,0x03,0x08, /* [609] OBJ_rc5_cbc */
1680x29,0x01,0x01,0x85,0x1A,0x01, /* [617] OBJ_rle_compression */ 1680x29,0x01,0x01,0x85,0x1A,0x01, /* [617] OBJ_rle_compression */
1690x29,0x01,0x01,0x85,0x1A,0x02, /* [623] OBJ_zlib_compression */ 1690x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x08,/* [623] OBJ_zlib_compression */
1700x55,0x1D,0x25, /* [629] OBJ_ext_key_usage */ 1700x55,0x1D,0x25, /* [634] OBJ_ext_key_usage */
1710x2B,0x06,0x01,0x05,0x05,0x07, /* [632] OBJ_id_pkix */ 1710x2B,0x06,0x01,0x05,0x05,0x07, /* [637] OBJ_id_pkix */
1720x2B,0x06,0x01,0x05,0x05,0x07,0x03, /* [638] OBJ_id_kp */ 1720x2B,0x06,0x01,0x05,0x05,0x07,0x03, /* [643] OBJ_id_kp */
1730x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x01, /* [645] OBJ_server_auth */ 1730x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x01, /* [650] OBJ_server_auth */
1740x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x02, /* [653] OBJ_client_auth */ 1740x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x02, /* [658] OBJ_client_auth */
1750x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x03, /* [661] OBJ_code_sign */ 1750x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x03, /* [666] OBJ_code_sign */
1760x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x04, /* [669] OBJ_email_protect */ 1760x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x04, /* [674] OBJ_email_protect */
1770x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x08, /* [677] OBJ_time_stamp */ 1770x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x08, /* [682] OBJ_time_stamp */
1780x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x15,/* [685] OBJ_ms_code_ind */ 1780x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x15,/* [690] OBJ_ms_code_ind */
1790x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x16,/* [695] OBJ_ms_code_com */ 1790x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x16,/* [700] OBJ_ms_code_com */
1800x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x0A,0x03,0x01,/* [705] OBJ_ms_ctl_sign */ 1800x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x0A,0x03,0x01,/* [710] OBJ_ms_ctl_sign */
1810x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x0A,0x03,0x03,/* [715] OBJ_ms_sgc */ 1810x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x0A,0x03,0x03,/* [720] OBJ_ms_sgc */
1820x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x0A,0x03,0x04,/* [725] OBJ_ms_efs */ 1820x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x0A,0x03,0x04,/* [730] OBJ_ms_efs */
1830x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x04,0x01,/* [735] OBJ_ns_sgc */ 1830x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x04,0x01,/* [740] OBJ_ns_sgc */
1840x55,0x1D,0x1B, /* [744] OBJ_delta_crl */ 1840x55,0x1D,0x1B, /* [749] OBJ_delta_crl */
1850x55,0x1D,0x15, /* [747] OBJ_crl_reason */ 1850x55,0x1D,0x15, /* [752] OBJ_crl_reason */
1860x55,0x1D,0x18, /* [750] OBJ_invalidity_date */ 1860x55,0x1D,0x18, /* [755] OBJ_invalidity_date */
1870x2B,0x65,0x01,0x04,0x01, /* [753] OBJ_sxnet */ 1870x2B,0x65,0x01,0x04,0x01, /* [758] OBJ_sxnet */
1880x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x01,/* [758] OBJ_pbe_WithSHA1And128BitRC4 */ 1880x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x01,/* [763] OBJ_pbe_WithSHA1And128BitRC4 */
1890x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x02,/* [768] OBJ_pbe_WithSHA1And40BitRC4 */ 1890x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x02,/* [773] OBJ_pbe_WithSHA1And40BitRC4 */
1900x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x03,/* [778] OBJ_pbe_WithSHA1And3_Key_TripleDES_CBC */ 1900x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x03,/* [783] OBJ_pbe_WithSHA1And3_Key_TripleDES_CBC */
1910x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x04,/* [788] OBJ_pbe_WithSHA1And2_Key_TripleDES_CBC */ 1910x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x04,/* [793] OBJ_pbe_WithSHA1And2_Key_TripleDES_CBC */
1920x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x05,/* [798] OBJ_pbe_WithSHA1And128BitRC2_CBC */ 1920x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x05,/* [803] OBJ_pbe_WithSHA1And128BitRC2_CBC */
1930x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x06,/* [808] OBJ_pbe_WithSHA1And40BitRC2_CBC */ 1930x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x06,/* [813] OBJ_pbe_WithSHA1And40BitRC2_CBC */
1940x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x01,/* [818] OBJ_keyBag */ 1940x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x01,/* [823] OBJ_keyBag */
1950x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x02,/* [829] OBJ_pkcs8ShroudedKeyBag */ 1950x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x02,/* [834] OBJ_pkcs8ShroudedKeyBag */
1960x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x03,/* [840] OBJ_certBag */ 1960x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x03,/* [845] OBJ_certBag */
1970x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x04,/* [851] OBJ_crlBag */ 1970x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x04,/* [856] OBJ_crlBag */
1980x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x05,/* [862] OBJ_secretBag */ 1980x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x05,/* [867] OBJ_secretBag */
1990x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x06,/* [873] OBJ_safeContentsBag */ 1990x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x06,/* [878] OBJ_safeContentsBag */
2000x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x14,/* [884] OBJ_friendlyName */ 2000x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x14,/* [889] OBJ_friendlyName */
2010x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x15,/* [893] OBJ_localKeyID */ 2010x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x15,/* [898] OBJ_localKeyID */
2020x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x16,0x01,/* [902] OBJ_x509Certificate */ 2020x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x16,0x01,/* [907] OBJ_x509Certificate */
2030x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x16,0x02,/* [912] OBJ_sdsiCertificate */ 2030x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x16,0x02,/* [917] OBJ_sdsiCertificate */
2040x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x17,0x01,/* [922] OBJ_x509Crl */ 2040x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x17,0x01,/* [927] OBJ_x509Crl */
2050x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x0D,/* [932] OBJ_pbes2 */ 2050x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x0D,/* [937] OBJ_pbes2 */
2060x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x0E,/* [941] OBJ_pbmac1 */ 2060x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x0E,/* [946] OBJ_pbmac1 */
2070x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x07, /* [950] OBJ_hmacWithSHA1 */ 2070x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x07, /* [955] OBJ_hmacWithSHA1 */
2080x2B,0x06,0x01,0x05,0x05,0x07,0x02,0x01, /* [958] OBJ_id_qt_cps */ 2080x2B,0x06,0x01,0x05,0x05,0x07,0x02,0x01, /* [963] OBJ_id_qt_cps */
2090x2B,0x06,0x01,0x05,0x05,0x07,0x02,0x02, /* [966] OBJ_id_qt_unotice */ 2090x2B,0x06,0x01,0x05,0x05,0x07,0x02,0x02, /* [971] OBJ_id_qt_unotice */
2100x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x0F,/* [974] OBJ_SMIMECapabilities */ 2100x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x0F,/* [979] OBJ_SMIMECapabilities */
2110x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x04,/* [983] OBJ_pbeWithMD2AndRC2_CBC */ 2110x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x04,/* [988] OBJ_pbeWithMD2AndRC2_CBC */
2120x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x06,/* [992] OBJ_pbeWithMD5AndRC2_CBC */ 2120x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x06,/* [997] OBJ_pbeWithMD5AndRC2_CBC */
2130x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x0A,/* [1001] OBJ_pbeWithSHA1AndDES_CBC */ 2130x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x0A,/* [1006] OBJ_pbeWithSHA1AndDES_CBC */
2140x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x0E,/* [1010] OBJ_ms_ext_req */ 2140x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x0E,/* [1015] OBJ_ms_ext_req */
2150x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x0E,/* [1020] OBJ_ext_req */ 2150x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x0E,/* [1025] OBJ_ext_req */
2160x55,0x04,0x29, /* [1029] OBJ_name */ 2160x55,0x04,0x29, /* [1034] OBJ_name */
2170x55,0x04,0x2E, /* [1032] OBJ_dnQualifier */ 2170x55,0x04,0x2E, /* [1037] OBJ_dnQualifier */
2180x2B,0x06,0x01,0x05,0x05,0x07,0x01, /* [1035] OBJ_id_pe */ 2180x2B,0x06,0x01,0x05,0x05,0x07,0x01, /* [1040] OBJ_id_pe */
2190x2B,0x06,0x01,0x05,0x05,0x07,0x30, /* [1042] OBJ_id_ad */ 2190x2B,0x06,0x01,0x05,0x05,0x07,0x30, /* [1047] OBJ_id_ad */
2200x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x01, /* [1049] OBJ_info_access */ 2200x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x01, /* [1054] OBJ_info_access */
2210x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01, /* [1057] OBJ_ad_OCSP */ 2210x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01, /* [1062] OBJ_ad_OCSP */
2220x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x02, /* [1065] OBJ_ad_ca_issuers */ 2220x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x02, /* [1070] OBJ_ad_ca_issuers */
2230x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x09, /* [1073] OBJ_OCSP_sign */ 2230x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x09, /* [1078] OBJ_OCSP_sign */
2240x28, /* [1081] OBJ_iso */ 2240x28, /* [1086] OBJ_iso */
2250x2A, /* [1082] OBJ_member_body */ 2250x2A, /* [1087] OBJ_member_body */
2260x2A,0x86,0x48, /* [1083] OBJ_ISO_US */ 2260x2A,0x86,0x48, /* [1088] OBJ_ISO_US */
2270x2A,0x86,0x48,0xCE,0x38, /* [1086] OBJ_X9_57 */ 2270x2A,0x86,0x48,0xCE,0x38, /* [1091] OBJ_X9_57 */
2280x2A,0x86,0x48,0xCE,0x38,0x04, /* [1091] OBJ_X9cm */ 2280x2A,0x86,0x48,0xCE,0x38,0x04, /* [1096] OBJ_X9cm */
2290x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01, /* [1097] OBJ_pkcs1 */ 2290x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01, /* [1102] OBJ_pkcs1 */
2300x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05, /* [1105] OBJ_pkcs5 */ 2300x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05, /* [1110] OBJ_pkcs5 */
2310x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,/* [1113] OBJ_SMIME */ 2310x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,/* [1118] OBJ_SMIME */
2320x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,/* [1122] OBJ_id_smime_mod */ 2320x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,/* [1127] OBJ_id_smime_mod */
2330x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,/* [1132] OBJ_id_smime_ct */ 2330x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,/* [1137] OBJ_id_smime_ct */
2340x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,/* [1142] OBJ_id_smime_aa */ 2340x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,/* [1147] OBJ_id_smime_aa */
2350x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,/* [1152] OBJ_id_smime_alg */ 2350x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,/* [1157] OBJ_id_smime_alg */
2360x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x04,/* [1162] OBJ_id_smime_cd */ 2360x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x04,/* [1167] OBJ_id_smime_cd */
2370x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x05,/* [1172] OBJ_id_smime_spq */ 2370x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x05,/* [1177] OBJ_id_smime_spq */
2380x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,/* [1182] OBJ_id_smime_cti */ 2380x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,/* [1187] OBJ_id_smime_cti */
2390x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x01,/* [1192] OBJ_id_smime_mod_cms */ 2390x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x01,/* [1197] OBJ_id_smime_mod_cms */
2400x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x02,/* [1203] OBJ_id_smime_mod_ess */ 2400x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x02,/* [1208] OBJ_id_smime_mod_ess */
2410x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x03,/* [1214] OBJ_id_smime_mod_oid */ 2410x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x03,/* [1219] OBJ_id_smime_mod_oid */
2420x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x04,/* [1225] OBJ_id_smime_mod_msg_v3 */ 2420x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x04,/* [1230] OBJ_id_smime_mod_msg_v3 */
2430x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x05,/* [1236] OBJ_id_smime_mod_ets_eSignature_88 */ 2430x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x05,/* [1241] OBJ_id_smime_mod_ets_eSignature_88 */
2440x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x06,/* [1247] OBJ_id_smime_mod_ets_eSignature_97 */ 2440x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x06,/* [1252] OBJ_id_smime_mod_ets_eSignature_97 */
2450x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x07,/* [1258] OBJ_id_smime_mod_ets_eSigPolicy_88 */ 2450x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x07,/* [1263] OBJ_id_smime_mod_ets_eSigPolicy_88 */
2460x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x08,/* [1269] OBJ_id_smime_mod_ets_eSigPolicy_97 */ 2460x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x08,/* [1274] OBJ_id_smime_mod_ets_eSigPolicy_97 */
2470x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x01,/* [1280] OBJ_id_smime_ct_receipt */ 2470x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x01,/* [1285] OBJ_id_smime_ct_receipt */
2480x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x02,/* [1291] OBJ_id_smime_ct_authData */ 2480x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x02,/* [1296] OBJ_id_smime_ct_authData */
2490x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x03,/* [1302] OBJ_id_smime_ct_publishCert */ 2490x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x03,/* [1307] OBJ_id_smime_ct_publishCert */
2500x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x04,/* [1313] OBJ_id_smime_ct_TSTInfo */ 2500x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x04,/* [1318] OBJ_id_smime_ct_TSTInfo */
2510x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x05,/* [1324] OBJ_id_smime_ct_TDTInfo */ 2510x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x05,/* [1329] OBJ_id_smime_ct_TDTInfo */
2520x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x06,/* [1335] OBJ_id_smime_ct_contentInfo */ 2520x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x06,/* [1340] OBJ_id_smime_ct_contentInfo */
2530x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x07,/* [1346] OBJ_id_smime_ct_DVCSRequestData */ 2530x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x07,/* [1351] OBJ_id_smime_ct_DVCSRequestData */
2540x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x08,/* [1357] OBJ_id_smime_ct_DVCSResponseData */ 2540x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x08,/* [1362] OBJ_id_smime_ct_DVCSResponseData */
2550x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x01,/* [1368] OBJ_id_smime_aa_receiptRequest */ 2550x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x01,/* [1373] OBJ_id_smime_aa_receiptRequest */
2560x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x02,/* [1379] OBJ_id_smime_aa_securityLabel */ 2560x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x02,/* [1384] OBJ_id_smime_aa_securityLabel */
2570x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x03,/* [1390] OBJ_id_smime_aa_mlExpandHistory */ 2570x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x03,/* [1395] OBJ_id_smime_aa_mlExpandHistory */
2580x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x04,/* [1401] OBJ_id_smime_aa_contentHint */ 2580x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x04,/* [1406] OBJ_id_smime_aa_contentHint */
2590x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x05,/* [1412] OBJ_id_smime_aa_msgSigDigest */ 2590x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x05,/* [1417] OBJ_id_smime_aa_msgSigDigest */
2600x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x06,/* [1423] OBJ_id_smime_aa_encapContentType */ 2600x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x06,/* [1428] OBJ_id_smime_aa_encapContentType */
2610x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x07,/* [1434] OBJ_id_smime_aa_contentIdentifier */ 2610x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x07,/* [1439] OBJ_id_smime_aa_contentIdentifier */
2620x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x08,/* [1445] OBJ_id_smime_aa_macValue */ 2620x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x08,/* [1450] OBJ_id_smime_aa_macValue */
2630x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x09,/* [1456] OBJ_id_smime_aa_equivalentLabels */ 2630x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x09,/* [1461] OBJ_id_smime_aa_equivalentLabels */
2640x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0A,/* [1467] OBJ_id_smime_aa_contentReference */ 2640x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0A,/* [1472] OBJ_id_smime_aa_contentReference */
2650x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0B,/* [1478] OBJ_id_smime_aa_encrypKeyPref */ 2650x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0B,/* [1483] OBJ_id_smime_aa_encrypKeyPref */
2660x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0C,/* [1489] OBJ_id_smime_aa_signingCertificate */ 2660x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0C,/* [1494] OBJ_id_smime_aa_signingCertificate */
2670x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0D,/* [1500] OBJ_id_smime_aa_smimeEncryptCerts */ 2670x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0D,/* [1505] OBJ_id_smime_aa_smimeEncryptCerts */
2680x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0E,/* [1511] OBJ_id_smime_aa_timeStampToken */ 2680x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0E,/* [1516] OBJ_id_smime_aa_timeStampToken */
2690x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0F,/* [1522] OBJ_id_smime_aa_ets_sigPolicyId */ 2690x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0F,/* [1527] OBJ_id_smime_aa_ets_sigPolicyId */
2700x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x10,/* [1533] OBJ_id_smime_aa_ets_commitmentType */ 2700x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x10,/* [1538] OBJ_id_smime_aa_ets_commitmentType */
2710x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x11,/* [1544] OBJ_id_smime_aa_ets_signerLocation */ 2710x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x11,/* [1549] OBJ_id_smime_aa_ets_signerLocation */
2720x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x12,/* [1555] OBJ_id_smime_aa_ets_signerAttr */ 2720x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x12,/* [1560] OBJ_id_smime_aa_ets_signerAttr */
2730x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x13,/* [1566] OBJ_id_smime_aa_ets_otherSigCert */ 2730x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x13,/* [1571] OBJ_id_smime_aa_ets_otherSigCert */
2740x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x14,/* [1577] OBJ_id_smime_aa_ets_contentTimestamp */ 2740x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x14,/* [1582] OBJ_id_smime_aa_ets_contentTimestamp */
2750x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x15,/* [1588] OBJ_id_smime_aa_ets_CertificateRefs */ 2750x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x15,/* [1593] OBJ_id_smime_aa_ets_CertificateRefs */
2760x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x16,/* [1599] OBJ_id_smime_aa_ets_RevocationRefs */ 2760x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x16,/* [1604] OBJ_id_smime_aa_ets_RevocationRefs */
2770x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x17,/* [1610] OBJ_id_smime_aa_ets_certValues */ 2770x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x17,/* [1615] OBJ_id_smime_aa_ets_certValues */
2780x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x18,/* [1621] OBJ_id_smime_aa_ets_revocationValues */ 2780x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x18,/* [1626] OBJ_id_smime_aa_ets_revocationValues */
2790x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x19,/* [1632] OBJ_id_smime_aa_ets_escTimeStamp */ 2790x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x19,/* [1637] OBJ_id_smime_aa_ets_escTimeStamp */
2800x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x1A,/* [1643] OBJ_id_smime_aa_ets_certCRLTimestamp */ 2800x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x1A,/* [1648] OBJ_id_smime_aa_ets_certCRLTimestamp */
2810x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x1B,/* [1654] OBJ_id_smime_aa_ets_archiveTimeStamp */ 2810x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x1B,/* [1659] OBJ_id_smime_aa_ets_archiveTimeStamp */
2820x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x1C,/* [1665] OBJ_id_smime_aa_signatureType */ 2820x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x1C,/* [1670] OBJ_id_smime_aa_signatureType */
2830x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x1D,/* [1676] OBJ_id_smime_aa_dvcs_dvc */ 2830x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x1D,/* [1681] OBJ_id_smime_aa_dvcs_dvc */
2840x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x01,/* [1687] OBJ_id_smime_alg_ESDHwith3DES */ 2840x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x01,/* [1692] OBJ_id_smime_alg_ESDHwith3DES */
2850x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x02,/* [1698] OBJ_id_smime_alg_ESDHwithRC2 */ 2850x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x02,/* [1703] OBJ_id_smime_alg_ESDHwithRC2 */
2860x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x03,/* [1709] OBJ_id_smime_alg_3DESwrap */ 2860x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x03,/* [1714] OBJ_id_smime_alg_3DESwrap */
2870x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x04,/* [1720] OBJ_id_smime_alg_RC2wrap */ 2870x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x04,/* [1725] OBJ_id_smime_alg_RC2wrap */
2880x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x05,/* [1731] OBJ_id_smime_alg_ESDH */ 2880x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x05,/* [1736] OBJ_id_smime_alg_ESDH */
2890x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x06,/* [1742] OBJ_id_smime_alg_CMS3DESwrap */ 2890x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x06,/* [1747] OBJ_id_smime_alg_CMS3DESwrap */
2900x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x07,/* [1753] OBJ_id_smime_alg_CMSRC2wrap */ 2900x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x07,/* [1758] OBJ_id_smime_alg_CMSRC2wrap */
2910x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x04,0x01,/* [1764] OBJ_id_smime_cd_ldap */ 2910x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x04,0x01,/* [1769] OBJ_id_smime_cd_ldap */
2920x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x05,0x01,/* [1775] OBJ_id_smime_spq_ets_sqt_uri */ 2920x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x05,0x01,/* [1780] OBJ_id_smime_spq_ets_sqt_uri */
2930x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x05,0x02,/* [1786] OBJ_id_smime_spq_ets_sqt_unotice */ 2930x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x05,0x02,/* [1791] OBJ_id_smime_spq_ets_sqt_unotice */
2940x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x01,/* [1797] OBJ_id_smime_cti_ets_proofOfOrigin */ 2940x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x01,/* [1802] OBJ_id_smime_cti_ets_proofOfOrigin */
2950x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x02,/* [1808] OBJ_id_smime_cti_ets_proofOfReceipt */ 2950x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x02,/* [1813] OBJ_id_smime_cti_ets_proofOfReceipt */
2960x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x03,/* [1819] OBJ_id_smime_cti_ets_proofOfDelivery */ 2960x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x03,/* [1824] OBJ_id_smime_cti_ets_proofOfDelivery */
2970x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x04,/* [1830] OBJ_id_smime_cti_ets_proofOfSender */ 2970x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x04,/* [1835] OBJ_id_smime_cti_ets_proofOfSender */
2980x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x05,/* [1841] OBJ_id_smime_cti_ets_proofOfApproval */ 2980x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x05,/* [1846] OBJ_id_smime_cti_ets_proofOfApproval */
2990x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x06,/* [1852] OBJ_id_smime_cti_ets_proofOfCreation */ 2990x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x06,/* [1857] OBJ_id_smime_cti_ets_proofOfCreation */
3000x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x04, /* [1863] OBJ_md4 */ 3000x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x04, /* [1868] OBJ_md4 */
3010x2B,0x06,0x01,0x05,0x05,0x07,0x00, /* [1871] OBJ_id_pkix_mod */ 3010x2B,0x06,0x01,0x05,0x05,0x07,0x00, /* [1876] OBJ_id_pkix_mod */
3020x2B,0x06,0x01,0x05,0x05,0x07,0x02, /* [1878] OBJ_id_qt */ 3020x2B,0x06,0x01,0x05,0x05,0x07,0x02, /* [1883] OBJ_id_qt */
3030x2B,0x06,0x01,0x05,0x05,0x07,0x04, /* [1885] OBJ_id_it */ 3030x2B,0x06,0x01,0x05,0x05,0x07,0x04, /* [1890] OBJ_id_it */
3040x2B,0x06,0x01,0x05,0x05,0x07,0x05, /* [1892] OBJ_id_pkip */ 3040x2B,0x06,0x01,0x05,0x05,0x07,0x05, /* [1897] OBJ_id_pkip */
3050x2B,0x06,0x01,0x05,0x05,0x07,0x06, /* [1899] OBJ_id_alg */ 3050x2B,0x06,0x01,0x05,0x05,0x07,0x06, /* [1904] OBJ_id_alg */
3060x2B,0x06,0x01,0x05,0x05,0x07,0x07, /* [1906] OBJ_id_cmc */ 3060x2B,0x06,0x01,0x05,0x05,0x07,0x07, /* [1911] OBJ_id_cmc */
3070x2B,0x06,0x01,0x05,0x05,0x07,0x08, /* [1913] OBJ_id_on */ 3070x2B,0x06,0x01,0x05,0x05,0x07,0x08, /* [1918] OBJ_id_on */
3080x2B,0x06,0x01,0x05,0x05,0x07,0x09, /* [1920] OBJ_id_pda */ 3080x2B,0x06,0x01,0x05,0x05,0x07,0x09, /* [1925] OBJ_id_pda */
3090x2B,0x06,0x01,0x05,0x05,0x07,0x0A, /* [1927] OBJ_id_aca */ 3090x2B,0x06,0x01,0x05,0x05,0x07,0x0A, /* [1932] OBJ_id_aca */
3100x2B,0x06,0x01,0x05,0x05,0x07,0x0B, /* [1934] OBJ_id_qcs */ 3100x2B,0x06,0x01,0x05,0x05,0x07,0x0B, /* [1939] OBJ_id_qcs */
3110x2B,0x06,0x01,0x05,0x05,0x07,0x0C, /* [1941] OBJ_id_cct */ 3110x2B,0x06,0x01,0x05,0x05,0x07,0x0C, /* [1946] OBJ_id_cct */
3120x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x01, /* [1948] OBJ_id_pkix1_explicit_88 */ 3120x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x01, /* [1953] OBJ_id_pkix1_explicit_88 */
3130x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x02, /* [1956] OBJ_id_pkix1_implicit_88 */ 3130x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x02, /* [1961] OBJ_id_pkix1_implicit_88 */
3140x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x03, /* [1964] OBJ_id_pkix1_explicit_93 */ 3140x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x03, /* [1969] OBJ_id_pkix1_explicit_93 */
3150x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x04, /* [1972] OBJ_id_pkix1_implicit_93 */ 3150x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x04, /* [1977] OBJ_id_pkix1_implicit_93 */
3160x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x05, /* [1980] OBJ_id_mod_crmf */ 3160x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x05, /* [1985] OBJ_id_mod_crmf */
3170x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x06, /* [1988] OBJ_id_mod_cmc */ 3170x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x06, /* [1993] OBJ_id_mod_cmc */
3180x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x07, /* [1996] OBJ_id_mod_kea_profile_88 */ 3180x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x07, /* [2001] OBJ_id_mod_kea_profile_88 */
3190x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x08, /* [2004] OBJ_id_mod_kea_profile_93 */ 3190x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x08, /* [2009] OBJ_id_mod_kea_profile_93 */
3200x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x09, /* [2012] OBJ_id_mod_cmp */ 3200x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x09, /* [2017] OBJ_id_mod_cmp */
3210x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0A, /* [2020] OBJ_id_mod_qualified_cert_88 */ 3210x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0A, /* [2025] OBJ_id_mod_qualified_cert_88 */
3220x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0B, /* [2028] OBJ_id_mod_qualified_cert_93 */ 3220x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0B, /* [2033] OBJ_id_mod_qualified_cert_93 */
3230x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0C, /* [2036] OBJ_id_mod_attribute_cert */ 3230x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0C, /* [2041] OBJ_id_mod_attribute_cert */
3240x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0D, /* [2044] OBJ_id_mod_timestamp_protocol */ 3240x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0D, /* [2049] OBJ_id_mod_timestamp_protocol */
3250x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0E, /* [2052] OBJ_id_mod_ocsp */ 3250x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0E, /* [2057] OBJ_id_mod_ocsp */
3260x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0F, /* [2060] OBJ_id_mod_dvcs */ 3260x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0F, /* [2065] OBJ_id_mod_dvcs */
3270x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x10, /* [2068] OBJ_id_mod_cmp2000 */ 3270x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x10, /* [2073] OBJ_id_mod_cmp2000 */
3280x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x02, /* [2076] OBJ_biometricInfo */ 3280x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x02, /* [2081] OBJ_biometricInfo */
3290x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x03, /* [2084] OBJ_qcStatements */ 3290x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x03, /* [2089] OBJ_qcStatements */
3300x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x04, /* [2092] OBJ_ac_auditEntity */ 3300x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x04, /* [2097] OBJ_ac_auditEntity */
3310x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x05, /* [2100] OBJ_ac_targeting */ 3310x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x05, /* [2105] OBJ_ac_targeting */
3320x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x06, /* [2108] OBJ_aaControls */ 3320x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x06, /* [2113] OBJ_aaControls */
3330x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x07, /* [2116] OBJ_sbgp_ipAddrBlock */ 3330x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x07, /* [2121] OBJ_sbgp_ipAddrBlock */
3340x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x08, /* [2124] OBJ_sbgp_autonomousSysNum */ 3340x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x08, /* [2129] OBJ_sbgp_autonomousSysNum */
3350x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x09, /* [2132] OBJ_sbgp_routerIdentifier */ 3350x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x09, /* [2137] OBJ_sbgp_routerIdentifier */
3360x2B,0x06,0x01,0x05,0x05,0x07,0x02,0x03, /* [2140] OBJ_textNotice */ 3360x2B,0x06,0x01,0x05,0x05,0x07,0x02,0x03, /* [2145] OBJ_textNotice */
3370x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x05, /* [2148] OBJ_ipsecEndSystem */ 3370x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x05, /* [2153] OBJ_ipsecEndSystem */
3380x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x06, /* [2156] OBJ_ipsecTunnel */ 3380x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x06, /* [2161] OBJ_ipsecTunnel */
3390x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x07, /* [2164] OBJ_ipsecUser */ 3390x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x07, /* [2169] OBJ_ipsecUser */
3400x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x0A, /* [2172] OBJ_dvcs */ 3400x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x0A, /* [2177] OBJ_dvcs */
3410x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x01, /* [2180] OBJ_id_it_caProtEncCert */ 3410x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x01, /* [2185] OBJ_id_it_caProtEncCert */
3420x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x02, /* [2188] OBJ_id_it_signKeyPairTypes */ 3420x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x02, /* [2193] OBJ_id_it_signKeyPairTypes */
3430x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x03, /* [2196] OBJ_id_it_encKeyPairTypes */ 3430x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x03, /* [2201] OBJ_id_it_encKeyPairTypes */
3440x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x04, /* [2204] OBJ_id_it_preferredSymmAlg */ 3440x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x04, /* [2209] OBJ_id_it_preferredSymmAlg */
3450x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x05, /* [2212] OBJ_id_it_caKeyUpdateInfo */ 3450x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x05, /* [2217] OBJ_id_it_caKeyUpdateInfo */
3460x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x06, /* [2220] OBJ_id_it_currentCRL */ 3460x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x06, /* [2225] OBJ_id_it_currentCRL */
3470x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x07, /* [2228] OBJ_id_it_unsupportedOIDs */ 3470x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x07, /* [2233] OBJ_id_it_unsupportedOIDs */
3480x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x08, /* [2236] OBJ_id_it_subscriptionRequest */ 3480x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x08, /* [2241] OBJ_id_it_subscriptionRequest */
3490x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x09, /* [2244] OBJ_id_it_subscriptionResponse */ 3490x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x09, /* [2249] OBJ_id_it_subscriptionResponse */
3500x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0A, /* [2252] OBJ_id_it_keyPairParamReq */ 3500x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0A, /* [2257] OBJ_id_it_keyPairParamReq */
3510x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0B, /* [2260] OBJ_id_it_keyPairParamRep */ 3510x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0B, /* [2265] OBJ_id_it_keyPairParamRep */
3520x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0C, /* [2268] OBJ_id_it_revPassphrase */ 3520x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0C, /* [2273] OBJ_id_it_revPassphrase */
3530x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0D, /* [2276] OBJ_id_it_implicitConfirm */ 3530x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0D, /* [2281] OBJ_id_it_implicitConfirm */
3540x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0E, /* [2284] OBJ_id_it_confirmWaitTime */ 3540x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0E, /* [2289] OBJ_id_it_confirmWaitTime */
3550x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0F, /* [2292] OBJ_id_it_origPKIMessage */ 3550x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0F, /* [2297] OBJ_id_it_origPKIMessage */
3560x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01, /* [2300] OBJ_id_regCtrl */ 3560x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01, /* [2305] OBJ_id_regCtrl */
3570x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x02, /* [2308] OBJ_id_regInfo */ 3570x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x02, /* [2313] OBJ_id_regInfo */
3580x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x01,/* [2316] OBJ_id_regCtrl_regToken */ 3580x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x01,/* [2321] OBJ_id_regCtrl_regToken */
3590x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x02,/* [2325] OBJ_id_regCtrl_authenticator */ 3590x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x02,/* [2330] OBJ_id_regCtrl_authenticator */
3600x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x03,/* [2334] OBJ_id_regCtrl_pkiPublicationInfo */ 3600x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x03,/* [2339] OBJ_id_regCtrl_pkiPublicationInfo */
3610x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x04,/* [2343] OBJ_id_regCtrl_pkiArchiveOptions */ 3610x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x04,/* [2348] OBJ_id_regCtrl_pkiArchiveOptions */
3620x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x05,/* [2352] OBJ_id_regCtrl_oldCertID */ 3620x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x05,/* [2357] OBJ_id_regCtrl_oldCertID */
3630x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x06,/* [2361] OBJ_id_regCtrl_protocolEncrKey */ 3630x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x06,/* [2366] OBJ_id_regCtrl_protocolEncrKey */
3640x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x02,0x01,/* [2370] OBJ_id_regInfo_utf8Pairs */ 3640x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x02,0x01,/* [2375] OBJ_id_regInfo_utf8Pairs */
3650x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x02,0x02,/* [2379] OBJ_id_regInfo_certReq */ 3650x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x02,0x02,/* [2384] OBJ_id_regInfo_certReq */
3660x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x01, /* [2388] OBJ_id_alg_des40 */ 3660x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x01, /* [2393] OBJ_id_alg_des40 */
3670x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x02, /* [2396] OBJ_id_alg_noSignature */ 3670x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x02, /* [2401] OBJ_id_alg_noSignature */
3680x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x03, /* [2404] OBJ_id_alg_dh_sig_hmac_sha1 */ 3680x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x03, /* [2409] OBJ_id_alg_dh_sig_hmac_sha1 */
3690x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x04, /* [2412] OBJ_id_alg_dh_pop */ 3690x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x04, /* [2417] OBJ_id_alg_dh_pop */
3700x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x01, /* [2420] OBJ_id_cmc_statusInfo */ 3700x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x01, /* [2425] OBJ_id_cmc_statusInfo */
3710x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x02, /* [2428] OBJ_id_cmc_identification */ 3710x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x02, /* [2433] OBJ_id_cmc_identification */
3720x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x03, /* [2436] OBJ_id_cmc_identityProof */ 3720x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x03, /* [2441] OBJ_id_cmc_identityProof */
3730x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x04, /* [2444] OBJ_id_cmc_dataReturn */ 3730x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x04, /* [2449] OBJ_id_cmc_dataReturn */
3740x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x05, /* [2452] OBJ_id_cmc_transactionId */ 3740x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x05, /* [2457] OBJ_id_cmc_transactionId */
3750x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x06, /* [2460] OBJ_id_cmc_senderNonce */ 3750x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x06, /* [2465] OBJ_id_cmc_senderNonce */
3760x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x07, /* [2468] OBJ_id_cmc_recipientNonce */ 3760x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x07, /* [2473] OBJ_id_cmc_recipientNonce */
3770x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x08, /* [2476] OBJ_id_cmc_addExtensions */ 3770x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x08, /* [2481] OBJ_id_cmc_addExtensions */
3780x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x09, /* [2484] OBJ_id_cmc_encryptedPOP */ 3780x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x09, /* [2489] OBJ_id_cmc_encryptedPOP */
3790x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x0A, /* [2492] OBJ_id_cmc_decryptedPOP */ 3790x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x0A, /* [2497] OBJ_id_cmc_decryptedPOP */
3800x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x0B, /* [2500] OBJ_id_cmc_lraPOPWitness */ 3800x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x0B, /* [2505] OBJ_id_cmc_lraPOPWitness */
3810x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x0F, /* [2508] OBJ_id_cmc_getCert */ 3810x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x0F, /* [2513] OBJ_id_cmc_getCert */
3820x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x10, /* [2516] OBJ_id_cmc_getCRL */ 3820x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x10, /* [2521] OBJ_id_cmc_getCRL */
3830x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x11, /* [2524] OBJ_id_cmc_revokeRequest */ 3830x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x11, /* [2529] OBJ_id_cmc_revokeRequest */
3840x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x12, /* [2532] OBJ_id_cmc_regInfo */ 3840x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x12, /* [2537] OBJ_id_cmc_regInfo */
3850x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x13, /* [2540] OBJ_id_cmc_responseInfo */ 3850x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x13, /* [2545] OBJ_id_cmc_responseInfo */
3860x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x15, /* [2548] OBJ_id_cmc_queryPending */ 3860x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x15, /* [2553] OBJ_id_cmc_queryPending */
3870x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x16, /* [2556] OBJ_id_cmc_popLinkRandom */ 3870x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x16, /* [2561] OBJ_id_cmc_popLinkRandom */
3880x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x17, /* [2564] OBJ_id_cmc_popLinkWitness */ 3880x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x17, /* [2569] OBJ_id_cmc_popLinkWitness */
3890x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x18, /* [2572] OBJ_id_cmc_confirmCertAcceptance */ 3890x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x18, /* [2577] OBJ_id_cmc_confirmCertAcceptance */
3900x2B,0x06,0x01,0x05,0x05,0x07,0x08,0x01, /* [2580] OBJ_id_on_personalData */ 3900x2B,0x06,0x01,0x05,0x05,0x07,0x08,0x01, /* [2585] OBJ_id_on_personalData */
3910x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x01, /* [2588] OBJ_id_pda_dateOfBirth */ 3910x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x01, /* [2593] OBJ_id_pda_dateOfBirth */
3920x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x02, /* [2596] OBJ_id_pda_placeOfBirth */ 3920x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x02, /* [2601] OBJ_id_pda_placeOfBirth */
3930x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x03, /* [2604] OBJ_id_pda_gender */ 3930x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x03, /* [2609] OBJ_id_pda_gender */
3940x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x04, /* [2612] OBJ_id_pda_countryOfCitizenship */ 3940x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x04, /* [2617] OBJ_id_pda_countryOfCitizenship */
3950x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x05, /* [2620] OBJ_id_pda_countryOfResidence */ 3950x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x05, /* [2625] OBJ_id_pda_countryOfResidence */
3960x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x01, /* [2628] OBJ_id_aca_authenticationInfo */ 3960x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x01, /* [2633] OBJ_id_aca_authenticationInfo */
3970x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x02, /* [2636] OBJ_id_aca_accessIdentity */ 3970x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x02, /* [2641] OBJ_id_aca_accessIdentity */
3980x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x03, /* [2644] OBJ_id_aca_chargingIdentity */ 3980x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x03, /* [2649] OBJ_id_aca_chargingIdentity */
3990x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x04, /* [2652] OBJ_id_aca_group */ 3990x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x04, /* [2657] OBJ_id_aca_group */
4000x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x05, /* [2660] OBJ_id_aca_role */ 4000x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x05, /* [2665] OBJ_id_aca_role */
4010x2B,0x06,0x01,0x05,0x05,0x07,0x0B,0x01, /* [2668] OBJ_id_qcs_pkixQCSyntax_v1 */ 4010x2B,0x06,0x01,0x05,0x05,0x07,0x0B,0x01, /* [2673] OBJ_id_qcs_pkixQCSyntax_v1 */
4020x2B,0x06,0x01,0x05,0x05,0x07,0x0C,0x01, /* [2676] OBJ_id_cct_crs */ 4020x2B,0x06,0x01,0x05,0x05,0x07,0x0C,0x01, /* [2681] OBJ_id_cct_crs */
4030x2B,0x06,0x01,0x05,0x05,0x07,0x0C,0x02, /* [2684] OBJ_id_cct_PKIData */ 4030x2B,0x06,0x01,0x05,0x05,0x07,0x0C,0x02, /* [2689] OBJ_id_cct_PKIData */
4040x2B,0x06,0x01,0x05,0x05,0x07,0x0C,0x03, /* [2692] OBJ_id_cct_PKIResponse */ 4040x2B,0x06,0x01,0x05,0x05,0x07,0x0C,0x03, /* [2697] OBJ_id_cct_PKIResponse */
4050x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x03, /* [2700] OBJ_ad_timeStamping */ 4050x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x03, /* [2705] OBJ_ad_timeStamping */
4060x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x04, /* [2708] OBJ_ad_dvcs */ 4060x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x04, /* [2713] OBJ_ad_dvcs */
4070x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x01,/* [2716] OBJ_id_pkix_OCSP_basic */ 4070x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x01,/* [2721] OBJ_id_pkix_OCSP_basic */
4080x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x02,/* [2725] OBJ_id_pkix_OCSP_Nonce */ 4080x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x02,/* [2730] OBJ_id_pkix_OCSP_Nonce */
4090x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x03,/* [2734] OBJ_id_pkix_OCSP_CrlID */ 4090x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x03,/* [2739] OBJ_id_pkix_OCSP_CrlID */
4100x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x04,/* [2743] OBJ_id_pkix_OCSP_acceptableResponses */ 4100x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x04,/* [2748] OBJ_id_pkix_OCSP_acceptableResponses */
4110x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x05,/* [2752] OBJ_id_pkix_OCSP_noCheck */ 4110x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x05,/* [2757] OBJ_id_pkix_OCSP_noCheck */
4120x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x06,/* [2761] OBJ_id_pkix_OCSP_archiveCutoff */ 4120x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x06,/* [2766] OBJ_id_pkix_OCSP_archiveCutoff */
4130x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x07,/* [2770] OBJ_id_pkix_OCSP_serviceLocator */ 4130x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x07,/* [2775] OBJ_id_pkix_OCSP_serviceLocator */
4140x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x08,/* [2779] OBJ_id_pkix_OCSP_extendedStatus */ 4140x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x08,/* [2784] OBJ_id_pkix_OCSP_extendedStatus */
4150x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x09,/* [2788] OBJ_id_pkix_OCSP_valid */ 4150x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x09,/* [2793] OBJ_id_pkix_OCSP_valid */
4160x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x0A,/* [2797] OBJ_id_pkix_OCSP_path */ 4160x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x0A,/* [2802] OBJ_id_pkix_OCSP_path */
4170x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x0B,/* [2806] OBJ_id_pkix_OCSP_trustRoot */ 4170x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x0B,/* [2811] OBJ_id_pkix_OCSP_trustRoot */
4180x2B,0x0E,0x03,0x02, /* [2815] OBJ_algorithm */ 4180x2B,0x0E,0x03,0x02, /* [2820] OBJ_algorithm */
4190x2B,0x0E,0x03,0x02,0x0B, /* [2819] OBJ_rsaSignature */ 4190x2B,0x0E,0x03,0x02,0x0B, /* [2824] OBJ_rsaSignature */
4200x55,0x08, /* [2824] OBJ_X500algorithms */ 4200x55,0x08, /* [2829] OBJ_X500algorithms */
4210x2B, /* [2826] OBJ_org */ 4210x2B, /* [2831] OBJ_org */
4220x2B,0x06, /* [2827] OBJ_dod */ 4220x2B,0x06, /* [2832] OBJ_dod */
4230x2B,0x06,0x01, /* [2829] OBJ_iana */ 4230x2B,0x06,0x01, /* [2834] OBJ_iana */
4240x2B,0x06,0x01,0x01, /* [2832] OBJ_Directory */ 4240x2B,0x06,0x01,0x01, /* [2837] OBJ_Directory */
4250x2B,0x06,0x01,0x02, /* [2836] OBJ_Management */ 4250x2B,0x06,0x01,0x02, /* [2841] OBJ_Management */
4260x2B,0x06,0x01,0x03, /* [2840] OBJ_Experimental */ 4260x2B,0x06,0x01,0x03, /* [2845] OBJ_Experimental */
4270x2B,0x06,0x01,0x04, /* [2844] OBJ_Private */ 4270x2B,0x06,0x01,0x04, /* [2849] OBJ_Private */
4280x2B,0x06,0x01,0x05, /* [2848] OBJ_Security */ 4280x2B,0x06,0x01,0x05, /* [2853] OBJ_Security */
4290x2B,0x06,0x01,0x06, /* [2852] OBJ_SNMPv2 */ 4290x2B,0x06,0x01,0x06, /* [2857] OBJ_SNMPv2 */
4300x2B,0x06,0x01,0x07, /* [2856] OBJ_Mail */ 4300x2B,0x06,0x01,0x07, /* [2861] OBJ_Mail */
4310x2B,0x06,0x01,0x04,0x01, /* [2860] OBJ_Enterprises */ 4310x2B,0x06,0x01,0x04,0x01, /* [2865] OBJ_Enterprises */
4320x2B,0x06,0x01,0x04,0x01,0x8B,0x3A,0x82,0x58,/* [2865] OBJ_dcObject */ 4320x2B,0x06,0x01,0x04,0x01,0x8B,0x3A,0x82,0x58,/* [2870] OBJ_dcObject */
4330x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x19,/* [2874] OBJ_domainComponent */ 4330x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x19,/* [2879] OBJ_domainComponent */
4340x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x0D,/* [2884] OBJ_Domain */ 4340x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x0D,/* [2889] OBJ_Domain */
4350x50, /* [2894] OBJ_joint_iso_ccitt */ 4350x00, /* [2899] OBJ_joint_iso_ccitt */
4360x55,0x01,0x05, /* [2895] OBJ_selected_attribute_types */ 4360x55,0x01,0x05, /* [2900] OBJ_selected_attribute_types */
4370x55,0x01,0x05,0x37, /* [2898] OBJ_clearance */ 4370x55,0x01,0x05,0x37, /* [2903] OBJ_clearance */
4380x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x03,/* [2902] OBJ_md4WithRSAEncryption */ 4380x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x03,/* [2907] OBJ_md4WithRSAEncryption */
4390x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x0A, /* [2911] OBJ_ac_proxying */ 4390x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x0A, /* [2916] OBJ_ac_proxying */
4400x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x0B, /* [2919] OBJ_sinfo_access */ 4400x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x0B, /* [2924] OBJ_sinfo_access */
4410x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x06, /* [2927] OBJ_id_aca_encAttrs */ 4410x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x06, /* [2932] OBJ_id_aca_encAttrs */
4420x55,0x04,0x48, /* [2935] OBJ_role */ 4420x55,0x04,0x48, /* [2940] OBJ_role */
4430x55,0x1D,0x24, /* [2938] OBJ_policy_constraints */ 4430x55,0x1D,0x24, /* [2943] OBJ_policy_constraints */
4440x55,0x1D,0x37, /* [2941] OBJ_target_information */ 4440x55,0x1D,0x37, /* [2946] OBJ_target_information */
4450x55,0x1D,0x38, /* [2944] OBJ_no_rev_avail */ 4450x55,0x1D,0x38, /* [2949] OBJ_no_rev_avail */
4460x00, /* [2947] OBJ_ccitt */ 4460x00, /* [2952] OBJ_ccitt */
4470x2A,0x86,0x48,0xCE,0x3D, /* [2948] OBJ_ansi_X9_62 */ 4470x2A,0x86,0x48,0xCE,0x3D, /* [2953] OBJ_ansi_X9_62 */
4480x2A,0x86,0x48,0xCE,0x3D,0x01,0x01, /* [2953] OBJ_X9_62_prime_field */ 4480x2A,0x86,0x48,0xCE,0x3D,0x01,0x01, /* [2958] OBJ_X9_62_prime_field */
4490x2A,0x86,0x48,0xCE,0x3D,0x01,0x02, /* [2960] OBJ_X9_62_characteristic_two_field */ 4490x2A,0x86,0x48,0xCE,0x3D,0x01,0x02, /* [2965] OBJ_X9_62_characteristic_two_field */
4500x2A,0x86,0x48,0xCE,0x3D,0x02,0x01, /* [2967] OBJ_X9_62_id_ecPublicKey */ 4500x2A,0x86,0x48,0xCE,0x3D,0x02,0x01, /* [2972] OBJ_X9_62_id_ecPublicKey */
4510x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x01, /* [2974] OBJ_X9_62_prime192v1 */ 4510x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x01, /* [2979] OBJ_X9_62_prime192v1 */
4520x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x02, /* [2982] OBJ_X9_62_prime192v2 */ 4520x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x02, /* [2987] OBJ_X9_62_prime192v2 */
4530x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x03, /* [2990] OBJ_X9_62_prime192v3 */ 4530x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x03, /* [2995] OBJ_X9_62_prime192v3 */
4540x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x04, /* [2998] OBJ_X9_62_prime239v1 */ 4540x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x04, /* [3003] OBJ_X9_62_prime239v1 */
4550x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x05, /* [3006] OBJ_X9_62_prime239v2 */ 4550x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x05, /* [3011] OBJ_X9_62_prime239v2 */
4560x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x06, /* [3014] OBJ_X9_62_prime239v3 */ 4560x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x06, /* [3019] OBJ_X9_62_prime239v3 */
4570x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x07, /* [3022] OBJ_X9_62_prime256v1 */ 4570x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x07, /* [3027] OBJ_X9_62_prime256v1 */
4580x2A,0x86,0x48,0xCE,0x3D,0x04,0x01, /* [3030] OBJ_ecdsa_with_SHA1 */ 4580x2A,0x86,0x48,0xCE,0x3D,0x04,0x01, /* [3035] OBJ_ecdsa_with_SHA1 */
4590x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x11,0x01,/* [3037] OBJ_ms_csp_name */ 4590x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x11,0x01,/* [3042] OBJ_ms_csp_name */
4600x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x01,/* [3046] OBJ_aes_128_ecb */ 4600x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x01,/* [3051] OBJ_aes_128_ecb */
4610x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x02,/* [3055] OBJ_aes_128_cbc */ 4610x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x02,/* [3060] OBJ_aes_128_cbc */
4620x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x03,/* [3064] OBJ_aes_128_ofb128 */ 4620x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x03,/* [3069] OBJ_aes_128_ofb128 */
4630x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x04,/* [3073] OBJ_aes_128_cfb128 */ 4630x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x04,/* [3078] OBJ_aes_128_cfb128 */
4640x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x15,/* [3082] OBJ_aes_192_ecb */ 4640x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x15,/* [3087] OBJ_aes_192_ecb */
4650x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x16,/* [3091] OBJ_aes_192_cbc */ 4650x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x16,/* [3096] OBJ_aes_192_cbc */
4660x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x17,/* [3100] OBJ_aes_192_ofb128 */ 4660x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x17,/* [3105] OBJ_aes_192_ofb128 */
4670x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x18,/* [3109] OBJ_aes_192_cfb128 */ 4670x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x18,/* [3114] OBJ_aes_192_cfb128 */
4680x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x29,/* [3118] OBJ_aes_256_ecb */ 4680x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x29,/* [3123] OBJ_aes_256_ecb */
4690x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2A,/* [3127] OBJ_aes_256_cbc */ 4690x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2A,/* [3132] OBJ_aes_256_cbc */
4700x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2B,/* [3136] OBJ_aes_256_ofb128 */ 4700x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2B,/* [3141] OBJ_aes_256_ofb128 */
4710x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2C,/* [3145] OBJ_aes_256_cfb128 */ 4710x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2C,/* [3150] OBJ_aes_256_cfb128 */
4720x55,0x1D,0x17, /* [3154] OBJ_hold_instruction_code */ 4720x55,0x1D,0x17, /* [3159] OBJ_hold_instruction_code */
4730x2A,0x86,0x48,0xCE,0x38,0x02,0x01, /* [3157] OBJ_hold_instruction_none */ 4730x2A,0x86,0x48,0xCE,0x38,0x02,0x01, /* [3162] OBJ_hold_instruction_none */
4740x2A,0x86,0x48,0xCE,0x38,0x02,0x02, /* [3164] OBJ_hold_instruction_call_issuer */ 4740x2A,0x86,0x48,0xCE,0x38,0x02,0x02, /* [3169] OBJ_hold_instruction_call_issuer */
4750x2A,0x86,0x48,0xCE,0x38,0x02,0x03, /* [3171] OBJ_hold_instruction_reject */ 4750x2A,0x86,0x48,0xCE,0x38,0x02,0x03, /* [3176] OBJ_hold_instruction_reject */
4760x09, /* [3178] OBJ_data */ 4760x09, /* [3183] OBJ_data */
4770x09,0x92,0x26, /* [3179] OBJ_pss */ 4770x09,0x92,0x26, /* [3184] OBJ_pss */
4780x09,0x92,0x26,0x89,0x93,0xF2,0x2C, /* [3182] OBJ_ucl */ 4780x09,0x92,0x26,0x89,0x93,0xF2,0x2C, /* [3187] OBJ_ucl */
4790x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64, /* [3189] OBJ_pilot */ 4790x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64, /* [3194] OBJ_pilot */
4800x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,/* [3197] OBJ_pilotAttributeType */ 4800x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,/* [3202] OBJ_pilotAttributeType */
4810x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x03,/* [3206] OBJ_pilotAttributeSyntax */ 4810x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x03,/* [3211] OBJ_pilotAttributeSyntax */
4820x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,/* [3215] OBJ_pilotObjectClass */ 4820x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,/* [3220] OBJ_pilotObjectClass */
4830x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x0A,/* [3224] OBJ_pilotGroups */ 4830x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x0A,/* [3229] OBJ_pilotGroups */
4840x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x03,0x04,/* [3233] OBJ_iA5StringSyntax */ 4840x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x03,0x04,/* [3238] OBJ_iA5StringSyntax */
4850x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x03,0x05,/* [3243] OBJ_caseIgnoreIA5StringSyntax */ 4850x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x03,0x05,/* [3248] OBJ_caseIgnoreIA5StringSyntax */
4860x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x03,/* [3253] OBJ_pilotObject */ 4860x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x03,/* [3258] OBJ_pilotObject */
4870x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x04,/* [3263] OBJ_pilotPerson */ 4870x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x04,/* [3268] OBJ_pilotPerson */
4880x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x05,/* [3273] OBJ_account */ 4880x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x05,/* [3278] OBJ_account */
4890x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x06,/* [3283] OBJ_document */ 4890x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x06,/* [3288] OBJ_document */
4900x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x07,/* [3293] OBJ_room */ 4900x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x07,/* [3298] OBJ_room */
4910x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x09,/* [3303] OBJ_documentSeries */ 4910x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x09,/* [3308] OBJ_documentSeries */
4920x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x0E,/* [3313] OBJ_rFC822localPart */ 4920x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x0E,/* [3318] OBJ_rFC822localPart */
4930x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x0F,/* [3323] OBJ_dNSDomain */ 4930x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x0F,/* [3328] OBJ_dNSDomain */
4940x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x11,/* [3333] OBJ_domainRelatedObject */ 4940x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x11,/* [3338] OBJ_domainRelatedObject */
4950x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x12,/* [3343] OBJ_friendlyCountry */ 4950x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x12,/* [3348] OBJ_friendlyCountry */
4960x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x13,/* [3353] OBJ_simpleSecurityObject */ 4960x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x13,/* [3358] OBJ_simpleSecurityObject */
4970x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x14,/* [3363] OBJ_pilotOrganization */ 4970x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x14,/* [3368] OBJ_pilotOrganization */
4980x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x15,/* [3373] OBJ_pilotDSA */ 4980x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x15,/* [3378] OBJ_pilotDSA */
4990x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x16,/* [3383] OBJ_qualityLabelledData */ 4990x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x16,/* [3388] OBJ_qualityLabelledData */
5000x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x01,/* [3393] OBJ_userId */ 5000x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x01,/* [3398] OBJ_userId */
5010x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x02,/* [3403] OBJ_textEncodedORAddress */ 5010x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x02,/* [3408] OBJ_textEncodedORAddress */
5020x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x03,/* [3413] OBJ_rfc822Mailbox */ 5020x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x03,/* [3418] OBJ_rfc822Mailbox */
5030x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x04,/* [3423] OBJ_info */ 5030x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x04,/* [3428] OBJ_info */
5040x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x05,/* [3433] OBJ_favouriteDrink */ 5040x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x05,/* [3438] OBJ_favouriteDrink */
5050x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x06,/* [3443] OBJ_roomNumber */ 5050x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x06,/* [3448] OBJ_roomNumber */
5060x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x07,/* [3453] OBJ_photo */ 5060x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x07,/* [3458] OBJ_photo */
5070x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x08,/* [3463] OBJ_userClass */ 5070x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x08,/* [3468] OBJ_userClass */
5080x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x09,/* [3473] OBJ_host */ 5080x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x09,/* [3478] OBJ_host */
5090x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0A,/* [3483] OBJ_manager */ 5090x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0A,/* [3488] OBJ_manager */
5100x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0B,/* [3493] OBJ_documentIdentifier */ 5100x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0B,/* [3498] OBJ_documentIdentifier */
5110x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0C,/* [3503] OBJ_documentTitle */ 5110x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0C,/* [3508] OBJ_documentTitle */
5120x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0D,/* [3513] OBJ_documentVersion */ 5120x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0D,/* [3518] OBJ_documentVersion */
5130x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0E,/* [3523] OBJ_documentAuthor */ 5130x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0E,/* [3528] OBJ_documentAuthor */
5140x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0F,/* [3533] OBJ_documentLocation */ 5140x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0F,/* [3538] OBJ_documentLocation */
5150x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x14,/* [3543] OBJ_homeTelephoneNumber */ 5150x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x14,/* [3548] OBJ_homeTelephoneNumber */
5160x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x15,/* [3553] OBJ_secretary */ 5160x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x15,/* [3558] OBJ_secretary */
5170x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x16,/* [3563] OBJ_otherMailbox */ 5170x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x16,/* [3568] OBJ_otherMailbox */
5180x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x17,/* [3573] OBJ_lastModifiedTime */ 5180x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x17,/* [3578] OBJ_lastModifiedTime */
5190x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x18,/* [3583] OBJ_lastModifiedBy */ 5190x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x18,/* [3588] OBJ_lastModifiedBy */
5200x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1A,/* [3593] OBJ_aRecord */ 5200x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1A,/* [3598] OBJ_aRecord */
5210x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1B,/* [3603] OBJ_pilotAttributeType27 */ 5210x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1B,/* [3608] OBJ_pilotAttributeType27 */
5220x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1C,/* [3613] OBJ_mXRecord */ 5220x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1C,/* [3618] OBJ_mXRecord */
5230x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1D,/* [3623] OBJ_nSRecord */ 5230x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1D,/* [3628] OBJ_nSRecord */
5240x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1E,/* [3633] OBJ_sOARecord */ 5240x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1E,/* [3638] OBJ_sOARecord */
5250x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1F,/* [3643] OBJ_cNAMERecord */ 5250x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1F,/* [3648] OBJ_cNAMERecord */
5260x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x25,/* [3653] OBJ_associatedDomain */ 5260x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x25,/* [3658] OBJ_associatedDomain */
5270x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x26,/* [3663] OBJ_associatedName */ 5270x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x26,/* [3668] OBJ_associatedName */
5280x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x27,/* [3673] OBJ_homePostalAddress */ 5280x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x27,/* [3678] OBJ_homePostalAddress */
5290x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x28,/* [3683] OBJ_personalTitle */ 5290x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x28,/* [3688] OBJ_personalTitle */
5300x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x29,/* [3693] OBJ_mobileTelephoneNumber */ 5300x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x29,/* [3698] OBJ_mobileTelephoneNumber */
5310x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2A,/* [3703] OBJ_pagerTelephoneNumber */ 5310x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2A,/* [3708] OBJ_pagerTelephoneNumber */
5320x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2B,/* [3713] OBJ_friendlyCountryName */ 5320x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2B,/* [3718] OBJ_friendlyCountryName */
5330x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2D,/* [3723] OBJ_organizationalStatus */ 5330x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2D,/* [3728] OBJ_organizationalStatus */
5340x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2E,/* [3733] OBJ_janetMailbox */ 5340x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2E,/* [3738] OBJ_janetMailbox */
5350x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2F,/* [3743] OBJ_mailPreferenceOption */ 5350x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2F,/* [3748] OBJ_mailPreferenceOption */
5360x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x30,/* [3753] OBJ_buildingName */ 5360x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x30,/* [3758] OBJ_buildingName */
5370x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x31,/* [3763] OBJ_dSAQuality */ 5370x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x31,/* [3768] OBJ_dSAQuality */
5380x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x32,/* [3773] OBJ_singleLevelQuality */ 5380x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x32,/* [3778] OBJ_singleLevelQuality */
5390x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x33,/* [3783] OBJ_subtreeMinimumQuality */ 5390x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x33,/* [3788] OBJ_subtreeMinimumQuality */
5400x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x34,/* [3793] OBJ_subtreeMaximumQuality */ 5400x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x34,/* [3798] OBJ_subtreeMaximumQuality */
5410x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x35,/* [3803] OBJ_personalSignature */ 5410x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x35,/* [3808] OBJ_personalSignature */
5420x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x36,/* [3813] OBJ_dITRedirect */ 5420x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x36,/* [3818] OBJ_dITRedirect */
5430x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x37,/* [3823] OBJ_audio */ 5430x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x37,/* [3828] OBJ_audio */
5440x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x38,/* [3833] OBJ_documentPublisher */ 5440x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x38,/* [3838] OBJ_documentPublisher */
5450x55,0x04,0x2D, /* [3843] OBJ_x500UniqueIdentifier */ 5450x55,0x04,0x2D, /* [3848] OBJ_x500UniqueIdentifier */
5460x2B,0x06,0x01,0x07,0x01, /* [3846] OBJ_mime_mhs */ 5460x2B,0x06,0x01,0x07,0x01, /* [3851] OBJ_mime_mhs */
5470x2B,0x06,0x01,0x07,0x01,0x01, /* [3851] OBJ_mime_mhs_headings */ 5470x2B,0x06,0x01,0x07,0x01,0x01, /* [3856] OBJ_mime_mhs_headings */
5480x2B,0x06,0x01,0x07,0x01,0x02, /* [3857] OBJ_mime_mhs_bodies */ 5480x2B,0x06,0x01,0x07,0x01,0x02, /* [3862] OBJ_mime_mhs_bodies */
5490x2B,0x06,0x01,0x07,0x01,0x01,0x01, /* [3863] OBJ_id_hex_partial_message */ 5490x2B,0x06,0x01,0x07,0x01,0x01,0x01, /* [3868] OBJ_id_hex_partial_message */
5500x2B,0x06,0x01,0x07,0x01,0x01,0x02, /* [3870] OBJ_id_hex_multipart_message */ 5500x2B,0x06,0x01,0x07,0x01,0x01,0x02, /* [3875] OBJ_id_hex_multipart_message */
5510x55,0x04,0x2C, /* [3877] OBJ_generationQualifier */ 5510x55,0x04,0x2C, /* [3882] OBJ_generationQualifier */
5520x55,0x04,0x41, /* [3880] OBJ_pseudonym */ 5520x55,0x04,0x41, /* [3885] OBJ_pseudonym */
5530x67,0x2A, /* [3883] OBJ_id_set */ 5530x67,0x2A, /* [3888] OBJ_id_set */
5540x67,0x2A,0x00, /* [3885] OBJ_set_ctype */ 5540x67,0x2A,0x00, /* [3890] OBJ_set_ctype */
5550x67,0x2A,0x01, /* [3888] OBJ_set_msgExt */ 5550x67,0x2A,0x01, /* [3893] OBJ_set_msgExt */
5560x67,0x2A,0x03, /* [3891] OBJ_set_attr */ 5560x67,0x2A,0x03, /* [3896] OBJ_set_attr */
5570x67,0x2A,0x05, /* [3894] OBJ_set_policy */ 5570x67,0x2A,0x05, /* [3899] OBJ_set_policy */
5580x67,0x2A,0x07, /* [3897] OBJ_set_certExt */ 5580x67,0x2A,0x07, /* [3902] OBJ_set_certExt */
5590x67,0x2A,0x08, /* [3900] OBJ_set_brand */ 5590x67,0x2A,0x08, /* [3905] OBJ_set_brand */
5600x67,0x2A,0x00,0x00, /* [3903] OBJ_setct_PANData */ 5600x67,0x2A,0x00,0x00, /* [3908] OBJ_setct_PANData */
5610x67,0x2A,0x00,0x01, /* [3907] OBJ_setct_PANToken */ 5610x67,0x2A,0x00,0x01, /* [3912] OBJ_setct_PANToken */
5620x67,0x2A,0x00,0x02, /* [3911] OBJ_setct_PANOnly */ 5620x67,0x2A,0x00,0x02, /* [3916] OBJ_setct_PANOnly */
5630x67,0x2A,0x00,0x03, /* [3915] OBJ_setct_OIData */ 5630x67,0x2A,0x00,0x03, /* [3920] OBJ_setct_OIData */
5640x67,0x2A,0x00,0x04, /* [3919] OBJ_setct_PI */ 5640x67,0x2A,0x00,0x04, /* [3924] OBJ_setct_PI */
5650x67,0x2A,0x00,0x05, /* [3923] OBJ_setct_PIData */ 5650x67,0x2A,0x00,0x05, /* [3928] OBJ_setct_PIData */
5660x67,0x2A,0x00,0x06, /* [3927] OBJ_setct_PIDataUnsigned */ 5660x67,0x2A,0x00,0x06, /* [3932] OBJ_setct_PIDataUnsigned */
5670x67,0x2A,0x00,0x07, /* [3931] OBJ_setct_HODInput */ 5670x67,0x2A,0x00,0x07, /* [3936] OBJ_setct_HODInput */
5680x67,0x2A,0x00,0x08, /* [3935] OBJ_setct_AuthResBaggage */ 5680x67,0x2A,0x00,0x08, /* [3940] OBJ_setct_AuthResBaggage */
5690x67,0x2A,0x00,0x09, /* [3939] OBJ_setct_AuthRevReqBaggage */ 5690x67,0x2A,0x00,0x09, /* [3944] OBJ_setct_AuthRevReqBaggage */
5700x67,0x2A,0x00,0x0A, /* [3943] OBJ_setct_AuthRevResBaggage */ 5700x67,0x2A,0x00,0x0A, /* [3948] OBJ_setct_AuthRevResBaggage */
5710x67,0x2A,0x00,0x0B, /* [3947] OBJ_setct_CapTokenSeq */ 5710x67,0x2A,0x00,0x0B, /* [3952] OBJ_setct_CapTokenSeq */
5720x67,0x2A,0x00,0x0C, /* [3951] OBJ_setct_PInitResData */ 5720x67,0x2A,0x00,0x0C, /* [3956] OBJ_setct_PInitResData */
5730x67,0x2A,0x00,0x0D, /* [3955] OBJ_setct_PI_TBS */ 5730x67,0x2A,0x00,0x0D, /* [3960] OBJ_setct_PI_TBS */
5740x67,0x2A,0x00,0x0E, /* [3959] OBJ_setct_PResData */ 5740x67,0x2A,0x00,0x0E, /* [3964] OBJ_setct_PResData */
5750x67,0x2A,0x00,0x10, /* [3963] OBJ_setct_AuthReqTBS */ 5750x67,0x2A,0x00,0x10, /* [3968] OBJ_setct_AuthReqTBS */
5760x67,0x2A,0x00,0x11, /* [3967] OBJ_setct_AuthResTBS */ 5760x67,0x2A,0x00,0x11, /* [3972] OBJ_setct_AuthResTBS */
5770x67,0x2A,0x00,0x12, /* [3971] OBJ_setct_AuthResTBSX */ 5770x67,0x2A,0x00,0x12, /* [3976] OBJ_setct_AuthResTBSX */
5780x67,0x2A,0x00,0x13, /* [3975] OBJ_setct_AuthTokenTBS */ 5780x67,0x2A,0x00,0x13, /* [3980] OBJ_setct_AuthTokenTBS */
5790x67,0x2A,0x00,0x14, /* [3979] OBJ_setct_CapTokenData */ 5790x67,0x2A,0x00,0x14, /* [3984] OBJ_setct_CapTokenData */
5800x67,0x2A,0x00,0x15, /* [3983] OBJ_setct_CapTokenTBS */ 5800x67,0x2A,0x00,0x15, /* [3988] OBJ_setct_CapTokenTBS */
5810x67,0x2A,0x00,0x16, /* [3987] OBJ_setct_AcqCardCodeMsg */ 5810x67,0x2A,0x00,0x16, /* [3992] OBJ_setct_AcqCardCodeMsg */
5820x67,0x2A,0x00,0x17, /* [3991] OBJ_setct_AuthRevReqTBS */ 5820x67,0x2A,0x00,0x17, /* [3996] OBJ_setct_AuthRevReqTBS */
5830x67,0x2A,0x00,0x18, /* [3995] OBJ_setct_AuthRevResData */ 5830x67,0x2A,0x00,0x18, /* [4000] OBJ_setct_AuthRevResData */
5840x67,0x2A,0x00,0x19, /* [3999] OBJ_setct_AuthRevResTBS */ 5840x67,0x2A,0x00,0x19, /* [4004] OBJ_setct_AuthRevResTBS */
5850x67,0x2A,0x00,0x1A, /* [4003] OBJ_setct_CapReqTBS */ 5850x67,0x2A,0x00,0x1A, /* [4008] OBJ_setct_CapReqTBS */
5860x67,0x2A,0x00,0x1B, /* [4007] OBJ_setct_CapReqTBSX */ 5860x67,0x2A,0x00,0x1B, /* [4012] OBJ_setct_CapReqTBSX */
5870x67,0x2A,0x00,0x1C, /* [4011] OBJ_setct_CapResData */ 5870x67,0x2A,0x00,0x1C, /* [4016] OBJ_setct_CapResData */
5880x67,0x2A,0x00,0x1D, /* [4015] OBJ_setct_CapRevReqTBS */ 5880x67,0x2A,0x00,0x1D, /* [4020] OBJ_setct_CapRevReqTBS */
5890x67,0x2A,0x00,0x1E, /* [4019] OBJ_setct_CapRevReqTBSX */ 5890x67,0x2A,0x00,0x1E, /* [4024] OBJ_setct_CapRevReqTBSX */
5900x67,0x2A,0x00,0x1F, /* [4023] OBJ_setct_CapRevResData */ 5900x67,0x2A,0x00,0x1F, /* [4028] OBJ_setct_CapRevResData */
5910x67,0x2A,0x00,0x20, /* [4027] OBJ_setct_CredReqTBS */ 5910x67,0x2A,0x00,0x20, /* [4032] OBJ_setct_CredReqTBS */
5920x67,0x2A,0x00,0x21, /* [4031] OBJ_setct_CredReqTBSX */ 5920x67,0x2A,0x00,0x21, /* [4036] OBJ_setct_CredReqTBSX */
5930x67,0x2A,0x00,0x22, /* [4035] OBJ_setct_CredResData */ 5930x67,0x2A,0x00,0x22, /* [4040] OBJ_setct_CredResData */
5940x67,0x2A,0x00,0x23, /* [4039] OBJ_setct_CredRevReqTBS */ 5940x67,0x2A,0x00,0x23, /* [4044] OBJ_setct_CredRevReqTBS */
5950x67,0x2A,0x00,0x24, /* [4043] OBJ_setct_CredRevReqTBSX */ 5950x67,0x2A,0x00,0x24, /* [4048] OBJ_setct_CredRevReqTBSX */
5960x67,0x2A,0x00,0x25, /* [4047] OBJ_setct_CredRevResData */ 5960x67,0x2A,0x00,0x25, /* [4052] OBJ_setct_CredRevResData */
5970x67,0x2A,0x00,0x26, /* [4051] OBJ_setct_PCertReqData */ 5970x67,0x2A,0x00,0x26, /* [4056] OBJ_setct_PCertReqData */
5980x67,0x2A,0x00,0x27, /* [4055] OBJ_setct_PCertResTBS */ 5980x67,0x2A,0x00,0x27, /* [4060] OBJ_setct_PCertResTBS */
5990x67,0x2A,0x00,0x28, /* [4059] OBJ_setct_BatchAdminReqData */ 5990x67,0x2A,0x00,0x28, /* [4064] OBJ_setct_BatchAdminReqData */
6000x67,0x2A,0x00,0x29, /* [4063] OBJ_setct_BatchAdminResData */ 6000x67,0x2A,0x00,0x29, /* [4068] OBJ_setct_BatchAdminResData */
6010x67,0x2A,0x00,0x2A, /* [4067] OBJ_setct_CardCInitResTBS */ 6010x67,0x2A,0x00,0x2A, /* [4072] OBJ_setct_CardCInitResTBS */
6020x67,0x2A,0x00,0x2B, /* [4071] OBJ_setct_MeAqCInitResTBS */ 6020x67,0x2A,0x00,0x2B, /* [4076] OBJ_setct_MeAqCInitResTBS */
6030x67,0x2A,0x00,0x2C, /* [4075] OBJ_setct_RegFormResTBS */ 6030x67,0x2A,0x00,0x2C, /* [4080] OBJ_setct_RegFormResTBS */
6040x67,0x2A,0x00,0x2D, /* [4079] OBJ_setct_CertReqData */ 6040x67,0x2A,0x00,0x2D, /* [4084] OBJ_setct_CertReqData */
6050x67,0x2A,0x00,0x2E, /* [4083] OBJ_setct_CertReqTBS */ 6050x67,0x2A,0x00,0x2E, /* [4088] OBJ_setct_CertReqTBS */
6060x67,0x2A,0x00,0x2F, /* [4087] OBJ_setct_CertResData */ 6060x67,0x2A,0x00,0x2F, /* [4092] OBJ_setct_CertResData */
6070x67,0x2A,0x00,0x30, /* [4091] OBJ_setct_CertInqReqTBS */ 6070x67,0x2A,0x00,0x30, /* [4096] OBJ_setct_CertInqReqTBS */
6080x67,0x2A,0x00,0x31, /* [4095] OBJ_setct_ErrorTBS */ 6080x67,0x2A,0x00,0x31, /* [4100] OBJ_setct_ErrorTBS */
6090x67,0x2A,0x00,0x32, /* [4099] OBJ_setct_PIDualSignedTBE */ 6090x67,0x2A,0x00,0x32, /* [4104] OBJ_setct_PIDualSignedTBE */
6100x67,0x2A,0x00,0x33, /* [4103] OBJ_setct_PIUnsignedTBE */ 6100x67,0x2A,0x00,0x33, /* [4108] OBJ_setct_PIUnsignedTBE */
6110x67,0x2A,0x00,0x34, /* [4107] OBJ_setct_AuthReqTBE */ 6110x67,0x2A,0x00,0x34, /* [4112] OBJ_setct_AuthReqTBE */
6120x67,0x2A,0x00,0x35, /* [4111] OBJ_setct_AuthResTBE */ 6120x67,0x2A,0x00,0x35, /* [4116] OBJ_setct_AuthResTBE */
6130x67,0x2A,0x00,0x36, /* [4115] OBJ_setct_AuthResTBEX */ 6130x67,0x2A,0x00,0x36, /* [4120] OBJ_setct_AuthResTBEX */
6140x67,0x2A,0x00,0x37, /* [4119] OBJ_setct_AuthTokenTBE */ 6140x67,0x2A,0x00,0x37, /* [4124] OBJ_setct_AuthTokenTBE */
6150x67,0x2A,0x00,0x38, /* [4123] OBJ_setct_CapTokenTBE */ 6150x67,0x2A,0x00,0x38, /* [4128] OBJ_setct_CapTokenTBE */
6160x67,0x2A,0x00,0x39, /* [4127] OBJ_setct_CapTokenTBEX */ 6160x67,0x2A,0x00,0x39, /* [4132] OBJ_setct_CapTokenTBEX */
6170x67,0x2A,0x00,0x3A, /* [4131] OBJ_setct_AcqCardCodeMsgTBE */ 6170x67,0x2A,0x00,0x3A, /* [4136] OBJ_setct_AcqCardCodeMsgTBE */
6180x67,0x2A,0x00,0x3B, /* [4135] OBJ_setct_AuthRevReqTBE */ 6180x67,0x2A,0x00,0x3B, /* [4140] OBJ_setct_AuthRevReqTBE */
6190x67,0x2A,0x00,0x3C, /* [4139] OBJ_setct_AuthRevResTBE */ 6190x67,0x2A,0x00,0x3C, /* [4144] OBJ_setct_AuthRevResTBE */
6200x67,0x2A,0x00,0x3D, /* [4143] OBJ_setct_AuthRevResTBEB */ 6200x67,0x2A,0x00,0x3D, /* [4148] OBJ_setct_AuthRevResTBEB */
6210x67,0x2A,0x00,0x3E, /* [4147] OBJ_setct_CapReqTBE */ 6210x67,0x2A,0x00,0x3E, /* [4152] OBJ_setct_CapReqTBE */
6220x67,0x2A,0x00,0x3F, /* [4151] OBJ_setct_CapReqTBEX */ 6220x67,0x2A,0x00,0x3F, /* [4156] OBJ_setct_CapReqTBEX */
6230x67,0x2A,0x00,0x40, /* [4155] OBJ_setct_CapResTBE */ 6230x67,0x2A,0x00,0x40, /* [4160] OBJ_setct_CapResTBE */
6240x67,0x2A,0x00,0x41, /* [4159] OBJ_setct_CapRevReqTBE */ 6240x67,0x2A,0x00,0x41, /* [4164] OBJ_setct_CapRevReqTBE */
6250x67,0x2A,0x00,0x42, /* [4163] OBJ_setct_CapRevReqTBEX */ 6250x67,0x2A,0x00,0x42, /* [4168] OBJ_setct_CapRevReqTBEX */
6260x67,0x2A,0x00,0x43, /* [4167] OBJ_setct_CapRevResTBE */ 6260x67,0x2A,0x00,0x43, /* [4172] OBJ_setct_CapRevResTBE */
6270x67,0x2A,0x00,0x44, /* [4171] OBJ_setct_CredReqTBE */ 6270x67,0x2A,0x00,0x44, /* [4176] OBJ_setct_CredReqTBE */
6280x67,0x2A,0x00,0x45, /* [4175] OBJ_setct_CredReqTBEX */ 6280x67,0x2A,0x00,0x45, /* [4180] OBJ_setct_CredReqTBEX */
6290x67,0x2A,0x00,0x46, /* [4179] OBJ_setct_CredResTBE */ 6290x67,0x2A,0x00,0x46, /* [4184] OBJ_setct_CredResTBE */
6300x67,0x2A,0x00,0x47, /* [4183] OBJ_setct_CredRevReqTBE */ 6300x67,0x2A,0x00,0x47, /* [4188] OBJ_setct_CredRevReqTBE */
6310x67,0x2A,0x00,0x48, /* [4187] OBJ_setct_CredRevReqTBEX */ 6310x67,0x2A,0x00,0x48, /* [4192] OBJ_setct_CredRevReqTBEX */
6320x67,0x2A,0x00,0x49, /* [4191] OBJ_setct_CredRevResTBE */ 6320x67,0x2A,0x00,0x49, /* [4196] OBJ_setct_CredRevResTBE */
6330x67,0x2A,0x00,0x4A, /* [4195] OBJ_setct_BatchAdminReqTBE */ 6330x67,0x2A,0x00,0x4A, /* [4200] OBJ_setct_BatchAdminReqTBE */
6340x67,0x2A,0x00,0x4B, /* [4199] OBJ_setct_BatchAdminResTBE */ 6340x67,0x2A,0x00,0x4B, /* [4204] OBJ_setct_BatchAdminResTBE */
6350x67,0x2A,0x00,0x4C, /* [4203] OBJ_setct_RegFormReqTBE */ 6350x67,0x2A,0x00,0x4C, /* [4208] OBJ_setct_RegFormReqTBE */
6360x67,0x2A,0x00,0x4D, /* [4207] OBJ_setct_CertReqTBE */ 6360x67,0x2A,0x00,0x4D, /* [4212] OBJ_setct_CertReqTBE */
6370x67,0x2A,0x00,0x4E, /* [4211] OBJ_setct_CertReqTBEX */ 6370x67,0x2A,0x00,0x4E, /* [4216] OBJ_setct_CertReqTBEX */
6380x67,0x2A,0x00,0x4F, /* [4215] OBJ_setct_CertResTBE */ 6380x67,0x2A,0x00,0x4F, /* [4220] OBJ_setct_CertResTBE */
6390x67,0x2A,0x00,0x50, /* [4219] OBJ_setct_CRLNotificationTBS */ 6390x67,0x2A,0x00,0x50, /* [4224] OBJ_setct_CRLNotificationTBS */
6400x67,0x2A,0x00,0x51, /* [4223] OBJ_setct_CRLNotificationResTBS */ 6400x67,0x2A,0x00,0x51, /* [4228] OBJ_setct_CRLNotificationResTBS */
6410x67,0x2A,0x00,0x52, /* [4227] OBJ_setct_BCIDistributionTBS */ 6410x67,0x2A,0x00,0x52, /* [4232] OBJ_setct_BCIDistributionTBS */
6420x67,0x2A,0x01,0x01, /* [4231] OBJ_setext_genCrypt */ 6420x67,0x2A,0x01,0x01, /* [4236] OBJ_setext_genCrypt */
6430x67,0x2A,0x01,0x03, /* [4235] OBJ_setext_miAuth */ 6430x67,0x2A,0x01,0x03, /* [4240] OBJ_setext_miAuth */
6440x67,0x2A,0x01,0x04, /* [4239] OBJ_setext_pinSecure */ 6440x67,0x2A,0x01,0x04, /* [4244] OBJ_setext_pinSecure */
6450x67,0x2A,0x01,0x05, /* [4243] OBJ_setext_pinAny */ 6450x67,0x2A,0x01,0x05, /* [4248] OBJ_setext_pinAny */
6460x67,0x2A,0x01,0x07, /* [4247] OBJ_setext_track2 */ 6460x67,0x2A,0x01,0x07, /* [4252] OBJ_setext_track2 */
6470x67,0x2A,0x01,0x08, /* [4251] OBJ_setext_cv */ 6470x67,0x2A,0x01,0x08, /* [4256] OBJ_setext_cv */
6480x67,0x2A,0x05,0x00, /* [4255] OBJ_set_policy_root */ 6480x67,0x2A,0x05,0x00, /* [4260] OBJ_set_policy_root */
6490x67,0x2A,0x07,0x00, /* [4259] OBJ_setCext_hashedRoot */ 6490x67,0x2A,0x07,0x00, /* [4264] OBJ_setCext_hashedRoot */
6500x67,0x2A,0x07,0x01, /* [4263] OBJ_setCext_certType */ 6500x67,0x2A,0x07,0x01, /* [4268] OBJ_setCext_certType */
6510x67,0x2A,0x07,0x02, /* [4267] OBJ_setCext_merchData */ 6510x67,0x2A,0x07,0x02, /* [4272] OBJ_setCext_merchData */
6520x67,0x2A,0x07,0x03, /* [4271] OBJ_setCext_cCertRequired */ 6520x67,0x2A,0x07,0x03, /* [4276] OBJ_setCext_cCertRequired */
6530x67,0x2A,0x07,0x04, /* [4275] OBJ_setCext_tunneling */ 6530x67,0x2A,0x07,0x04, /* [4280] OBJ_setCext_tunneling */
6540x67,0x2A,0x07,0x05, /* [4279] OBJ_setCext_setExt */ 6540x67,0x2A,0x07,0x05, /* [4284] OBJ_setCext_setExt */
6550x67,0x2A,0x07,0x06, /* [4283] OBJ_setCext_setQualf */ 6550x67,0x2A,0x07,0x06, /* [4288] OBJ_setCext_setQualf */
6560x67,0x2A,0x07,0x07, /* [4287] OBJ_setCext_PGWYcapabilities */ 6560x67,0x2A,0x07,0x07, /* [4292] OBJ_setCext_PGWYcapabilities */
6570x67,0x2A,0x07,0x08, /* [4291] OBJ_setCext_TokenIdentifier */ 6570x67,0x2A,0x07,0x08, /* [4296] OBJ_setCext_TokenIdentifier */
6580x67,0x2A,0x07,0x09, /* [4295] OBJ_setCext_Track2Data */ 6580x67,0x2A,0x07,0x09, /* [4300] OBJ_setCext_Track2Data */
6590x67,0x2A,0x07,0x0A, /* [4299] OBJ_setCext_TokenType */ 6590x67,0x2A,0x07,0x0A, /* [4304] OBJ_setCext_TokenType */
6600x67,0x2A,0x07,0x0B, /* [4303] OBJ_setCext_IssuerCapabilities */ 6600x67,0x2A,0x07,0x0B, /* [4308] OBJ_setCext_IssuerCapabilities */
6610x67,0x2A,0x03,0x00, /* [4307] OBJ_setAttr_Cert */ 6610x67,0x2A,0x03,0x00, /* [4312] OBJ_setAttr_Cert */
6620x67,0x2A,0x03,0x01, /* [4311] OBJ_setAttr_PGWYcap */ 6620x67,0x2A,0x03,0x01, /* [4316] OBJ_setAttr_PGWYcap */
6630x67,0x2A,0x03,0x02, /* [4315] OBJ_setAttr_TokenType */ 6630x67,0x2A,0x03,0x02, /* [4320] OBJ_setAttr_TokenType */
6640x67,0x2A,0x03,0x03, /* [4319] OBJ_setAttr_IssCap */ 6640x67,0x2A,0x03,0x03, /* [4324] OBJ_setAttr_IssCap */
6650x67,0x2A,0x03,0x00,0x00, /* [4323] OBJ_set_rootKeyThumb */ 6650x67,0x2A,0x03,0x00,0x00, /* [4328] OBJ_set_rootKeyThumb */
6660x67,0x2A,0x03,0x00,0x01, /* [4328] OBJ_set_addPolicy */ 6660x67,0x2A,0x03,0x00,0x01, /* [4333] OBJ_set_addPolicy */
6670x67,0x2A,0x03,0x02,0x01, /* [4333] OBJ_setAttr_Token_EMV */ 6670x67,0x2A,0x03,0x02,0x01, /* [4338] OBJ_setAttr_Token_EMV */
6680x67,0x2A,0x03,0x02,0x02, /* [4338] OBJ_setAttr_Token_B0Prime */ 6680x67,0x2A,0x03,0x02,0x02, /* [4343] OBJ_setAttr_Token_B0Prime */
6690x67,0x2A,0x03,0x03,0x03, /* [4343] OBJ_setAttr_IssCap_CVM */ 6690x67,0x2A,0x03,0x03,0x03, /* [4348] OBJ_setAttr_IssCap_CVM */
6700x67,0x2A,0x03,0x03,0x04, /* [4348] OBJ_setAttr_IssCap_T2 */ 6700x67,0x2A,0x03,0x03,0x04, /* [4353] OBJ_setAttr_IssCap_T2 */
6710x67,0x2A,0x03,0x03,0x05, /* [4353] OBJ_setAttr_IssCap_Sig */ 6710x67,0x2A,0x03,0x03,0x05, /* [4358] OBJ_setAttr_IssCap_Sig */
6720x67,0x2A,0x03,0x03,0x03,0x01, /* [4358] OBJ_setAttr_GenCryptgrm */ 6720x67,0x2A,0x03,0x03,0x03,0x01, /* [4363] OBJ_setAttr_GenCryptgrm */
6730x67,0x2A,0x03,0x03,0x04,0x01, /* [4364] OBJ_setAttr_T2Enc */ 6730x67,0x2A,0x03,0x03,0x04,0x01, /* [4369] OBJ_setAttr_T2Enc */
6740x67,0x2A,0x03,0x03,0x04,0x02, /* [4370] OBJ_setAttr_T2cleartxt */ 6740x67,0x2A,0x03,0x03,0x04,0x02, /* [4375] OBJ_setAttr_T2cleartxt */
6750x67,0x2A,0x03,0x03,0x05,0x01, /* [4376] OBJ_setAttr_TokICCsig */ 6750x67,0x2A,0x03,0x03,0x05,0x01, /* [4381] OBJ_setAttr_TokICCsig */
6760x67,0x2A,0x03,0x03,0x05,0x02, /* [4382] OBJ_setAttr_SecDevSig */ 6760x67,0x2A,0x03,0x03,0x05,0x02, /* [4387] OBJ_setAttr_SecDevSig */
6770x67,0x2A,0x08,0x01, /* [4388] OBJ_set_brand_IATA_ATA */ 6770x67,0x2A,0x08,0x01, /* [4393] OBJ_set_brand_IATA_ATA */
6780x67,0x2A,0x08,0x1E, /* [4392] OBJ_set_brand_Diners */ 6780x67,0x2A,0x08,0x1E, /* [4397] OBJ_set_brand_Diners */
6790x67,0x2A,0x08,0x22, /* [4396] OBJ_set_brand_AmericanExpress */ 6790x67,0x2A,0x08,0x22, /* [4401] OBJ_set_brand_AmericanExpress */
6800x67,0x2A,0x08,0x23, /* [4400] OBJ_set_brand_JCB */ 6800x67,0x2A,0x08,0x23, /* [4405] OBJ_set_brand_JCB */
6810x67,0x2A,0x08,0x04, /* [4404] OBJ_set_brand_Visa */ 6810x67,0x2A,0x08,0x04, /* [4409] OBJ_set_brand_Visa */
6820x67,0x2A,0x08,0x05, /* [4408] OBJ_set_brand_MasterCard */ 6820x67,0x2A,0x08,0x05, /* [4413] OBJ_set_brand_MasterCard */
6830x67,0x2A,0x08,0xAE,0x7B, /* [4412] OBJ_set_brand_Novus */ 6830x67,0x2A,0x08,0xAE,0x7B, /* [4417] OBJ_set_brand_Novus */
6840x2A,0x86,0x48,0x86,0xF7,0x0D,0x03,0x0A, /* [4417] OBJ_des_cdmf */ 6840x2A,0x86,0x48,0x86,0xF7,0x0D,0x03,0x0A, /* [4422] OBJ_des_cdmf */
6850x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x06,/* [4425] OBJ_rsaOAEPEncryptionSET */ 6850x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x06,/* [4430] OBJ_rsaOAEPEncryptionSET */
6860x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x14,0x02,0x02,/* [4434] OBJ_ms_smartcard_login */ 6860x00, /* [4439] OBJ_itu_t */
6870x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x14,0x02,0x03,/* [4444] OBJ_ms_upn */ 6870x50, /* [4440] OBJ_joint_iso_itu_t */
6880x55,0x04,0x09, /* [4454] OBJ_streetAddress */ 6880x67, /* [4441] OBJ_international_organizations */
6890x55,0x04,0x11, /* [4457] OBJ_postalCode */ 6890x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x14,0x02,0x02,/* [4442] OBJ_ms_smartcard_login */
6900x2B,0x06,0x01,0x05,0x05,0x07,0x15, /* [4460] OBJ_id_ppl */ 6900x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x14,0x02,0x03,/* [4452] OBJ_ms_upn */
6910x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x0E, /* [4467] OBJ_proxyCertInfo */ 6910x55,0x04,0x09, /* [4462] OBJ_streetAddress */
6920x2B,0x06,0x01,0x05,0x05,0x07,0x15,0x00, /* [4475] OBJ_id_ppl_anyLanguage */ 6920x55,0x04,0x11, /* [4465] OBJ_postalCode */
6930x2B,0x06,0x01,0x05,0x05,0x07,0x15,0x01, /* [4483] OBJ_id_ppl_inheritAll */ 6930x2B,0x06,0x01,0x05,0x05,0x07,0x15, /* [4468] OBJ_id_ppl */
6940x55,0x1D,0x1E, /* [4491] OBJ_name_constraints */ 6940x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x0E, /* [4475] OBJ_proxyCertInfo */
6950x2B,0x06,0x01,0x05,0x05,0x07,0x15,0x02, /* [4494] OBJ_Independent */ 6950x2B,0x06,0x01,0x05,0x05,0x07,0x15,0x00, /* [4483] OBJ_id_ppl_anyLanguage */
6960x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0B,/* [4502] OBJ_sha256WithRSAEncryption */ 6960x2B,0x06,0x01,0x05,0x05,0x07,0x15,0x01, /* [4491] OBJ_id_ppl_inheritAll */
6970x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0C,/* [4511] OBJ_sha384WithRSAEncryption */ 6970x55,0x1D,0x1E, /* [4499] OBJ_name_constraints */
6980x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0D,/* [4520] OBJ_sha512WithRSAEncryption */ 6980x2B,0x06,0x01,0x05,0x05,0x07,0x15,0x02, /* [4502] OBJ_Independent */
6990x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0E,/* [4529] OBJ_sha224WithRSAEncryption */ 6990x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0B,/* [4510] OBJ_sha256WithRSAEncryption */
7000x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x01,/* [4538] OBJ_sha256 */ 7000x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0C,/* [4519] OBJ_sha384WithRSAEncryption */
7010x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x02,/* [4547] OBJ_sha384 */ 7010x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0D,/* [4528] OBJ_sha512WithRSAEncryption */
7020x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x03,/* [4556] OBJ_sha512 */ 7020x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0E,/* [4537] OBJ_sha224WithRSAEncryption */
7030x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x04,/* [4565] OBJ_sha224 */ 7030x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x01,/* [4546] OBJ_sha256 */
7040x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x02,/* [4555] OBJ_sha384 */
7050x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x03,/* [4564] OBJ_sha512 */
7060x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x04,/* [4573] OBJ_sha224 */
7070x2B, /* [4582] OBJ_identified_organization */
7080x2B,0x81,0x04, /* [4583] OBJ_certicom_arc */
7090x67,0x2B, /* [4586] OBJ_wap */
7100x67,0x2B,0x0D, /* [4588] OBJ_wap_wsg */
7110x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,0x03, /* [4591] OBJ_X9_62_id_characteristic_two_basis */
7120x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,0x03,0x01,/* [4599] OBJ_X9_62_onBasis */
7130x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,0x03,0x02,/* [4608] OBJ_X9_62_tpBasis */
7140x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,0x03,0x03,/* [4617] OBJ_X9_62_ppBasis */
7150x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x01, /* [4626] OBJ_X9_62_c2pnb163v1 */
7160x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x02, /* [4634] OBJ_X9_62_c2pnb163v2 */
7170x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x03, /* [4642] OBJ_X9_62_c2pnb163v3 */
7180x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x04, /* [4650] OBJ_X9_62_c2pnb176v1 */
7190x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x05, /* [4658] OBJ_X9_62_c2tnb191v1 */
7200x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x06, /* [4666] OBJ_X9_62_c2tnb191v2 */
7210x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x07, /* [4674] OBJ_X9_62_c2tnb191v3 */
7220x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x08, /* [4682] OBJ_X9_62_c2onb191v4 */
7230x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x09, /* [4690] OBJ_X9_62_c2onb191v5 */
7240x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0A, /* [4698] OBJ_X9_62_c2pnb208w1 */
7250x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0B, /* [4706] OBJ_X9_62_c2tnb239v1 */
7260x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0C, /* [4714] OBJ_X9_62_c2tnb239v2 */
7270x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0D, /* [4722] OBJ_X9_62_c2tnb239v3 */
7280x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0E, /* [4730] OBJ_X9_62_c2onb239v4 */
7290x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0F, /* [4738] OBJ_X9_62_c2onb239v5 */
7300x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x10, /* [4746] OBJ_X9_62_c2pnb272w1 */
7310x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x11, /* [4754] OBJ_X9_62_c2pnb304w1 */
7320x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x12, /* [4762] OBJ_X9_62_c2tnb359v1 */
7330x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x13, /* [4770] OBJ_X9_62_c2pnb368w1 */
7340x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x14, /* [4778] OBJ_X9_62_c2tnb431r1 */
7350x2B,0x81,0x04,0x00,0x06, /* [4786] OBJ_secp112r1 */
7360x2B,0x81,0x04,0x00,0x07, /* [4791] OBJ_secp112r2 */
7370x2B,0x81,0x04,0x00,0x1C, /* [4796] OBJ_secp128r1 */
7380x2B,0x81,0x04,0x00,0x1D, /* [4801] OBJ_secp128r2 */
7390x2B,0x81,0x04,0x00,0x09, /* [4806] OBJ_secp160k1 */
7400x2B,0x81,0x04,0x00,0x08, /* [4811] OBJ_secp160r1 */
7410x2B,0x81,0x04,0x00,0x1E, /* [4816] OBJ_secp160r2 */
7420x2B,0x81,0x04,0x00,0x1F, /* [4821] OBJ_secp192k1 */
7430x2B,0x81,0x04,0x00,0x20, /* [4826] OBJ_secp224k1 */
7440x2B,0x81,0x04,0x00,0x21, /* [4831] OBJ_secp224r1 */
7450x2B,0x81,0x04,0x00,0x0A, /* [4836] OBJ_secp256k1 */
7460x2B,0x81,0x04,0x00,0x22, /* [4841] OBJ_secp384r1 */
7470x2B,0x81,0x04,0x00,0x23, /* [4846] OBJ_secp521r1 */
7480x2B,0x81,0x04,0x00,0x04, /* [4851] OBJ_sect113r1 */
7490x2B,0x81,0x04,0x00,0x05, /* [4856] OBJ_sect113r2 */
7500x2B,0x81,0x04,0x00,0x16, /* [4861] OBJ_sect131r1 */
7510x2B,0x81,0x04,0x00,0x17, /* [4866] OBJ_sect131r2 */
7520x2B,0x81,0x04,0x00,0x01, /* [4871] OBJ_sect163k1 */
7530x2B,0x81,0x04,0x00,0x02, /* [4876] OBJ_sect163r1 */
7540x2B,0x81,0x04,0x00,0x0F, /* [4881] OBJ_sect163r2 */
7550x2B,0x81,0x04,0x00,0x18, /* [4886] OBJ_sect193r1 */
7560x2B,0x81,0x04,0x00,0x19, /* [4891] OBJ_sect193r2 */
7570x2B,0x81,0x04,0x00,0x1A, /* [4896] OBJ_sect233k1 */
7580x2B,0x81,0x04,0x00,0x1B, /* [4901] OBJ_sect233r1 */
7590x2B,0x81,0x04,0x00,0x03, /* [4906] OBJ_sect239k1 */
7600x2B,0x81,0x04,0x00,0x10, /* [4911] OBJ_sect283k1 */
7610x2B,0x81,0x04,0x00,0x11, /* [4916] OBJ_sect283r1 */
7620x2B,0x81,0x04,0x00,0x24, /* [4921] OBJ_sect409k1 */
7630x2B,0x81,0x04,0x00,0x25, /* [4926] OBJ_sect409r1 */
7640x2B,0x81,0x04,0x00,0x26, /* [4931] OBJ_sect571k1 */
7650x2B,0x81,0x04,0x00,0x27, /* [4936] OBJ_sect571r1 */
7660x67,0x2B,0x0D,0x04,0x01, /* [4941] OBJ_wap_wsg_idm_ecid_wtls1 */
7670x67,0x2B,0x0D,0x04,0x03, /* [4946] OBJ_wap_wsg_idm_ecid_wtls3 */
7680x67,0x2B,0x0D,0x04,0x04, /* [4951] OBJ_wap_wsg_idm_ecid_wtls4 */
7690x67,0x2B,0x0D,0x04,0x05, /* [4956] OBJ_wap_wsg_idm_ecid_wtls5 */
7700x67,0x2B,0x0D,0x04,0x06, /* [4961] OBJ_wap_wsg_idm_ecid_wtls6 */
7710x67,0x2B,0x0D,0x04,0x07, /* [4966] OBJ_wap_wsg_idm_ecid_wtls7 */
7720x67,0x2B,0x0D,0x04,0x08, /* [4971] OBJ_wap_wsg_idm_ecid_wtls8 */
7730x67,0x2B,0x0D,0x04,0x09, /* [4976] OBJ_wap_wsg_idm_ecid_wtls9 */
7740x67,0x2B,0x0D,0x04,0x0A, /* [4981] OBJ_wap_wsg_idm_ecid_wtls10 */
7750x67,0x2B,0x0D,0x04,0x0B, /* [4986] OBJ_wap_wsg_idm_ecid_wtls11 */
7760x67,0x2B,0x0D,0x04,0x0C, /* [4991] OBJ_wap_wsg_idm_ecid_wtls12 */
7770x55,0x1D,0x20,0x00, /* [4996] OBJ_any_policy */
7780x55,0x1D,0x21, /* [5000] OBJ_policy_mappings */
7790x55,0x1D,0x36, /* [5003] OBJ_inhibit_any_policy */
7800x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x01,0x02,/* [5006] OBJ_camellia_128_cbc */
7810x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x01,0x03,/* [5017] OBJ_camellia_192_cbc */
7820x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x01,0x04,/* [5028] OBJ_camellia_256_cbc */
7830x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x01, /* [5039] OBJ_camellia_128_ecb */
7840x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x15, /* [5047] OBJ_camellia_192_ecb */
7850x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x29, /* [5055] OBJ_camellia_256_ecb */
7860x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x04, /* [5063] OBJ_camellia_128_cfb128 */
7870x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x18, /* [5071] OBJ_camellia_192_cfb128 */
7880x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x2C, /* [5079] OBJ_camellia_256_cfb128 */
7890x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x03, /* [5087] OBJ_camellia_128_ofb128 */
7900x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x17, /* [5095] OBJ_camellia_192_ofb128 */
7910x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x2B, /* [5103] OBJ_camellia_256_ofb128 */
7920x55,0x1D,0x09, /* [5111] OBJ_subject_directory_attributes */
7930x55,0x1D,0x1C, /* [5114] OBJ_issuing_distribution_point */
7940x55,0x1D,0x1D, /* [5117] OBJ_certificate_issuer */
7950x2A,0x83,0x1A,0x8C,0x9A,0x44, /* [5120] OBJ_kisa */
7960x2A,0x83,0x1A,0x8C,0x9A,0x44,0x01,0x03, /* [5126] OBJ_seed_ecb */
7970x2A,0x83,0x1A,0x8C,0x9A,0x44,0x01,0x04, /* [5134] OBJ_seed_cbc */
7980x2A,0x83,0x1A,0x8C,0x9A,0x44,0x01,0x06, /* [5142] OBJ_seed_ofb128 */
7990x2A,0x83,0x1A,0x8C,0x9A,0x44,0x01,0x05, /* [5150] OBJ_seed_cfb128 */
8000x2B,0x06,0x01,0x05,0x05,0x08,0x01,0x01, /* [5158] OBJ_hmac_md5 */
8010x2B,0x06,0x01,0x05,0x05,0x08,0x01,0x02, /* [5166] OBJ_hmac_sha1 */
8020x2A,0x86,0x48,0x86,0xF6,0x7D,0x07,0x42,0x0D,/* [5174] OBJ_id_PasswordBasedMAC */
8030x2A,0x86,0x48,0x86,0xF6,0x7D,0x07,0x42,0x1E,/* [5183] OBJ_id_DHBasedMac */
8040x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x10, /* [5192] OBJ_id_it_suppLangTags */
8050x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x05, /* [5200] OBJ_caRepository */
8060x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x09,/* [5208] OBJ_id_smime_ct_compressedData */
8070x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x1B,/* [5219] OBJ_id_ct_asciiTextWithCRLF */
8080x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x05,/* [5230] OBJ_id_aes128_wrap */
8090x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x19,/* [5239] OBJ_id_aes192_wrap */
8100x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2D,/* [5248] OBJ_id_aes256_wrap */
704}; 811};
705 812
706static ASN1_OBJECT nid_objs[NUM_NID]={ 813static ASN1_OBJECT nid_objs[NUM_NID]={
@@ -748,21 +855,21 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
748{"DES-CFB","des-cfb",NID_des_cfb64,5,&(lvalues[192]),0}, 855{"DES-CFB","des-cfb",NID_des_cfb64,5,&(lvalues[192]),0},
749{"DES-CBC","des-cbc",NID_des_cbc,5,&(lvalues[197]),0}, 856{"DES-CBC","des-cbc",NID_des_cbc,5,&(lvalues[197]),0},
750{"DES-EDE","des-ede",NID_des_ede_ecb,5,&(lvalues[202]),0}, 857{"DES-EDE","des-ede",NID_des_ede_ecb,5,&(lvalues[202]),0},
751{"DES-EDE3","des-ede3",NID_des_ede3_ecb,0,NULL}, 858{"DES-EDE3","des-ede3",NID_des_ede3_ecb,0,NULL,0},
752{"IDEA-CBC","idea-cbc",NID_idea_cbc,11,&(lvalues[207]),0}, 859{"IDEA-CBC","idea-cbc",NID_idea_cbc,11,&(lvalues[207]),0},
753{"IDEA-CFB","idea-cfb",NID_idea_cfb64,0,NULL}, 860{"IDEA-CFB","idea-cfb",NID_idea_cfb64,0,NULL,0},
754{"IDEA-ECB","idea-ecb",NID_idea_ecb,0,NULL}, 861{"IDEA-ECB","idea-ecb",NID_idea_ecb,0,NULL,0},
755{"RC2-CBC","rc2-cbc",NID_rc2_cbc,8,&(lvalues[218]),0}, 862{"RC2-CBC","rc2-cbc",NID_rc2_cbc,8,&(lvalues[218]),0},
756{"RC2-ECB","rc2-ecb",NID_rc2_ecb,0,NULL}, 863{"RC2-ECB","rc2-ecb",NID_rc2_ecb,0,NULL,0},
757{"RC2-CFB","rc2-cfb",NID_rc2_cfb64,0,NULL}, 864{"RC2-CFB","rc2-cfb",NID_rc2_cfb64,0,NULL,0},
758{"RC2-OFB","rc2-ofb",NID_rc2_ofb64,0,NULL}, 865{"RC2-OFB","rc2-ofb",NID_rc2_ofb64,0,NULL,0},
759{"SHA","sha",NID_sha,5,&(lvalues[226]),0}, 866{"SHA","sha",NID_sha,5,&(lvalues[226]),0},
760{"RSA-SHA","shaWithRSAEncryption",NID_shaWithRSAEncryption,5, 867{"RSA-SHA","shaWithRSAEncryption",NID_shaWithRSAEncryption,5,
761 &(lvalues[231]),0}, 868 &(lvalues[231]),0},
762{"DES-EDE-CBC","des-ede-cbc",NID_des_ede_cbc,0,NULL}, 869{"DES-EDE-CBC","des-ede-cbc",NID_des_ede_cbc,0,NULL,0},
763{"DES-EDE3-CBC","des-ede3-cbc",NID_des_ede3_cbc,8,&(lvalues[236]),0}, 870{"DES-EDE3-CBC","des-ede3-cbc",NID_des_ede3_cbc,8,&(lvalues[236]),0},
764{"DES-OFB","des-ofb",NID_des_ofb64,5,&(lvalues[244]),0}, 871{"DES-OFB","des-ofb",NID_des_ofb64,5,&(lvalues[244]),0},
765{"IDEA-OFB","idea-ofb",NID_idea_ofb64,0,NULL}, 872{"IDEA-OFB","idea-ofb",NID_idea_ofb64,0,NULL,0},
766{"pkcs9","pkcs9",NID_pkcs9,8,&(lvalues[249]),0}, 873{"pkcs9","pkcs9",NID_pkcs9,8,&(lvalues[249]),0},
767{"emailAddress","emailAddress",NID_pkcs9_emailAddress,9, 874{"emailAddress","emailAddress",NID_pkcs9_emailAddress,9,
768 &(lvalues[257]),0}, 875 &(lvalues[257]),0},
@@ -786,10 +893,10 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
786 NID_netscape_cert_extension,8,&(lvalues[345]),0}, 893 NID_netscape_cert_extension,8,&(lvalues[345]),0},
787{"nsDataType","Netscape Data Type",NID_netscape_data_type,8, 894{"nsDataType","Netscape Data Type",NID_netscape_data_type,8,
788 &(lvalues[353]),0}, 895 &(lvalues[353]),0},
789{"DES-EDE-CFB","des-ede-cfb",NID_des_ede_cfb64,0,NULL}, 896{"DES-EDE-CFB","des-ede-cfb",NID_des_ede_cfb64,0,NULL,0},
790{"DES-EDE3-CFB","des-ede3-cfb",NID_des_ede3_cfb64,0,NULL}, 897{"DES-EDE3-CFB","des-ede3-cfb",NID_des_ede3_cfb64,0,NULL,0},
791{"DES-EDE-OFB","des-ede-ofb",NID_des_ede_ofb64,0,NULL}, 898{"DES-EDE-OFB","des-ede-ofb",NID_des_ede_ofb64,0,NULL,0},
792{"DES-EDE3-OFB","des-ede3-ofb",NID_des_ede3_ofb64,0,NULL}, 899{"DES-EDE3-OFB","des-ede3-ofb",NID_des_ede3_ofb64,0,NULL,0},
793{"SHA1","sha1",NID_sha1,5,&(lvalues[361]),0}, 900{"SHA1","sha1",NID_sha1,5,&(lvalues[361]),0},
794{"RSA-SHA1","sha1WithRSAEncryption",NID_sha1WithRSAEncryption,9, 901{"RSA-SHA1","sha1WithRSAEncryption",NID_sha1WithRSAEncryption,9,
795 &(lvalues[366]),0}, 902 &(lvalues[366]),0},
@@ -816,7 +923,7 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
816{"nsComment","Netscape Comment",NID_netscape_comment,9,&(lvalues[471]),0}, 923{"nsComment","Netscape Comment",NID_netscape_comment,9,&(lvalues[471]),0},
817{"nsCertSequence","Netscape Certificate Sequence", 924{"nsCertSequence","Netscape Certificate Sequence",
818 NID_netscape_cert_sequence,9,&(lvalues[480]),0}, 925 NID_netscape_cert_sequence,9,&(lvalues[480]),0},
819{"DESX-CBC","desx-cbc",NID_desx_cbc,0,NULL}, 926{"DESX-CBC","desx-cbc",NID_desx_cbc,0,NULL,0},
820{"id-ce","id-ce",NID_id_ce,2,&(lvalues[489]),0}, 927{"id-ce","id-ce",NID_id_ce,2,&(lvalues[489]),0},
821{"subjectKeyIdentifier","X509v3 Subject Key Identifier", 928{"subjectKeyIdentifier","X509v3 Subject Key Identifier",
822 NID_subject_key_identifier,3,&(lvalues[491]),0}, 929 NID_subject_key_identifier,3,&(lvalues[491]),0},
@@ -835,17 +942,17 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
835{"authorityKeyIdentifier","X509v3 Authority Key Identifier", 942{"authorityKeyIdentifier","X509v3 Authority Key Identifier",
836 NID_authority_key_identifier,3,&(lvalues[515]),0}, 943 NID_authority_key_identifier,3,&(lvalues[515]),0},
837{"BF-CBC","bf-cbc",NID_bf_cbc,9,&(lvalues[518]),0}, 944{"BF-CBC","bf-cbc",NID_bf_cbc,9,&(lvalues[518]),0},
838{"BF-ECB","bf-ecb",NID_bf_ecb,0,NULL}, 945{"BF-ECB","bf-ecb",NID_bf_ecb,0,NULL,0},
839{"BF-CFB","bf-cfb",NID_bf_cfb64,0,NULL}, 946{"BF-CFB","bf-cfb",NID_bf_cfb64,0,NULL,0},
840{"BF-OFB","bf-ofb",NID_bf_ofb64,0,NULL}, 947{"BF-OFB","bf-ofb",NID_bf_ofb64,0,NULL,0},
841{"MDC2","mdc2",NID_mdc2,4,&(lvalues[527]),0}, 948{"MDC2","mdc2",NID_mdc2,4,&(lvalues[527]),0},
842{"RSA-MDC2","mdc2WithRSA",NID_mdc2WithRSA,4,&(lvalues[531]),0}, 949{"RSA-MDC2","mdc2WithRSA",NID_mdc2WithRSA,4,&(lvalues[531]),0},
843{"RC4-40","rc4-40",NID_rc4_40,0,NULL}, 950{"RC4-40","rc4-40",NID_rc4_40,0,NULL,0},
844{"RC2-40-CBC","rc2-40-cbc",NID_rc2_40_cbc,0,NULL}, 951{"RC2-40-CBC","rc2-40-cbc",NID_rc2_40_cbc,0,NULL,0},
845{"GN","givenName",NID_givenName,3,&(lvalues[535]),0}, 952{"GN","givenName",NID_givenName,3,&(lvalues[535]),0},
846{"SN","surname",NID_surname,3,&(lvalues[538]),0}, 953{"SN","surname",NID_surname,3,&(lvalues[538]),0},
847{"initials","initials",NID_initials,3,&(lvalues[541]),0}, 954{"initials","initials",NID_initials,3,&(lvalues[541]),0},
848{NULL,NULL,NID_undef,0,NULL}, 955{NULL,NULL,NID_undef,0,NULL,0},
849{"crlDistributionPoints","X509v3 CRL Distribution Points", 956{"crlDistributionPoints","X509v3 CRL Distribution Points",
850 NID_crl_distribution_points,3,&(lvalues[544]),0}, 957 NID_crl_distribution_points,3,&(lvalues[544]),0},
851{"RSA-NP-MD5","md5WithRSA",NID_md5WithRSA,5,&(lvalues[547]),0}, 958{"RSA-NP-MD5","md5WithRSA",NID_md5WithRSA,5,&(lvalues[547]),0},
@@ -853,931 +960,1085 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
853{"title","title",NID_title,3,&(lvalues[555]),0}, 960{"title","title",NID_title,3,&(lvalues[555]),0},
854{"description","description",NID_description,3,&(lvalues[558]),0}, 961{"description","description",NID_description,3,&(lvalues[558]),0},
855{"CAST5-CBC","cast5-cbc",NID_cast5_cbc,9,&(lvalues[561]),0}, 962{"CAST5-CBC","cast5-cbc",NID_cast5_cbc,9,&(lvalues[561]),0},
856{"CAST5-ECB","cast5-ecb",NID_cast5_ecb,0,NULL}, 963{"CAST5-ECB","cast5-ecb",NID_cast5_ecb,0,NULL,0},
857{"CAST5-CFB","cast5-cfb",NID_cast5_cfb64,0,NULL}, 964{"CAST5-CFB","cast5-cfb",NID_cast5_cfb64,0,NULL,0},
858{"CAST5-OFB","cast5-ofb",NID_cast5_ofb64,0,NULL}, 965{"CAST5-OFB","cast5-ofb",NID_cast5_ofb64,0,NULL,0},
859{"pbeWithMD5AndCast5CBC","pbeWithMD5AndCast5CBC", 966{"pbeWithMD5AndCast5CBC","pbeWithMD5AndCast5CBC",
860 NID_pbeWithMD5AndCast5_CBC,9,&(lvalues[570]),0}, 967 NID_pbeWithMD5AndCast5_CBC,9,&(lvalues[570]),0},
861{"DSA-SHA1","dsaWithSHA1",NID_dsaWithSHA1,7,&(lvalues[579]),0}, 968{"DSA-SHA1","dsaWithSHA1",NID_dsaWithSHA1,7,&(lvalues[579]),0},
862{"MD5-SHA1","md5-sha1",NID_md5_sha1,0,NULL}, 969{"MD5-SHA1","md5-sha1",NID_md5_sha1,0,NULL,0},
863{"RSA-SHA1-2","sha1WithRSA",NID_sha1WithRSA,5,&(lvalues[586]),0}, 970{"RSA-SHA1-2","sha1WithRSA",NID_sha1WithRSA,5,&(lvalues[586]),0},
864{"DSA","dsaEncryption",NID_dsa,7,&(lvalues[591]),0}, 971{"DSA","dsaEncryption",NID_dsa,7,&(lvalues[591]),0},
865{"RIPEMD160","ripemd160",NID_ripemd160,5,&(lvalues[598]),0}, 972{"RIPEMD160","ripemd160",NID_ripemd160,5,&(lvalues[598]),0},
866{NULL,NULL,NID_undef,0,NULL}, 973{NULL,NULL,NID_undef,0,NULL,0},
867{"RSA-RIPEMD160","ripemd160WithRSA",NID_ripemd160WithRSA,6, 974{"RSA-RIPEMD160","ripemd160WithRSA",NID_ripemd160WithRSA,6,
868 &(lvalues[603]),0}, 975 &(lvalues[603]),0},
869{"RC5-CBC","rc5-cbc",NID_rc5_cbc,8,&(lvalues[609]),0}, 976{"RC5-CBC","rc5-cbc",NID_rc5_cbc,8,&(lvalues[609]),0},
870{"RC5-ECB","rc5-ecb",NID_rc5_ecb,0,NULL}, 977{"RC5-ECB","rc5-ecb",NID_rc5_ecb,0,NULL,0},
871{"RC5-CFB","rc5-cfb",NID_rc5_cfb64,0,NULL}, 978{"RC5-CFB","rc5-cfb",NID_rc5_cfb64,0,NULL,0},
872{"RC5-OFB","rc5-ofb",NID_rc5_ofb64,0,NULL}, 979{"RC5-OFB","rc5-ofb",NID_rc5_ofb64,0,NULL,0},
873{"RLE","run length compression",NID_rle_compression,6,&(lvalues[617]),0}, 980{"RLE","run length compression",NID_rle_compression,6,&(lvalues[617]),0},
874{"ZLIB","zlib compression",NID_zlib_compression,6,&(lvalues[623]),0}, 981{"ZLIB","zlib compression",NID_zlib_compression,11,&(lvalues[623]),0},
875{"extendedKeyUsage","X509v3 Extended Key Usage",NID_ext_key_usage,3, 982{"extendedKeyUsage","X509v3 Extended Key Usage",NID_ext_key_usage,3,
876 &(lvalues[629]),0}, 983 &(lvalues[634]),0},
877{"PKIX","PKIX",NID_id_pkix,6,&(lvalues[632]),0}, 984{"PKIX","PKIX",NID_id_pkix,6,&(lvalues[637]),0},
878{"id-kp","id-kp",NID_id_kp,7,&(lvalues[638]),0}, 985{"id-kp","id-kp",NID_id_kp,7,&(lvalues[643]),0},
879{"serverAuth","TLS Web Server Authentication",NID_server_auth,8, 986{"serverAuth","TLS Web Server Authentication",NID_server_auth,8,
880 &(lvalues[645]),0}, 987 &(lvalues[650]),0},
881{"clientAuth","TLS Web Client Authentication",NID_client_auth,8, 988{"clientAuth","TLS Web Client Authentication",NID_client_auth,8,
882 &(lvalues[653]),0}, 989 &(lvalues[658]),0},
883{"codeSigning","Code Signing",NID_code_sign,8,&(lvalues[661]),0}, 990{"codeSigning","Code Signing",NID_code_sign,8,&(lvalues[666]),0},
884{"emailProtection","E-mail Protection",NID_email_protect,8, 991{"emailProtection","E-mail Protection",NID_email_protect,8,
885 &(lvalues[669]),0}, 992 &(lvalues[674]),0},
886{"timeStamping","Time Stamping",NID_time_stamp,8,&(lvalues[677]),0}, 993{"timeStamping","Time Stamping",NID_time_stamp,8,&(lvalues[682]),0},
887{"msCodeInd","Microsoft Individual Code Signing",NID_ms_code_ind,10, 994{"msCodeInd","Microsoft Individual Code Signing",NID_ms_code_ind,10,
888 &(lvalues[685]),0}, 995 &(lvalues[690]),0},
889{"msCodeCom","Microsoft Commercial Code Signing",NID_ms_code_com,10, 996{"msCodeCom","Microsoft Commercial Code Signing",NID_ms_code_com,10,
890 &(lvalues[695]),0}, 997 &(lvalues[700]),0},
891{"msCTLSign","Microsoft Trust List Signing",NID_ms_ctl_sign,10, 998{"msCTLSign","Microsoft Trust List Signing",NID_ms_ctl_sign,10,
892 &(lvalues[705]),0}, 999 &(lvalues[710]),0},
893{"msSGC","Microsoft Server Gated Crypto",NID_ms_sgc,10,&(lvalues[715]),0}, 1000{"msSGC","Microsoft Server Gated Crypto",NID_ms_sgc,10,&(lvalues[720]),0},
894{"msEFS","Microsoft Encrypted File System",NID_ms_efs,10, 1001{"msEFS","Microsoft Encrypted File System",NID_ms_efs,10,
895 &(lvalues[725]),0}, 1002 &(lvalues[730]),0},
896{"nsSGC","Netscape Server Gated Crypto",NID_ns_sgc,9,&(lvalues[735]),0}, 1003{"nsSGC","Netscape Server Gated Crypto",NID_ns_sgc,9,&(lvalues[740]),0},
897{"deltaCRL","X509v3 Delta CRL Indicator",NID_delta_crl,3, 1004{"deltaCRL","X509v3 Delta CRL Indicator",NID_delta_crl,3,
898 &(lvalues[744]),0}, 1005 &(lvalues[749]),0},
899{"CRLReason","X509v3 CRL Reason Code",NID_crl_reason,3,&(lvalues[747]),0}, 1006{"CRLReason","X509v3 CRL Reason Code",NID_crl_reason,3,&(lvalues[752]),0},
900{"invalidityDate","Invalidity Date",NID_invalidity_date,3, 1007{"invalidityDate","Invalidity Date",NID_invalidity_date,3,
901 &(lvalues[750]),0}, 1008 &(lvalues[755]),0},
902{"SXNetID","Strong Extranet ID",NID_sxnet,5,&(lvalues[753]),0}, 1009{"SXNetID","Strong Extranet ID",NID_sxnet,5,&(lvalues[758]),0},
903{"PBE-SHA1-RC4-128","pbeWithSHA1And128BitRC4", 1010{"PBE-SHA1-RC4-128","pbeWithSHA1And128BitRC4",
904 NID_pbe_WithSHA1And128BitRC4,10,&(lvalues[758]),0}, 1011 NID_pbe_WithSHA1And128BitRC4,10,&(lvalues[763]),0},
905{"PBE-SHA1-RC4-40","pbeWithSHA1And40BitRC4", 1012{"PBE-SHA1-RC4-40","pbeWithSHA1And40BitRC4",
906 NID_pbe_WithSHA1And40BitRC4,10,&(lvalues[768]),0}, 1013 NID_pbe_WithSHA1And40BitRC4,10,&(lvalues[773]),0},
907{"PBE-SHA1-3DES","pbeWithSHA1And3-KeyTripleDES-CBC", 1014{"PBE-SHA1-3DES","pbeWithSHA1And3-KeyTripleDES-CBC",
908 NID_pbe_WithSHA1And3_Key_TripleDES_CBC,10,&(lvalues[778]),0}, 1015 NID_pbe_WithSHA1And3_Key_TripleDES_CBC,10,&(lvalues[783]),0},
909{"PBE-SHA1-2DES","pbeWithSHA1And2-KeyTripleDES-CBC", 1016{"PBE-SHA1-2DES","pbeWithSHA1And2-KeyTripleDES-CBC",
910 NID_pbe_WithSHA1And2_Key_TripleDES_CBC,10,&(lvalues[788]),0}, 1017 NID_pbe_WithSHA1And2_Key_TripleDES_CBC,10,&(lvalues[793]),0},
911{"PBE-SHA1-RC2-128","pbeWithSHA1And128BitRC2-CBC", 1018{"PBE-SHA1-RC2-128","pbeWithSHA1And128BitRC2-CBC",
912 NID_pbe_WithSHA1And128BitRC2_CBC,10,&(lvalues[798]),0}, 1019 NID_pbe_WithSHA1And128BitRC2_CBC,10,&(lvalues[803]),0},
913{"PBE-SHA1-RC2-40","pbeWithSHA1And40BitRC2-CBC", 1020{"PBE-SHA1-RC2-40","pbeWithSHA1And40BitRC2-CBC",
914 NID_pbe_WithSHA1And40BitRC2_CBC,10,&(lvalues[808]),0}, 1021 NID_pbe_WithSHA1And40BitRC2_CBC,10,&(lvalues[813]),0},
915{"keyBag","keyBag",NID_keyBag,11,&(lvalues[818]),0}, 1022{"keyBag","keyBag",NID_keyBag,11,&(lvalues[823]),0},
916{"pkcs8ShroudedKeyBag","pkcs8ShroudedKeyBag",NID_pkcs8ShroudedKeyBag, 1023{"pkcs8ShroudedKeyBag","pkcs8ShroudedKeyBag",NID_pkcs8ShroudedKeyBag,
917 11,&(lvalues[829]),0}, 1024 11,&(lvalues[834]),0},
918{"certBag","certBag",NID_certBag,11,&(lvalues[840]),0}, 1025{"certBag","certBag",NID_certBag,11,&(lvalues[845]),0},
919{"crlBag","crlBag",NID_crlBag,11,&(lvalues[851]),0}, 1026{"crlBag","crlBag",NID_crlBag,11,&(lvalues[856]),0},
920{"secretBag","secretBag",NID_secretBag,11,&(lvalues[862]),0}, 1027{"secretBag","secretBag",NID_secretBag,11,&(lvalues[867]),0},
921{"safeContentsBag","safeContentsBag",NID_safeContentsBag,11, 1028{"safeContentsBag","safeContentsBag",NID_safeContentsBag,11,
922 &(lvalues[873]),0}, 1029 &(lvalues[878]),0},
923{"friendlyName","friendlyName",NID_friendlyName,9,&(lvalues[884]),0}, 1030{"friendlyName","friendlyName",NID_friendlyName,9,&(lvalues[889]),0},
924{"localKeyID","localKeyID",NID_localKeyID,9,&(lvalues[893]),0}, 1031{"localKeyID","localKeyID",NID_localKeyID,9,&(lvalues[898]),0},
925{"x509Certificate","x509Certificate",NID_x509Certificate,10, 1032{"x509Certificate","x509Certificate",NID_x509Certificate,10,
926 &(lvalues[902]),0}, 1033 &(lvalues[907]),0},
927{"sdsiCertificate","sdsiCertificate",NID_sdsiCertificate,10, 1034{"sdsiCertificate","sdsiCertificate",NID_sdsiCertificate,10,
928 &(lvalues[912]),0}, 1035 &(lvalues[917]),0},
929{"x509Crl","x509Crl",NID_x509Crl,10,&(lvalues[922]),0}, 1036{"x509Crl","x509Crl",NID_x509Crl,10,&(lvalues[927]),0},
930{"PBES2","PBES2",NID_pbes2,9,&(lvalues[932]),0}, 1037{"PBES2","PBES2",NID_pbes2,9,&(lvalues[937]),0},
931{"PBMAC1","PBMAC1",NID_pbmac1,9,&(lvalues[941]),0}, 1038{"PBMAC1","PBMAC1",NID_pbmac1,9,&(lvalues[946]),0},
932{"hmacWithSHA1","hmacWithSHA1",NID_hmacWithSHA1,8,&(lvalues[950]),0}, 1039{"hmacWithSHA1","hmacWithSHA1",NID_hmacWithSHA1,8,&(lvalues[955]),0},
933{"id-qt-cps","Policy Qualifier CPS",NID_id_qt_cps,8,&(lvalues[958]),0}, 1040{"id-qt-cps","Policy Qualifier CPS",NID_id_qt_cps,8,&(lvalues[963]),0},
934{"id-qt-unotice","Policy Qualifier User Notice",NID_id_qt_unotice,8, 1041{"id-qt-unotice","Policy Qualifier User Notice",NID_id_qt_unotice,8,
935 &(lvalues[966]),0}, 1042 &(lvalues[971]),0},
936{"RC2-64-CBC","rc2-64-cbc",NID_rc2_64_cbc,0,NULL}, 1043{"RC2-64-CBC","rc2-64-cbc",NID_rc2_64_cbc,0,NULL,0},
937{"SMIME-CAPS","S/MIME Capabilities",NID_SMIMECapabilities,9, 1044{"SMIME-CAPS","S/MIME Capabilities",NID_SMIMECapabilities,9,
938 &(lvalues[974]),0}, 1045 &(lvalues[979]),0},
939{"PBE-MD2-RC2-64","pbeWithMD2AndRC2-CBC",NID_pbeWithMD2AndRC2_CBC,9, 1046{"PBE-MD2-RC2-64","pbeWithMD2AndRC2-CBC",NID_pbeWithMD2AndRC2_CBC,9,
940 &(lvalues[983]),0}, 1047 &(lvalues[988]),0},
941{"PBE-MD5-RC2-64","pbeWithMD5AndRC2-CBC",NID_pbeWithMD5AndRC2_CBC,9, 1048{"PBE-MD5-RC2-64","pbeWithMD5AndRC2-CBC",NID_pbeWithMD5AndRC2_CBC,9,
942 &(lvalues[992]),0}, 1049 &(lvalues[997]),0},
943{"PBE-SHA1-DES","pbeWithSHA1AndDES-CBC",NID_pbeWithSHA1AndDES_CBC,9, 1050{"PBE-SHA1-DES","pbeWithSHA1AndDES-CBC",NID_pbeWithSHA1AndDES_CBC,9,
944 &(lvalues[1001]),0}, 1051 &(lvalues[1006]),0},
945{"msExtReq","Microsoft Extension Request",NID_ms_ext_req,10, 1052{"msExtReq","Microsoft Extension Request",NID_ms_ext_req,10,
946 &(lvalues[1010]),0}, 1053 &(lvalues[1015]),0},
947{"extReq","Extension Request",NID_ext_req,9,&(lvalues[1020]),0}, 1054{"extReq","Extension Request",NID_ext_req,9,&(lvalues[1025]),0},
948{"name","name",NID_name,3,&(lvalues[1029]),0}, 1055{"name","name",NID_name,3,&(lvalues[1034]),0},
949{"dnQualifier","dnQualifier",NID_dnQualifier,3,&(lvalues[1032]),0}, 1056{"dnQualifier","dnQualifier",NID_dnQualifier,3,&(lvalues[1037]),0},
950{"id-pe","id-pe",NID_id_pe,7,&(lvalues[1035]),0}, 1057{"id-pe","id-pe",NID_id_pe,7,&(lvalues[1040]),0},
951{"id-ad","id-ad",NID_id_ad,7,&(lvalues[1042]),0}, 1058{"id-ad","id-ad",NID_id_ad,7,&(lvalues[1047]),0},
952{"authorityInfoAccess","Authority Information Access",NID_info_access, 1059{"authorityInfoAccess","Authority Information Access",NID_info_access,
953 8,&(lvalues[1049]),0}, 1060 8,&(lvalues[1054]),0},
954{"OCSP","OCSP",NID_ad_OCSP,8,&(lvalues[1057]),0}, 1061{"OCSP","OCSP",NID_ad_OCSP,8,&(lvalues[1062]),0},
955{"caIssuers","CA Issuers",NID_ad_ca_issuers,8,&(lvalues[1065]),0}, 1062{"caIssuers","CA Issuers",NID_ad_ca_issuers,8,&(lvalues[1070]),0},
956{"OCSPSigning","OCSP Signing",NID_OCSP_sign,8,&(lvalues[1073]),0}, 1063{"OCSPSigning","OCSP Signing",NID_OCSP_sign,8,&(lvalues[1078]),0},
957{"ISO","iso",NID_iso,1,&(lvalues[1081]),0}, 1064{"ISO","iso",NID_iso,1,&(lvalues[1086]),0},
958{"member-body","ISO Member Body",NID_member_body,1,&(lvalues[1082]),0}, 1065{"member-body","ISO Member Body",NID_member_body,1,&(lvalues[1087]),0},
959{"ISO-US","ISO US Member Body",NID_ISO_US,3,&(lvalues[1083]),0}, 1066{"ISO-US","ISO US Member Body",NID_ISO_US,3,&(lvalues[1088]),0},
960{"X9-57","X9.57",NID_X9_57,5,&(lvalues[1086]),0}, 1067{"X9-57","X9.57",NID_X9_57,5,&(lvalues[1091]),0},
961{"X9cm","X9.57 CM ?",NID_X9cm,6,&(lvalues[1091]),0}, 1068{"X9cm","X9.57 CM ?",NID_X9cm,6,&(lvalues[1096]),0},
962{"pkcs1","pkcs1",NID_pkcs1,8,&(lvalues[1097]),0}, 1069{"pkcs1","pkcs1",NID_pkcs1,8,&(lvalues[1102]),0},
963{"pkcs5","pkcs5",NID_pkcs5,8,&(lvalues[1105]),0}, 1070{"pkcs5","pkcs5",NID_pkcs5,8,&(lvalues[1110]),0},
964{"SMIME","S/MIME",NID_SMIME,9,&(lvalues[1113]),0}, 1071{"SMIME","S/MIME",NID_SMIME,9,&(lvalues[1118]),0},
965{"id-smime-mod","id-smime-mod",NID_id_smime_mod,10,&(lvalues[1122]),0}, 1072{"id-smime-mod","id-smime-mod",NID_id_smime_mod,10,&(lvalues[1127]),0},
966{"id-smime-ct","id-smime-ct",NID_id_smime_ct,10,&(lvalues[1132]),0}, 1073{"id-smime-ct","id-smime-ct",NID_id_smime_ct,10,&(lvalues[1137]),0},
967{"id-smime-aa","id-smime-aa",NID_id_smime_aa,10,&(lvalues[1142]),0}, 1074{"id-smime-aa","id-smime-aa",NID_id_smime_aa,10,&(lvalues[1147]),0},
968{"id-smime-alg","id-smime-alg",NID_id_smime_alg,10,&(lvalues[1152]),0}, 1075{"id-smime-alg","id-smime-alg",NID_id_smime_alg,10,&(lvalues[1157]),0},
969{"id-smime-cd","id-smime-cd",NID_id_smime_cd,10,&(lvalues[1162]),0}, 1076{"id-smime-cd","id-smime-cd",NID_id_smime_cd,10,&(lvalues[1167]),0},
970{"id-smime-spq","id-smime-spq",NID_id_smime_spq,10,&(lvalues[1172]),0}, 1077{"id-smime-spq","id-smime-spq",NID_id_smime_spq,10,&(lvalues[1177]),0},
971{"id-smime-cti","id-smime-cti",NID_id_smime_cti,10,&(lvalues[1182]),0}, 1078{"id-smime-cti","id-smime-cti",NID_id_smime_cti,10,&(lvalues[1187]),0},
972{"id-smime-mod-cms","id-smime-mod-cms",NID_id_smime_mod_cms,11, 1079{"id-smime-mod-cms","id-smime-mod-cms",NID_id_smime_mod_cms,11,
973 &(lvalues[1192]),0}, 1080 &(lvalues[1197]),0},
974{"id-smime-mod-ess","id-smime-mod-ess",NID_id_smime_mod_ess,11, 1081{"id-smime-mod-ess","id-smime-mod-ess",NID_id_smime_mod_ess,11,
975 &(lvalues[1203]),0}, 1082 &(lvalues[1208]),0},
976{"id-smime-mod-oid","id-smime-mod-oid",NID_id_smime_mod_oid,11, 1083{"id-smime-mod-oid","id-smime-mod-oid",NID_id_smime_mod_oid,11,
977 &(lvalues[1214]),0}, 1084 &(lvalues[1219]),0},
978{"id-smime-mod-msg-v3","id-smime-mod-msg-v3",NID_id_smime_mod_msg_v3, 1085{"id-smime-mod-msg-v3","id-smime-mod-msg-v3",NID_id_smime_mod_msg_v3,
979 11,&(lvalues[1225]),0}, 1086 11,&(lvalues[1230]),0},
980{"id-smime-mod-ets-eSignature-88","id-smime-mod-ets-eSignature-88", 1087{"id-smime-mod-ets-eSignature-88","id-smime-mod-ets-eSignature-88",
981 NID_id_smime_mod_ets_eSignature_88,11,&(lvalues[1236]),0}, 1088 NID_id_smime_mod_ets_eSignature_88,11,&(lvalues[1241]),0},
982{"id-smime-mod-ets-eSignature-97","id-smime-mod-ets-eSignature-97", 1089{"id-smime-mod-ets-eSignature-97","id-smime-mod-ets-eSignature-97",
983 NID_id_smime_mod_ets_eSignature_97,11,&(lvalues[1247]),0}, 1090 NID_id_smime_mod_ets_eSignature_97,11,&(lvalues[1252]),0},
984{"id-smime-mod-ets-eSigPolicy-88","id-smime-mod-ets-eSigPolicy-88", 1091{"id-smime-mod-ets-eSigPolicy-88","id-smime-mod-ets-eSigPolicy-88",
985 NID_id_smime_mod_ets_eSigPolicy_88,11,&(lvalues[1258]),0}, 1092 NID_id_smime_mod_ets_eSigPolicy_88,11,&(lvalues[1263]),0},
986{"id-smime-mod-ets-eSigPolicy-97","id-smime-mod-ets-eSigPolicy-97", 1093{"id-smime-mod-ets-eSigPolicy-97","id-smime-mod-ets-eSigPolicy-97",
987 NID_id_smime_mod_ets_eSigPolicy_97,11,&(lvalues[1269]),0}, 1094 NID_id_smime_mod_ets_eSigPolicy_97,11,&(lvalues[1274]),0},
988{"id-smime-ct-receipt","id-smime-ct-receipt",NID_id_smime_ct_receipt, 1095{"id-smime-ct-receipt","id-smime-ct-receipt",NID_id_smime_ct_receipt,
989 11,&(lvalues[1280]),0}, 1096 11,&(lvalues[1285]),0},
990{"id-smime-ct-authData","id-smime-ct-authData", 1097{"id-smime-ct-authData","id-smime-ct-authData",
991 NID_id_smime_ct_authData,11,&(lvalues[1291]),0}, 1098 NID_id_smime_ct_authData,11,&(lvalues[1296]),0},
992{"id-smime-ct-publishCert","id-smime-ct-publishCert", 1099{"id-smime-ct-publishCert","id-smime-ct-publishCert",
993 NID_id_smime_ct_publishCert,11,&(lvalues[1302]),0}, 1100 NID_id_smime_ct_publishCert,11,&(lvalues[1307]),0},
994{"id-smime-ct-TSTInfo","id-smime-ct-TSTInfo",NID_id_smime_ct_TSTInfo, 1101{"id-smime-ct-TSTInfo","id-smime-ct-TSTInfo",NID_id_smime_ct_TSTInfo,
995 11,&(lvalues[1313]),0}, 1102 11,&(lvalues[1318]),0},
996{"id-smime-ct-TDTInfo","id-smime-ct-TDTInfo",NID_id_smime_ct_TDTInfo, 1103{"id-smime-ct-TDTInfo","id-smime-ct-TDTInfo",NID_id_smime_ct_TDTInfo,
997 11,&(lvalues[1324]),0}, 1104 11,&(lvalues[1329]),0},
998{"id-smime-ct-contentInfo","id-smime-ct-contentInfo", 1105{"id-smime-ct-contentInfo","id-smime-ct-contentInfo",
999 NID_id_smime_ct_contentInfo,11,&(lvalues[1335]),0}, 1106 NID_id_smime_ct_contentInfo,11,&(lvalues[1340]),0},
1000{"id-smime-ct-DVCSRequestData","id-smime-ct-DVCSRequestData", 1107{"id-smime-ct-DVCSRequestData","id-smime-ct-DVCSRequestData",
1001 NID_id_smime_ct_DVCSRequestData,11,&(lvalues[1346]),0}, 1108 NID_id_smime_ct_DVCSRequestData,11,&(lvalues[1351]),0},
1002{"id-smime-ct-DVCSResponseData","id-smime-ct-DVCSResponseData", 1109{"id-smime-ct-DVCSResponseData","id-smime-ct-DVCSResponseData",
1003 NID_id_smime_ct_DVCSResponseData,11,&(lvalues[1357]),0}, 1110 NID_id_smime_ct_DVCSResponseData,11,&(lvalues[1362]),0},
1004{"id-smime-aa-receiptRequest","id-smime-aa-receiptRequest", 1111{"id-smime-aa-receiptRequest","id-smime-aa-receiptRequest",
1005 NID_id_smime_aa_receiptRequest,11,&(lvalues[1368]),0}, 1112 NID_id_smime_aa_receiptRequest,11,&(lvalues[1373]),0},
1006{"id-smime-aa-securityLabel","id-smime-aa-securityLabel", 1113{"id-smime-aa-securityLabel","id-smime-aa-securityLabel",
1007 NID_id_smime_aa_securityLabel,11,&(lvalues[1379]),0}, 1114 NID_id_smime_aa_securityLabel,11,&(lvalues[1384]),0},
1008{"id-smime-aa-mlExpandHistory","id-smime-aa-mlExpandHistory", 1115{"id-smime-aa-mlExpandHistory","id-smime-aa-mlExpandHistory",
1009 NID_id_smime_aa_mlExpandHistory,11,&(lvalues[1390]),0}, 1116 NID_id_smime_aa_mlExpandHistory,11,&(lvalues[1395]),0},
1010{"id-smime-aa-contentHint","id-smime-aa-contentHint", 1117{"id-smime-aa-contentHint","id-smime-aa-contentHint",
1011 NID_id_smime_aa_contentHint,11,&(lvalues[1401]),0}, 1118 NID_id_smime_aa_contentHint,11,&(lvalues[1406]),0},
1012{"id-smime-aa-msgSigDigest","id-smime-aa-msgSigDigest", 1119{"id-smime-aa-msgSigDigest","id-smime-aa-msgSigDigest",
1013 NID_id_smime_aa_msgSigDigest,11,&(lvalues[1412]),0}, 1120 NID_id_smime_aa_msgSigDigest,11,&(lvalues[1417]),0},
1014{"id-smime-aa-encapContentType","id-smime-aa-encapContentType", 1121{"id-smime-aa-encapContentType","id-smime-aa-encapContentType",
1015 NID_id_smime_aa_encapContentType,11,&(lvalues[1423]),0}, 1122 NID_id_smime_aa_encapContentType,11,&(lvalues[1428]),0},
1016{"id-smime-aa-contentIdentifier","id-smime-aa-contentIdentifier", 1123{"id-smime-aa-contentIdentifier","id-smime-aa-contentIdentifier",
1017 NID_id_smime_aa_contentIdentifier,11,&(lvalues[1434]),0}, 1124 NID_id_smime_aa_contentIdentifier,11,&(lvalues[1439]),0},
1018{"id-smime-aa-macValue","id-smime-aa-macValue", 1125{"id-smime-aa-macValue","id-smime-aa-macValue",
1019 NID_id_smime_aa_macValue,11,&(lvalues[1445]),0}, 1126 NID_id_smime_aa_macValue,11,&(lvalues[1450]),0},
1020{"id-smime-aa-equivalentLabels","id-smime-aa-equivalentLabels", 1127{"id-smime-aa-equivalentLabels","id-smime-aa-equivalentLabels",
1021 NID_id_smime_aa_equivalentLabels,11,&(lvalues[1456]),0}, 1128 NID_id_smime_aa_equivalentLabels,11,&(lvalues[1461]),0},
1022{"id-smime-aa-contentReference","id-smime-aa-contentReference", 1129{"id-smime-aa-contentReference","id-smime-aa-contentReference",
1023 NID_id_smime_aa_contentReference,11,&(lvalues[1467]),0}, 1130 NID_id_smime_aa_contentReference,11,&(lvalues[1472]),0},
1024{"id-smime-aa-encrypKeyPref","id-smime-aa-encrypKeyPref", 1131{"id-smime-aa-encrypKeyPref","id-smime-aa-encrypKeyPref",
1025 NID_id_smime_aa_encrypKeyPref,11,&(lvalues[1478]),0}, 1132 NID_id_smime_aa_encrypKeyPref,11,&(lvalues[1483]),0},
1026{"id-smime-aa-signingCertificate","id-smime-aa-signingCertificate", 1133{"id-smime-aa-signingCertificate","id-smime-aa-signingCertificate",
1027 NID_id_smime_aa_signingCertificate,11,&(lvalues[1489]),0}, 1134 NID_id_smime_aa_signingCertificate,11,&(lvalues[1494]),0},
1028{"id-smime-aa-smimeEncryptCerts","id-smime-aa-smimeEncryptCerts", 1135{"id-smime-aa-smimeEncryptCerts","id-smime-aa-smimeEncryptCerts",
1029 NID_id_smime_aa_smimeEncryptCerts,11,&(lvalues[1500]),0}, 1136 NID_id_smime_aa_smimeEncryptCerts,11,&(lvalues[1505]),0},
1030{"id-smime-aa-timeStampToken","id-smime-aa-timeStampToken", 1137{"id-smime-aa-timeStampToken","id-smime-aa-timeStampToken",
1031 NID_id_smime_aa_timeStampToken,11,&(lvalues[1511]),0}, 1138 NID_id_smime_aa_timeStampToken,11,&(lvalues[1516]),0},
1032{"id-smime-aa-ets-sigPolicyId","id-smime-aa-ets-sigPolicyId", 1139{"id-smime-aa-ets-sigPolicyId","id-smime-aa-ets-sigPolicyId",
1033 NID_id_smime_aa_ets_sigPolicyId,11,&(lvalues[1522]),0}, 1140 NID_id_smime_aa_ets_sigPolicyId,11,&(lvalues[1527]),0},
1034{"id-smime-aa-ets-commitmentType","id-smime-aa-ets-commitmentType", 1141{"id-smime-aa-ets-commitmentType","id-smime-aa-ets-commitmentType",
1035 NID_id_smime_aa_ets_commitmentType,11,&(lvalues[1533]),0}, 1142 NID_id_smime_aa_ets_commitmentType,11,&(lvalues[1538]),0},
1036{"id-smime-aa-ets-signerLocation","id-smime-aa-ets-signerLocation", 1143{"id-smime-aa-ets-signerLocation","id-smime-aa-ets-signerLocation",
1037 NID_id_smime_aa_ets_signerLocation,11,&(lvalues[1544]),0}, 1144 NID_id_smime_aa_ets_signerLocation,11,&(lvalues[1549]),0},
1038{"id-smime-aa-ets-signerAttr","id-smime-aa-ets-signerAttr", 1145{"id-smime-aa-ets-signerAttr","id-smime-aa-ets-signerAttr",
1039 NID_id_smime_aa_ets_signerAttr,11,&(lvalues[1555]),0}, 1146 NID_id_smime_aa_ets_signerAttr,11,&(lvalues[1560]),0},
1040{"id-smime-aa-ets-otherSigCert","id-smime-aa-ets-otherSigCert", 1147{"id-smime-aa-ets-otherSigCert","id-smime-aa-ets-otherSigCert",
1041 NID_id_smime_aa_ets_otherSigCert,11,&(lvalues[1566]),0}, 1148 NID_id_smime_aa_ets_otherSigCert,11,&(lvalues[1571]),0},
1042{"id-smime-aa-ets-contentTimestamp", 1149{"id-smime-aa-ets-contentTimestamp",
1043 "id-smime-aa-ets-contentTimestamp", 1150 "id-smime-aa-ets-contentTimestamp",
1044 NID_id_smime_aa_ets_contentTimestamp,11,&(lvalues[1577]),0}, 1151 NID_id_smime_aa_ets_contentTimestamp,11,&(lvalues[1582]),0},
1045{"id-smime-aa-ets-CertificateRefs","id-smime-aa-ets-CertificateRefs", 1152{"id-smime-aa-ets-CertificateRefs","id-smime-aa-ets-CertificateRefs",
1046 NID_id_smime_aa_ets_CertificateRefs,11,&(lvalues[1588]),0}, 1153 NID_id_smime_aa_ets_CertificateRefs,11,&(lvalues[1593]),0},
1047{"id-smime-aa-ets-RevocationRefs","id-smime-aa-ets-RevocationRefs", 1154{"id-smime-aa-ets-RevocationRefs","id-smime-aa-ets-RevocationRefs",
1048 NID_id_smime_aa_ets_RevocationRefs,11,&(lvalues[1599]),0}, 1155 NID_id_smime_aa_ets_RevocationRefs,11,&(lvalues[1604]),0},
1049{"id-smime-aa-ets-certValues","id-smime-aa-ets-certValues", 1156{"id-smime-aa-ets-certValues","id-smime-aa-ets-certValues",
1050 NID_id_smime_aa_ets_certValues,11,&(lvalues[1610]),0}, 1157 NID_id_smime_aa_ets_certValues,11,&(lvalues[1615]),0},
1051{"id-smime-aa-ets-revocationValues", 1158{"id-smime-aa-ets-revocationValues",
1052 "id-smime-aa-ets-revocationValues", 1159 "id-smime-aa-ets-revocationValues",
1053 NID_id_smime_aa_ets_revocationValues,11,&(lvalues[1621]),0}, 1160 NID_id_smime_aa_ets_revocationValues,11,&(lvalues[1626]),0},
1054{"id-smime-aa-ets-escTimeStamp","id-smime-aa-ets-escTimeStamp", 1161{"id-smime-aa-ets-escTimeStamp","id-smime-aa-ets-escTimeStamp",
1055 NID_id_smime_aa_ets_escTimeStamp,11,&(lvalues[1632]),0}, 1162 NID_id_smime_aa_ets_escTimeStamp,11,&(lvalues[1637]),0},
1056{"id-smime-aa-ets-certCRLTimestamp", 1163{"id-smime-aa-ets-certCRLTimestamp",
1057 "id-smime-aa-ets-certCRLTimestamp", 1164 "id-smime-aa-ets-certCRLTimestamp",
1058 NID_id_smime_aa_ets_certCRLTimestamp,11,&(lvalues[1643]),0}, 1165 NID_id_smime_aa_ets_certCRLTimestamp,11,&(lvalues[1648]),0},
1059{"id-smime-aa-ets-archiveTimeStamp", 1166{"id-smime-aa-ets-archiveTimeStamp",
1060 "id-smime-aa-ets-archiveTimeStamp", 1167 "id-smime-aa-ets-archiveTimeStamp",
1061 NID_id_smime_aa_ets_archiveTimeStamp,11,&(lvalues[1654]),0}, 1168 NID_id_smime_aa_ets_archiveTimeStamp,11,&(lvalues[1659]),0},
1062{"id-smime-aa-signatureType","id-smime-aa-signatureType", 1169{"id-smime-aa-signatureType","id-smime-aa-signatureType",
1063 NID_id_smime_aa_signatureType,11,&(lvalues[1665]),0}, 1170 NID_id_smime_aa_signatureType,11,&(lvalues[1670]),0},
1064{"id-smime-aa-dvcs-dvc","id-smime-aa-dvcs-dvc", 1171{"id-smime-aa-dvcs-dvc","id-smime-aa-dvcs-dvc",
1065 NID_id_smime_aa_dvcs_dvc,11,&(lvalues[1676]),0}, 1172 NID_id_smime_aa_dvcs_dvc,11,&(lvalues[1681]),0},
1066{"id-smime-alg-ESDHwith3DES","id-smime-alg-ESDHwith3DES", 1173{"id-smime-alg-ESDHwith3DES","id-smime-alg-ESDHwith3DES",
1067 NID_id_smime_alg_ESDHwith3DES,11,&(lvalues[1687]),0}, 1174 NID_id_smime_alg_ESDHwith3DES,11,&(lvalues[1692]),0},
1068{"id-smime-alg-ESDHwithRC2","id-smime-alg-ESDHwithRC2", 1175{"id-smime-alg-ESDHwithRC2","id-smime-alg-ESDHwithRC2",
1069 NID_id_smime_alg_ESDHwithRC2,11,&(lvalues[1698]),0}, 1176 NID_id_smime_alg_ESDHwithRC2,11,&(lvalues[1703]),0},
1070{"id-smime-alg-3DESwrap","id-smime-alg-3DESwrap", 1177{"id-smime-alg-3DESwrap","id-smime-alg-3DESwrap",
1071 NID_id_smime_alg_3DESwrap,11,&(lvalues[1709]),0}, 1178 NID_id_smime_alg_3DESwrap,11,&(lvalues[1714]),0},
1072{"id-smime-alg-RC2wrap","id-smime-alg-RC2wrap", 1179{"id-smime-alg-RC2wrap","id-smime-alg-RC2wrap",
1073 NID_id_smime_alg_RC2wrap,11,&(lvalues[1720]),0}, 1180 NID_id_smime_alg_RC2wrap,11,&(lvalues[1725]),0},
1074{"id-smime-alg-ESDH","id-smime-alg-ESDH",NID_id_smime_alg_ESDH,11, 1181{"id-smime-alg-ESDH","id-smime-alg-ESDH",NID_id_smime_alg_ESDH,11,
1075 &(lvalues[1731]),0}, 1182 &(lvalues[1736]),0},
1076{"id-smime-alg-CMS3DESwrap","id-smime-alg-CMS3DESwrap", 1183{"id-smime-alg-CMS3DESwrap","id-smime-alg-CMS3DESwrap",
1077 NID_id_smime_alg_CMS3DESwrap,11,&(lvalues[1742]),0}, 1184 NID_id_smime_alg_CMS3DESwrap,11,&(lvalues[1747]),0},
1078{"id-smime-alg-CMSRC2wrap","id-smime-alg-CMSRC2wrap", 1185{"id-smime-alg-CMSRC2wrap","id-smime-alg-CMSRC2wrap",
1079 NID_id_smime_alg_CMSRC2wrap,11,&(lvalues[1753]),0}, 1186 NID_id_smime_alg_CMSRC2wrap,11,&(lvalues[1758]),0},
1080{"id-smime-cd-ldap","id-smime-cd-ldap",NID_id_smime_cd_ldap,11, 1187{"id-smime-cd-ldap","id-smime-cd-ldap",NID_id_smime_cd_ldap,11,
1081 &(lvalues[1764]),0}, 1188 &(lvalues[1769]),0},
1082{"id-smime-spq-ets-sqt-uri","id-smime-spq-ets-sqt-uri", 1189{"id-smime-spq-ets-sqt-uri","id-smime-spq-ets-sqt-uri",
1083 NID_id_smime_spq_ets_sqt_uri,11,&(lvalues[1775]),0}, 1190 NID_id_smime_spq_ets_sqt_uri,11,&(lvalues[1780]),0},
1084{"id-smime-spq-ets-sqt-unotice","id-smime-spq-ets-sqt-unotice", 1191{"id-smime-spq-ets-sqt-unotice","id-smime-spq-ets-sqt-unotice",
1085 NID_id_smime_spq_ets_sqt_unotice,11,&(lvalues[1786]),0}, 1192 NID_id_smime_spq_ets_sqt_unotice,11,&(lvalues[1791]),0},
1086{"id-smime-cti-ets-proofOfOrigin","id-smime-cti-ets-proofOfOrigin", 1193{"id-smime-cti-ets-proofOfOrigin","id-smime-cti-ets-proofOfOrigin",
1087 NID_id_smime_cti_ets_proofOfOrigin,11,&(lvalues[1797]),0}, 1194 NID_id_smime_cti_ets_proofOfOrigin,11,&(lvalues[1802]),0},
1088{"id-smime-cti-ets-proofOfReceipt","id-smime-cti-ets-proofOfReceipt", 1195{"id-smime-cti-ets-proofOfReceipt","id-smime-cti-ets-proofOfReceipt",
1089 NID_id_smime_cti_ets_proofOfReceipt,11,&(lvalues[1808]),0}, 1196 NID_id_smime_cti_ets_proofOfReceipt,11,&(lvalues[1813]),0},
1090{"id-smime-cti-ets-proofOfDelivery", 1197{"id-smime-cti-ets-proofOfDelivery",
1091 "id-smime-cti-ets-proofOfDelivery", 1198 "id-smime-cti-ets-proofOfDelivery",
1092 NID_id_smime_cti_ets_proofOfDelivery,11,&(lvalues[1819]),0}, 1199 NID_id_smime_cti_ets_proofOfDelivery,11,&(lvalues[1824]),0},
1093{"id-smime-cti-ets-proofOfSender","id-smime-cti-ets-proofOfSender", 1200{"id-smime-cti-ets-proofOfSender","id-smime-cti-ets-proofOfSender",
1094 NID_id_smime_cti_ets_proofOfSender,11,&(lvalues[1830]),0}, 1201 NID_id_smime_cti_ets_proofOfSender,11,&(lvalues[1835]),0},
1095{"id-smime-cti-ets-proofOfApproval", 1202{"id-smime-cti-ets-proofOfApproval",
1096 "id-smime-cti-ets-proofOfApproval", 1203 "id-smime-cti-ets-proofOfApproval",
1097 NID_id_smime_cti_ets_proofOfApproval,11,&(lvalues[1841]),0}, 1204 NID_id_smime_cti_ets_proofOfApproval,11,&(lvalues[1846]),0},
1098{"id-smime-cti-ets-proofOfCreation", 1205{"id-smime-cti-ets-proofOfCreation",
1099 "id-smime-cti-ets-proofOfCreation", 1206 "id-smime-cti-ets-proofOfCreation",
1100 NID_id_smime_cti_ets_proofOfCreation,11,&(lvalues[1852]),0}, 1207 NID_id_smime_cti_ets_proofOfCreation,11,&(lvalues[1857]),0},
1101{"MD4","md4",NID_md4,8,&(lvalues[1863]),0}, 1208{"MD4","md4",NID_md4,8,&(lvalues[1868]),0},
1102{"id-pkix-mod","id-pkix-mod",NID_id_pkix_mod,7,&(lvalues[1871]),0}, 1209{"id-pkix-mod","id-pkix-mod",NID_id_pkix_mod,7,&(lvalues[1876]),0},
1103{"id-qt","id-qt",NID_id_qt,7,&(lvalues[1878]),0}, 1210{"id-qt","id-qt",NID_id_qt,7,&(lvalues[1883]),0},
1104{"id-it","id-it",NID_id_it,7,&(lvalues[1885]),0}, 1211{"id-it","id-it",NID_id_it,7,&(lvalues[1890]),0},
1105{"id-pkip","id-pkip",NID_id_pkip,7,&(lvalues[1892]),0}, 1212{"id-pkip","id-pkip",NID_id_pkip,7,&(lvalues[1897]),0},
1106{"id-alg","id-alg",NID_id_alg,7,&(lvalues[1899]),0}, 1213{"id-alg","id-alg",NID_id_alg,7,&(lvalues[1904]),0},
1107{"id-cmc","id-cmc",NID_id_cmc,7,&(lvalues[1906]),0}, 1214{"id-cmc","id-cmc",NID_id_cmc,7,&(lvalues[1911]),0},
1108{"id-on","id-on",NID_id_on,7,&(lvalues[1913]),0}, 1215{"id-on","id-on",NID_id_on,7,&(lvalues[1918]),0},
1109{"id-pda","id-pda",NID_id_pda,7,&(lvalues[1920]),0}, 1216{"id-pda","id-pda",NID_id_pda,7,&(lvalues[1925]),0},
1110{"id-aca","id-aca",NID_id_aca,7,&(lvalues[1927]),0}, 1217{"id-aca","id-aca",NID_id_aca,7,&(lvalues[1932]),0},
1111{"id-qcs","id-qcs",NID_id_qcs,7,&(lvalues[1934]),0}, 1218{"id-qcs","id-qcs",NID_id_qcs,7,&(lvalues[1939]),0},
1112{"id-cct","id-cct",NID_id_cct,7,&(lvalues[1941]),0}, 1219{"id-cct","id-cct",NID_id_cct,7,&(lvalues[1946]),0},
1113{"id-pkix1-explicit-88","id-pkix1-explicit-88", 1220{"id-pkix1-explicit-88","id-pkix1-explicit-88",
1114 NID_id_pkix1_explicit_88,8,&(lvalues[1948]),0}, 1221 NID_id_pkix1_explicit_88,8,&(lvalues[1953]),0},
1115{"id-pkix1-implicit-88","id-pkix1-implicit-88", 1222{"id-pkix1-implicit-88","id-pkix1-implicit-88",
1116 NID_id_pkix1_implicit_88,8,&(lvalues[1956]),0}, 1223 NID_id_pkix1_implicit_88,8,&(lvalues[1961]),0},
1117{"id-pkix1-explicit-93","id-pkix1-explicit-93", 1224{"id-pkix1-explicit-93","id-pkix1-explicit-93",
1118 NID_id_pkix1_explicit_93,8,&(lvalues[1964]),0}, 1225 NID_id_pkix1_explicit_93,8,&(lvalues[1969]),0},
1119{"id-pkix1-implicit-93","id-pkix1-implicit-93", 1226{"id-pkix1-implicit-93","id-pkix1-implicit-93",
1120 NID_id_pkix1_implicit_93,8,&(lvalues[1972]),0}, 1227 NID_id_pkix1_implicit_93,8,&(lvalues[1977]),0},
1121{"id-mod-crmf","id-mod-crmf",NID_id_mod_crmf,8,&(lvalues[1980]),0}, 1228{"id-mod-crmf","id-mod-crmf",NID_id_mod_crmf,8,&(lvalues[1985]),0},
1122{"id-mod-cmc","id-mod-cmc",NID_id_mod_cmc,8,&(lvalues[1988]),0}, 1229{"id-mod-cmc","id-mod-cmc",NID_id_mod_cmc,8,&(lvalues[1993]),0},
1123{"id-mod-kea-profile-88","id-mod-kea-profile-88", 1230{"id-mod-kea-profile-88","id-mod-kea-profile-88",
1124 NID_id_mod_kea_profile_88,8,&(lvalues[1996]),0}, 1231 NID_id_mod_kea_profile_88,8,&(lvalues[2001]),0},
1125{"id-mod-kea-profile-93","id-mod-kea-profile-93", 1232{"id-mod-kea-profile-93","id-mod-kea-profile-93",
1126 NID_id_mod_kea_profile_93,8,&(lvalues[2004]),0}, 1233 NID_id_mod_kea_profile_93,8,&(lvalues[2009]),0},
1127{"id-mod-cmp","id-mod-cmp",NID_id_mod_cmp,8,&(lvalues[2012]),0}, 1234{"id-mod-cmp","id-mod-cmp",NID_id_mod_cmp,8,&(lvalues[2017]),0},
1128{"id-mod-qualified-cert-88","id-mod-qualified-cert-88", 1235{"id-mod-qualified-cert-88","id-mod-qualified-cert-88",
1129 NID_id_mod_qualified_cert_88,8,&(lvalues[2020]),0}, 1236 NID_id_mod_qualified_cert_88,8,&(lvalues[2025]),0},
1130{"id-mod-qualified-cert-93","id-mod-qualified-cert-93", 1237{"id-mod-qualified-cert-93","id-mod-qualified-cert-93",
1131 NID_id_mod_qualified_cert_93,8,&(lvalues[2028]),0}, 1238 NID_id_mod_qualified_cert_93,8,&(lvalues[2033]),0},
1132{"id-mod-attribute-cert","id-mod-attribute-cert", 1239{"id-mod-attribute-cert","id-mod-attribute-cert",
1133 NID_id_mod_attribute_cert,8,&(lvalues[2036]),0}, 1240 NID_id_mod_attribute_cert,8,&(lvalues[2041]),0},
1134{"id-mod-timestamp-protocol","id-mod-timestamp-protocol", 1241{"id-mod-timestamp-protocol","id-mod-timestamp-protocol",
1135 NID_id_mod_timestamp_protocol,8,&(lvalues[2044]),0}, 1242 NID_id_mod_timestamp_protocol,8,&(lvalues[2049]),0},
1136{"id-mod-ocsp","id-mod-ocsp",NID_id_mod_ocsp,8,&(lvalues[2052]),0}, 1243{"id-mod-ocsp","id-mod-ocsp",NID_id_mod_ocsp,8,&(lvalues[2057]),0},
1137{"id-mod-dvcs","id-mod-dvcs",NID_id_mod_dvcs,8,&(lvalues[2060]),0}, 1244{"id-mod-dvcs","id-mod-dvcs",NID_id_mod_dvcs,8,&(lvalues[2065]),0},
1138{"id-mod-cmp2000","id-mod-cmp2000",NID_id_mod_cmp2000,8, 1245{"id-mod-cmp2000","id-mod-cmp2000",NID_id_mod_cmp2000,8,
1139 &(lvalues[2068]),0}, 1246 &(lvalues[2073]),0},
1140{"biometricInfo","Biometric Info",NID_biometricInfo,8,&(lvalues[2076]),0}, 1247{"biometricInfo","Biometric Info",NID_biometricInfo,8,&(lvalues[2081]),0},
1141{"qcStatements","qcStatements",NID_qcStatements,8,&(lvalues[2084]),0}, 1248{"qcStatements","qcStatements",NID_qcStatements,8,&(lvalues[2089]),0},
1142{"ac-auditEntity","ac-auditEntity",NID_ac_auditEntity,8, 1249{"ac-auditEntity","ac-auditEntity",NID_ac_auditEntity,8,
1143 &(lvalues[2092]),0}, 1250 &(lvalues[2097]),0},
1144{"ac-targeting","ac-targeting",NID_ac_targeting,8,&(lvalues[2100]),0}, 1251{"ac-targeting","ac-targeting",NID_ac_targeting,8,&(lvalues[2105]),0},
1145{"aaControls","aaControls",NID_aaControls,8,&(lvalues[2108]),0}, 1252{"aaControls","aaControls",NID_aaControls,8,&(lvalues[2113]),0},
1146{"sbgp-ipAddrBlock","sbgp-ipAddrBlock",NID_sbgp_ipAddrBlock,8, 1253{"sbgp-ipAddrBlock","sbgp-ipAddrBlock",NID_sbgp_ipAddrBlock,8,
1147 &(lvalues[2116]),0}, 1254 &(lvalues[2121]),0},
1148{"sbgp-autonomousSysNum","sbgp-autonomousSysNum", 1255{"sbgp-autonomousSysNum","sbgp-autonomousSysNum",
1149 NID_sbgp_autonomousSysNum,8,&(lvalues[2124]),0}, 1256 NID_sbgp_autonomousSysNum,8,&(lvalues[2129]),0},
1150{"sbgp-routerIdentifier","sbgp-routerIdentifier", 1257{"sbgp-routerIdentifier","sbgp-routerIdentifier",
1151 NID_sbgp_routerIdentifier,8,&(lvalues[2132]),0}, 1258 NID_sbgp_routerIdentifier,8,&(lvalues[2137]),0},
1152{"textNotice","textNotice",NID_textNotice,8,&(lvalues[2140]),0}, 1259{"textNotice","textNotice",NID_textNotice,8,&(lvalues[2145]),0},
1153{"ipsecEndSystem","IPSec End System",NID_ipsecEndSystem,8, 1260{"ipsecEndSystem","IPSec End System",NID_ipsecEndSystem,8,
1154 &(lvalues[2148]),0}, 1261 &(lvalues[2153]),0},
1155{"ipsecTunnel","IPSec Tunnel",NID_ipsecTunnel,8,&(lvalues[2156]),0}, 1262{"ipsecTunnel","IPSec Tunnel",NID_ipsecTunnel,8,&(lvalues[2161]),0},
1156{"ipsecUser","IPSec User",NID_ipsecUser,8,&(lvalues[2164]),0}, 1263{"ipsecUser","IPSec User",NID_ipsecUser,8,&(lvalues[2169]),0},
1157{"DVCS","dvcs",NID_dvcs,8,&(lvalues[2172]),0}, 1264{"DVCS","dvcs",NID_dvcs,8,&(lvalues[2177]),0},
1158{"id-it-caProtEncCert","id-it-caProtEncCert",NID_id_it_caProtEncCert, 1265{"id-it-caProtEncCert","id-it-caProtEncCert",NID_id_it_caProtEncCert,
1159 8,&(lvalues[2180]),0}, 1266 8,&(lvalues[2185]),0},
1160{"id-it-signKeyPairTypes","id-it-signKeyPairTypes", 1267{"id-it-signKeyPairTypes","id-it-signKeyPairTypes",
1161 NID_id_it_signKeyPairTypes,8,&(lvalues[2188]),0}, 1268 NID_id_it_signKeyPairTypes,8,&(lvalues[2193]),0},
1162{"id-it-encKeyPairTypes","id-it-encKeyPairTypes", 1269{"id-it-encKeyPairTypes","id-it-encKeyPairTypes",
1163 NID_id_it_encKeyPairTypes,8,&(lvalues[2196]),0}, 1270 NID_id_it_encKeyPairTypes,8,&(lvalues[2201]),0},
1164{"id-it-preferredSymmAlg","id-it-preferredSymmAlg", 1271{"id-it-preferredSymmAlg","id-it-preferredSymmAlg",
1165 NID_id_it_preferredSymmAlg,8,&(lvalues[2204]),0}, 1272 NID_id_it_preferredSymmAlg,8,&(lvalues[2209]),0},
1166{"id-it-caKeyUpdateInfo","id-it-caKeyUpdateInfo", 1273{"id-it-caKeyUpdateInfo","id-it-caKeyUpdateInfo",
1167 NID_id_it_caKeyUpdateInfo,8,&(lvalues[2212]),0}, 1274 NID_id_it_caKeyUpdateInfo,8,&(lvalues[2217]),0},
1168{"id-it-currentCRL","id-it-currentCRL",NID_id_it_currentCRL,8, 1275{"id-it-currentCRL","id-it-currentCRL",NID_id_it_currentCRL,8,
1169 &(lvalues[2220]),0}, 1276 &(lvalues[2225]),0},
1170{"id-it-unsupportedOIDs","id-it-unsupportedOIDs", 1277{"id-it-unsupportedOIDs","id-it-unsupportedOIDs",
1171 NID_id_it_unsupportedOIDs,8,&(lvalues[2228]),0}, 1278 NID_id_it_unsupportedOIDs,8,&(lvalues[2233]),0},
1172{"id-it-subscriptionRequest","id-it-subscriptionRequest", 1279{"id-it-subscriptionRequest","id-it-subscriptionRequest",
1173 NID_id_it_subscriptionRequest,8,&(lvalues[2236]),0}, 1280 NID_id_it_subscriptionRequest,8,&(lvalues[2241]),0},
1174{"id-it-subscriptionResponse","id-it-subscriptionResponse", 1281{"id-it-subscriptionResponse","id-it-subscriptionResponse",
1175 NID_id_it_subscriptionResponse,8,&(lvalues[2244]),0}, 1282 NID_id_it_subscriptionResponse,8,&(lvalues[2249]),0},
1176{"id-it-keyPairParamReq","id-it-keyPairParamReq", 1283{"id-it-keyPairParamReq","id-it-keyPairParamReq",
1177 NID_id_it_keyPairParamReq,8,&(lvalues[2252]),0}, 1284 NID_id_it_keyPairParamReq,8,&(lvalues[2257]),0},
1178{"id-it-keyPairParamRep","id-it-keyPairParamRep", 1285{"id-it-keyPairParamRep","id-it-keyPairParamRep",
1179 NID_id_it_keyPairParamRep,8,&(lvalues[2260]),0}, 1286 NID_id_it_keyPairParamRep,8,&(lvalues[2265]),0},
1180{"id-it-revPassphrase","id-it-revPassphrase",NID_id_it_revPassphrase, 1287{"id-it-revPassphrase","id-it-revPassphrase",NID_id_it_revPassphrase,
1181 8,&(lvalues[2268]),0}, 1288 8,&(lvalues[2273]),0},
1182{"id-it-implicitConfirm","id-it-implicitConfirm", 1289{"id-it-implicitConfirm","id-it-implicitConfirm",
1183 NID_id_it_implicitConfirm,8,&(lvalues[2276]),0}, 1290 NID_id_it_implicitConfirm,8,&(lvalues[2281]),0},
1184{"id-it-confirmWaitTime","id-it-confirmWaitTime", 1291{"id-it-confirmWaitTime","id-it-confirmWaitTime",
1185 NID_id_it_confirmWaitTime,8,&(lvalues[2284]),0}, 1292 NID_id_it_confirmWaitTime,8,&(lvalues[2289]),0},
1186{"id-it-origPKIMessage","id-it-origPKIMessage", 1293{"id-it-origPKIMessage","id-it-origPKIMessage",
1187 NID_id_it_origPKIMessage,8,&(lvalues[2292]),0}, 1294 NID_id_it_origPKIMessage,8,&(lvalues[2297]),0},
1188{"id-regCtrl","id-regCtrl",NID_id_regCtrl,8,&(lvalues[2300]),0}, 1295{"id-regCtrl","id-regCtrl",NID_id_regCtrl,8,&(lvalues[2305]),0},
1189{"id-regInfo","id-regInfo",NID_id_regInfo,8,&(lvalues[2308]),0}, 1296{"id-regInfo","id-regInfo",NID_id_regInfo,8,&(lvalues[2313]),0},
1190{"id-regCtrl-regToken","id-regCtrl-regToken",NID_id_regCtrl_regToken, 1297{"id-regCtrl-regToken","id-regCtrl-regToken",NID_id_regCtrl_regToken,
1191 9,&(lvalues[2316]),0}, 1298 9,&(lvalues[2321]),0},
1192{"id-regCtrl-authenticator","id-regCtrl-authenticator", 1299{"id-regCtrl-authenticator","id-regCtrl-authenticator",
1193 NID_id_regCtrl_authenticator,9,&(lvalues[2325]),0}, 1300 NID_id_regCtrl_authenticator,9,&(lvalues[2330]),0},
1194{"id-regCtrl-pkiPublicationInfo","id-regCtrl-pkiPublicationInfo", 1301{"id-regCtrl-pkiPublicationInfo","id-regCtrl-pkiPublicationInfo",
1195 NID_id_regCtrl_pkiPublicationInfo,9,&(lvalues[2334]),0}, 1302 NID_id_regCtrl_pkiPublicationInfo,9,&(lvalues[2339]),0},
1196{"id-regCtrl-pkiArchiveOptions","id-regCtrl-pkiArchiveOptions", 1303{"id-regCtrl-pkiArchiveOptions","id-regCtrl-pkiArchiveOptions",
1197 NID_id_regCtrl_pkiArchiveOptions,9,&(lvalues[2343]),0}, 1304 NID_id_regCtrl_pkiArchiveOptions,9,&(lvalues[2348]),0},
1198{"id-regCtrl-oldCertID","id-regCtrl-oldCertID", 1305{"id-regCtrl-oldCertID","id-regCtrl-oldCertID",
1199 NID_id_regCtrl_oldCertID,9,&(lvalues[2352]),0}, 1306 NID_id_regCtrl_oldCertID,9,&(lvalues[2357]),0},
1200{"id-regCtrl-protocolEncrKey","id-regCtrl-protocolEncrKey", 1307{"id-regCtrl-protocolEncrKey","id-regCtrl-protocolEncrKey",
1201 NID_id_regCtrl_protocolEncrKey,9,&(lvalues[2361]),0}, 1308 NID_id_regCtrl_protocolEncrKey,9,&(lvalues[2366]),0},
1202{"id-regInfo-utf8Pairs","id-regInfo-utf8Pairs", 1309{"id-regInfo-utf8Pairs","id-regInfo-utf8Pairs",
1203 NID_id_regInfo_utf8Pairs,9,&(lvalues[2370]),0}, 1310 NID_id_regInfo_utf8Pairs,9,&(lvalues[2375]),0},
1204{"id-regInfo-certReq","id-regInfo-certReq",NID_id_regInfo_certReq,9, 1311{"id-regInfo-certReq","id-regInfo-certReq",NID_id_regInfo_certReq,9,
1205 &(lvalues[2379]),0}, 1312 &(lvalues[2384]),0},
1206{"id-alg-des40","id-alg-des40",NID_id_alg_des40,8,&(lvalues[2388]),0}, 1313{"id-alg-des40","id-alg-des40",NID_id_alg_des40,8,&(lvalues[2393]),0},
1207{"id-alg-noSignature","id-alg-noSignature",NID_id_alg_noSignature,8, 1314{"id-alg-noSignature","id-alg-noSignature",NID_id_alg_noSignature,8,
1208 &(lvalues[2396]),0}, 1315 &(lvalues[2401]),0},
1209{"id-alg-dh-sig-hmac-sha1","id-alg-dh-sig-hmac-sha1", 1316{"id-alg-dh-sig-hmac-sha1","id-alg-dh-sig-hmac-sha1",
1210 NID_id_alg_dh_sig_hmac_sha1,8,&(lvalues[2404]),0}, 1317 NID_id_alg_dh_sig_hmac_sha1,8,&(lvalues[2409]),0},
1211{"id-alg-dh-pop","id-alg-dh-pop",NID_id_alg_dh_pop,8,&(lvalues[2412]),0}, 1318{"id-alg-dh-pop","id-alg-dh-pop",NID_id_alg_dh_pop,8,&(lvalues[2417]),0},
1212{"id-cmc-statusInfo","id-cmc-statusInfo",NID_id_cmc_statusInfo,8, 1319{"id-cmc-statusInfo","id-cmc-statusInfo",NID_id_cmc_statusInfo,8,
1213 &(lvalues[2420]),0}, 1320 &(lvalues[2425]),0},
1214{"id-cmc-identification","id-cmc-identification", 1321{"id-cmc-identification","id-cmc-identification",
1215 NID_id_cmc_identification,8,&(lvalues[2428]),0}, 1322 NID_id_cmc_identification,8,&(lvalues[2433]),0},
1216{"id-cmc-identityProof","id-cmc-identityProof", 1323{"id-cmc-identityProof","id-cmc-identityProof",
1217 NID_id_cmc_identityProof,8,&(lvalues[2436]),0}, 1324 NID_id_cmc_identityProof,8,&(lvalues[2441]),0},
1218{"id-cmc-dataReturn","id-cmc-dataReturn",NID_id_cmc_dataReturn,8, 1325{"id-cmc-dataReturn","id-cmc-dataReturn",NID_id_cmc_dataReturn,8,
1219 &(lvalues[2444]),0}, 1326 &(lvalues[2449]),0},
1220{"id-cmc-transactionId","id-cmc-transactionId", 1327{"id-cmc-transactionId","id-cmc-transactionId",
1221 NID_id_cmc_transactionId,8,&(lvalues[2452]),0}, 1328 NID_id_cmc_transactionId,8,&(lvalues[2457]),0},
1222{"id-cmc-senderNonce","id-cmc-senderNonce",NID_id_cmc_senderNonce,8, 1329{"id-cmc-senderNonce","id-cmc-senderNonce",NID_id_cmc_senderNonce,8,
1223 &(lvalues[2460]),0}, 1330 &(lvalues[2465]),0},
1224{"id-cmc-recipientNonce","id-cmc-recipientNonce", 1331{"id-cmc-recipientNonce","id-cmc-recipientNonce",
1225 NID_id_cmc_recipientNonce,8,&(lvalues[2468]),0}, 1332 NID_id_cmc_recipientNonce,8,&(lvalues[2473]),0},
1226{"id-cmc-addExtensions","id-cmc-addExtensions", 1333{"id-cmc-addExtensions","id-cmc-addExtensions",
1227 NID_id_cmc_addExtensions,8,&(lvalues[2476]),0}, 1334 NID_id_cmc_addExtensions,8,&(lvalues[2481]),0},
1228{"id-cmc-encryptedPOP","id-cmc-encryptedPOP",NID_id_cmc_encryptedPOP, 1335{"id-cmc-encryptedPOP","id-cmc-encryptedPOP",NID_id_cmc_encryptedPOP,
1229 8,&(lvalues[2484]),0}, 1336 8,&(lvalues[2489]),0},
1230{"id-cmc-decryptedPOP","id-cmc-decryptedPOP",NID_id_cmc_decryptedPOP, 1337{"id-cmc-decryptedPOP","id-cmc-decryptedPOP",NID_id_cmc_decryptedPOP,
1231 8,&(lvalues[2492]),0}, 1338 8,&(lvalues[2497]),0},
1232{"id-cmc-lraPOPWitness","id-cmc-lraPOPWitness", 1339{"id-cmc-lraPOPWitness","id-cmc-lraPOPWitness",
1233 NID_id_cmc_lraPOPWitness,8,&(lvalues[2500]),0}, 1340 NID_id_cmc_lraPOPWitness,8,&(lvalues[2505]),0},
1234{"id-cmc-getCert","id-cmc-getCert",NID_id_cmc_getCert,8, 1341{"id-cmc-getCert","id-cmc-getCert",NID_id_cmc_getCert,8,
1235 &(lvalues[2508]),0}, 1342 &(lvalues[2513]),0},
1236{"id-cmc-getCRL","id-cmc-getCRL",NID_id_cmc_getCRL,8,&(lvalues[2516]),0}, 1343{"id-cmc-getCRL","id-cmc-getCRL",NID_id_cmc_getCRL,8,&(lvalues[2521]),0},
1237{"id-cmc-revokeRequest","id-cmc-revokeRequest", 1344{"id-cmc-revokeRequest","id-cmc-revokeRequest",
1238 NID_id_cmc_revokeRequest,8,&(lvalues[2524]),0}, 1345 NID_id_cmc_revokeRequest,8,&(lvalues[2529]),0},
1239{"id-cmc-regInfo","id-cmc-regInfo",NID_id_cmc_regInfo,8, 1346{"id-cmc-regInfo","id-cmc-regInfo",NID_id_cmc_regInfo,8,
1240 &(lvalues[2532]),0}, 1347 &(lvalues[2537]),0},
1241{"id-cmc-responseInfo","id-cmc-responseInfo",NID_id_cmc_responseInfo, 1348{"id-cmc-responseInfo","id-cmc-responseInfo",NID_id_cmc_responseInfo,
1242 8,&(lvalues[2540]),0}, 1349 8,&(lvalues[2545]),0},
1243{"id-cmc-queryPending","id-cmc-queryPending",NID_id_cmc_queryPending, 1350{"id-cmc-queryPending","id-cmc-queryPending",NID_id_cmc_queryPending,
1244 8,&(lvalues[2548]),0}, 1351 8,&(lvalues[2553]),0},
1245{"id-cmc-popLinkRandom","id-cmc-popLinkRandom", 1352{"id-cmc-popLinkRandom","id-cmc-popLinkRandom",
1246 NID_id_cmc_popLinkRandom,8,&(lvalues[2556]),0}, 1353 NID_id_cmc_popLinkRandom,8,&(lvalues[2561]),0},
1247{"id-cmc-popLinkWitness","id-cmc-popLinkWitness", 1354{"id-cmc-popLinkWitness","id-cmc-popLinkWitness",
1248 NID_id_cmc_popLinkWitness,8,&(lvalues[2564]),0}, 1355 NID_id_cmc_popLinkWitness,8,&(lvalues[2569]),0},
1249{"id-cmc-confirmCertAcceptance","id-cmc-confirmCertAcceptance", 1356{"id-cmc-confirmCertAcceptance","id-cmc-confirmCertAcceptance",
1250 NID_id_cmc_confirmCertAcceptance,8,&(lvalues[2572]),0}, 1357 NID_id_cmc_confirmCertAcceptance,8,&(lvalues[2577]),0},
1251{"id-on-personalData","id-on-personalData",NID_id_on_personalData,8, 1358{"id-on-personalData","id-on-personalData",NID_id_on_personalData,8,
1252 &(lvalues[2580]),0}, 1359 &(lvalues[2585]),0},
1253{"id-pda-dateOfBirth","id-pda-dateOfBirth",NID_id_pda_dateOfBirth,8, 1360{"id-pda-dateOfBirth","id-pda-dateOfBirth",NID_id_pda_dateOfBirth,8,
1254 &(lvalues[2588]),0}, 1361 &(lvalues[2593]),0},
1255{"id-pda-placeOfBirth","id-pda-placeOfBirth",NID_id_pda_placeOfBirth, 1362{"id-pda-placeOfBirth","id-pda-placeOfBirth",NID_id_pda_placeOfBirth,
1256 8,&(lvalues[2596]),0}, 1363 8,&(lvalues[2601]),0},
1257{NULL,NULL,NID_undef,0,NULL}, 1364{NULL,NULL,NID_undef,0,NULL,0},
1258{"id-pda-gender","id-pda-gender",NID_id_pda_gender,8,&(lvalues[2604]),0}, 1365{"id-pda-gender","id-pda-gender",NID_id_pda_gender,8,&(lvalues[2609]),0},
1259{"id-pda-countryOfCitizenship","id-pda-countryOfCitizenship", 1366{"id-pda-countryOfCitizenship","id-pda-countryOfCitizenship",
1260 NID_id_pda_countryOfCitizenship,8,&(lvalues[2612]),0}, 1367 NID_id_pda_countryOfCitizenship,8,&(lvalues[2617]),0},
1261{"id-pda-countryOfResidence","id-pda-countryOfResidence", 1368{"id-pda-countryOfResidence","id-pda-countryOfResidence",
1262 NID_id_pda_countryOfResidence,8,&(lvalues[2620]),0}, 1369 NID_id_pda_countryOfResidence,8,&(lvalues[2625]),0},
1263{"id-aca-authenticationInfo","id-aca-authenticationInfo", 1370{"id-aca-authenticationInfo","id-aca-authenticationInfo",
1264 NID_id_aca_authenticationInfo,8,&(lvalues[2628]),0}, 1371 NID_id_aca_authenticationInfo,8,&(lvalues[2633]),0},
1265{"id-aca-accessIdentity","id-aca-accessIdentity", 1372{"id-aca-accessIdentity","id-aca-accessIdentity",
1266 NID_id_aca_accessIdentity,8,&(lvalues[2636]),0}, 1373 NID_id_aca_accessIdentity,8,&(lvalues[2641]),0},
1267{"id-aca-chargingIdentity","id-aca-chargingIdentity", 1374{"id-aca-chargingIdentity","id-aca-chargingIdentity",
1268 NID_id_aca_chargingIdentity,8,&(lvalues[2644]),0}, 1375 NID_id_aca_chargingIdentity,8,&(lvalues[2649]),0},
1269{"id-aca-group","id-aca-group",NID_id_aca_group,8,&(lvalues[2652]),0}, 1376{"id-aca-group","id-aca-group",NID_id_aca_group,8,&(lvalues[2657]),0},
1270{"id-aca-role","id-aca-role",NID_id_aca_role,8,&(lvalues[2660]),0}, 1377{"id-aca-role","id-aca-role",NID_id_aca_role,8,&(lvalues[2665]),0},
1271{"id-qcs-pkixQCSyntax-v1","id-qcs-pkixQCSyntax-v1", 1378{"id-qcs-pkixQCSyntax-v1","id-qcs-pkixQCSyntax-v1",
1272 NID_id_qcs_pkixQCSyntax_v1,8,&(lvalues[2668]),0}, 1379 NID_id_qcs_pkixQCSyntax_v1,8,&(lvalues[2673]),0},
1273{"id-cct-crs","id-cct-crs",NID_id_cct_crs,8,&(lvalues[2676]),0}, 1380{"id-cct-crs","id-cct-crs",NID_id_cct_crs,8,&(lvalues[2681]),0},
1274{"id-cct-PKIData","id-cct-PKIData",NID_id_cct_PKIData,8, 1381{"id-cct-PKIData","id-cct-PKIData",NID_id_cct_PKIData,8,
1275 &(lvalues[2684]),0}, 1382 &(lvalues[2689]),0},
1276{"id-cct-PKIResponse","id-cct-PKIResponse",NID_id_cct_PKIResponse,8, 1383{"id-cct-PKIResponse","id-cct-PKIResponse",NID_id_cct_PKIResponse,8,
1277 &(lvalues[2692]),0}, 1384 &(lvalues[2697]),0},
1278{"ad_timestamping","AD Time Stamping",NID_ad_timeStamping,8, 1385{"ad_timestamping","AD Time Stamping",NID_ad_timeStamping,8,
1279 &(lvalues[2700]),0}, 1386 &(lvalues[2705]),0},
1280{"AD_DVCS","ad dvcs",NID_ad_dvcs,8,&(lvalues[2708]),0}, 1387{"AD_DVCS","ad dvcs",NID_ad_dvcs,8,&(lvalues[2713]),0},
1281{"basicOCSPResponse","Basic OCSP Response",NID_id_pkix_OCSP_basic,9, 1388{"basicOCSPResponse","Basic OCSP Response",NID_id_pkix_OCSP_basic,9,
1282 &(lvalues[2716]),0}, 1389 &(lvalues[2721]),0},
1283{"Nonce","OCSP Nonce",NID_id_pkix_OCSP_Nonce,9,&(lvalues[2725]),0}, 1390{"Nonce","OCSP Nonce",NID_id_pkix_OCSP_Nonce,9,&(lvalues[2730]),0},
1284{"CrlID","OCSP CRL ID",NID_id_pkix_OCSP_CrlID,9,&(lvalues[2734]),0}, 1391{"CrlID","OCSP CRL ID",NID_id_pkix_OCSP_CrlID,9,&(lvalues[2739]),0},
1285{"acceptableResponses","Acceptable OCSP Responses", 1392{"acceptableResponses","Acceptable OCSP Responses",
1286 NID_id_pkix_OCSP_acceptableResponses,9,&(lvalues[2743]),0}, 1393 NID_id_pkix_OCSP_acceptableResponses,9,&(lvalues[2748]),0},
1287{"noCheck","OCSP No Check",NID_id_pkix_OCSP_noCheck,9,&(lvalues[2752]),0}, 1394{"noCheck","OCSP No Check",NID_id_pkix_OCSP_noCheck,9,&(lvalues[2757]),0},
1288{"archiveCutoff","OCSP Archive Cutoff",NID_id_pkix_OCSP_archiveCutoff, 1395{"archiveCutoff","OCSP Archive Cutoff",NID_id_pkix_OCSP_archiveCutoff,
1289 9,&(lvalues[2761]),0}, 1396 9,&(lvalues[2766]),0},
1290{"serviceLocator","OCSP Service Locator", 1397{"serviceLocator","OCSP Service Locator",
1291 NID_id_pkix_OCSP_serviceLocator,9,&(lvalues[2770]),0}, 1398 NID_id_pkix_OCSP_serviceLocator,9,&(lvalues[2775]),0},
1292{"extendedStatus","Extended OCSP Status", 1399{"extendedStatus","Extended OCSP Status",
1293 NID_id_pkix_OCSP_extendedStatus,9,&(lvalues[2779]),0}, 1400 NID_id_pkix_OCSP_extendedStatus,9,&(lvalues[2784]),0},
1294{"valid","valid",NID_id_pkix_OCSP_valid,9,&(lvalues[2788]),0}, 1401{"valid","valid",NID_id_pkix_OCSP_valid,9,&(lvalues[2793]),0},
1295{"path","path",NID_id_pkix_OCSP_path,9,&(lvalues[2797]),0}, 1402{"path","path",NID_id_pkix_OCSP_path,9,&(lvalues[2802]),0},
1296{"trustRoot","Trust Root",NID_id_pkix_OCSP_trustRoot,9, 1403{"trustRoot","Trust Root",NID_id_pkix_OCSP_trustRoot,9,
1297 &(lvalues[2806]),0}, 1404 &(lvalues[2811]),0},
1298{"algorithm","algorithm",NID_algorithm,4,&(lvalues[2815]),0}, 1405{"algorithm","algorithm",NID_algorithm,4,&(lvalues[2820]),0},
1299{"rsaSignature","rsaSignature",NID_rsaSignature,5,&(lvalues[2819]),0}, 1406{"rsaSignature","rsaSignature",NID_rsaSignature,5,&(lvalues[2824]),0},
1300{"X500algorithms","directory services - algorithms", 1407{"X500algorithms","directory services - algorithms",
1301 NID_X500algorithms,2,&(lvalues[2824]),0}, 1408 NID_X500algorithms,2,&(lvalues[2829]),0},
1302{"ORG","org",NID_org,1,&(lvalues[2826]),0}, 1409{"ORG","org",NID_org,1,&(lvalues[2831]),0},
1303{"DOD","dod",NID_dod,2,&(lvalues[2827]),0}, 1410{"DOD","dod",NID_dod,2,&(lvalues[2832]),0},
1304{"IANA","iana",NID_iana,3,&(lvalues[2829]),0}, 1411{"IANA","iana",NID_iana,3,&(lvalues[2834]),0},
1305{"directory","Directory",NID_Directory,4,&(lvalues[2832]),0}, 1412{"directory","Directory",NID_Directory,4,&(lvalues[2837]),0},
1306{"mgmt","Management",NID_Management,4,&(lvalues[2836]),0}, 1413{"mgmt","Management",NID_Management,4,&(lvalues[2841]),0},
1307{"experimental","Experimental",NID_Experimental,4,&(lvalues[2840]),0}, 1414{"experimental","Experimental",NID_Experimental,4,&(lvalues[2845]),0},
1308{"private","Private",NID_Private,4,&(lvalues[2844]),0}, 1415{"private","Private",NID_Private,4,&(lvalues[2849]),0},
1309{"security","Security",NID_Security,4,&(lvalues[2848]),0}, 1416{"security","Security",NID_Security,4,&(lvalues[2853]),0},
1310{"snmpv2","SNMPv2",NID_SNMPv2,4,&(lvalues[2852]),0}, 1417{"snmpv2","SNMPv2",NID_SNMPv2,4,&(lvalues[2857]),0},
1311{"Mail","Mail",NID_Mail,4,&(lvalues[2856]),0}, 1418{"Mail","Mail",NID_Mail,4,&(lvalues[2861]),0},
1312{"enterprises","Enterprises",NID_Enterprises,5,&(lvalues[2860]),0}, 1419{"enterprises","Enterprises",NID_Enterprises,5,&(lvalues[2865]),0},
1313{"dcobject","dcObject",NID_dcObject,9,&(lvalues[2865]),0}, 1420{"dcobject","dcObject",NID_dcObject,9,&(lvalues[2870]),0},
1314{"DC","domainComponent",NID_domainComponent,10,&(lvalues[2874]),0}, 1421{"DC","domainComponent",NID_domainComponent,10,&(lvalues[2879]),0},
1315{"domain","Domain",NID_Domain,10,&(lvalues[2884]),0}, 1422{"domain","Domain",NID_Domain,10,&(lvalues[2889]),0},
1316{"JOINT-ISO-CCITT","joint-iso-ccitt",NID_joint_iso_ccitt,1, 1423{"NULL","NULL",NID_joint_iso_ccitt,1,&(lvalues[2899]),0},
1317 &(lvalues[2894]),0},
1318{"selected-attribute-types","Selected Attribute Types", 1424{"selected-attribute-types","Selected Attribute Types",
1319 NID_selected_attribute_types,3,&(lvalues[2895]),0}, 1425 NID_selected_attribute_types,3,&(lvalues[2900]),0},
1320{"clearance","clearance",NID_clearance,4,&(lvalues[2898]),0}, 1426{"clearance","clearance",NID_clearance,4,&(lvalues[2903]),0},
1321{"RSA-MD4","md4WithRSAEncryption",NID_md4WithRSAEncryption,9, 1427{"RSA-MD4","md4WithRSAEncryption",NID_md4WithRSAEncryption,9,
1322 &(lvalues[2902]),0}, 1428 &(lvalues[2907]),0},
1323{"ac-proxying","ac-proxying",NID_ac_proxying,8,&(lvalues[2911]),0}, 1429{"ac-proxying","ac-proxying",NID_ac_proxying,8,&(lvalues[2916]),0},
1324{"subjectInfoAccess","Subject Information Access",NID_sinfo_access,8, 1430{"subjectInfoAccess","Subject Information Access",NID_sinfo_access,8,
1325 &(lvalues[2919]),0}, 1431 &(lvalues[2924]),0},
1326{"id-aca-encAttrs","id-aca-encAttrs",NID_id_aca_encAttrs,8, 1432{"id-aca-encAttrs","id-aca-encAttrs",NID_id_aca_encAttrs,8,
1327 &(lvalues[2927]),0}, 1433 &(lvalues[2932]),0},
1328{"role","role",NID_role,3,&(lvalues[2935]),0}, 1434{"role","role",NID_role,3,&(lvalues[2940]),0},
1329{"policyConstraints","X509v3 Policy Constraints", 1435{"policyConstraints","X509v3 Policy Constraints",
1330 NID_policy_constraints,3,&(lvalues[2938]),0}, 1436 NID_policy_constraints,3,&(lvalues[2943]),0},
1331{"targetInformation","X509v3 AC Targeting",NID_target_information,3, 1437{"targetInformation","X509v3 AC Targeting",NID_target_information,3,
1332 &(lvalues[2941]),0}, 1438 &(lvalues[2946]),0},
1333{"noRevAvail","X509v3 No Revocation Available",NID_no_rev_avail,3, 1439{"noRevAvail","X509v3 No Revocation Available",NID_no_rev_avail,3,
1334 &(lvalues[2944]),0}, 1440 &(lvalues[2949]),0},
1335{"CCITT","ccitt",NID_ccitt,1,&(lvalues[2947]),0}, 1441{"NULL","NULL",NID_ccitt,1,&(lvalues[2952]),0},
1336{"ansi-X9-62","ANSI X9.62",NID_ansi_X9_62,5,&(lvalues[2948]),0}, 1442{"ansi-X9-62","ANSI X9.62",NID_ansi_X9_62,5,&(lvalues[2953]),0},
1337{"prime-field","prime-field",NID_X9_62_prime_field,7,&(lvalues[2953]),0}, 1443{"prime-field","prime-field",NID_X9_62_prime_field,7,&(lvalues[2958]),0},
1338{"characteristic-two-field","characteristic-two-field", 1444{"characteristic-two-field","characteristic-two-field",
1339 NID_X9_62_characteristic_two_field,7,&(lvalues[2960]),0}, 1445 NID_X9_62_characteristic_two_field,7,&(lvalues[2965]),0},
1340{"id-ecPublicKey","id-ecPublicKey",NID_X9_62_id_ecPublicKey,7, 1446{"id-ecPublicKey","id-ecPublicKey",NID_X9_62_id_ecPublicKey,7,
1341 &(lvalues[2967]),0}, 1447 &(lvalues[2972]),0},
1342{"prime192v1","prime192v1",NID_X9_62_prime192v1,8,&(lvalues[2974]),0}, 1448{"prime192v1","prime192v1",NID_X9_62_prime192v1,8,&(lvalues[2979]),0},
1343{"prime192v2","prime192v2",NID_X9_62_prime192v2,8,&(lvalues[2982]),0}, 1449{"prime192v2","prime192v2",NID_X9_62_prime192v2,8,&(lvalues[2987]),0},
1344{"prime192v3","prime192v3",NID_X9_62_prime192v3,8,&(lvalues[2990]),0}, 1450{"prime192v3","prime192v3",NID_X9_62_prime192v3,8,&(lvalues[2995]),0},
1345{"prime239v1","prime239v1",NID_X9_62_prime239v1,8,&(lvalues[2998]),0}, 1451{"prime239v1","prime239v1",NID_X9_62_prime239v1,8,&(lvalues[3003]),0},
1346{"prime239v2","prime239v2",NID_X9_62_prime239v2,8,&(lvalues[3006]),0}, 1452{"prime239v2","prime239v2",NID_X9_62_prime239v2,8,&(lvalues[3011]),0},
1347{"prime239v3","prime239v3",NID_X9_62_prime239v3,8,&(lvalues[3014]),0}, 1453{"prime239v3","prime239v3",NID_X9_62_prime239v3,8,&(lvalues[3019]),0},
1348{"prime256v1","prime256v1",NID_X9_62_prime256v1,8,&(lvalues[3022]),0}, 1454{"prime256v1","prime256v1",NID_X9_62_prime256v1,8,&(lvalues[3027]),0},
1349{"ecdsa-with-SHA1","ecdsa-with-SHA1",NID_ecdsa_with_SHA1,7, 1455{"ecdsa-with-SHA1","ecdsa-with-SHA1",NID_ecdsa_with_SHA1,7,
1350 &(lvalues[3030]),0}, 1456 &(lvalues[3035]),0},
1351{"CSPName","Microsoft CSP Name",NID_ms_csp_name,9,&(lvalues[3037]),0}, 1457{"CSPName","Microsoft CSP Name",NID_ms_csp_name,9,&(lvalues[3042]),0},
1352{"AES-128-ECB","aes-128-ecb",NID_aes_128_ecb,9,&(lvalues[3046]),0}, 1458{"AES-128-ECB","aes-128-ecb",NID_aes_128_ecb,9,&(lvalues[3051]),0},
1353{"AES-128-CBC","aes-128-cbc",NID_aes_128_cbc,9,&(lvalues[3055]),0}, 1459{"AES-128-CBC","aes-128-cbc",NID_aes_128_cbc,9,&(lvalues[3060]),0},
1354{"AES-128-OFB","aes-128-ofb",NID_aes_128_ofb128,9,&(lvalues[3064]),0}, 1460{"AES-128-OFB","aes-128-ofb",NID_aes_128_ofb128,9,&(lvalues[3069]),0},
1355{"AES-128-CFB","aes-128-cfb",NID_aes_128_cfb128,9,&(lvalues[3073]),0}, 1461{"AES-128-CFB","aes-128-cfb",NID_aes_128_cfb128,9,&(lvalues[3078]),0},
1356{"AES-192-ECB","aes-192-ecb",NID_aes_192_ecb,9,&(lvalues[3082]),0}, 1462{"AES-192-ECB","aes-192-ecb",NID_aes_192_ecb,9,&(lvalues[3087]),0},
1357{"AES-192-CBC","aes-192-cbc",NID_aes_192_cbc,9,&(lvalues[3091]),0}, 1463{"AES-192-CBC","aes-192-cbc",NID_aes_192_cbc,9,&(lvalues[3096]),0},
1358{"AES-192-OFB","aes-192-ofb",NID_aes_192_ofb128,9,&(lvalues[3100]),0}, 1464{"AES-192-OFB","aes-192-ofb",NID_aes_192_ofb128,9,&(lvalues[3105]),0},
1359{"AES-192-CFB","aes-192-cfb",NID_aes_192_cfb128,9,&(lvalues[3109]),0}, 1465{"AES-192-CFB","aes-192-cfb",NID_aes_192_cfb128,9,&(lvalues[3114]),0},
1360{"AES-256-ECB","aes-256-ecb",NID_aes_256_ecb,9,&(lvalues[3118]),0}, 1466{"AES-256-ECB","aes-256-ecb",NID_aes_256_ecb,9,&(lvalues[3123]),0},
1361{"AES-256-CBC","aes-256-cbc",NID_aes_256_cbc,9,&(lvalues[3127]),0}, 1467{"AES-256-CBC","aes-256-cbc",NID_aes_256_cbc,9,&(lvalues[3132]),0},
1362{"AES-256-OFB","aes-256-ofb",NID_aes_256_ofb128,9,&(lvalues[3136]),0}, 1468{"AES-256-OFB","aes-256-ofb",NID_aes_256_ofb128,9,&(lvalues[3141]),0},
1363{"AES-256-CFB","aes-256-cfb",NID_aes_256_cfb128,9,&(lvalues[3145]),0}, 1469{"AES-256-CFB","aes-256-cfb",NID_aes_256_cfb128,9,&(lvalues[3150]),0},
1364{"holdInstructionCode","Hold Instruction Code", 1470{"holdInstructionCode","Hold Instruction Code",
1365 NID_hold_instruction_code,3,&(lvalues[3154]),0}, 1471 NID_hold_instruction_code,3,&(lvalues[3159]),0},
1366{"holdInstructionNone","Hold Instruction None", 1472{"holdInstructionNone","Hold Instruction None",
1367 NID_hold_instruction_none,7,&(lvalues[3157]),0}, 1473 NID_hold_instruction_none,7,&(lvalues[3162]),0},
1368{"holdInstructionCallIssuer","Hold Instruction Call Issuer", 1474{"holdInstructionCallIssuer","Hold Instruction Call Issuer",
1369 NID_hold_instruction_call_issuer,7,&(lvalues[3164]),0}, 1475 NID_hold_instruction_call_issuer,7,&(lvalues[3169]),0},
1370{"holdInstructionReject","Hold Instruction Reject", 1476{"holdInstructionReject","Hold Instruction Reject",
1371 NID_hold_instruction_reject,7,&(lvalues[3171]),0}, 1477 NID_hold_instruction_reject,7,&(lvalues[3176]),0},
1372{"data","data",NID_data,1,&(lvalues[3178]),0}, 1478{"data","data",NID_data,1,&(lvalues[3183]),0},
1373{"pss","pss",NID_pss,3,&(lvalues[3179]),0}, 1479{"pss","pss",NID_pss,3,&(lvalues[3184]),0},
1374{"ucl","ucl",NID_ucl,7,&(lvalues[3182]),0}, 1480{"ucl","ucl",NID_ucl,7,&(lvalues[3187]),0},
1375{"pilot","pilot",NID_pilot,8,&(lvalues[3189]),0}, 1481{"pilot","pilot",NID_pilot,8,&(lvalues[3194]),0},
1376{"pilotAttributeType","pilotAttributeType",NID_pilotAttributeType,9, 1482{"pilotAttributeType","pilotAttributeType",NID_pilotAttributeType,9,
1377 &(lvalues[3197]),0}, 1483 &(lvalues[3202]),0},
1378{"pilotAttributeSyntax","pilotAttributeSyntax", 1484{"pilotAttributeSyntax","pilotAttributeSyntax",
1379 NID_pilotAttributeSyntax,9,&(lvalues[3206]),0}, 1485 NID_pilotAttributeSyntax,9,&(lvalues[3211]),0},
1380{"pilotObjectClass","pilotObjectClass",NID_pilotObjectClass,9, 1486{"pilotObjectClass","pilotObjectClass",NID_pilotObjectClass,9,
1381 &(lvalues[3215]),0}, 1487 &(lvalues[3220]),0},
1382{"pilotGroups","pilotGroups",NID_pilotGroups,9,&(lvalues[3224]),0}, 1488{"pilotGroups","pilotGroups",NID_pilotGroups,9,&(lvalues[3229]),0},
1383{"iA5StringSyntax","iA5StringSyntax",NID_iA5StringSyntax,10, 1489{"iA5StringSyntax","iA5StringSyntax",NID_iA5StringSyntax,10,
1384 &(lvalues[3233]),0}, 1490 &(lvalues[3238]),0},
1385{"caseIgnoreIA5StringSyntax","caseIgnoreIA5StringSyntax", 1491{"caseIgnoreIA5StringSyntax","caseIgnoreIA5StringSyntax",
1386 NID_caseIgnoreIA5StringSyntax,10,&(lvalues[3243]),0}, 1492 NID_caseIgnoreIA5StringSyntax,10,&(lvalues[3248]),0},
1387{"pilotObject","pilotObject",NID_pilotObject,10,&(lvalues[3253]),0}, 1493{"pilotObject","pilotObject",NID_pilotObject,10,&(lvalues[3258]),0},
1388{"pilotPerson","pilotPerson",NID_pilotPerson,10,&(lvalues[3263]),0}, 1494{"pilotPerson","pilotPerson",NID_pilotPerson,10,&(lvalues[3268]),0},
1389{"account","account",NID_account,10,&(lvalues[3273]),0}, 1495{"account","account",NID_account,10,&(lvalues[3278]),0},
1390{"document","document",NID_document,10,&(lvalues[3283]),0}, 1496{"document","document",NID_document,10,&(lvalues[3288]),0},
1391{"room","room",NID_room,10,&(lvalues[3293]),0}, 1497{"room","room",NID_room,10,&(lvalues[3298]),0},
1392{"documentSeries","documentSeries",NID_documentSeries,10, 1498{"documentSeries","documentSeries",NID_documentSeries,10,
1393 &(lvalues[3303]),0}, 1499 &(lvalues[3308]),0},
1394{"rFC822localPart","rFC822localPart",NID_rFC822localPart,10, 1500{"rFC822localPart","rFC822localPart",NID_rFC822localPart,10,
1395 &(lvalues[3313]),0}, 1501 &(lvalues[3318]),0},
1396{"dNSDomain","dNSDomain",NID_dNSDomain,10,&(lvalues[3323]),0}, 1502{"dNSDomain","dNSDomain",NID_dNSDomain,10,&(lvalues[3328]),0},
1397{"domainRelatedObject","domainRelatedObject",NID_domainRelatedObject, 1503{"domainRelatedObject","domainRelatedObject",NID_domainRelatedObject,
1398 10,&(lvalues[3333]),0}, 1504 10,&(lvalues[3338]),0},
1399{"friendlyCountry","friendlyCountry",NID_friendlyCountry,10, 1505{"friendlyCountry","friendlyCountry",NID_friendlyCountry,10,
1400 &(lvalues[3343]),0}, 1506 &(lvalues[3348]),0},
1401{"simpleSecurityObject","simpleSecurityObject", 1507{"simpleSecurityObject","simpleSecurityObject",
1402 NID_simpleSecurityObject,10,&(lvalues[3353]),0}, 1508 NID_simpleSecurityObject,10,&(lvalues[3358]),0},
1403{"pilotOrganization","pilotOrganization",NID_pilotOrganization,10, 1509{"pilotOrganization","pilotOrganization",NID_pilotOrganization,10,
1404 &(lvalues[3363]),0}, 1510 &(lvalues[3368]),0},
1405{"pilotDSA","pilotDSA",NID_pilotDSA,10,&(lvalues[3373]),0}, 1511{"pilotDSA","pilotDSA",NID_pilotDSA,10,&(lvalues[3378]),0},
1406{"qualityLabelledData","qualityLabelledData",NID_qualityLabelledData, 1512{"qualityLabelledData","qualityLabelledData",NID_qualityLabelledData,
1407 10,&(lvalues[3383]),0}, 1513 10,&(lvalues[3388]),0},
1408{"UID","userId",NID_userId,10,&(lvalues[3393]),0}, 1514{"UID","userId",NID_userId,10,&(lvalues[3398]),0},
1409{"textEncodedORAddress","textEncodedORAddress", 1515{"textEncodedORAddress","textEncodedORAddress",
1410 NID_textEncodedORAddress,10,&(lvalues[3403]),0}, 1516 NID_textEncodedORAddress,10,&(lvalues[3408]),0},
1411{"mail","rfc822Mailbox",NID_rfc822Mailbox,10,&(lvalues[3413]),0}, 1517{"mail","rfc822Mailbox",NID_rfc822Mailbox,10,&(lvalues[3418]),0},
1412{"info","info",NID_info,10,&(lvalues[3423]),0}, 1518{"info","info",NID_info,10,&(lvalues[3428]),0},
1413{"favouriteDrink","favouriteDrink",NID_favouriteDrink,10, 1519{"favouriteDrink","favouriteDrink",NID_favouriteDrink,10,
1414 &(lvalues[3433]),0}, 1520 &(lvalues[3438]),0},
1415{"roomNumber","roomNumber",NID_roomNumber,10,&(lvalues[3443]),0}, 1521{"roomNumber","roomNumber",NID_roomNumber,10,&(lvalues[3448]),0},
1416{"photo","photo",NID_photo,10,&(lvalues[3453]),0}, 1522{"photo","photo",NID_photo,10,&(lvalues[3458]),0},
1417{"userClass","userClass",NID_userClass,10,&(lvalues[3463]),0}, 1523{"userClass","userClass",NID_userClass,10,&(lvalues[3468]),0},
1418{"host","host",NID_host,10,&(lvalues[3473]),0}, 1524{"host","host",NID_host,10,&(lvalues[3478]),0},
1419{"manager","manager",NID_manager,10,&(lvalues[3483]),0}, 1525{"manager","manager",NID_manager,10,&(lvalues[3488]),0},
1420{"documentIdentifier","documentIdentifier",NID_documentIdentifier,10, 1526{"documentIdentifier","documentIdentifier",NID_documentIdentifier,10,
1421 &(lvalues[3493]),0}, 1527 &(lvalues[3498]),0},
1422{"documentTitle","documentTitle",NID_documentTitle,10,&(lvalues[3503]),0}, 1528{"documentTitle","documentTitle",NID_documentTitle,10,&(lvalues[3508]),0},
1423{"documentVersion","documentVersion",NID_documentVersion,10, 1529{"documentVersion","documentVersion",NID_documentVersion,10,
1424 &(lvalues[3513]),0}, 1530 &(lvalues[3518]),0},
1425{"documentAuthor","documentAuthor",NID_documentAuthor,10, 1531{"documentAuthor","documentAuthor",NID_documentAuthor,10,
1426 &(lvalues[3523]),0}, 1532 &(lvalues[3528]),0},
1427{"documentLocation","documentLocation",NID_documentLocation,10, 1533{"documentLocation","documentLocation",NID_documentLocation,10,
1428 &(lvalues[3533]),0}, 1534 &(lvalues[3538]),0},
1429{"homeTelephoneNumber","homeTelephoneNumber",NID_homeTelephoneNumber, 1535{"homeTelephoneNumber","homeTelephoneNumber",NID_homeTelephoneNumber,
1430 10,&(lvalues[3543]),0}, 1536 10,&(lvalues[3548]),0},
1431{"secretary","secretary",NID_secretary,10,&(lvalues[3553]),0}, 1537{"secretary","secretary",NID_secretary,10,&(lvalues[3558]),0},
1432{"otherMailbox","otherMailbox",NID_otherMailbox,10,&(lvalues[3563]),0}, 1538{"otherMailbox","otherMailbox",NID_otherMailbox,10,&(lvalues[3568]),0},
1433{"lastModifiedTime","lastModifiedTime",NID_lastModifiedTime,10, 1539{"lastModifiedTime","lastModifiedTime",NID_lastModifiedTime,10,
1434 &(lvalues[3573]),0}, 1540 &(lvalues[3578]),0},
1435{"lastModifiedBy","lastModifiedBy",NID_lastModifiedBy,10, 1541{"lastModifiedBy","lastModifiedBy",NID_lastModifiedBy,10,
1436 &(lvalues[3583]),0}, 1542 &(lvalues[3588]),0},
1437{"aRecord","aRecord",NID_aRecord,10,&(lvalues[3593]),0}, 1543{"aRecord","aRecord",NID_aRecord,10,&(lvalues[3598]),0},
1438{"pilotAttributeType27","pilotAttributeType27", 1544{"pilotAttributeType27","pilotAttributeType27",
1439 NID_pilotAttributeType27,10,&(lvalues[3603]),0}, 1545 NID_pilotAttributeType27,10,&(lvalues[3608]),0},
1440{"mXRecord","mXRecord",NID_mXRecord,10,&(lvalues[3613]),0}, 1546{"mXRecord","mXRecord",NID_mXRecord,10,&(lvalues[3618]),0},
1441{"nSRecord","nSRecord",NID_nSRecord,10,&(lvalues[3623]),0}, 1547{"nSRecord","nSRecord",NID_nSRecord,10,&(lvalues[3628]),0},
1442{"sOARecord","sOARecord",NID_sOARecord,10,&(lvalues[3633]),0}, 1548{"sOARecord","sOARecord",NID_sOARecord,10,&(lvalues[3638]),0},
1443{"cNAMERecord","cNAMERecord",NID_cNAMERecord,10,&(lvalues[3643]),0}, 1549{"cNAMERecord","cNAMERecord",NID_cNAMERecord,10,&(lvalues[3648]),0},
1444{"associatedDomain","associatedDomain",NID_associatedDomain,10, 1550{"associatedDomain","associatedDomain",NID_associatedDomain,10,
1445 &(lvalues[3653]),0}, 1551 &(lvalues[3658]),0},
1446{"associatedName","associatedName",NID_associatedName,10, 1552{"associatedName","associatedName",NID_associatedName,10,
1447 &(lvalues[3663]),0}, 1553 &(lvalues[3668]),0},
1448{"homePostalAddress","homePostalAddress",NID_homePostalAddress,10, 1554{"homePostalAddress","homePostalAddress",NID_homePostalAddress,10,
1449 &(lvalues[3673]),0}, 1555 &(lvalues[3678]),0},
1450{"personalTitle","personalTitle",NID_personalTitle,10,&(lvalues[3683]),0}, 1556{"personalTitle","personalTitle",NID_personalTitle,10,&(lvalues[3688]),0},
1451{"mobileTelephoneNumber","mobileTelephoneNumber", 1557{"mobileTelephoneNumber","mobileTelephoneNumber",
1452 NID_mobileTelephoneNumber,10,&(lvalues[3693]),0}, 1558 NID_mobileTelephoneNumber,10,&(lvalues[3698]),0},
1453{"pagerTelephoneNumber","pagerTelephoneNumber", 1559{"pagerTelephoneNumber","pagerTelephoneNumber",
1454 NID_pagerTelephoneNumber,10,&(lvalues[3703]),0}, 1560 NID_pagerTelephoneNumber,10,&(lvalues[3708]),0},
1455{"friendlyCountryName","friendlyCountryName",NID_friendlyCountryName, 1561{"friendlyCountryName","friendlyCountryName",NID_friendlyCountryName,
1456 10,&(lvalues[3713]),0}, 1562 10,&(lvalues[3718]),0},
1457{"organizationalStatus","organizationalStatus", 1563{"organizationalStatus","organizationalStatus",
1458 NID_organizationalStatus,10,&(lvalues[3723]),0}, 1564 NID_organizationalStatus,10,&(lvalues[3728]),0},
1459{"janetMailbox","janetMailbox",NID_janetMailbox,10,&(lvalues[3733]),0}, 1565{"janetMailbox","janetMailbox",NID_janetMailbox,10,&(lvalues[3738]),0},
1460{"mailPreferenceOption","mailPreferenceOption", 1566{"mailPreferenceOption","mailPreferenceOption",
1461 NID_mailPreferenceOption,10,&(lvalues[3743]),0}, 1567 NID_mailPreferenceOption,10,&(lvalues[3748]),0},
1462{"buildingName","buildingName",NID_buildingName,10,&(lvalues[3753]),0}, 1568{"buildingName","buildingName",NID_buildingName,10,&(lvalues[3758]),0},
1463{"dSAQuality","dSAQuality",NID_dSAQuality,10,&(lvalues[3763]),0}, 1569{"dSAQuality","dSAQuality",NID_dSAQuality,10,&(lvalues[3768]),0},
1464{"singleLevelQuality","singleLevelQuality",NID_singleLevelQuality,10, 1570{"singleLevelQuality","singleLevelQuality",NID_singleLevelQuality,10,
1465 &(lvalues[3773]),0}, 1571 &(lvalues[3778]),0},
1466{"subtreeMinimumQuality","subtreeMinimumQuality", 1572{"subtreeMinimumQuality","subtreeMinimumQuality",
1467 NID_subtreeMinimumQuality,10,&(lvalues[3783]),0}, 1573 NID_subtreeMinimumQuality,10,&(lvalues[3788]),0},
1468{"subtreeMaximumQuality","subtreeMaximumQuality", 1574{"subtreeMaximumQuality","subtreeMaximumQuality",
1469 NID_subtreeMaximumQuality,10,&(lvalues[3793]),0}, 1575 NID_subtreeMaximumQuality,10,&(lvalues[3798]),0},
1470{"personalSignature","personalSignature",NID_personalSignature,10, 1576{"personalSignature","personalSignature",NID_personalSignature,10,
1471 &(lvalues[3803]),0}, 1577 &(lvalues[3808]),0},
1472{"dITRedirect","dITRedirect",NID_dITRedirect,10,&(lvalues[3813]),0}, 1578{"dITRedirect","dITRedirect",NID_dITRedirect,10,&(lvalues[3818]),0},
1473{"audio","audio",NID_audio,10,&(lvalues[3823]),0}, 1579{"audio","audio",NID_audio,10,&(lvalues[3828]),0},
1474{"documentPublisher","documentPublisher",NID_documentPublisher,10, 1580{"documentPublisher","documentPublisher",NID_documentPublisher,10,
1475 &(lvalues[3833]),0}, 1581 &(lvalues[3838]),0},
1476{"x500UniqueIdentifier","x500UniqueIdentifier", 1582{"x500UniqueIdentifier","x500UniqueIdentifier",
1477 NID_x500UniqueIdentifier,3,&(lvalues[3843]),0}, 1583 NID_x500UniqueIdentifier,3,&(lvalues[3848]),0},
1478{"mime-mhs","MIME MHS",NID_mime_mhs,5,&(lvalues[3846]),0}, 1584{"mime-mhs","MIME MHS",NID_mime_mhs,5,&(lvalues[3851]),0},
1479{"mime-mhs-headings","mime-mhs-headings",NID_mime_mhs_headings,6, 1585{"mime-mhs-headings","mime-mhs-headings",NID_mime_mhs_headings,6,
1480 &(lvalues[3851]),0}, 1586 &(lvalues[3856]),0},
1481{"mime-mhs-bodies","mime-mhs-bodies",NID_mime_mhs_bodies,6, 1587{"mime-mhs-bodies","mime-mhs-bodies",NID_mime_mhs_bodies,6,
1482 &(lvalues[3857]),0}, 1588 &(lvalues[3862]),0},
1483{"id-hex-partial-message","id-hex-partial-message", 1589{"id-hex-partial-message","id-hex-partial-message",
1484 NID_id_hex_partial_message,7,&(lvalues[3863]),0}, 1590 NID_id_hex_partial_message,7,&(lvalues[3868]),0},
1485{"id-hex-multipart-message","id-hex-multipart-message", 1591{"id-hex-multipart-message","id-hex-multipart-message",
1486 NID_id_hex_multipart_message,7,&(lvalues[3870]),0}, 1592 NID_id_hex_multipart_message,7,&(lvalues[3875]),0},
1487{"generationQualifier","generationQualifier",NID_generationQualifier, 1593{"generationQualifier","generationQualifier",NID_generationQualifier,
1488 3,&(lvalues[3877]),0}, 1594 3,&(lvalues[3882]),0},
1489{"pseudonym","pseudonym",NID_pseudonym,3,&(lvalues[3880]),0}, 1595{"pseudonym","pseudonym",NID_pseudonym,3,&(lvalues[3885]),0},
1490{NULL,NULL,NID_undef,0,NULL}, 1596{NULL,NULL,NID_undef,0,NULL,0},
1491{"id-set","Secure Electronic Transactions",NID_id_set,2, 1597{"id-set","Secure Electronic Transactions",NID_id_set,2,
1492 &(lvalues[3883]),0}, 1598 &(lvalues[3888]),0},
1493{"set-ctype","content types",NID_set_ctype,3,&(lvalues[3885]),0}, 1599{"set-ctype","content types",NID_set_ctype,3,&(lvalues[3890]),0},
1494{"set-msgExt","message extensions",NID_set_msgExt,3,&(lvalues[3888]),0}, 1600{"set-msgExt","message extensions",NID_set_msgExt,3,&(lvalues[3893]),0},
1495{"set-attr","set-attr",NID_set_attr,3,&(lvalues[3891]),0}, 1601{"set-attr","set-attr",NID_set_attr,3,&(lvalues[3896]),0},
1496{"set-policy","set-policy",NID_set_policy,3,&(lvalues[3894]),0}, 1602{"set-policy","set-policy",NID_set_policy,3,&(lvalues[3899]),0},
1497{"set-certExt","certificate extensions",NID_set_certExt,3, 1603{"set-certExt","certificate extensions",NID_set_certExt,3,
1498 &(lvalues[3897]),0}, 1604 &(lvalues[3902]),0},
1499{"set-brand","set-brand",NID_set_brand,3,&(lvalues[3900]),0}, 1605{"set-brand","set-brand",NID_set_brand,3,&(lvalues[3905]),0},
1500{"setct-PANData","setct-PANData",NID_setct_PANData,4,&(lvalues[3903]),0}, 1606{"setct-PANData","setct-PANData",NID_setct_PANData,4,&(lvalues[3908]),0},
1501{"setct-PANToken","setct-PANToken",NID_setct_PANToken,4, 1607{"setct-PANToken","setct-PANToken",NID_setct_PANToken,4,
1502 &(lvalues[3907]),0}, 1608 &(lvalues[3912]),0},
1503{"setct-PANOnly","setct-PANOnly",NID_setct_PANOnly,4,&(lvalues[3911]),0}, 1609{"setct-PANOnly","setct-PANOnly",NID_setct_PANOnly,4,&(lvalues[3916]),0},
1504{"setct-OIData","setct-OIData",NID_setct_OIData,4,&(lvalues[3915]),0}, 1610{"setct-OIData","setct-OIData",NID_setct_OIData,4,&(lvalues[3920]),0},
1505{"setct-PI","setct-PI",NID_setct_PI,4,&(lvalues[3919]),0}, 1611{"setct-PI","setct-PI",NID_setct_PI,4,&(lvalues[3924]),0},
1506{"setct-PIData","setct-PIData",NID_setct_PIData,4,&(lvalues[3923]),0}, 1612{"setct-PIData","setct-PIData",NID_setct_PIData,4,&(lvalues[3928]),0},
1507{"setct-PIDataUnsigned","setct-PIDataUnsigned", 1613{"setct-PIDataUnsigned","setct-PIDataUnsigned",
1508 NID_setct_PIDataUnsigned,4,&(lvalues[3927]),0}, 1614 NID_setct_PIDataUnsigned,4,&(lvalues[3932]),0},
1509{"setct-HODInput","setct-HODInput",NID_setct_HODInput,4, 1615{"setct-HODInput","setct-HODInput",NID_setct_HODInput,4,
1510 &(lvalues[3931]),0}, 1616 &(lvalues[3936]),0},
1511{"setct-AuthResBaggage","setct-AuthResBaggage", 1617{"setct-AuthResBaggage","setct-AuthResBaggage",
1512 NID_setct_AuthResBaggage,4,&(lvalues[3935]),0}, 1618 NID_setct_AuthResBaggage,4,&(lvalues[3940]),0},
1513{"setct-AuthRevReqBaggage","setct-AuthRevReqBaggage", 1619{"setct-AuthRevReqBaggage","setct-AuthRevReqBaggage",
1514 NID_setct_AuthRevReqBaggage,4,&(lvalues[3939]),0}, 1620 NID_setct_AuthRevReqBaggage,4,&(lvalues[3944]),0},
1515{"setct-AuthRevResBaggage","setct-AuthRevResBaggage", 1621{"setct-AuthRevResBaggage","setct-AuthRevResBaggage",
1516 NID_setct_AuthRevResBaggage,4,&(lvalues[3943]),0}, 1622 NID_setct_AuthRevResBaggage,4,&(lvalues[3948]),0},
1517{"setct-CapTokenSeq","setct-CapTokenSeq",NID_setct_CapTokenSeq,4, 1623{"setct-CapTokenSeq","setct-CapTokenSeq",NID_setct_CapTokenSeq,4,
1518 &(lvalues[3947]),0}, 1624 &(lvalues[3952]),0},
1519{"setct-PInitResData","setct-PInitResData",NID_setct_PInitResData,4, 1625{"setct-PInitResData","setct-PInitResData",NID_setct_PInitResData,4,
1520 &(lvalues[3951]),0}, 1626 &(lvalues[3956]),0},
1521{"setct-PI-TBS","setct-PI-TBS",NID_setct_PI_TBS,4,&(lvalues[3955]),0}, 1627{"setct-PI-TBS","setct-PI-TBS",NID_setct_PI_TBS,4,&(lvalues[3960]),0},
1522{"setct-PResData","setct-PResData",NID_setct_PResData,4, 1628{"setct-PResData","setct-PResData",NID_setct_PResData,4,
1523 &(lvalues[3959]),0}, 1629 &(lvalues[3964]),0},
1524{"setct-AuthReqTBS","setct-AuthReqTBS",NID_setct_AuthReqTBS,4, 1630{"setct-AuthReqTBS","setct-AuthReqTBS",NID_setct_AuthReqTBS,4,
1525 &(lvalues[3963]),0}, 1631 &(lvalues[3968]),0},
1526{"setct-AuthResTBS","setct-AuthResTBS",NID_setct_AuthResTBS,4, 1632{"setct-AuthResTBS","setct-AuthResTBS",NID_setct_AuthResTBS,4,
1527 &(lvalues[3967]),0}, 1633 &(lvalues[3972]),0},
1528{"setct-AuthResTBSX","setct-AuthResTBSX",NID_setct_AuthResTBSX,4, 1634{"setct-AuthResTBSX","setct-AuthResTBSX",NID_setct_AuthResTBSX,4,
1529 &(lvalues[3971]),0}, 1635 &(lvalues[3976]),0},
1530{"setct-AuthTokenTBS","setct-AuthTokenTBS",NID_setct_AuthTokenTBS,4, 1636{"setct-AuthTokenTBS","setct-AuthTokenTBS",NID_setct_AuthTokenTBS,4,
1531 &(lvalues[3975]),0}, 1637 &(lvalues[3980]),0},
1532{"setct-CapTokenData","setct-CapTokenData",NID_setct_CapTokenData,4, 1638{"setct-CapTokenData","setct-CapTokenData",NID_setct_CapTokenData,4,
1533 &(lvalues[3979]),0}, 1639 &(lvalues[3984]),0},
1534{"setct-CapTokenTBS","setct-CapTokenTBS",NID_setct_CapTokenTBS,4, 1640{"setct-CapTokenTBS","setct-CapTokenTBS",NID_setct_CapTokenTBS,4,
1535 &(lvalues[3983]),0}, 1641 &(lvalues[3988]),0},
1536{"setct-AcqCardCodeMsg","setct-AcqCardCodeMsg", 1642{"setct-AcqCardCodeMsg","setct-AcqCardCodeMsg",
1537 NID_setct_AcqCardCodeMsg,4,&(lvalues[3987]),0}, 1643 NID_setct_AcqCardCodeMsg,4,&(lvalues[3992]),0},
1538{"setct-AuthRevReqTBS","setct-AuthRevReqTBS",NID_setct_AuthRevReqTBS, 1644{"setct-AuthRevReqTBS","setct-AuthRevReqTBS",NID_setct_AuthRevReqTBS,
1539 4,&(lvalues[3991]),0}, 1645 4,&(lvalues[3996]),0},
1540{"setct-AuthRevResData","setct-AuthRevResData", 1646{"setct-AuthRevResData","setct-AuthRevResData",
1541 NID_setct_AuthRevResData,4,&(lvalues[3995]),0}, 1647 NID_setct_AuthRevResData,4,&(lvalues[4000]),0},
1542{"setct-AuthRevResTBS","setct-AuthRevResTBS",NID_setct_AuthRevResTBS, 1648{"setct-AuthRevResTBS","setct-AuthRevResTBS",NID_setct_AuthRevResTBS,
1543 4,&(lvalues[3999]),0}, 1649 4,&(lvalues[4004]),0},
1544{"setct-CapReqTBS","setct-CapReqTBS",NID_setct_CapReqTBS,4, 1650{"setct-CapReqTBS","setct-CapReqTBS",NID_setct_CapReqTBS,4,
1545 &(lvalues[4003]),0}, 1651 &(lvalues[4008]),0},
1546{"setct-CapReqTBSX","setct-CapReqTBSX",NID_setct_CapReqTBSX,4, 1652{"setct-CapReqTBSX","setct-CapReqTBSX",NID_setct_CapReqTBSX,4,
1547 &(lvalues[4007]),0}, 1653 &(lvalues[4012]),0},
1548{"setct-CapResData","setct-CapResData",NID_setct_CapResData,4, 1654{"setct-CapResData","setct-CapResData",NID_setct_CapResData,4,
1549 &(lvalues[4011]),0}, 1655 &(lvalues[4016]),0},
1550{"setct-CapRevReqTBS","setct-CapRevReqTBS",NID_setct_CapRevReqTBS,4, 1656{"setct-CapRevReqTBS","setct-CapRevReqTBS",NID_setct_CapRevReqTBS,4,
1551 &(lvalues[4015]),0}, 1657 &(lvalues[4020]),0},
1552{"setct-CapRevReqTBSX","setct-CapRevReqTBSX",NID_setct_CapRevReqTBSX, 1658{"setct-CapRevReqTBSX","setct-CapRevReqTBSX",NID_setct_CapRevReqTBSX,
1553 4,&(lvalues[4019]),0}, 1659 4,&(lvalues[4024]),0},
1554{"setct-CapRevResData","setct-CapRevResData",NID_setct_CapRevResData, 1660{"setct-CapRevResData","setct-CapRevResData",NID_setct_CapRevResData,
1555 4,&(lvalues[4023]),0}, 1661 4,&(lvalues[4028]),0},
1556{"setct-CredReqTBS","setct-CredReqTBS",NID_setct_CredReqTBS,4, 1662{"setct-CredReqTBS","setct-CredReqTBS",NID_setct_CredReqTBS,4,
1557 &(lvalues[4027]),0}, 1663 &(lvalues[4032]),0},
1558{"setct-CredReqTBSX","setct-CredReqTBSX",NID_setct_CredReqTBSX,4, 1664{"setct-CredReqTBSX","setct-CredReqTBSX",NID_setct_CredReqTBSX,4,
1559 &(lvalues[4031]),0}, 1665 &(lvalues[4036]),0},
1560{"setct-CredResData","setct-CredResData",NID_setct_CredResData,4, 1666{"setct-CredResData","setct-CredResData",NID_setct_CredResData,4,
1561 &(lvalues[4035]),0}, 1667 &(lvalues[4040]),0},
1562{"setct-CredRevReqTBS","setct-CredRevReqTBS",NID_setct_CredRevReqTBS, 1668{"setct-CredRevReqTBS","setct-CredRevReqTBS",NID_setct_CredRevReqTBS,
1563 4,&(lvalues[4039]),0}, 1669 4,&(lvalues[4044]),0},
1564{"setct-CredRevReqTBSX","setct-CredRevReqTBSX", 1670{"setct-CredRevReqTBSX","setct-CredRevReqTBSX",
1565 NID_setct_CredRevReqTBSX,4,&(lvalues[4043]),0}, 1671 NID_setct_CredRevReqTBSX,4,&(lvalues[4048]),0},
1566{"setct-CredRevResData","setct-CredRevResData", 1672{"setct-CredRevResData","setct-CredRevResData",
1567 NID_setct_CredRevResData,4,&(lvalues[4047]),0}, 1673 NID_setct_CredRevResData,4,&(lvalues[4052]),0},
1568{"setct-PCertReqData","setct-PCertReqData",NID_setct_PCertReqData,4, 1674{"setct-PCertReqData","setct-PCertReqData",NID_setct_PCertReqData,4,
1569 &(lvalues[4051]),0}, 1675 &(lvalues[4056]),0},
1570{"setct-PCertResTBS","setct-PCertResTBS",NID_setct_PCertResTBS,4, 1676{"setct-PCertResTBS","setct-PCertResTBS",NID_setct_PCertResTBS,4,
1571 &(lvalues[4055]),0}, 1677 &(lvalues[4060]),0},
1572{"setct-BatchAdminReqData","setct-BatchAdminReqData", 1678{"setct-BatchAdminReqData","setct-BatchAdminReqData",
1573 NID_setct_BatchAdminReqData,4,&(lvalues[4059]),0}, 1679 NID_setct_BatchAdminReqData,4,&(lvalues[4064]),0},
1574{"setct-BatchAdminResData","setct-BatchAdminResData", 1680{"setct-BatchAdminResData","setct-BatchAdminResData",
1575 NID_setct_BatchAdminResData,4,&(lvalues[4063]),0}, 1681 NID_setct_BatchAdminResData,4,&(lvalues[4068]),0},
1576{"setct-CardCInitResTBS","setct-CardCInitResTBS", 1682{"setct-CardCInitResTBS","setct-CardCInitResTBS",
1577 NID_setct_CardCInitResTBS,4,&(lvalues[4067]),0}, 1683 NID_setct_CardCInitResTBS,4,&(lvalues[4072]),0},
1578{"setct-MeAqCInitResTBS","setct-MeAqCInitResTBS", 1684{"setct-MeAqCInitResTBS","setct-MeAqCInitResTBS",
1579 NID_setct_MeAqCInitResTBS,4,&(lvalues[4071]),0}, 1685 NID_setct_MeAqCInitResTBS,4,&(lvalues[4076]),0},
1580{"setct-RegFormResTBS","setct-RegFormResTBS",NID_setct_RegFormResTBS, 1686{"setct-RegFormResTBS","setct-RegFormResTBS",NID_setct_RegFormResTBS,
1581 4,&(lvalues[4075]),0}, 1687 4,&(lvalues[4080]),0},
1582{"setct-CertReqData","setct-CertReqData",NID_setct_CertReqData,4, 1688{"setct-CertReqData","setct-CertReqData",NID_setct_CertReqData,4,
1583 &(lvalues[4079]),0}, 1689 &(lvalues[4084]),0},
1584{"setct-CertReqTBS","setct-CertReqTBS",NID_setct_CertReqTBS,4, 1690{"setct-CertReqTBS","setct-CertReqTBS",NID_setct_CertReqTBS,4,
1585 &(lvalues[4083]),0}, 1691 &(lvalues[4088]),0},
1586{"setct-CertResData","setct-CertResData",NID_setct_CertResData,4, 1692{"setct-CertResData","setct-CertResData",NID_setct_CertResData,4,
1587 &(lvalues[4087]),0}, 1693 &(lvalues[4092]),0},
1588{"setct-CertInqReqTBS","setct-CertInqReqTBS",NID_setct_CertInqReqTBS, 1694{"setct-CertInqReqTBS","setct-CertInqReqTBS",NID_setct_CertInqReqTBS,
1589 4,&(lvalues[4091]),0}, 1695 4,&(lvalues[4096]),0},
1590{"setct-ErrorTBS","setct-ErrorTBS",NID_setct_ErrorTBS,4, 1696{"setct-ErrorTBS","setct-ErrorTBS",NID_setct_ErrorTBS,4,
1591 &(lvalues[4095]),0}, 1697 &(lvalues[4100]),0},
1592{"setct-PIDualSignedTBE","setct-PIDualSignedTBE", 1698{"setct-PIDualSignedTBE","setct-PIDualSignedTBE",
1593 NID_setct_PIDualSignedTBE,4,&(lvalues[4099]),0}, 1699 NID_setct_PIDualSignedTBE,4,&(lvalues[4104]),0},
1594{"setct-PIUnsignedTBE","setct-PIUnsignedTBE",NID_setct_PIUnsignedTBE, 1700{"setct-PIUnsignedTBE","setct-PIUnsignedTBE",NID_setct_PIUnsignedTBE,
1595 4,&(lvalues[4103]),0}, 1701 4,&(lvalues[4108]),0},
1596{"setct-AuthReqTBE","setct-AuthReqTBE",NID_setct_AuthReqTBE,4, 1702{"setct-AuthReqTBE","setct-AuthReqTBE",NID_setct_AuthReqTBE,4,
1597 &(lvalues[4107]),0}, 1703 &(lvalues[4112]),0},
1598{"setct-AuthResTBE","setct-AuthResTBE",NID_setct_AuthResTBE,4, 1704{"setct-AuthResTBE","setct-AuthResTBE",NID_setct_AuthResTBE,4,
1599 &(lvalues[4111]),0}, 1705 &(lvalues[4116]),0},
1600{"setct-AuthResTBEX","setct-AuthResTBEX",NID_setct_AuthResTBEX,4, 1706{"setct-AuthResTBEX","setct-AuthResTBEX",NID_setct_AuthResTBEX,4,
1601 &(lvalues[4115]),0}, 1707 &(lvalues[4120]),0},
1602{"setct-AuthTokenTBE","setct-AuthTokenTBE",NID_setct_AuthTokenTBE,4, 1708{"setct-AuthTokenTBE","setct-AuthTokenTBE",NID_setct_AuthTokenTBE,4,
1603 &(lvalues[4119]),0}, 1709 &(lvalues[4124]),0},
1604{"setct-CapTokenTBE","setct-CapTokenTBE",NID_setct_CapTokenTBE,4, 1710{"setct-CapTokenTBE","setct-CapTokenTBE",NID_setct_CapTokenTBE,4,
1605 &(lvalues[4123]),0}, 1711 &(lvalues[4128]),0},
1606{"setct-CapTokenTBEX","setct-CapTokenTBEX",NID_setct_CapTokenTBEX,4, 1712{"setct-CapTokenTBEX","setct-CapTokenTBEX",NID_setct_CapTokenTBEX,4,
1607 &(lvalues[4127]),0}, 1713 &(lvalues[4132]),0},
1608{"setct-AcqCardCodeMsgTBE","setct-AcqCardCodeMsgTBE", 1714{"setct-AcqCardCodeMsgTBE","setct-AcqCardCodeMsgTBE",
1609 NID_setct_AcqCardCodeMsgTBE,4,&(lvalues[4131]),0}, 1715 NID_setct_AcqCardCodeMsgTBE,4,&(lvalues[4136]),0},
1610{"setct-AuthRevReqTBE","setct-AuthRevReqTBE",NID_setct_AuthRevReqTBE, 1716{"setct-AuthRevReqTBE","setct-AuthRevReqTBE",NID_setct_AuthRevReqTBE,
1611 4,&(lvalues[4135]),0}, 1717 4,&(lvalues[4140]),0},
1612{"setct-AuthRevResTBE","setct-AuthRevResTBE",NID_setct_AuthRevResTBE, 1718{"setct-AuthRevResTBE","setct-AuthRevResTBE",NID_setct_AuthRevResTBE,
1613 4,&(lvalues[4139]),0}, 1719 4,&(lvalues[4144]),0},
1614{"setct-AuthRevResTBEB","setct-AuthRevResTBEB", 1720{"setct-AuthRevResTBEB","setct-AuthRevResTBEB",
1615 NID_setct_AuthRevResTBEB,4,&(lvalues[4143]),0}, 1721 NID_setct_AuthRevResTBEB,4,&(lvalues[4148]),0},
1616{"setct-CapReqTBE","setct-CapReqTBE",NID_setct_CapReqTBE,4, 1722{"setct-CapReqTBE","setct-CapReqTBE",NID_setct_CapReqTBE,4,
1617 &(lvalues[4147]),0}, 1723 &(lvalues[4152]),0},
1618{"setct-CapReqTBEX","setct-CapReqTBEX",NID_setct_CapReqTBEX,4, 1724{"setct-CapReqTBEX","setct-CapReqTBEX",NID_setct_CapReqTBEX,4,
1619 &(lvalues[4151]),0}, 1725 &(lvalues[4156]),0},
1620{"setct-CapResTBE","setct-CapResTBE",NID_setct_CapResTBE,4, 1726{"setct-CapResTBE","setct-CapResTBE",NID_setct_CapResTBE,4,
1621 &(lvalues[4155]),0}, 1727 &(lvalues[4160]),0},
1622{"setct-CapRevReqTBE","setct-CapRevReqTBE",NID_setct_CapRevReqTBE,4, 1728{"setct-CapRevReqTBE","setct-CapRevReqTBE",NID_setct_CapRevReqTBE,4,
1623 &(lvalues[4159]),0}, 1729 &(lvalues[4164]),0},
1624{"setct-CapRevReqTBEX","setct-CapRevReqTBEX",NID_setct_CapRevReqTBEX, 1730{"setct-CapRevReqTBEX","setct-CapRevReqTBEX",NID_setct_CapRevReqTBEX,
1625 4,&(lvalues[4163]),0}, 1731 4,&(lvalues[4168]),0},
1626{"setct-CapRevResTBE","setct-CapRevResTBE",NID_setct_CapRevResTBE,4, 1732{"setct-CapRevResTBE","setct-CapRevResTBE",NID_setct_CapRevResTBE,4,
1627 &(lvalues[4167]),0}, 1733 &(lvalues[4172]),0},
1628{"setct-CredReqTBE","setct-CredReqTBE",NID_setct_CredReqTBE,4, 1734{"setct-CredReqTBE","setct-CredReqTBE",NID_setct_CredReqTBE,4,
1629 &(lvalues[4171]),0}, 1735 &(lvalues[4176]),0},
1630{"setct-CredReqTBEX","setct-CredReqTBEX",NID_setct_CredReqTBEX,4, 1736{"setct-CredReqTBEX","setct-CredReqTBEX",NID_setct_CredReqTBEX,4,
1631 &(lvalues[4175]),0}, 1737 &(lvalues[4180]),0},
1632{"setct-CredResTBE","setct-CredResTBE",NID_setct_CredResTBE,4, 1738{"setct-CredResTBE","setct-CredResTBE",NID_setct_CredResTBE,4,
1633 &(lvalues[4179]),0}, 1739 &(lvalues[4184]),0},
1634{"setct-CredRevReqTBE","setct-CredRevReqTBE",NID_setct_CredRevReqTBE, 1740{"setct-CredRevReqTBE","setct-CredRevReqTBE",NID_setct_CredRevReqTBE,
1635 4,&(lvalues[4183]),0}, 1741 4,&(lvalues[4188]),0},
1636{"setct-CredRevReqTBEX","setct-CredRevReqTBEX", 1742{"setct-CredRevReqTBEX","setct-CredRevReqTBEX",
1637 NID_setct_CredRevReqTBEX,4,&(lvalues[4187]),0}, 1743 NID_setct_CredRevReqTBEX,4,&(lvalues[4192]),0},
1638{"setct-CredRevResTBE","setct-CredRevResTBE",NID_setct_CredRevResTBE, 1744{"setct-CredRevResTBE","setct-CredRevResTBE",NID_setct_CredRevResTBE,
1639 4,&(lvalues[4191]),0}, 1745 4,&(lvalues[4196]),0},
1640{"setct-BatchAdminReqTBE","setct-BatchAdminReqTBE", 1746{"setct-BatchAdminReqTBE","setct-BatchAdminReqTBE",
1641 NID_setct_BatchAdminReqTBE,4,&(lvalues[4195]),0}, 1747 NID_setct_BatchAdminReqTBE,4,&(lvalues[4200]),0},
1642{"setct-BatchAdminResTBE","setct-BatchAdminResTBE", 1748{"setct-BatchAdminResTBE","setct-BatchAdminResTBE",
1643 NID_setct_BatchAdminResTBE,4,&(lvalues[4199]),0}, 1749 NID_setct_BatchAdminResTBE,4,&(lvalues[4204]),0},
1644{"setct-RegFormReqTBE","setct-RegFormReqTBE",NID_setct_RegFormReqTBE, 1750{"setct-RegFormReqTBE","setct-RegFormReqTBE",NID_setct_RegFormReqTBE,
1645 4,&(lvalues[4203]),0}, 1751 4,&(lvalues[4208]),0},
1646{"setct-CertReqTBE","setct-CertReqTBE",NID_setct_CertReqTBE,4, 1752{"setct-CertReqTBE","setct-CertReqTBE",NID_setct_CertReqTBE,4,
1647 &(lvalues[4207]),0}, 1753 &(lvalues[4212]),0},
1648{"setct-CertReqTBEX","setct-CertReqTBEX",NID_setct_CertReqTBEX,4, 1754{"setct-CertReqTBEX","setct-CertReqTBEX",NID_setct_CertReqTBEX,4,
1649 &(lvalues[4211]),0}, 1755 &(lvalues[4216]),0},
1650{"setct-CertResTBE","setct-CertResTBE",NID_setct_CertResTBE,4, 1756{"setct-CertResTBE","setct-CertResTBE",NID_setct_CertResTBE,4,
1651 &(lvalues[4215]),0}, 1757 &(lvalues[4220]),0},
1652{"setct-CRLNotificationTBS","setct-CRLNotificationTBS", 1758{"setct-CRLNotificationTBS","setct-CRLNotificationTBS",
1653 NID_setct_CRLNotificationTBS,4,&(lvalues[4219]),0}, 1759 NID_setct_CRLNotificationTBS,4,&(lvalues[4224]),0},
1654{"setct-CRLNotificationResTBS","setct-CRLNotificationResTBS", 1760{"setct-CRLNotificationResTBS","setct-CRLNotificationResTBS",
1655 NID_setct_CRLNotificationResTBS,4,&(lvalues[4223]),0}, 1761 NID_setct_CRLNotificationResTBS,4,&(lvalues[4228]),0},
1656{"setct-BCIDistributionTBS","setct-BCIDistributionTBS", 1762{"setct-BCIDistributionTBS","setct-BCIDistributionTBS",
1657 NID_setct_BCIDistributionTBS,4,&(lvalues[4227]),0}, 1763 NID_setct_BCIDistributionTBS,4,&(lvalues[4232]),0},
1658{"setext-genCrypt","generic cryptogram",NID_setext_genCrypt,4, 1764{"setext-genCrypt","generic cryptogram",NID_setext_genCrypt,4,
1659 &(lvalues[4231]),0}, 1765 &(lvalues[4236]),0},
1660{"setext-miAuth","merchant initiated auth",NID_setext_miAuth,4, 1766{"setext-miAuth","merchant initiated auth",NID_setext_miAuth,4,
1661 &(lvalues[4235]),0}, 1767 &(lvalues[4240]),0},
1662{"setext-pinSecure","setext-pinSecure",NID_setext_pinSecure,4, 1768{"setext-pinSecure","setext-pinSecure",NID_setext_pinSecure,4,
1663 &(lvalues[4239]),0}, 1769 &(lvalues[4244]),0},
1664{"setext-pinAny","setext-pinAny",NID_setext_pinAny,4,&(lvalues[4243]),0}, 1770{"setext-pinAny","setext-pinAny",NID_setext_pinAny,4,&(lvalues[4248]),0},
1665{"setext-track2","setext-track2",NID_setext_track2,4,&(lvalues[4247]),0}, 1771{"setext-track2","setext-track2",NID_setext_track2,4,&(lvalues[4252]),0},
1666{"setext-cv","additional verification",NID_setext_cv,4, 1772{"setext-cv","additional verification",NID_setext_cv,4,
1667 &(lvalues[4251]),0}, 1773 &(lvalues[4256]),0},
1668{"set-policy-root","set-policy-root",NID_set_policy_root,4, 1774{"set-policy-root","set-policy-root",NID_set_policy_root,4,
1669 &(lvalues[4255]),0}, 1775 &(lvalues[4260]),0},
1670{"setCext-hashedRoot","setCext-hashedRoot",NID_setCext_hashedRoot,4, 1776{"setCext-hashedRoot","setCext-hashedRoot",NID_setCext_hashedRoot,4,
1671 &(lvalues[4259]),0}, 1777 &(lvalues[4264]),0},
1672{"setCext-certType","setCext-certType",NID_setCext_certType,4, 1778{"setCext-certType","setCext-certType",NID_setCext_certType,4,
1673 &(lvalues[4263]),0}, 1779 &(lvalues[4268]),0},
1674{"setCext-merchData","setCext-merchData",NID_setCext_merchData,4, 1780{"setCext-merchData","setCext-merchData",NID_setCext_merchData,4,
1675 &(lvalues[4267]),0}, 1781 &(lvalues[4272]),0},
1676{"setCext-cCertRequired","setCext-cCertRequired", 1782{"setCext-cCertRequired","setCext-cCertRequired",
1677 NID_setCext_cCertRequired,4,&(lvalues[4271]),0}, 1783 NID_setCext_cCertRequired,4,&(lvalues[4276]),0},
1678{"setCext-tunneling","setCext-tunneling",NID_setCext_tunneling,4, 1784{"setCext-tunneling","setCext-tunneling",NID_setCext_tunneling,4,
1679 &(lvalues[4275]),0}, 1785 &(lvalues[4280]),0},
1680{"setCext-setExt","setCext-setExt",NID_setCext_setExt,4, 1786{"setCext-setExt","setCext-setExt",NID_setCext_setExt,4,
1681 &(lvalues[4279]),0}, 1787 &(lvalues[4284]),0},
1682{"setCext-setQualf","setCext-setQualf",NID_setCext_setQualf,4, 1788{"setCext-setQualf","setCext-setQualf",NID_setCext_setQualf,4,
1683 &(lvalues[4283]),0}, 1789 &(lvalues[4288]),0},
1684{"setCext-PGWYcapabilities","setCext-PGWYcapabilities", 1790{"setCext-PGWYcapabilities","setCext-PGWYcapabilities",
1685 NID_setCext_PGWYcapabilities,4,&(lvalues[4287]),0}, 1791 NID_setCext_PGWYcapabilities,4,&(lvalues[4292]),0},
1686{"setCext-TokenIdentifier","setCext-TokenIdentifier", 1792{"setCext-TokenIdentifier","setCext-TokenIdentifier",
1687 NID_setCext_TokenIdentifier,4,&(lvalues[4291]),0}, 1793 NID_setCext_TokenIdentifier,4,&(lvalues[4296]),0},
1688{"setCext-Track2Data","setCext-Track2Data",NID_setCext_Track2Data,4, 1794{"setCext-Track2Data","setCext-Track2Data",NID_setCext_Track2Data,4,
1689 &(lvalues[4295]),0}, 1795 &(lvalues[4300]),0},
1690{"setCext-TokenType","setCext-TokenType",NID_setCext_TokenType,4, 1796{"setCext-TokenType","setCext-TokenType",NID_setCext_TokenType,4,
1691 &(lvalues[4299]),0}, 1797 &(lvalues[4304]),0},
1692{"setCext-IssuerCapabilities","setCext-IssuerCapabilities", 1798{"setCext-IssuerCapabilities","setCext-IssuerCapabilities",
1693 NID_setCext_IssuerCapabilities,4,&(lvalues[4303]),0}, 1799 NID_setCext_IssuerCapabilities,4,&(lvalues[4308]),0},
1694{"setAttr-Cert","setAttr-Cert",NID_setAttr_Cert,4,&(lvalues[4307]),0}, 1800{"setAttr-Cert","setAttr-Cert",NID_setAttr_Cert,4,&(lvalues[4312]),0},
1695{"setAttr-PGWYcap","payment gateway capabilities",NID_setAttr_PGWYcap, 1801{"setAttr-PGWYcap","payment gateway capabilities",NID_setAttr_PGWYcap,
1696 4,&(lvalues[4311]),0}, 1802 4,&(lvalues[4316]),0},
1697{"setAttr-TokenType","setAttr-TokenType",NID_setAttr_TokenType,4, 1803{"setAttr-TokenType","setAttr-TokenType",NID_setAttr_TokenType,4,
1698 &(lvalues[4315]),0}, 1804 &(lvalues[4320]),0},
1699{"setAttr-IssCap","issuer capabilities",NID_setAttr_IssCap,4, 1805{"setAttr-IssCap","issuer capabilities",NID_setAttr_IssCap,4,
1700 &(lvalues[4319]),0}, 1806 &(lvalues[4324]),0},
1701{"set-rootKeyThumb","set-rootKeyThumb",NID_set_rootKeyThumb,5, 1807{"set-rootKeyThumb","set-rootKeyThumb",NID_set_rootKeyThumb,5,
1702 &(lvalues[4323]),0}, 1808 &(lvalues[4328]),0},
1703{"set-addPolicy","set-addPolicy",NID_set_addPolicy,5,&(lvalues[4328]),0}, 1809{"set-addPolicy","set-addPolicy",NID_set_addPolicy,5,&(lvalues[4333]),0},
1704{"setAttr-Token-EMV","setAttr-Token-EMV",NID_setAttr_Token_EMV,5, 1810{"setAttr-Token-EMV","setAttr-Token-EMV",NID_setAttr_Token_EMV,5,
1705 &(lvalues[4333]),0}, 1811 &(lvalues[4338]),0},
1706{"setAttr-Token-B0Prime","setAttr-Token-B0Prime", 1812{"setAttr-Token-B0Prime","setAttr-Token-B0Prime",
1707 NID_setAttr_Token_B0Prime,5,&(lvalues[4338]),0}, 1813 NID_setAttr_Token_B0Prime,5,&(lvalues[4343]),0},
1708{"setAttr-IssCap-CVM","setAttr-IssCap-CVM",NID_setAttr_IssCap_CVM,5, 1814{"setAttr-IssCap-CVM","setAttr-IssCap-CVM",NID_setAttr_IssCap_CVM,5,
1709 &(lvalues[4343]),0},
1710{"setAttr-IssCap-T2","setAttr-IssCap-T2",NID_setAttr_IssCap_T2,5,
1711 &(lvalues[4348]),0}, 1815 &(lvalues[4348]),0},
1712{"setAttr-IssCap-Sig","setAttr-IssCap-Sig",NID_setAttr_IssCap_Sig,5, 1816{"setAttr-IssCap-T2","setAttr-IssCap-T2",NID_setAttr_IssCap_T2,5,
1713 &(lvalues[4353]),0}, 1817 &(lvalues[4353]),0},
1818{"setAttr-IssCap-Sig","setAttr-IssCap-Sig",NID_setAttr_IssCap_Sig,5,
1819 &(lvalues[4358]),0},
1714{"setAttr-GenCryptgrm","generate cryptogram",NID_setAttr_GenCryptgrm, 1820{"setAttr-GenCryptgrm","generate cryptogram",NID_setAttr_GenCryptgrm,
1715 6,&(lvalues[4358]),0}, 1821 6,&(lvalues[4363]),0},
1716{"setAttr-T2Enc","encrypted track 2",NID_setAttr_T2Enc,6, 1822{"setAttr-T2Enc","encrypted track 2",NID_setAttr_T2Enc,6,
1717 &(lvalues[4364]),0}, 1823 &(lvalues[4369]),0},
1718{"setAttr-T2cleartxt","cleartext track 2",NID_setAttr_T2cleartxt,6, 1824{"setAttr-T2cleartxt","cleartext track 2",NID_setAttr_T2cleartxt,6,
1719 &(lvalues[4370]),0}, 1825 &(lvalues[4375]),0},
1720{"setAttr-TokICCsig","ICC or token signature",NID_setAttr_TokICCsig,6, 1826{"setAttr-TokICCsig","ICC or token signature",NID_setAttr_TokICCsig,6,
1721 &(lvalues[4376]),0}, 1827 &(lvalues[4381]),0},
1722{"setAttr-SecDevSig","secure device signature",NID_setAttr_SecDevSig, 1828{"setAttr-SecDevSig","secure device signature",NID_setAttr_SecDevSig,
1723 6,&(lvalues[4382]),0}, 1829 6,&(lvalues[4387]),0},
1724{"set-brand-IATA-ATA","set-brand-IATA-ATA",NID_set_brand_IATA_ATA,4, 1830{"set-brand-IATA-ATA","set-brand-IATA-ATA",NID_set_brand_IATA_ATA,4,
1725 &(lvalues[4388]),0}, 1831 &(lvalues[4393]),0},
1726{"set-brand-Diners","set-brand-Diners",NID_set_brand_Diners,4, 1832{"set-brand-Diners","set-brand-Diners",NID_set_brand_Diners,4,
1727 &(lvalues[4392]),0}, 1833 &(lvalues[4397]),0},
1728{"set-brand-AmericanExpress","set-brand-AmericanExpress", 1834{"set-brand-AmericanExpress","set-brand-AmericanExpress",
1729 NID_set_brand_AmericanExpress,4,&(lvalues[4396]),0}, 1835 NID_set_brand_AmericanExpress,4,&(lvalues[4401]),0},
1730{"set-brand-JCB","set-brand-JCB",NID_set_brand_JCB,4,&(lvalues[4400]),0}, 1836{"set-brand-JCB","set-brand-JCB",NID_set_brand_JCB,4,&(lvalues[4405]),0},
1731{"set-brand-Visa","set-brand-Visa",NID_set_brand_Visa,4, 1837{"set-brand-Visa","set-brand-Visa",NID_set_brand_Visa,4,
1732 &(lvalues[4404]),0}, 1838 &(lvalues[4409]),0},
1733{"set-brand-MasterCard","set-brand-MasterCard", 1839{"set-brand-MasterCard","set-brand-MasterCard",
1734 NID_set_brand_MasterCard,4,&(lvalues[4408]),0}, 1840 NID_set_brand_MasterCard,4,&(lvalues[4413]),0},
1735{"set-brand-Novus","set-brand-Novus",NID_set_brand_Novus,5, 1841{"set-brand-Novus","set-brand-Novus",NID_set_brand_Novus,5,
1736 &(lvalues[4412]),0}, 1842 &(lvalues[4417]),0},
1737{"DES-CDMF","des-cdmf",NID_des_cdmf,8,&(lvalues[4417]),0}, 1843{"DES-CDMF","des-cdmf",NID_des_cdmf,8,&(lvalues[4422]),0},
1738{"rsaOAEPEncryptionSET","rsaOAEPEncryptionSET", 1844{"rsaOAEPEncryptionSET","rsaOAEPEncryptionSET",
1739 NID_rsaOAEPEncryptionSET,9,&(lvalues[4425]),0}, 1845 NID_rsaOAEPEncryptionSET,9,&(lvalues[4430]),0},
1740{NULL,NULL,NID_undef,0,NULL}, 1846{"ITU-T","itu-t",NID_itu_t,1,&(lvalues[4439]),0},
1741{NULL,NULL,NID_undef,0,NULL}, 1847{"JOINT-ISO-ITU-T","joint-iso-itu-t",NID_joint_iso_itu_t,1,
1742{NULL,NULL,NID_undef,0,NULL}, 1848 &(lvalues[4440]),0},
1849{"international-organizations","International Organizations",
1850 NID_international_organizations,1,&(lvalues[4441]),0},
1743{"msSmartcardLogin","Microsoft Smartcardlogin",NID_ms_smartcard_login, 1851{"msSmartcardLogin","Microsoft Smartcardlogin",NID_ms_smartcard_login,
1744 10,&(lvalues[4434]),0}, 1852 10,&(lvalues[4442]),0},
1745{"msUPN","Microsoft Universal Principal Name",NID_ms_upn,10, 1853{"msUPN","Microsoft Universal Principal Name",NID_ms_upn,10,
1746 &(lvalues[4444]),0}, 1854 &(lvalues[4452]),0},
1747{"AES-128-CFB1","aes-128-cfb1",NID_aes_128_cfb1,0,NULL}, 1855{"AES-128-CFB1","aes-128-cfb1",NID_aes_128_cfb1,0,NULL,0},
1748{"AES-192-CFB1","aes-192-cfb1",NID_aes_192_cfb1,0,NULL}, 1856{"AES-192-CFB1","aes-192-cfb1",NID_aes_192_cfb1,0,NULL,0},
1749{"AES-256-CFB1","aes-256-cfb1",NID_aes_256_cfb1,0,NULL}, 1857{"AES-256-CFB1","aes-256-cfb1",NID_aes_256_cfb1,0,NULL,0},
1750{"AES-128-CFB8","aes-128-cfb8",NID_aes_128_cfb8,0,NULL}, 1858{"AES-128-CFB8","aes-128-cfb8",NID_aes_128_cfb8,0,NULL,0},
1751{"AES-192-CFB8","aes-192-cfb8",NID_aes_192_cfb8,0,NULL}, 1859{"AES-192-CFB8","aes-192-cfb8",NID_aes_192_cfb8,0,NULL,0},
1752{"AES-256-CFB8","aes-256-cfb8",NID_aes_256_cfb8,0,NULL}, 1860{"AES-256-CFB8","aes-256-cfb8",NID_aes_256_cfb8,0,NULL,0},
1753{"DES-CFB1","des-cfb1",NID_des_cfb1,0,NULL}, 1861{"DES-CFB1","des-cfb1",NID_des_cfb1,0,NULL,0},
1754{"DES-CFB8","des-cfb8",NID_des_cfb8,0,NULL}, 1862{"DES-CFB8","des-cfb8",NID_des_cfb8,0,NULL,0},
1755{"DES-EDE3-CFB1","des-ede3-cfb1",NID_des_ede3_cfb1,0,NULL}, 1863{"DES-EDE3-CFB1","des-ede3-cfb1",NID_des_ede3_cfb1,0,NULL,0},
1756{"DES-EDE3-CFB8","des-ede3-cfb8",NID_des_ede3_cfb8,0,NULL}, 1864{"DES-EDE3-CFB8","des-ede3-cfb8",NID_des_ede3_cfb8,0,NULL,0},
1757{"streetAddress","streetAddress",NID_streetAddress,3,&(lvalues[4454]),0}, 1865{"streetAddress","streetAddress",NID_streetAddress,3,&(lvalues[4462]),0},
1758{"postalCode","postalCode",NID_postalCode,3,&(lvalues[4457]),0}, 1866{"postalCode","postalCode",NID_postalCode,3,&(lvalues[4465]),0},
1759{"id-ppl","id-ppl",NID_id_ppl,7,&(lvalues[4460]),0}, 1867{"id-ppl","id-ppl",NID_id_ppl,7,&(lvalues[4468]),0},
1760{"proxyCertInfo","Proxy Certificate Information",NID_proxyCertInfo,8, 1868{"proxyCertInfo","Proxy Certificate Information",NID_proxyCertInfo,8,
1761 &(lvalues[4467]),0},
1762{"id-ppl-anyLanguage","Any language",NID_id_ppl_anyLanguage,8,
1763 &(lvalues[4475]),0}, 1869 &(lvalues[4475]),0},
1764{"id-ppl-inheritAll","Inherit all",NID_id_ppl_inheritAll,8, 1870{"id-ppl-anyLanguage","Any language",NID_id_ppl_anyLanguage,8,
1765 &(lvalues[4483]),0}, 1871 &(lvalues[4483]),0},
1766{"nameConstraints","X509v3 Name Constraints",NID_name_constraints,3, 1872{"id-ppl-inheritAll","Inherit all",NID_id_ppl_inheritAll,8,
1767 &(lvalues[4491]),0}, 1873 &(lvalues[4491]),0},
1768{"id-ppl-independent","Independent",NID_Independent,8,&(lvalues[4494]),0}, 1874{"nameConstraints","X509v3 Name Constraints",NID_name_constraints,3,
1875 &(lvalues[4499]),0},
1876{"id-ppl-independent","Independent",NID_Independent,8,&(lvalues[4502]),0},
1769{"RSA-SHA256","sha256WithRSAEncryption",NID_sha256WithRSAEncryption,9, 1877{"RSA-SHA256","sha256WithRSAEncryption",NID_sha256WithRSAEncryption,9,
1770 &(lvalues[4502]),0}, 1878 &(lvalues[4510]),0},
1771{"RSA-SHA384","sha384WithRSAEncryption",NID_sha384WithRSAEncryption,9, 1879{"RSA-SHA384","sha384WithRSAEncryption",NID_sha384WithRSAEncryption,9,
1772 &(lvalues[4511]),0}, 1880 &(lvalues[4519]),0},
1773{"RSA-SHA512","sha512WithRSAEncryption",NID_sha512WithRSAEncryption,9, 1881{"RSA-SHA512","sha512WithRSAEncryption",NID_sha512WithRSAEncryption,9,
1774 &(lvalues[4520]),0}, 1882 &(lvalues[4528]),0},
1775{"RSA-SHA224","sha224WithRSAEncryption",NID_sha224WithRSAEncryption,9, 1883{"RSA-SHA224","sha224WithRSAEncryption",NID_sha224WithRSAEncryption,9,
1776 &(lvalues[4529]),0}, 1884 &(lvalues[4537]),0},
1777{"SHA256","sha256",NID_sha256,9,&(lvalues[4538]),0}, 1885{"SHA256","sha256",NID_sha256,9,&(lvalues[4546]),0},
1778{"SHA384","sha384",NID_sha384,9,&(lvalues[4547]),0}, 1886{"SHA384","sha384",NID_sha384,9,&(lvalues[4555]),0},
1779{"SHA512","sha512",NID_sha512,9,&(lvalues[4556]),0}, 1887{"SHA512","sha512",NID_sha512,9,&(lvalues[4564]),0},
1780{"SHA224","sha224",NID_sha224,9,&(lvalues[4565]),0}, 1888{"SHA224","sha224",NID_sha224,9,&(lvalues[4573]),0},
1889{"identified-organization","identified-organization",
1890 NID_identified_organization,1,&(lvalues[4582]),0},
1891{"certicom-arc","certicom-arc",NID_certicom_arc,3,&(lvalues[4583]),0},
1892{"wap","wap",NID_wap,2,&(lvalues[4586]),0},
1893{"wap-wsg","wap-wsg",NID_wap_wsg,3,&(lvalues[4588]),0},
1894{"id-characteristic-two-basis","id-characteristic-two-basis",
1895 NID_X9_62_id_characteristic_two_basis,8,&(lvalues[4591]),0},
1896{"onBasis","onBasis",NID_X9_62_onBasis,9,&(lvalues[4599]),0},
1897{"tpBasis","tpBasis",NID_X9_62_tpBasis,9,&(lvalues[4608]),0},
1898{"ppBasis","ppBasis",NID_X9_62_ppBasis,9,&(lvalues[4617]),0},
1899{"c2pnb163v1","c2pnb163v1",NID_X9_62_c2pnb163v1,8,&(lvalues[4626]),0},
1900{"c2pnb163v2","c2pnb163v2",NID_X9_62_c2pnb163v2,8,&(lvalues[4634]),0},
1901{"c2pnb163v3","c2pnb163v3",NID_X9_62_c2pnb163v3,8,&(lvalues[4642]),0},
1902{"c2pnb176v1","c2pnb176v1",NID_X9_62_c2pnb176v1,8,&(lvalues[4650]),0},
1903{"c2tnb191v1","c2tnb191v1",NID_X9_62_c2tnb191v1,8,&(lvalues[4658]),0},
1904{"c2tnb191v2","c2tnb191v2",NID_X9_62_c2tnb191v2,8,&(lvalues[4666]),0},
1905{"c2tnb191v3","c2tnb191v3",NID_X9_62_c2tnb191v3,8,&(lvalues[4674]),0},
1906{"c2onb191v4","c2onb191v4",NID_X9_62_c2onb191v4,8,&(lvalues[4682]),0},
1907{"c2onb191v5","c2onb191v5",NID_X9_62_c2onb191v5,8,&(lvalues[4690]),0},
1908{"c2pnb208w1","c2pnb208w1",NID_X9_62_c2pnb208w1,8,&(lvalues[4698]),0},
1909{"c2tnb239v1","c2tnb239v1",NID_X9_62_c2tnb239v1,8,&(lvalues[4706]),0},
1910{"c2tnb239v2","c2tnb239v2",NID_X9_62_c2tnb239v2,8,&(lvalues[4714]),0},
1911{"c2tnb239v3","c2tnb239v3",NID_X9_62_c2tnb239v3,8,&(lvalues[4722]),0},
1912{"c2onb239v4","c2onb239v4",NID_X9_62_c2onb239v4,8,&(lvalues[4730]),0},
1913{"c2onb239v5","c2onb239v5",NID_X9_62_c2onb239v5,8,&(lvalues[4738]),0},
1914{"c2pnb272w1","c2pnb272w1",NID_X9_62_c2pnb272w1,8,&(lvalues[4746]),0},
1915{"c2pnb304w1","c2pnb304w1",NID_X9_62_c2pnb304w1,8,&(lvalues[4754]),0},
1916{"c2tnb359v1","c2tnb359v1",NID_X9_62_c2tnb359v1,8,&(lvalues[4762]),0},
1917{"c2pnb368w1","c2pnb368w1",NID_X9_62_c2pnb368w1,8,&(lvalues[4770]),0},
1918{"c2tnb431r1","c2tnb431r1",NID_X9_62_c2tnb431r1,8,&(lvalues[4778]),0},
1919{"secp112r1","secp112r1",NID_secp112r1,5,&(lvalues[4786]),0},
1920{"secp112r2","secp112r2",NID_secp112r2,5,&(lvalues[4791]),0},
1921{"secp128r1","secp128r1",NID_secp128r1,5,&(lvalues[4796]),0},
1922{"secp128r2","secp128r2",NID_secp128r2,5,&(lvalues[4801]),0},
1923{"secp160k1","secp160k1",NID_secp160k1,5,&(lvalues[4806]),0},
1924{"secp160r1","secp160r1",NID_secp160r1,5,&(lvalues[4811]),0},
1925{"secp160r2","secp160r2",NID_secp160r2,5,&(lvalues[4816]),0},
1926{"secp192k1","secp192k1",NID_secp192k1,5,&(lvalues[4821]),0},
1927{"secp224k1","secp224k1",NID_secp224k1,5,&(lvalues[4826]),0},
1928{"secp224r1","secp224r1",NID_secp224r1,5,&(lvalues[4831]),0},
1929{"secp256k1","secp256k1",NID_secp256k1,5,&(lvalues[4836]),0},
1930{"secp384r1","secp384r1",NID_secp384r1,5,&(lvalues[4841]),0},
1931{"secp521r1","secp521r1",NID_secp521r1,5,&(lvalues[4846]),0},
1932{"sect113r1","sect113r1",NID_sect113r1,5,&(lvalues[4851]),0},
1933{"sect113r2","sect113r2",NID_sect113r2,5,&(lvalues[4856]),0},
1934{"sect131r1","sect131r1",NID_sect131r1,5,&(lvalues[4861]),0},
1935{"sect131r2","sect131r2",NID_sect131r2,5,&(lvalues[4866]),0},
1936{"sect163k1","sect163k1",NID_sect163k1,5,&(lvalues[4871]),0},
1937{"sect163r1","sect163r1",NID_sect163r1,5,&(lvalues[4876]),0},
1938{"sect163r2","sect163r2",NID_sect163r2,5,&(lvalues[4881]),0},
1939{"sect193r1","sect193r1",NID_sect193r1,5,&(lvalues[4886]),0},
1940{"sect193r2","sect193r2",NID_sect193r2,5,&(lvalues[4891]),0},
1941{"sect233k1","sect233k1",NID_sect233k1,5,&(lvalues[4896]),0},
1942{"sect233r1","sect233r1",NID_sect233r1,5,&(lvalues[4901]),0},
1943{"sect239k1","sect239k1",NID_sect239k1,5,&(lvalues[4906]),0},
1944{"sect283k1","sect283k1",NID_sect283k1,5,&(lvalues[4911]),0},
1945{"sect283r1","sect283r1",NID_sect283r1,5,&(lvalues[4916]),0},
1946{"sect409k1","sect409k1",NID_sect409k1,5,&(lvalues[4921]),0},
1947{"sect409r1","sect409r1",NID_sect409r1,5,&(lvalues[4926]),0},
1948{"sect571k1","sect571k1",NID_sect571k1,5,&(lvalues[4931]),0},
1949{"sect571r1","sect571r1",NID_sect571r1,5,&(lvalues[4936]),0},
1950{"wap-wsg-idm-ecid-wtls1","wap-wsg-idm-ecid-wtls1",
1951 NID_wap_wsg_idm_ecid_wtls1,5,&(lvalues[4941]),0},
1952{"wap-wsg-idm-ecid-wtls3","wap-wsg-idm-ecid-wtls3",
1953 NID_wap_wsg_idm_ecid_wtls3,5,&(lvalues[4946]),0},
1954{"wap-wsg-idm-ecid-wtls4","wap-wsg-idm-ecid-wtls4",
1955 NID_wap_wsg_idm_ecid_wtls4,5,&(lvalues[4951]),0},
1956{"wap-wsg-idm-ecid-wtls5","wap-wsg-idm-ecid-wtls5",
1957 NID_wap_wsg_idm_ecid_wtls5,5,&(lvalues[4956]),0},
1958{"wap-wsg-idm-ecid-wtls6","wap-wsg-idm-ecid-wtls6",
1959 NID_wap_wsg_idm_ecid_wtls6,5,&(lvalues[4961]),0},
1960{"wap-wsg-idm-ecid-wtls7","wap-wsg-idm-ecid-wtls7",
1961 NID_wap_wsg_idm_ecid_wtls7,5,&(lvalues[4966]),0},
1962{"wap-wsg-idm-ecid-wtls8","wap-wsg-idm-ecid-wtls8",
1963 NID_wap_wsg_idm_ecid_wtls8,5,&(lvalues[4971]),0},
1964{"wap-wsg-idm-ecid-wtls9","wap-wsg-idm-ecid-wtls9",
1965 NID_wap_wsg_idm_ecid_wtls9,5,&(lvalues[4976]),0},
1966{"wap-wsg-idm-ecid-wtls10","wap-wsg-idm-ecid-wtls10",
1967 NID_wap_wsg_idm_ecid_wtls10,5,&(lvalues[4981]),0},
1968{"wap-wsg-idm-ecid-wtls11","wap-wsg-idm-ecid-wtls11",
1969 NID_wap_wsg_idm_ecid_wtls11,5,&(lvalues[4986]),0},
1970{"wap-wsg-idm-ecid-wtls12","wap-wsg-idm-ecid-wtls12",
1971 NID_wap_wsg_idm_ecid_wtls12,5,&(lvalues[4991]),0},
1972{"anyPolicy","X509v3 Any Policy",NID_any_policy,4,&(lvalues[4996]),0},
1973{"policyMappings","X509v3 Policy Mappings",NID_policy_mappings,3,
1974 &(lvalues[5000]),0},
1975{"inhibitAnyPolicy","X509v3 Inhibit Any Policy",
1976 NID_inhibit_any_policy,3,&(lvalues[5003]),0},
1977{"Oakley-EC2N-3","ipsec3",NID_ipsec3,0,NULL,0},
1978{"Oakley-EC2N-4","ipsec4",NID_ipsec4,0,NULL,0},
1979{"CAMELLIA-128-CBC","camellia-128-cbc",NID_camellia_128_cbc,11,
1980 &(lvalues[5006]),0},
1981{"CAMELLIA-192-CBC","camellia-192-cbc",NID_camellia_192_cbc,11,
1982 &(lvalues[5017]),0},
1983{"CAMELLIA-256-CBC","camellia-256-cbc",NID_camellia_256_cbc,11,
1984 &(lvalues[5028]),0},
1985{"CAMELLIA-128-ECB","camellia-128-ecb",NID_camellia_128_ecb,8,
1986 &(lvalues[5039]),0},
1987{"CAMELLIA-192-ECB","camellia-192-ecb",NID_camellia_192_ecb,8,
1988 &(lvalues[5047]),0},
1989{"CAMELLIA-256-ECB","camellia-256-ecb",NID_camellia_256_ecb,8,
1990 &(lvalues[5055]),0},
1991{"CAMELLIA-128-CFB","camellia-128-cfb",NID_camellia_128_cfb128,8,
1992 &(lvalues[5063]),0},
1993{"CAMELLIA-192-CFB","camellia-192-cfb",NID_camellia_192_cfb128,8,
1994 &(lvalues[5071]),0},
1995{"CAMELLIA-256-CFB","camellia-256-cfb",NID_camellia_256_cfb128,8,
1996 &(lvalues[5079]),0},
1997{"CAMELLIA-128-CFB1","camellia-128-cfb1",NID_camellia_128_cfb1,0,NULL,0},
1998{"CAMELLIA-192-CFB1","camellia-192-cfb1",NID_camellia_192_cfb1,0,NULL,0},
1999{"CAMELLIA-256-CFB1","camellia-256-cfb1",NID_camellia_256_cfb1,0,NULL,0},
2000{"CAMELLIA-128-CFB8","camellia-128-cfb8",NID_camellia_128_cfb8,0,NULL,0},
2001{"CAMELLIA-192-CFB8","camellia-192-cfb8",NID_camellia_192_cfb8,0,NULL,0},
2002{"CAMELLIA-256-CFB8","camellia-256-cfb8",NID_camellia_256_cfb8,0,NULL,0},
2003{"CAMELLIA-128-OFB","camellia-128-ofb",NID_camellia_128_ofb128,8,
2004 &(lvalues[5087]),0},
2005{"CAMELLIA-192-OFB","camellia-192-ofb",NID_camellia_192_ofb128,8,
2006 &(lvalues[5095]),0},
2007{"CAMELLIA-256-OFB","camellia-256-ofb",NID_camellia_256_ofb128,8,
2008 &(lvalues[5103]),0},
2009{"subjectDirectoryAttributes","X509v3 Subject Directory Attributes",
2010 NID_subject_directory_attributes,3,&(lvalues[5111]),0},
2011{"issuingDistributionPoint","X509v3 Issuing Distrubution Point",
2012 NID_issuing_distribution_point,3,&(lvalues[5114]),0},
2013{"certificateIssuer","X509v3 Certificate Issuer",
2014 NID_certificate_issuer,3,&(lvalues[5117]),0},
2015{NULL,NULL,NID_undef,0,NULL,0},
2016{"KISA","kisa",NID_kisa,6,&(lvalues[5120]),0},
2017{NULL,NULL,NID_undef,0,NULL,0},
2018{NULL,NULL,NID_undef,0,NULL,0},
2019{"SEED-ECB","seed-ecb",NID_seed_ecb,8,&(lvalues[5126]),0},
2020{"SEED-CBC","seed-cbc",NID_seed_cbc,8,&(lvalues[5134]),0},
2021{"SEED-OFB","seed-ofb",NID_seed_ofb128,8,&(lvalues[5142]),0},
2022{"SEED-CFB","seed-cfb",NID_seed_cfb128,8,&(lvalues[5150]),0},
2023{"HMAC-MD5","hmac-md5",NID_hmac_md5,8,&(lvalues[5158]),0},
2024{"HMAC-SHA1","hmac-sha1",NID_hmac_sha1,8,&(lvalues[5166]),0},
2025{"id-PasswordBasedMAC","password based MAC",NID_id_PasswordBasedMAC,9,
2026 &(lvalues[5174]),0},
2027{"id-DHBasedMac","Diffie-Hellman based MAC",NID_id_DHBasedMac,9,
2028 &(lvalues[5183]),0},
2029{"id-it-suppLangTags","id-it-suppLangTags",NID_id_it_suppLangTags,8,
2030 &(lvalues[5192]),0},
2031{"caRepository","CA Repository",NID_caRepository,8,&(lvalues[5200]),0},
2032{"id-smime-ct-compressedData","id-smime-ct-compressedData",
2033 NID_id_smime_ct_compressedData,11,&(lvalues[5208]),0},
2034{"id-ct-asciiTextWithCRLF","id-ct-asciiTextWithCRLF",
2035 NID_id_ct_asciiTextWithCRLF,11,&(lvalues[5219]),0},
2036{"id-aes128-wrap","id-aes128-wrap",NID_id_aes128_wrap,9,
2037 &(lvalues[5230]),0},
2038{"id-aes192-wrap","id-aes192-wrap",NID_id_aes192_wrap,9,
2039 &(lvalues[5239]),0},
2040{"id-aes256-wrap","id-aes256-wrap",NID_id_aes256_wrap,9,
2041 &(lvalues[5248]),0},
1781}; 2042};
1782 2043
1783static ASN1_OBJECT *sn_objs[NUM_SN]={ 2044static ASN1_OBJECT *sn_objs[NUM_SN]={
@@ -1805,11 +2066,28 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
1805&(nid_objs[92]),/* "BF-ECB" */ 2066&(nid_objs[92]),/* "BF-ECB" */
1806&(nid_objs[94]),/* "BF-OFB" */ 2067&(nid_objs[94]),/* "BF-OFB" */
1807&(nid_objs[14]),/* "C" */ 2068&(nid_objs[14]),/* "C" */
2069&(nid_objs[751]),/* "CAMELLIA-128-CBC" */
2070&(nid_objs[757]),/* "CAMELLIA-128-CFB" */
2071&(nid_objs[760]),/* "CAMELLIA-128-CFB1" */
2072&(nid_objs[763]),/* "CAMELLIA-128-CFB8" */
2073&(nid_objs[754]),/* "CAMELLIA-128-ECB" */
2074&(nid_objs[766]),/* "CAMELLIA-128-OFB" */
2075&(nid_objs[752]),/* "CAMELLIA-192-CBC" */
2076&(nid_objs[758]),/* "CAMELLIA-192-CFB" */
2077&(nid_objs[761]),/* "CAMELLIA-192-CFB1" */
2078&(nid_objs[764]),/* "CAMELLIA-192-CFB8" */
2079&(nid_objs[755]),/* "CAMELLIA-192-ECB" */
2080&(nid_objs[767]),/* "CAMELLIA-192-OFB" */
2081&(nid_objs[753]),/* "CAMELLIA-256-CBC" */
2082&(nid_objs[759]),/* "CAMELLIA-256-CFB" */
2083&(nid_objs[762]),/* "CAMELLIA-256-CFB1" */
2084&(nid_objs[765]),/* "CAMELLIA-256-CFB8" */
2085&(nid_objs[756]),/* "CAMELLIA-256-ECB" */
2086&(nid_objs[768]),/* "CAMELLIA-256-OFB" */
1808&(nid_objs[108]),/* "CAST5-CBC" */ 2087&(nid_objs[108]),/* "CAST5-CBC" */
1809&(nid_objs[110]),/* "CAST5-CFB" */ 2088&(nid_objs[110]),/* "CAST5-CFB" */
1810&(nid_objs[109]),/* "CAST5-ECB" */ 2089&(nid_objs[109]),/* "CAST5-ECB" */
1811&(nid_objs[111]),/* "CAST5-OFB" */ 2090&(nid_objs[111]),/* "CAST5-OFB" */
1812&(nid_objs[404]),/* "CCITT" */
1813&(nid_objs[13]),/* "CN" */ 2091&(nid_objs[13]),/* "CN" */
1814&(nid_objs[141]),/* "CRLReason" */ 2092&(nid_objs[141]),/* "CRLReason" */
1815&(nid_objs[417]),/* "CSPName" */ 2093&(nid_objs[417]),/* "CSPName" */
@@ -1841,6 +2119,8 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
1841&(nid_objs[67]),/* "DSA-old" */ 2119&(nid_objs[67]),/* "DSA-old" */
1842&(nid_objs[297]),/* "DVCS" */ 2120&(nid_objs[297]),/* "DVCS" */
1843&(nid_objs[99]),/* "GN" */ 2121&(nid_objs[99]),/* "GN" */
2122&(nid_objs[780]),/* "HMAC-MD5" */
2123&(nid_objs[781]),/* "HMAC-SHA1" */
1844&(nid_objs[381]),/* "IANA" */ 2124&(nid_objs[381]),/* "IANA" */
1845&(nid_objs[34]),/* "IDEA-CBC" */ 2125&(nid_objs[34]),/* "IDEA-CBC" */
1846&(nid_objs[35]),/* "IDEA-CFB" */ 2126&(nid_objs[35]),/* "IDEA-CFB" */
@@ -1848,7 +2128,9 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
1848&(nid_objs[46]),/* "IDEA-OFB" */ 2128&(nid_objs[46]),/* "IDEA-OFB" */
1849&(nid_objs[181]),/* "ISO" */ 2129&(nid_objs[181]),/* "ISO" */
1850&(nid_objs[183]),/* "ISO-US" */ 2130&(nid_objs[183]),/* "ISO-US" */
1851&(nid_objs[393]),/* "JOINT-ISO-CCITT" */ 2131&(nid_objs[645]),/* "ITU-T" */
2132&(nid_objs[646]),/* "JOINT-ISO-ITU-T" */
2133&(nid_objs[773]),/* "KISA" */
1852&(nid_objs[15]),/* "L" */ 2134&(nid_objs[15]),/* "L" */
1853&(nid_objs[ 3]),/* "MD2" */ 2135&(nid_objs[ 3]),/* "MD2" */
1854&(nid_objs[257]),/* "MD4" */ 2136&(nid_objs[257]),/* "MD4" */
@@ -1856,6 +2138,8 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
1856&(nid_objs[114]),/* "MD5-SHA1" */ 2138&(nid_objs[114]),/* "MD5-SHA1" */
1857&(nid_objs[95]),/* "MDC2" */ 2139&(nid_objs[95]),/* "MDC2" */
1858&(nid_objs[388]),/* "Mail" */ 2140&(nid_objs[388]),/* "Mail" */
2141&(nid_objs[393]),/* "NULL" */
2142&(nid_objs[404]),/* "NULL" */
1859&(nid_objs[57]),/* "Netscape" */ 2143&(nid_objs[57]),/* "Netscape" */
1860&(nid_objs[366]),/* "Nonce" */ 2144&(nid_objs[366]),/* "Nonce" */
1861&(nid_objs[17]),/* "O" */ 2145&(nid_objs[17]),/* "O" */
@@ -1863,6 +2147,8 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
1863&(nid_objs[180]),/* "OCSPSigning" */ 2147&(nid_objs[180]),/* "OCSPSigning" */
1864&(nid_objs[379]),/* "ORG" */ 2148&(nid_objs[379]),/* "ORG" */
1865&(nid_objs[18]),/* "OU" */ 2149&(nid_objs[18]),/* "OU" */
2150&(nid_objs[749]),/* "Oakley-EC2N-3" */
2151&(nid_objs[750]),/* "Oakley-EC2N-4" */
1866&(nid_objs[ 9]),/* "PBE-MD2-DES" */ 2152&(nid_objs[ 9]),/* "PBE-MD2-DES" */
1867&(nid_objs[168]),/* "PBE-MD2-RC2-64" */ 2153&(nid_objs[168]),/* "PBE-MD2-RC2-64" */
1868&(nid_objs[10]),/* "PBE-MD5-DES" */ 2154&(nid_objs[10]),/* "PBE-MD5-DES" */
@@ -1907,6 +2193,10 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
1907&(nid_objs[668]),/* "RSA-SHA256" */ 2193&(nid_objs[668]),/* "RSA-SHA256" */
1908&(nid_objs[669]),/* "RSA-SHA384" */ 2194&(nid_objs[669]),/* "RSA-SHA384" */
1909&(nid_objs[670]),/* "RSA-SHA512" */ 2195&(nid_objs[670]),/* "RSA-SHA512" */
2196&(nid_objs[777]),/* "SEED-CBC" */
2197&(nid_objs[779]),/* "SEED-CFB" */
2198&(nid_objs[776]),/* "SEED-ECB" */
2199&(nid_objs[778]),/* "SEED-OFB" */
1910&(nid_objs[41]),/* "SHA" */ 2200&(nid_objs[41]),/* "SHA" */
1911&(nid_objs[64]),/* "SHA1" */ 2201&(nid_objs[64]),/* "SHA1" */
1912&(nid_objs[675]),/* "SHA224" */ 2202&(nid_objs[675]),/* "SHA224" */
@@ -1936,6 +2226,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
1936&(nid_objs[363]),/* "ad_timestamping" */ 2226&(nid_objs[363]),/* "ad_timestamping" */
1937&(nid_objs[376]),/* "algorithm" */ 2227&(nid_objs[376]),/* "algorithm" */
1938&(nid_objs[405]),/* "ansi-X9-62" */ 2228&(nid_objs[405]),/* "ansi-X9-62" */
2229&(nid_objs[746]),/* "anyPolicy" */
1939&(nid_objs[370]),/* "archiveCutoff" */ 2230&(nid_objs[370]),/* "archiveCutoff" */
1940&(nid_objs[484]),/* "associatedDomain" */ 2231&(nid_objs[484]),/* "associatedDomain" */
1941&(nid_objs[485]),/* "associatedName" */ 2232&(nid_objs[485]),/* "associatedName" */
@@ -1946,10 +2237,33 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
1946&(nid_objs[365]),/* "basicOCSPResponse" */ 2237&(nid_objs[365]),/* "basicOCSPResponse" */
1947&(nid_objs[285]),/* "biometricInfo" */ 2238&(nid_objs[285]),/* "biometricInfo" */
1948&(nid_objs[494]),/* "buildingName" */ 2239&(nid_objs[494]),/* "buildingName" */
2240&(nid_objs[691]),/* "c2onb191v4" */
2241&(nid_objs[692]),/* "c2onb191v5" */
2242&(nid_objs[697]),/* "c2onb239v4" */
2243&(nid_objs[698]),/* "c2onb239v5" */
2244&(nid_objs[684]),/* "c2pnb163v1" */
2245&(nid_objs[685]),/* "c2pnb163v2" */
2246&(nid_objs[686]),/* "c2pnb163v3" */
2247&(nid_objs[687]),/* "c2pnb176v1" */
2248&(nid_objs[693]),/* "c2pnb208w1" */
2249&(nid_objs[699]),/* "c2pnb272w1" */
2250&(nid_objs[700]),/* "c2pnb304w1" */
2251&(nid_objs[702]),/* "c2pnb368w1" */
2252&(nid_objs[688]),/* "c2tnb191v1" */
2253&(nid_objs[689]),/* "c2tnb191v2" */
2254&(nid_objs[690]),/* "c2tnb191v3" */
2255&(nid_objs[694]),/* "c2tnb239v1" */
2256&(nid_objs[695]),/* "c2tnb239v2" */
2257&(nid_objs[696]),/* "c2tnb239v3" */
2258&(nid_objs[701]),/* "c2tnb359v1" */
2259&(nid_objs[703]),/* "c2tnb431r1" */
1949&(nid_objs[483]),/* "cNAMERecord" */ 2260&(nid_objs[483]),/* "cNAMERecord" */
1950&(nid_objs[179]),/* "caIssuers" */ 2261&(nid_objs[179]),/* "caIssuers" */
2262&(nid_objs[785]),/* "caRepository" */
1951&(nid_objs[443]),/* "caseIgnoreIA5StringSyntax" */ 2263&(nid_objs[443]),/* "caseIgnoreIA5StringSyntax" */
1952&(nid_objs[152]),/* "certBag" */ 2264&(nid_objs[152]),/* "certBag" */
2265&(nid_objs[677]),/* "certicom-arc" */
2266&(nid_objs[771]),/* "certificateIssuer" */
1953&(nid_objs[89]),/* "certificatePolicies" */ 2267&(nid_objs[89]),/* "certificatePolicies" */
1954&(nid_objs[54]),/* "challengePassword" */ 2268&(nid_objs[54]),/* "challengePassword" */
1955&(nid_objs[407]),/* "characteristic-two-field" */ 2269&(nid_objs[407]),/* "characteristic-two-field" */
@@ -2004,6 +2318,8 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
2004&(nid_objs[473]),/* "homeTelephoneNumber" */ 2318&(nid_objs[473]),/* "homeTelephoneNumber" */
2005&(nid_objs[466]),/* "host" */ 2319&(nid_objs[466]),/* "host" */
2006&(nid_objs[442]),/* "iA5StringSyntax" */ 2320&(nid_objs[442]),/* "iA5StringSyntax" */
2321&(nid_objs[783]),/* "id-DHBasedMac" */
2322&(nid_objs[782]),/* "id-PasswordBasedMAC" */
2007&(nid_objs[266]),/* "id-aca" */ 2323&(nid_objs[266]),/* "id-aca" */
2008&(nid_objs[355]),/* "id-aca-accessIdentity" */ 2324&(nid_objs[355]),/* "id-aca-accessIdentity" */
2009&(nid_objs[354]),/* "id-aca-authenticationInfo" */ 2325&(nid_objs[354]),/* "id-aca-authenticationInfo" */
@@ -2012,6 +2328,9 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
2012&(nid_objs[357]),/* "id-aca-group" */ 2328&(nid_objs[357]),/* "id-aca-group" */
2013&(nid_objs[358]),/* "id-aca-role" */ 2329&(nid_objs[358]),/* "id-aca-role" */
2014&(nid_objs[176]),/* "id-ad" */ 2330&(nid_objs[176]),/* "id-ad" */
2331&(nid_objs[788]),/* "id-aes128-wrap" */
2332&(nid_objs[789]),/* "id-aes192-wrap" */
2333&(nid_objs[790]),/* "id-aes256-wrap" */
2015&(nid_objs[262]),/* "id-alg" */ 2334&(nid_objs[262]),/* "id-alg" */
2016&(nid_objs[323]),/* "id-alg-des40" */ 2335&(nid_objs[323]),/* "id-alg-des40" */
2017&(nid_objs[326]),/* "id-alg-dh-pop" */ 2336&(nid_objs[326]),/* "id-alg-dh-pop" */
@@ -2022,6 +2341,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
2022&(nid_objs[362]),/* "id-cct-PKIResponse" */ 2341&(nid_objs[362]),/* "id-cct-PKIResponse" */
2023&(nid_objs[360]),/* "id-cct-crs" */ 2342&(nid_objs[360]),/* "id-cct-crs" */
2024&(nid_objs[81]),/* "id-ce" */ 2343&(nid_objs[81]),/* "id-ce" */
2344&(nid_objs[680]),/* "id-characteristic-two-basis" */
2025&(nid_objs[263]),/* "id-cmc" */ 2345&(nid_objs[263]),/* "id-cmc" */
2026&(nid_objs[334]),/* "id-cmc-addExtensions" */ 2346&(nid_objs[334]),/* "id-cmc-addExtensions" */
2027&(nid_objs[346]),/* "id-cmc-confirmCertAcceptance" */ 2347&(nid_objs[346]),/* "id-cmc-confirmCertAcceptance" */
@@ -2043,6 +2363,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
2043&(nid_objs[332]),/* "id-cmc-senderNonce" */ 2363&(nid_objs[332]),/* "id-cmc-senderNonce" */
2044&(nid_objs[327]),/* "id-cmc-statusInfo" */ 2364&(nid_objs[327]),/* "id-cmc-statusInfo" */
2045&(nid_objs[331]),/* "id-cmc-transactionId" */ 2365&(nid_objs[331]),/* "id-cmc-transactionId" */
2366&(nid_objs[787]),/* "id-ct-asciiTextWithCRLF" */
2046&(nid_objs[408]),/* "id-ecPublicKey" */ 2367&(nid_objs[408]),/* "id-ecPublicKey" */
2047&(nid_objs[508]),/* "id-hex-multipart-message" */ 2368&(nid_objs[508]),/* "id-hex-multipart-message" */
2048&(nid_objs[507]),/* "id-hex-partial-message" */ 2369&(nid_objs[507]),/* "id-hex-partial-message" */
@@ -2061,6 +2382,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
2061&(nid_objs[299]),/* "id-it-signKeyPairTypes" */ 2382&(nid_objs[299]),/* "id-it-signKeyPairTypes" */
2062&(nid_objs[305]),/* "id-it-subscriptionRequest" */ 2383&(nid_objs[305]),/* "id-it-subscriptionRequest" */
2063&(nid_objs[306]),/* "id-it-subscriptionResponse" */ 2384&(nid_objs[306]),/* "id-it-subscriptionResponse" */
2385&(nid_objs[784]),/* "id-it-suppLangTags" */
2064&(nid_objs[304]),/* "id-it-unsupportedOIDs" */ 2386&(nid_objs[304]),/* "id-it-unsupportedOIDs" */
2065&(nid_objs[128]),/* "id-kp" */ 2387&(nid_objs[128]),/* "id-kp" */
2066&(nid_objs[280]),/* "id-mod-attribute-cert" */ 2388&(nid_objs[280]),/* "id-mod-attribute-cert" */
@@ -2156,6 +2478,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
2156&(nid_objs[208]),/* "id-smime-ct-TDTInfo" */ 2478&(nid_objs[208]),/* "id-smime-ct-TDTInfo" */
2157&(nid_objs[207]),/* "id-smime-ct-TSTInfo" */ 2479&(nid_objs[207]),/* "id-smime-ct-TSTInfo" */
2158&(nid_objs[205]),/* "id-smime-ct-authData" */ 2480&(nid_objs[205]),/* "id-smime-ct-authData" */
2481&(nid_objs[786]),/* "id-smime-ct-compressedData" */
2159&(nid_objs[209]),/* "id-smime-ct-contentInfo" */ 2482&(nid_objs[209]),/* "id-smime-ct-contentInfo" */
2160&(nid_objs[206]),/* "id-smime-ct-publishCert" */ 2483&(nid_objs[206]),/* "id-smime-ct-publishCert" */
2161&(nid_objs[204]),/* "id-smime-ct-receipt" */ 2484&(nid_objs[204]),/* "id-smime-ct-receipt" */
@@ -2178,13 +2501,17 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
2178&(nid_objs[194]),/* "id-smime-spq" */ 2501&(nid_objs[194]),/* "id-smime-spq" */
2179&(nid_objs[250]),/* "id-smime-spq-ets-sqt-unotice" */ 2502&(nid_objs[250]),/* "id-smime-spq-ets-sqt-unotice" */
2180&(nid_objs[249]),/* "id-smime-spq-ets-sqt-uri" */ 2503&(nid_objs[249]),/* "id-smime-spq-ets-sqt-uri" */
2504&(nid_objs[676]),/* "identified-organization" */
2181&(nid_objs[461]),/* "info" */ 2505&(nid_objs[461]),/* "info" */
2506&(nid_objs[748]),/* "inhibitAnyPolicy" */
2182&(nid_objs[101]),/* "initials" */ 2507&(nid_objs[101]),/* "initials" */
2508&(nid_objs[647]),/* "international-organizations" */
2183&(nid_objs[142]),/* "invalidityDate" */ 2509&(nid_objs[142]),/* "invalidityDate" */
2184&(nid_objs[294]),/* "ipsecEndSystem" */ 2510&(nid_objs[294]),/* "ipsecEndSystem" */
2185&(nid_objs[295]),/* "ipsecTunnel" */ 2511&(nid_objs[295]),/* "ipsecTunnel" */
2186&(nid_objs[296]),/* "ipsecUser" */ 2512&(nid_objs[296]),/* "ipsecUser" */
2187&(nid_objs[86]),/* "issuerAltName" */ 2513&(nid_objs[86]),/* "issuerAltName" */
2514&(nid_objs[770]),/* "issuingDistributionPoint" */
2188&(nid_objs[492]),/* "janetMailbox" */ 2515&(nid_objs[492]),/* "janetMailbox" */
2189&(nid_objs[150]),/* "keyBag" */ 2516&(nid_objs[150]),/* "keyBag" */
2190&(nid_objs[83]),/* "keyUsage" */ 2517&(nid_objs[83]),/* "keyUsage" */
@@ -2227,6 +2554,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
2227&(nid_objs[73]),/* "nsRevocationUrl" */ 2554&(nid_objs[73]),/* "nsRevocationUrl" */
2228&(nid_objs[139]),/* "nsSGC" */ 2555&(nid_objs[139]),/* "nsSGC" */
2229&(nid_objs[77]),/* "nsSslServerName" */ 2556&(nid_objs[77]),/* "nsSslServerName" */
2557&(nid_objs[681]),/* "onBasis" */
2230&(nid_objs[491]),/* "organizationalStatus" */ 2558&(nid_objs[491]),/* "organizationalStatus" */
2231&(nid_objs[475]),/* "otherMailbox" */ 2559&(nid_objs[475]),/* "otherMailbox" */
2232&(nid_objs[489]),/* "pagerTelephoneNumber" */ 2560&(nid_objs[489]),/* "pagerTelephoneNumber" */
@@ -2259,7 +2587,9 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
2259&(nid_objs[151]),/* "pkcs8ShroudedKeyBag" */ 2587&(nid_objs[151]),/* "pkcs8ShroudedKeyBag" */
2260&(nid_objs[47]),/* "pkcs9" */ 2588&(nid_objs[47]),/* "pkcs9" */
2261&(nid_objs[401]),/* "policyConstraints" */ 2589&(nid_objs[401]),/* "policyConstraints" */
2590&(nid_objs[747]),/* "policyMappings" */
2262&(nid_objs[661]),/* "postalCode" */ 2591&(nid_objs[661]),/* "postalCode" */
2592&(nid_objs[683]),/* "ppBasis" */
2263&(nid_objs[406]),/* "prime-field" */ 2593&(nid_objs[406]),/* "prime-field" */
2264&(nid_objs[409]),/* "prime192v1" */ 2594&(nid_objs[409]),/* "prime192v1" */
2265&(nid_objs[410]),/* "prime192v2" */ 2595&(nid_objs[410]),/* "prime192v2" */
@@ -2289,8 +2619,39 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
2289&(nid_objs[290]),/* "sbgp-ipAddrBlock" */ 2619&(nid_objs[290]),/* "sbgp-ipAddrBlock" */
2290&(nid_objs[292]),/* "sbgp-routerIdentifier" */ 2620&(nid_objs[292]),/* "sbgp-routerIdentifier" */
2291&(nid_objs[159]),/* "sdsiCertificate" */ 2621&(nid_objs[159]),/* "sdsiCertificate" */
2622&(nid_objs[704]),/* "secp112r1" */
2623&(nid_objs[705]),/* "secp112r2" */
2624&(nid_objs[706]),/* "secp128r1" */
2625&(nid_objs[707]),/* "secp128r2" */
2626&(nid_objs[708]),/* "secp160k1" */
2627&(nid_objs[709]),/* "secp160r1" */
2628&(nid_objs[710]),/* "secp160r2" */
2629&(nid_objs[711]),/* "secp192k1" */
2630&(nid_objs[712]),/* "secp224k1" */
2631&(nid_objs[713]),/* "secp224r1" */
2632&(nid_objs[714]),/* "secp256k1" */
2633&(nid_objs[715]),/* "secp384r1" */
2634&(nid_objs[716]),/* "secp521r1" */
2292&(nid_objs[154]),/* "secretBag" */ 2635&(nid_objs[154]),/* "secretBag" */
2293&(nid_objs[474]),/* "secretary" */ 2636&(nid_objs[474]),/* "secretary" */
2637&(nid_objs[717]),/* "sect113r1" */
2638&(nid_objs[718]),/* "sect113r2" */
2639&(nid_objs[719]),/* "sect131r1" */
2640&(nid_objs[720]),/* "sect131r2" */
2641&(nid_objs[721]),/* "sect163k1" */
2642&(nid_objs[722]),/* "sect163r1" */
2643&(nid_objs[723]),/* "sect163r2" */
2644&(nid_objs[724]),/* "sect193r1" */
2645&(nid_objs[725]),/* "sect193r2" */
2646&(nid_objs[726]),/* "sect233k1" */
2647&(nid_objs[727]),/* "sect233r1" */
2648&(nid_objs[728]),/* "sect239k1" */
2649&(nid_objs[729]),/* "sect283k1" */
2650&(nid_objs[730]),/* "sect283r1" */
2651&(nid_objs[731]),/* "sect409k1" */
2652&(nid_objs[732]),/* "sect409r1" */
2653&(nid_objs[733]),/* "sect571k1" */
2654&(nid_objs[734]),/* "sect571r1" */
2294&(nid_objs[386]),/* "security" */ 2655&(nid_objs[386]),/* "security" */
2295&(nid_objs[394]),/* "selected-attribute-types" */ 2656&(nid_objs[394]),/* "selected-attribute-types" */
2296&(nid_objs[105]),/* "serialNumber" */ 2657&(nid_objs[105]),/* "serialNumber" */
@@ -2432,6 +2793,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
2432&(nid_objs[387]),/* "snmpv2" */ 2793&(nid_objs[387]),/* "snmpv2" */
2433&(nid_objs[660]),/* "streetAddress" */ 2794&(nid_objs[660]),/* "streetAddress" */
2434&(nid_objs[85]),/* "subjectAltName" */ 2795&(nid_objs[85]),/* "subjectAltName" */
2796&(nid_objs[769]),/* "subjectDirectoryAttributes" */
2435&(nid_objs[398]),/* "subjectInfoAccess" */ 2797&(nid_objs[398]),/* "subjectInfoAccess" */
2436&(nid_objs[82]),/* "subjectKeyIdentifier" */ 2798&(nid_objs[82]),/* "subjectKeyIdentifier" */
2437&(nid_objs[498]),/* "subtreeMaximumQuality" */ 2799&(nid_objs[498]),/* "subtreeMaximumQuality" */
@@ -2441,12 +2803,26 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
2441&(nid_objs[293]),/* "textNotice" */ 2803&(nid_objs[293]),/* "textNotice" */
2442&(nid_objs[133]),/* "timeStamping" */ 2804&(nid_objs[133]),/* "timeStamping" */
2443&(nid_objs[106]),/* "title" */ 2805&(nid_objs[106]),/* "title" */
2806&(nid_objs[682]),/* "tpBasis" */
2444&(nid_objs[375]),/* "trustRoot" */ 2807&(nid_objs[375]),/* "trustRoot" */
2445&(nid_objs[436]),/* "ucl" */ 2808&(nid_objs[436]),/* "ucl" */
2446&(nid_objs[55]),/* "unstructuredAddress" */ 2809&(nid_objs[55]),/* "unstructuredAddress" */
2447&(nid_objs[49]),/* "unstructuredName" */ 2810&(nid_objs[49]),/* "unstructuredName" */
2448&(nid_objs[465]),/* "userClass" */ 2811&(nid_objs[465]),/* "userClass" */
2449&(nid_objs[373]),/* "valid" */ 2812&(nid_objs[373]),/* "valid" */
2813&(nid_objs[678]),/* "wap" */
2814&(nid_objs[679]),/* "wap-wsg" */
2815&(nid_objs[735]),/* "wap-wsg-idm-ecid-wtls1" */
2816&(nid_objs[743]),/* "wap-wsg-idm-ecid-wtls10" */
2817&(nid_objs[744]),/* "wap-wsg-idm-ecid-wtls11" */
2818&(nid_objs[745]),/* "wap-wsg-idm-ecid-wtls12" */
2819&(nid_objs[736]),/* "wap-wsg-idm-ecid-wtls3" */
2820&(nid_objs[737]),/* "wap-wsg-idm-ecid-wtls4" */
2821&(nid_objs[738]),/* "wap-wsg-idm-ecid-wtls5" */
2822&(nid_objs[739]),/* "wap-wsg-idm-ecid-wtls6" */
2823&(nid_objs[740]),/* "wap-wsg-idm-ecid-wtls7" */
2824&(nid_objs[741]),/* "wap-wsg-idm-ecid-wtls8" */
2825&(nid_objs[742]),/* "wap-wsg-idm-ecid-wtls9" */
2450&(nid_objs[503]),/* "x500UniqueIdentifier" */ 2826&(nid_objs[503]),/* "x500UniqueIdentifier" */
2451&(nid_objs[158]),/* "x509Certificate" */ 2827&(nid_objs[158]),/* "x509Certificate" */
2452&(nid_objs[160]),/* "x509Crl" */ 2828&(nid_objs[160]),/* "x509Crl" */
@@ -2461,7 +2837,9 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
2461&(nid_objs[365]),/* "Basic OCSP Response" */ 2837&(nid_objs[365]),/* "Basic OCSP Response" */
2462&(nid_objs[285]),/* "Biometric Info" */ 2838&(nid_objs[285]),/* "Biometric Info" */
2463&(nid_objs[179]),/* "CA Issuers" */ 2839&(nid_objs[179]),/* "CA Issuers" */
2840&(nid_objs[785]),/* "CA Repository" */
2464&(nid_objs[131]),/* "Code Signing" */ 2841&(nid_objs[131]),/* "Code Signing" */
2842&(nid_objs[783]),/* "Diffie-Hellman based MAC" */
2465&(nid_objs[382]),/* "Directory" */ 2843&(nid_objs[382]),/* "Directory" */
2466&(nid_objs[392]),/* "Domain" */ 2844&(nid_objs[392]),/* "Domain" */
2467&(nid_objs[132]),/* "E-mail Protection" */ 2845&(nid_objs[132]),/* "E-mail Protection" */
@@ -2481,6 +2859,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
2481&(nid_objs[183]),/* "ISO US Member Body" */ 2859&(nid_objs[183]),/* "ISO US Member Body" */
2482&(nid_objs[667]),/* "Independent" */ 2860&(nid_objs[667]),/* "Independent" */
2483&(nid_objs[665]),/* "Inherit all" */ 2861&(nid_objs[665]),/* "Inherit all" */
2862&(nid_objs[647]),/* "International Organizations" */
2484&(nid_objs[142]),/* "Invalidity Date" */ 2863&(nid_objs[142]),/* "Invalidity Date" */
2485&(nid_objs[504]),/* "MIME MHS" */ 2864&(nid_objs[504]),/* "MIME MHS" */
2486&(nid_objs[388]),/* "Mail" */ 2865&(nid_objs[388]),/* "Mail" */
@@ -2494,6 +2873,8 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
2494&(nid_objs[648]),/* "Microsoft Smartcardlogin" */ 2873&(nid_objs[648]),/* "Microsoft Smartcardlogin" */
2495&(nid_objs[136]),/* "Microsoft Trust List Signing" */ 2874&(nid_objs[136]),/* "Microsoft Trust List Signing" */
2496&(nid_objs[649]),/* "Microsoft Universal Principal Name" */ 2875&(nid_objs[649]),/* "Microsoft Universal Principal Name" */
2876&(nid_objs[393]),/* "NULL" */
2877&(nid_objs[404]),/* "NULL" */
2497&(nid_objs[72]),/* "Netscape Base Url" */ 2878&(nid_objs[72]),/* "Netscape Base Url" */
2498&(nid_objs[76]),/* "Netscape CA Policy Url" */ 2879&(nid_objs[76]),/* "Netscape CA Policy Url" */
2499&(nid_objs[74]),/* "Netscape CA Revocation Url" */ 2880&(nid_objs[74]),/* "Netscape CA Revocation Url" */
@@ -2538,21 +2919,27 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
2538&(nid_objs[375]),/* "Trust Root" */ 2919&(nid_objs[375]),/* "Trust Root" */
2539&(nid_objs[12]),/* "X509" */ 2920&(nid_objs[12]),/* "X509" */
2540&(nid_objs[402]),/* "X509v3 AC Targeting" */ 2921&(nid_objs[402]),/* "X509v3 AC Targeting" */
2922&(nid_objs[746]),/* "X509v3 Any Policy" */
2541&(nid_objs[90]),/* "X509v3 Authority Key Identifier" */ 2923&(nid_objs[90]),/* "X509v3 Authority Key Identifier" */
2542&(nid_objs[87]),/* "X509v3 Basic Constraints" */ 2924&(nid_objs[87]),/* "X509v3 Basic Constraints" */
2543&(nid_objs[103]),/* "X509v3 CRL Distribution Points" */ 2925&(nid_objs[103]),/* "X509v3 CRL Distribution Points" */
2544&(nid_objs[88]),/* "X509v3 CRL Number" */ 2926&(nid_objs[88]),/* "X509v3 CRL Number" */
2545&(nid_objs[141]),/* "X509v3 CRL Reason Code" */ 2927&(nid_objs[141]),/* "X509v3 CRL Reason Code" */
2928&(nid_objs[771]),/* "X509v3 Certificate Issuer" */
2546&(nid_objs[89]),/* "X509v3 Certificate Policies" */ 2929&(nid_objs[89]),/* "X509v3 Certificate Policies" */
2547&(nid_objs[140]),/* "X509v3 Delta CRL Indicator" */ 2930&(nid_objs[140]),/* "X509v3 Delta CRL Indicator" */
2548&(nid_objs[126]),/* "X509v3 Extended Key Usage" */ 2931&(nid_objs[126]),/* "X509v3 Extended Key Usage" */
2932&(nid_objs[748]),/* "X509v3 Inhibit Any Policy" */
2549&(nid_objs[86]),/* "X509v3 Issuer Alternative Name" */ 2933&(nid_objs[86]),/* "X509v3 Issuer Alternative Name" */
2934&(nid_objs[770]),/* "X509v3 Issuing Distrubution Point" */
2550&(nid_objs[83]),/* "X509v3 Key Usage" */ 2935&(nid_objs[83]),/* "X509v3 Key Usage" */
2551&(nid_objs[666]),/* "X509v3 Name Constraints" */ 2936&(nid_objs[666]),/* "X509v3 Name Constraints" */
2552&(nid_objs[403]),/* "X509v3 No Revocation Available" */ 2937&(nid_objs[403]),/* "X509v3 No Revocation Available" */
2553&(nid_objs[401]),/* "X509v3 Policy Constraints" */ 2938&(nid_objs[401]),/* "X509v3 Policy Constraints" */
2939&(nid_objs[747]),/* "X509v3 Policy Mappings" */
2554&(nid_objs[84]),/* "X509v3 Private Key Usage Period" */ 2940&(nid_objs[84]),/* "X509v3 Private Key Usage Period" */
2555&(nid_objs[85]),/* "X509v3 Subject Alternative Name" */ 2941&(nid_objs[85]),/* "X509v3 Subject Alternative Name" */
2942&(nid_objs[769]),/* "X509v3 Subject Directory Attributes" */
2556&(nid_objs[82]),/* "X509v3 Subject Key Identifier" */ 2943&(nid_objs[82]),/* "X509v3 Subject Key Identifier" */
2557&(nid_objs[184]),/* "X9.57" */ 2944&(nid_objs[184]),/* "X9.57" */
2558&(nid_objs[185]),/* "X9.57 CM ?" */ 2945&(nid_objs[185]),/* "X9.57 CM ?" */
@@ -2591,14 +2978,52 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
2591&(nid_objs[92]),/* "bf-ecb" */ 2978&(nid_objs[92]),/* "bf-ecb" */
2592&(nid_objs[94]),/* "bf-ofb" */ 2979&(nid_objs[94]),/* "bf-ofb" */
2593&(nid_objs[494]),/* "buildingName" */ 2980&(nid_objs[494]),/* "buildingName" */
2981&(nid_objs[691]),/* "c2onb191v4" */
2982&(nid_objs[692]),/* "c2onb191v5" */
2983&(nid_objs[697]),/* "c2onb239v4" */
2984&(nid_objs[698]),/* "c2onb239v5" */
2985&(nid_objs[684]),/* "c2pnb163v1" */
2986&(nid_objs[685]),/* "c2pnb163v2" */
2987&(nid_objs[686]),/* "c2pnb163v3" */
2988&(nid_objs[687]),/* "c2pnb176v1" */
2989&(nid_objs[693]),/* "c2pnb208w1" */
2990&(nid_objs[699]),/* "c2pnb272w1" */
2991&(nid_objs[700]),/* "c2pnb304w1" */
2992&(nid_objs[702]),/* "c2pnb368w1" */
2993&(nid_objs[688]),/* "c2tnb191v1" */
2994&(nid_objs[689]),/* "c2tnb191v2" */
2995&(nid_objs[690]),/* "c2tnb191v3" */
2996&(nid_objs[694]),/* "c2tnb239v1" */
2997&(nid_objs[695]),/* "c2tnb239v2" */
2998&(nid_objs[696]),/* "c2tnb239v3" */
2999&(nid_objs[701]),/* "c2tnb359v1" */
3000&(nid_objs[703]),/* "c2tnb431r1" */
2594&(nid_objs[483]),/* "cNAMERecord" */ 3001&(nid_objs[483]),/* "cNAMERecord" */
3002&(nid_objs[751]),/* "camellia-128-cbc" */
3003&(nid_objs[757]),/* "camellia-128-cfb" */
3004&(nid_objs[760]),/* "camellia-128-cfb1" */
3005&(nid_objs[763]),/* "camellia-128-cfb8" */
3006&(nid_objs[754]),/* "camellia-128-ecb" */
3007&(nid_objs[766]),/* "camellia-128-ofb" */
3008&(nid_objs[752]),/* "camellia-192-cbc" */
3009&(nid_objs[758]),/* "camellia-192-cfb" */
3010&(nid_objs[761]),/* "camellia-192-cfb1" */
3011&(nid_objs[764]),/* "camellia-192-cfb8" */
3012&(nid_objs[755]),/* "camellia-192-ecb" */
3013&(nid_objs[767]),/* "camellia-192-ofb" */
3014&(nid_objs[753]),/* "camellia-256-cbc" */
3015&(nid_objs[759]),/* "camellia-256-cfb" */
3016&(nid_objs[762]),/* "camellia-256-cfb1" */
3017&(nid_objs[765]),/* "camellia-256-cfb8" */
3018&(nid_objs[756]),/* "camellia-256-ecb" */
3019&(nid_objs[768]),/* "camellia-256-ofb" */
2595&(nid_objs[443]),/* "caseIgnoreIA5StringSyntax" */ 3020&(nid_objs[443]),/* "caseIgnoreIA5StringSyntax" */
2596&(nid_objs[108]),/* "cast5-cbc" */ 3021&(nid_objs[108]),/* "cast5-cbc" */
2597&(nid_objs[110]),/* "cast5-cfb" */ 3022&(nid_objs[110]),/* "cast5-cfb" */
2598&(nid_objs[109]),/* "cast5-ecb" */ 3023&(nid_objs[109]),/* "cast5-ecb" */
2599&(nid_objs[111]),/* "cast5-ofb" */ 3024&(nid_objs[111]),/* "cast5-ofb" */
2600&(nid_objs[404]),/* "ccitt" */
2601&(nid_objs[152]),/* "certBag" */ 3025&(nid_objs[152]),/* "certBag" */
3026&(nid_objs[677]),/* "certicom-arc" */
2602&(nid_objs[517]),/* "certificate extensions" */ 3027&(nid_objs[517]),/* "certificate extensions" */
2603&(nid_objs[54]),/* "challengePassword" */ 3028&(nid_objs[54]),/* "challengePassword" */
2604&(nid_objs[407]),/* "characteristic-two-field" */ 3029&(nid_objs[407]),/* "characteristic-two-field" */
@@ -2667,6 +3092,8 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
2667&(nid_objs[509]),/* "generationQualifier" */ 3092&(nid_objs[509]),/* "generationQualifier" */
2668&(nid_objs[601]),/* "generic cryptogram" */ 3093&(nid_objs[601]),/* "generic cryptogram" */
2669&(nid_objs[99]),/* "givenName" */ 3094&(nid_objs[99]),/* "givenName" */
3095&(nid_objs[780]),/* "hmac-md5" */
3096&(nid_objs[781]),/* "hmac-sha1" */
2670&(nid_objs[163]),/* "hmacWithSHA1" */ 3097&(nid_objs[163]),/* "hmacWithSHA1" */
2671&(nid_objs[486]),/* "homePostalAddress" */ 3098&(nid_objs[486]),/* "homePostalAddress" */
2672&(nid_objs[473]),/* "homeTelephoneNumber" */ 3099&(nid_objs[473]),/* "homeTelephoneNumber" */
@@ -2681,6 +3108,9 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
2681&(nid_objs[357]),/* "id-aca-group" */ 3108&(nid_objs[357]),/* "id-aca-group" */
2682&(nid_objs[358]),/* "id-aca-role" */ 3109&(nid_objs[358]),/* "id-aca-role" */
2683&(nid_objs[176]),/* "id-ad" */ 3110&(nid_objs[176]),/* "id-ad" */
3111&(nid_objs[788]),/* "id-aes128-wrap" */
3112&(nid_objs[789]),/* "id-aes192-wrap" */
3113&(nid_objs[790]),/* "id-aes256-wrap" */
2684&(nid_objs[262]),/* "id-alg" */ 3114&(nid_objs[262]),/* "id-alg" */
2685&(nid_objs[323]),/* "id-alg-des40" */ 3115&(nid_objs[323]),/* "id-alg-des40" */
2686&(nid_objs[326]),/* "id-alg-dh-pop" */ 3116&(nid_objs[326]),/* "id-alg-dh-pop" */
@@ -2691,6 +3121,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
2691&(nid_objs[362]),/* "id-cct-PKIResponse" */ 3121&(nid_objs[362]),/* "id-cct-PKIResponse" */
2692&(nid_objs[360]),/* "id-cct-crs" */ 3122&(nid_objs[360]),/* "id-cct-crs" */
2693&(nid_objs[81]),/* "id-ce" */ 3123&(nid_objs[81]),/* "id-ce" */
3124&(nid_objs[680]),/* "id-characteristic-two-basis" */
2694&(nid_objs[263]),/* "id-cmc" */ 3125&(nid_objs[263]),/* "id-cmc" */
2695&(nid_objs[334]),/* "id-cmc-addExtensions" */ 3126&(nid_objs[334]),/* "id-cmc-addExtensions" */
2696&(nid_objs[346]),/* "id-cmc-confirmCertAcceptance" */ 3127&(nid_objs[346]),/* "id-cmc-confirmCertAcceptance" */
@@ -2712,6 +3143,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
2712&(nid_objs[332]),/* "id-cmc-senderNonce" */ 3143&(nid_objs[332]),/* "id-cmc-senderNonce" */
2713&(nid_objs[327]),/* "id-cmc-statusInfo" */ 3144&(nid_objs[327]),/* "id-cmc-statusInfo" */
2714&(nid_objs[331]),/* "id-cmc-transactionId" */ 3145&(nid_objs[331]),/* "id-cmc-transactionId" */
3146&(nid_objs[787]),/* "id-ct-asciiTextWithCRLF" */
2715&(nid_objs[408]),/* "id-ecPublicKey" */ 3147&(nid_objs[408]),/* "id-ecPublicKey" */
2716&(nid_objs[508]),/* "id-hex-multipart-message" */ 3148&(nid_objs[508]),/* "id-hex-multipart-message" */
2717&(nid_objs[507]),/* "id-hex-partial-message" */ 3149&(nid_objs[507]),/* "id-hex-partial-message" */
@@ -2730,6 +3162,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
2730&(nid_objs[299]),/* "id-it-signKeyPairTypes" */ 3162&(nid_objs[299]),/* "id-it-signKeyPairTypes" */
2731&(nid_objs[305]),/* "id-it-subscriptionRequest" */ 3163&(nid_objs[305]),/* "id-it-subscriptionRequest" */
2732&(nid_objs[306]),/* "id-it-subscriptionResponse" */ 3164&(nid_objs[306]),/* "id-it-subscriptionResponse" */
3165&(nid_objs[784]),/* "id-it-suppLangTags" */
2733&(nid_objs[304]),/* "id-it-unsupportedOIDs" */ 3166&(nid_objs[304]),/* "id-it-unsupportedOIDs" */
2734&(nid_objs[128]),/* "id-kp" */ 3167&(nid_objs[128]),/* "id-kp" */
2735&(nid_objs[280]),/* "id-mod-attribute-cert" */ 3168&(nid_objs[280]),/* "id-mod-attribute-cert" */
@@ -2819,6 +3252,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
2819&(nid_objs[208]),/* "id-smime-ct-TDTInfo" */ 3252&(nid_objs[208]),/* "id-smime-ct-TDTInfo" */
2820&(nid_objs[207]),/* "id-smime-ct-TSTInfo" */ 3253&(nid_objs[207]),/* "id-smime-ct-TSTInfo" */
2821&(nid_objs[205]),/* "id-smime-ct-authData" */ 3254&(nid_objs[205]),/* "id-smime-ct-authData" */
3255&(nid_objs[786]),/* "id-smime-ct-compressedData" */
2822&(nid_objs[209]),/* "id-smime-ct-contentInfo" */ 3256&(nid_objs[209]),/* "id-smime-ct-contentInfo" */
2823&(nid_objs[206]),/* "id-smime-ct-publishCert" */ 3257&(nid_objs[206]),/* "id-smime-ct-publishCert" */
2824&(nid_objs[204]),/* "id-smime-ct-receipt" */ 3258&(nid_objs[204]),/* "id-smime-ct-receipt" */
@@ -2845,13 +3279,18 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
2845&(nid_objs[35]),/* "idea-cfb" */ 3279&(nid_objs[35]),/* "idea-cfb" */
2846&(nid_objs[36]),/* "idea-ecb" */ 3280&(nid_objs[36]),/* "idea-ecb" */
2847&(nid_objs[46]),/* "idea-ofb" */ 3281&(nid_objs[46]),/* "idea-ofb" */
3282&(nid_objs[676]),/* "identified-organization" */
2848&(nid_objs[461]),/* "info" */ 3283&(nid_objs[461]),/* "info" */
2849&(nid_objs[101]),/* "initials" */ 3284&(nid_objs[101]),/* "initials" */
3285&(nid_objs[749]),/* "ipsec3" */
3286&(nid_objs[750]),/* "ipsec4" */
2850&(nid_objs[181]),/* "iso" */ 3287&(nid_objs[181]),/* "iso" */
2851&(nid_objs[623]),/* "issuer capabilities" */ 3288&(nid_objs[623]),/* "issuer capabilities" */
3289&(nid_objs[645]),/* "itu-t" */
2852&(nid_objs[492]),/* "janetMailbox" */ 3290&(nid_objs[492]),/* "janetMailbox" */
2853&(nid_objs[393]),/* "joint-iso-ccitt" */ 3291&(nid_objs[646]),/* "joint-iso-itu-t" */
2854&(nid_objs[150]),/* "keyBag" */ 3292&(nid_objs[150]),/* "keyBag" */
3293&(nid_objs[773]),/* "kisa" */
2855&(nid_objs[477]),/* "lastModifiedBy" */ 3294&(nid_objs[477]),/* "lastModifiedBy" */
2856&(nid_objs[476]),/* "lastModifiedTime" */ 3295&(nid_objs[476]),/* "lastModifiedTime" */
2857&(nid_objs[157]),/* "localKeyID" */ 3296&(nid_objs[157]),/* "localKeyID" */
@@ -2877,12 +3316,14 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
2877&(nid_objs[488]),/* "mobileTelephoneNumber" */ 3316&(nid_objs[488]),/* "mobileTelephoneNumber" */
2878&(nid_objs[481]),/* "nSRecord" */ 3317&(nid_objs[481]),/* "nSRecord" */
2879&(nid_objs[173]),/* "name" */ 3318&(nid_objs[173]),/* "name" */
3319&(nid_objs[681]),/* "onBasis" */
2880&(nid_objs[379]),/* "org" */ 3320&(nid_objs[379]),/* "org" */
2881&(nid_objs[17]),/* "organizationName" */ 3321&(nid_objs[17]),/* "organizationName" */
2882&(nid_objs[491]),/* "organizationalStatus" */ 3322&(nid_objs[491]),/* "organizationalStatus" */
2883&(nid_objs[18]),/* "organizationalUnitName" */ 3323&(nid_objs[18]),/* "organizationalUnitName" */
2884&(nid_objs[475]),/* "otherMailbox" */ 3324&(nid_objs[475]),/* "otherMailbox" */
2885&(nid_objs[489]),/* "pagerTelephoneNumber" */ 3325&(nid_objs[489]),/* "pagerTelephoneNumber" */
3326&(nid_objs[782]),/* "password based MAC" */
2886&(nid_objs[374]),/* "path" */ 3327&(nid_objs[374]),/* "path" */
2887&(nid_objs[621]),/* "payment gateway capabilities" */ 3328&(nid_objs[621]),/* "payment gateway capabilities" */
2888&(nid_objs[ 9]),/* "pbeWithMD2AndDES-CBC" */ 3329&(nid_objs[ 9]),/* "pbeWithMD2AndDES-CBC" */
@@ -2924,6 +3365,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
2924&(nid_objs[151]),/* "pkcs8ShroudedKeyBag" */ 3365&(nid_objs[151]),/* "pkcs8ShroudedKeyBag" */
2925&(nid_objs[47]),/* "pkcs9" */ 3366&(nid_objs[47]),/* "pkcs9" */
2926&(nid_objs[661]),/* "postalCode" */ 3367&(nid_objs[661]),/* "postalCode" */
3368&(nid_objs[683]),/* "ppBasis" */
2927&(nid_objs[406]),/* "prime-field" */ 3369&(nid_objs[406]),/* "prime-field" */
2928&(nid_objs[409]),/* "prime192v1" */ 3370&(nid_objs[409]),/* "prime192v1" */
2929&(nid_objs[410]),/* "prime192v2" */ 3371&(nid_objs[410]),/* "prime192v2" */
@@ -2966,9 +3408,44 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
2966&(nid_objs[290]),/* "sbgp-ipAddrBlock" */ 3408&(nid_objs[290]),/* "sbgp-ipAddrBlock" */
2967&(nid_objs[292]),/* "sbgp-routerIdentifier" */ 3409&(nid_objs[292]),/* "sbgp-routerIdentifier" */
2968&(nid_objs[159]),/* "sdsiCertificate" */ 3410&(nid_objs[159]),/* "sdsiCertificate" */
3411&(nid_objs[704]),/* "secp112r1" */
3412&(nid_objs[705]),/* "secp112r2" */
3413&(nid_objs[706]),/* "secp128r1" */
3414&(nid_objs[707]),/* "secp128r2" */
3415&(nid_objs[708]),/* "secp160k1" */
3416&(nid_objs[709]),/* "secp160r1" */
3417&(nid_objs[710]),/* "secp160r2" */
3418&(nid_objs[711]),/* "secp192k1" */
3419&(nid_objs[712]),/* "secp224k1" */
3420&(nid_objs[713]),/* "secp224r1" */
3421&(nid_objs[714]),/* "secp256k1" */
3422&(nid_objs[715]),/* "secp384r1" */
3423&(nid_objs[716]),/* "secp521r1" */
2969&(nid_objs[154]),/* "secretBag" */ 3424&(nid_objs[154]),/* "secretBag" */
2970&(nid_objs[474]),/* "secretary" */ 3425&(nid_objs[474]),/* "secretary" */
3426&(nid_objs[717]),/* "sect113r1" */
3427&(nid_objs[718]),/* "sect113r2" */
3428&(nid_objs[719]),/* "sect131r1" */
3429&(nid_objs[720]),/* "sect131r2" */
3430&(nid_objs[721]),/* "sect163k1" */
3431&(nid_objs[722]),/* "sect163r1" */
3432&(nid_objs[723]),/* "sect163r2" */
3433&(nid_objs[724]),/* "sect193r1" */
3434&(nid_objs[725]),/* "sect193r2" */
3435&(nid_objs[726]),/* "sect233k1" */
3436&(nid_objs[727]),/* "sect233r1" */
3437&(nid_objs[728]),/* "sect239k1" */
3438&(nid_objs[729]),/* "sect283k1" */
3439&(nid_objs[730]),/* "sect283r1" */
3440&(nid_objs[731]),/* "sect409k1" */
3441&(nid_objs[732]),/* "sect409r1" */
3442&(nid_objs[733]),/* "sect571k1" */
3443&(nid_objs[734]),/* "sect571r1" */
2971&(nid_objs[635]),/* "secure device signature" */ 3444&(nid_objs[635]),/* "secure device signature" */
3445&(nid_objs[777]),/* "seed-cbc" */
3446&(nid_objs[779]),/* "seed-cfb" */
3447&(nid_objs[776]),/* "seed-ecb" */
3448&(nid_objs[778]),/* "seed-ofb" */
2972&(nid_objs[105]),/* "serialNumber" */ 3449&(nid_objs[105]),/* "serialNumber" */
2973&(nid_objs[625]),/* "set-addPolicy" */ 3450&(nid_objs[625]),/* "set-addPolicy" */
2974&(nid_objs[515]),/* "set-attr" */ 3451&(nid_objs[515]),/* "set-attr" */
@@ -3111,6 +3588,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
3111&(nid_objs[459]),/* "textEncodedORAddress" */ 3588&(nid_objs[459]),/* "textEncodedORAddress" */
3112&(nid_objs[293]),/* "textNotice" */ 3589&(nid_objs[293]),/* "textNotice" */
3113&(nid_objs[106]),/* "title" */ 3590&(nid_objs[106]),/* "title" */
3591&(nid_objs[682]),/* "tpBasis" */
3114&(nid_objs[436]),/* "ucl" */ 3592&(nid_objs[436]),/* "ucl" */
3115&(nid_objs[ 0]),/* "undefined" */ 3593&(nid_objs[ 0]),/* "undefined" */
3116&(nid_objs[55]),/* "unstructuredAddress" */ 3594&(nid_objs[55]),/* "unstructuredAddress" */
@@ -3118,6 +3596,19 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
3118&(nid_objs[465]),/* "userClass" */ 3596&(nid_objs[465]),/* "userClass" */
3119&(nid_objs[458]),/* "userId" */ 3597&(nid_objs[458]),/* "userId" */
3120&(nid_objs[373]),/* "valid" */ 3598&(nid_objs[373]),/* "valid" */
3599&(nid_objs[678]),/* "wap" */
3600&(nid_objs[679]),/* "wap-wsg" */
3601&(nid_objs[735]),/* "wap-wsg-idm-ecid-wtls1" */
3602&(nid_objs[743]),/* "wap-wsg-idm-ecid-wtls10" */
3603&(nid_objs[744]),/* "wap-wsg-idm-ecid-wtls11" */
3604&(nid_objs[745]),/* "wap-wsg-idm-ecid-wtls12" */
3605&(nid_objs[736]),/* "wap-wsg-idm-ecid-wtls3" */
3606&(nid_objs[737]),/* "wap-wsg-idm-ecid-wtls4" */
3607&(nid_objs[738]),/* "wap-wsg-idm-ecid-wtls5" */
3608&(nid_objs[739]),/* "wap-wsg-idm-ecid-wtls6" */
3609&(nid_objs[740]),/* "wap-wsg-idm-ecid-wtls7" */
3610&(nid_objs[741]),/* "wap-wsg-idm-ecid-wtls8" */
3611&(nid_objs[742]),/* "wap-wsg-idm-ecid-wtls9" */
3121&(nid_objs[503]),/* "x500UniqueIdentifier" */ 3612&(nid_objs[503]),/* "x500UniqueIdentifier" */
3122&(nid_objs[158]),/* "x509Certificate" */ 3613&(nid_objs[158]),/* "x509Certificate" */
3123&(nid_objs[160]),/* "x509Crl" */ 3614&(nid_objs[160]),/* "x509Crl" */
@@ -3126,21 +3617,27 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
3126 3617
3127static ASN1_OBJECT *obj_objs[NUM_OBJ]={ 3618static ASN1_OBJECT *obj_objs[NUM_OBJ]={
3128&(nid_objs[ 0]),/* OBJ_undef 0 */ 3619&(nid_objs[ 0]),/* OBJ_undef 0 */
3129&(nid_objs[404]),/* OBJ_ccitt 0 */ 3620&(nid_objs[393]),/* OBJ_joint_iso_ccitt OBJ_joint_iso_itu_t */
3621&(nid_objs[404]),/* OBJ_ccitt OBJ_itu_t */
3622&(nid_objs[645]),/* OBJ_itu_t 0 */
3130&(nid_objs[434]),/* OBJ_data 0 9 */ 3623&(nid_objs[434]),/* OBJ_data 0 9 */
3131&(nid_objs[181]),/* OBJ_iso 1 */ 3624&(nid_objs[181]),/* OBJ_iso 1 */
3132&(nid_objs[182]),/* OBJ_member_body 1 2 */ 3625&(nid_objs[182]),/* OBJ_member_body 1 2 */
3133&(nid_objs[379]),/* OBJ_org 1 3 */ 3626&(nid_objs[379]),/* OBJ_org 1 3 */
3134&(nid_objs[393]),/* OBJ_joint_iso_ccitt 2 */ 3627&(nid_objs[676]),/* OBJ_identified_organization 1 3 */
3628&(nid_objs[646]),/* OBJ_joint_iso_itu_t 2 */
3135&(nid_objs[11]),/* OBJ_X500 2 5 */ 3629&(nid_objs[11]),/* OBJ_X500 2 5 */
3630&(nid_objs[647]),/* OBJ_international_organizations 2 23 */
3136&(nid_objs[380]),/* OBJ_dod 1 3 6 */ 3631&(nid_objs[380]),/* OBJ_dod 1 3 6 */
3137&(nid_objs[12]),/* OBJ_X509 2 5 4 */ 3632&(nid_objs[12]),/* OBJ_X509 2 5 4 */
3138&(nid_objs[378]),/* OBJ_X500algorithms 2 5 8 */ 3633&(nid_objs[378]),/* OBJ_X500algorithms 2 5 8 */
3139&(nid_objs[81]),/* OBJ_id_ce 2 5 29 */ 3634&(nid_objs[81]),/* OBJ_id_ce 2 5 29 */
3140&(nid_objs[512]),/* OBJ_id_set 2 23 42 */ 3635&(nid_objs[512]),/* OBJ_id_set 2 23 42 */
3636&(nid_objs[678]),/* OBJ_wap 2 23 43 */
3141&(nid_objs[435]),/* OBJ_pss 0 9 2342 */ 3637&(nid_objs[435]),/* OBJ_pss 0 9 2342 */
3142&(nid_objs[183]),/* OBJ_ISO_US 1 2 840 */ 3638&(nid_objs[183]),/* OBJ_ISO_US 1 2 840 */
3143&(nid_objs[381]),/* OBJ_iana 1 3 6 1 */ 3639&(nid_objs[381]),/* OBJ_iana 1 3 6 1 */
3640&(nid_objs[677]),/* OBJ_certicom_arc 1 3 132 */
3144&(nid_objs[394]),/* OBJ_selected_attribute_types 2 5 1 5 */ 3641&(nid_objs[394]),/* OBJ_selected_attribute_types 2 5 1 5 */
3145&(nid_objs[13]),/* OBJ_commonName 2 5 4 3 */ 3642&(nid_objs[13]),/* OBJ_commonName 2 5 4 3 */
3146&(nid_objs[100]),/* OBJ_surname 2 5 4 4 */ 3643&(nid_objs[100]),/* OBJ_surname 2 5 4 4 */
@@ -3162,6 +3659,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
3162&(nid_objs[174]),/* OBJ_dnQualifier 2 5 4 46 */ 3659&(nid_objs[174]),/* OBJ_dnQualifier 2 5 4 46 */
3163&(nid_objs[510]),/* OBJ_pseudonym 2 5 4 65 */ 3660&(nid_objs[510]),/* OBJ_pseudonym 2 5 4 65 */
3164&(nid_objs[400]),/* OBJ_role 2 5 4 72 */ 3661&(nid_objs[400]),/* OBJ_role 2 5 4 72 */
3662&(nid_objs[769]),/* OBJ_subject_directory_attributes 2 5 29 9 */
3165&(nid_objs[82]),/* OBJ_subject_key_identifier 2 5 29 14 */ 3663&(nid_objs[82]),/* OBJ_subject_key_identifier 2 5 29 14 */
3166&(nid_objs[83]),/* OBJ_key_usage 2 5 29 15 */ 3664&(nid_objs[83]),/* OBJ_key_usage 2 5 29 15 */
3167&(nid_objs[84]),/* OBJ_private_key_usage_period 2 5 29 16 */ 3665&(nid_objs[84]),/* OBJ_private_key_usage_period 2 5 29 16 */
@@ -3173,12 +3671,16 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
3173&(nid_objs[430]),/* OBJ_hold_instruction_code 2 5 29 23 */ 3671&(nid_objs[430]),/* OBJ_hold_instruction_code 2 5 29 23 */
3174&(nid_objs[142]),/* OBJ_invalidity_date 2 5 29 24 */ 3672&(nid_objs[142]),/* OBJ_invalidity_date 2 5 29 24 */
3175&(nid_objs[140]),/* OBJ_delta_crl 2 5 29 27 */ 3673&(nid_objs[140]),/* OBJ_delta_crl 2 5 29 27 */
3674&(nid_objs[770]),/* OBJ_issuing_distribution_point 2 5 29 28 */
3675&(nid_objs[771]),/* OBJ_certificate_issuer 2 5 29 29 */
3176&(nid_objs[666]),/* OBJ_name_constraints 2 5 29 30 */ 3676&(nid_objs[666]),/* OBJ_name_constraints 2 5 29 30 */
3177&(nid_objs[103]),/* OBJ_crl_distribution_points 2 5 29 31 */ 3677&(nid_objs[103]),/* OBJ_crl_distribution_points 2 5 29 31 */
3178&(nid_objs[89]),/* OBJ_certificate_policies 2 5 29 32 */ 3678&(nid_objs[89]),/* OBJ_certificate_policies 2 5 29 32 */
3679&(nid_objs[747]),/* OBJ_policy_mappings 2 5 29 33 */
3179&(nid_objs[90]),/* OBJ_authority_key_identifier 2 5 29 35 */ 3680&(nid_objs[90]),/* OBJ_authority_key_identifier 2 5 29 35 */
3180&(nid_objs[401]),/* OBJ_policy_constraints 2 5 29 36 */ 3681&(nid_objs[401]),/* OBJ_policy_constraints 2 5 29 36 */
3181&(nid_objs[126]),/* OBJ_ext_key_usage 2 5 29 37 */ 3682&(nid_objs[126]),/* OBJ_ext_key_usage 2 5 29 37 */
3683&(nid_objs[748]),/* OBJ_inhibit_any_policy 2 5 29 54 */
3182&(nid_objs[402]),/* OBJ_target_information 2 5 29 55 */ 3684&(nid_objs[402]),/* OBJ_target_information 2 5 29 55 */
3183&(nid_objs[403]),/* OBJ_no_rev_avail 2 5 29 56 */ 3685&(nid_objs[403]),/* OBJ_no_rev_avail 2 5 29 56 */
3184&(nid_objs[513]),/* OBJ_set_ctype 2 23 42 0 */ 3686&(nid_objs[513]),/* OBJ_set_ctype 2 23 42 0 */
@@ -3187,6 +3689,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
3187&(nid_objs[516]),/* OBJ_set_policy 2 23 42 5 */ 3689&(nid_objs[516]),/* OBJ_set_policy 2 23 42 5 */
3188&(nid_objs[517]),/* OBJ_set_certExt 2 23 42 7 */ 3690&(nid_objs[517]),/* OBJ_set_certExt 2 23 42 7 */
3189&(nid_objs[518]),/* OBJ_set_brand 2 23 42 8 */ 3691&(nid_objs[518]),/* OBJ_set_brand 2 23 42 8 */
3692&(nid_objs[679]),/* OBJ_wap_wsg 2 23 43 13 */
3190&(nid_objs[382]),/* OBJ_Directory 1 3 6 1 1 */ 3693&(nid_objs[382]),/* OBJ_Directory 1 3 6 1 1 */
3191&(nid_objs[383]),/* OBJ_Management 1 3 6 1 2 */ 3694&(nid_objs[383]),/* OBJ_Management 1 3 6 1 2 */
3192&(nid_objs[384]),/* OBJ_Experimental 1 3 6 1 3 */ 3695&(nid_objs[384]),/* OBJ_Experimental 1 3 6 1 3 */
@@ -3199,6 +3702,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
3199&(nid_objs[19]),/* OBJ_rsa 2 5 8 1 1 */ 3702&(nid_objs[19]),/* OBJ_rsa 2 5 8 1 1 */
3200&(nid_objs[96]),/* OBJ_mdc2WithRSA 2 5 8 3 100 */ 3703&(nid_objs[96]),/* OBJ_mdc2WithRSA 2 5 8 3 100 */
3201&(nid_objs[95]),/* OBJ_mdc2 2 5 8 3 101 */ 3704&(nid_objs[95]),/* OBJ_mdc2 2 5 8 3 101 */
3705&(nid_objs[746]),/* OBJ_any_policy 2 5 29 32 0 */
3202&(nid_objs[519]),/* OBJ_setct_PANData 2 23 42 0 0 */ 3706&(nid_objs[519]),/* OBJ_setct_PANData 2 23 42 0 0 */
3203&(nid_objs[520]),/* OBJ_setct_PANToken 2 23 42 0 1 */ 3707&(nid_objs[520]),/* OBJ_setct_PANToken 2 23 42 0 1 */
3204&(nid_objs[521]),/* OBJ_setct_PANOnly 2 23 42 0 2 */ 3708&(nid_objs[521]),/* OBJ_setct_PANOnly 2 23 42 0 2 */
@@ -3330,6 +3834,37 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
3330&(nid_objs[115]),/* OBJ_sha1WithRSA 1 3 14 3 2 29 */ 3834&(nid_objs[115]),/* OBJ_sha1WithRSA 1 3 14 3 2 29 */
3331&(nid_objs[117]),/* OBJ_ripemd160 1 3 36 3 2 1 */ 3835&(nid_objs[117]),/* OBJ_ripemd160 1 3 36 3 2 1 */
3332&(nid_objs[143]),/* OBJ_sxnet 1 3 101 1 4 1 */ 3836&(nid_objs[143]),/* OBJ_sxnet 1 3 101 1 4 1 */
3837&(nid_objs[721]),/* OBJ_sect163k1 1 3 132 0 1 */
3838&(nid_objs[722]),/* OBJ_sect163r1 1 3 132 0 2 */
3839&(nid_objs[728]),/* OBJ_sect239k1 1 3 132 0 3 */
3840&(nid_objs[717]),/* OBJ_sect113r1 1 3 132 0 4 */
3841&(nid_objs[718]),/* OBJ_sect113r2 1 3 132 0 5 */
3842&(nid_objs[704]),/* OBJ_secp112r1 1 3 132 0 6 */
3843&(nid_objs[705]),/* OBJ_secp112r2 1 3 132 0 7 */
3844&(nid_objs[709]),/* OBJ_secp160r1 1 3 132 0 8 */
3845&(nid_objs[708]),/* OBJ_secp160k1 1 3 132 0 9 */
3846&(nid_objs[714]),/* OBJ_secp256k1 1 3 132 0 10 */
3847&(nid_objs[723]),/* OBJ_sect163r2 1 3 132 0 15 */
3848&(nid_objs[729]),/* OBJ_sect283k1 1 3 132 0 16 */
3849&(nid_objs[730]),/* OBJ_sect283r1 1 3 132 0 17 */
3850&(nid_objs[719]),/* OBJ_sect131r1 1 3 132 0 22 */
3851&(nid_objs[720]),/* OBJ_sect131r2 1 3 132 0 23 */
3852&(nid_objs[724]),/* OBJ_sect193r1 1 3 132 0 24 */
3853&(nid_objs[725]),/* OBJ_sect193r2 1 3 132 0 25 */
3854&(nid_objs[726]),/* OBJ_sect233k1 1 3 132 0 26 */
3855&(nid_objs[727]),/* OBJ_sect233r1 1 3 132 0 27 */
3856&(nid_objs[706]),/* OBJ_secp128r1 1 3 132 0 28 */
3857&(nid_objs[707]),/* OBJ_secp128r2 1 3 132 0 29 */
3858&(nid_objs[710]),/* OBJ_secp160r2 1 3 132 0 30 */
3859&(nid_objs[711]),/* OBJ_secp192k1 1 3 132 0 31 */
3860&(nid_objs[712]),/* OBJ_secp224k1 1 3 132 0 32 */
3861&(nid_objs[713]),/* OBJ_secp224r1 1 3 132 0 33 */
3862&(nid_objs[715]),/* OBJ_secp384r1 1 3 132 0 34 */
3863&(nid_objs[716]),/* OBJ_secp521r1 1 3 132 0 35 */
3864&(nid_objs[731]),/* OBJ_sect409k1 1 3 132 0 36 */
3865&(nid_objs[732]),/* OBJ_sect409r1 1 3 132 0 37 */
3866&(nid_objs[733]),/* OBJ_sect571k1 1 3 132 0 38 */
3867&(nid_objs[734]),/* OBJ_sect571r1 1 3 132 0 39 */
3333&(nid_objs[624]),/* OBJ_set_rootKeyThumb 2 23 42 3 0 0 */ 3868&(nid_objs[624]),/* OBJ_set_rootKeyThumb 2 23 42 3 0 0 */
3334&(nid_objs[625]),/* OBJ_set_addPolicy 2 23 42 3 0 1 */ 3869&(nid_objs[625]),/* OBJ_set_addPolicy 2 23 42 3 0 1 */
3335&(nid_objs[626]),/* OBJ_setAttr_Token_EMV 2 23 42 3 2 1 */ 3870&(nid_objs[626]),/* OBJ_setAttr_Token_EMV 2 23 42 3 2 1 */
@@ -3338,8 +3873,19 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
3338&(nid_objs[629]),/* OBJ_setAttr_IssCap_T2 2 23 42 3 3 4 */ 3873&(nid_objs[629]),/* OBJ_setAttr_IssCap_T2 2 23 42 3 3 4 */
3339&(nid_objs[630]),/* OBJ_setAttr_IssCap_Sig 2 23 42 3 3 5 */ 3874&(nid_objs[630]),/* OBJ_setAttr_IssCap_Sig 2 23 42 3 3 5 */
3340&(nid_objs[642]),/* OBJ_set_brand_Novus 2 23 42 8 6011 */ 3875&(nid_objs[642]),/* OBJ_set_brand_Novus 2 23 42 8 6011 */
3876&(nid_objs[735]),/* OBJ_wap_wsg_idm_ecid_wtls1 2 23 43 13 4 1 */
3877&(nid_objs[736]),/* OBJ_wap_wsg_idm_ecid_wtls3 2 23 43 13 4 3 */
3878&(nid_objs[737]),/* OBJ_wap_wsg_idm_ecid_wtls4 2 23 43 13 4 4 */
3879&(nid_objs[738]),/* OBJ_wap_wsg_idm_ecid_wtls5 2 23 43 13 4 5 */
3880&(nid_objs[739]),/* OBJ_wap_wsg_idm_ecid_wtls6 2 23 43 13 4 6 */
3881&(nid_objs[740]),/* OBJ_wap_wsg_idm_ecid_wtls7 2 23 43 13 4 7 */
3882&(nid_objs[741]),/* OBJ_wap_wsg_idm_ecid_wtls8 2 23 43 13 4 8 */
3883&(nid_objs[742]),/* OBJ_wap_wsg_idm_ecid_wtls9 2 23 43 13 4 9 */
3884&(nid_objs[743]),/* OBJ_wap_wsg_idm_ecid_wtls10 2 23 43 13 4 10 */
3885&(nid_objs[744]),/* OBJ_wap_wsg_idm_ecid_wtls11 2 23 43 13 4 11 */
3886&(nid_objs[745]),/* OBJ_wap_wsg_idm_ecid_wtls12 2 23 43 13 4 12 */
3341&(nid_objs[124]),/* OBJ_rle_compression 1 1 1 1 666 1 */ 3887&(nid_objs[124]),/* OBJ_rle_compression 1 1 1 1 666 1 */
3342&(nid_objs[125]),/* OBJ_zlib_compression 1 1 1 1 666 2 */ 3888&(nid_objs[773]),/* OBJ_kisa 1 2 410 200004 */
3343&(nid_objs[ 1]),/* OBJ_rsadsi 1 2 840 113549 */ 3889&(nid_objs[ 1]),/* OBJ_rsadsi 1 2 840 113549 */
3344&(nid_objs[185]),/* OBJ_X9cm 1 2 840 10040 4 */ 3890&(nid_objs[185]),/* OBJ_X9cm 1 2 840 10040 4 */
3345&(nid_objs[127]),/* OBJ_id_pkix 1 3 6 1 5 5 7 */ 3891&(nid_objs[127]),/* OBJ_id_pkix 1 3 6 1 5 5 7 */
@@ -3380,7 +3926,20 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
3380&(nid_objs[507]),/* OBJ_id_hex_partial_message 1 3 6 1 7 1 1 1 */ 3926&(nid_objs[507]),/* OBJ_id_hex_partial_message 1 3 6 1 7 1 1 1 */
3381&(nid_objs[508]),/* OBJ_id_hex_multipart_message 1 3 6 1 7 1 1 2 */ 3927&(nid_objs[508]),/* OBJ_id_hex_multipart_message 1 3 6 1 7 1 1 2 */
3382&(nid_objs[57]),/* OBJ_netscape 2 16 840 1 113730 */ 3928&(nid_objs[57]),/* OBJ_netscape 2 16 840 1 113730 */
3929&(nid_objs[754]),/* OBJ_camellia_128_ecb 0 3 4401 5 3 1 9 1 */
3930&(nid_objs[766]),/* OBJ_camellia_128_ofb128 0 3 4401 5 3 1 9 3 */
3931&(nid_objs[757]),/* OBJ_camellia_128_cfb128 0 3 4401 5 3 1 9 4 */
3932&(nid_objs[755]),/* OBJ_camellia_192_ecb 0 3 4401 5 3 1 9 21 */
3933&(nid_objs[767]),/* OBJ_camellia_192_ofb128 0 3 4401 5 3 1 9 23 */
3934&(nid_objs[758]),/* OBJ_camellia_192_cfb128 0 3 4401 5 3 1 9 24 */
3935&(nid_objs[756]),/* OBJ_camellia_256_ecb 0 3 4401 5 3 1 9 41 */
3936&(nid_objs[768]),/* OBJ_camellia_256_ofb128 0 3 4401 5 3 1 9 43 */
3937&(nid_objs[759]),/* OBJ_camellia_256_cfb128 0 3 4401 5 3 1 9 44 */
3383&(nid_objs[437]),/* OBJ_pilot 0 9 2342 19200300 100 */ 3938&(nid_objs[437]),/* OBJ_pilot 0 9 2342 19200300 100 */
3939&(nid_objs[776]),/* OBJ_seed_ecb 1 2 410 200004 1 3 */
3940&(nid_objs[777]),/* OBJ_seed_cbc 1 2 410 200004 1 4 */
3941&(nid_objs[779]),/* OBJ_seed_cfb128 1 2 410 200004 1 5 */
3942&(nid_objs[778]),/* OBJ_seed_ofb128 1 2 410 200004 1 6 */
3384&(nid_objs[186]),/* OBJ_pkcs1 1 2 840 113549 1 1 */ 3943&(nid_objs[186]),/* OBJ_pkcs1 1 2 840 113549 1 1 */
3385&(nid_objs[27]),/* OBJ_pkcs3 1 2 840 113549 1 3 */ 3944&(nid_objs[27]),/* OBJ_pkcs3 1 2 840 113549 1 3 */
3386&(nid_objs[187]),/* OBJ_pkcs5 1 2 840 113549 1 5 */ 3945&(nid_objs[187]),/* OBJ_pkcs5 1 2 840 113549 1 5 */
@@ -3395,6 +3954,27 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
3395&(nid_objs[44]),/* OBJ_des_ede3_cbc 1 2 840 113549 3 7 */ 3954&(nid_objs[44]),/* OBJ_des_ede3_cbc 1 2 840 113549 3 7 */
3396&(nid_objs[120]),/* OBJ_rc5_cbc 1 2 840 113549 3 8 */ 3955&(nid_objs[120]),/* OBJ_rc5_cbc 1 2 840 113549 3 8 */
3397&(nid_objs[643]),/* OBJ_des_cdmf 1 2 840 113549 3 10 */ 3956&(nid_objs[643]),/* OBJ_des_cdmf 1 2 840 113549 3 10 */
3957&(nid_objs[680]),/* OBJ_X9_62_id_characteristic_two_basis 1 2 840 10045 1 2 3 */
3958&(nid_objs[684]),/* OBJ_X9_62_c2pnb163v1 1 2 840 10045 3 0 1 */
3959&(nid_objs[685]),/* OBJ_X9_62_c2pnb163v2 1 2 840 10045 3 0 2 */
3960&(nid_objs[686]),/* OBJ_X9_62_c2pnb163v3 1 2 840 10045 3 0 3 */
3961&(nid_objs[687]),/* OBJ_X9_62_c2pnb176v1 1 2 840 10045 3 0 4 */
3962&(nid_objs[688]),/* OBJ_X9_62_c2tnb191v1 1 2 840 10045 3 0 5 */
3963&(nid_objs[689]),/* OBJ_X9_62_c2tnb191v2 1 2 840 10045 3 0 6 */
3964&(nid_objs[690]),/* OBJ_X9_62_c2tnb191v3 1 2 840 10045 3 0 7 */
3965&(nid_objs[691]),/* OBJ_X9_62_c2onb191v4 1 2 840 10045 3 0 8 */
3966&(nid_objs[692]),/* OBJ_X9_62_c2onb191v5 1 2 840 10045 3 0 9 */
3967&(nid_objs[693]),/* OBJ_X9_62_c2pnb208w1 1 2 840 10045 3 0 10 */
3968&(nid_objs[694]),/* OBJ_X9_62_c2tnb239v1 1 2 840 10045 3 0 11 */
3969&(nid_objs[695]),/* OBJ_X9_62_c2tnb239v2 1 2 840 10045 3 0 12 */
3970&(nid_objs[696]),/* OBJ_X9_62_c2tnb239v3 1 2 840 10045 3 0 13 */
3971&(nid_objs[697]),/* OBJ_X9_62_c2onb239v4 1 2 840 10045 3 0 14 */
3972&(nid_objs[698]),/* OBJ_X9_62_c2onb239v5 1 2 840 10045 3 0 15 */
3973&(nid_objs[699]),/* OBJ_X9_62_c2pnb272w1 1 2 840 10045 3 0 16 */
3974&(nid_objs[700]),/* OBJ_X9_62_c2pnb304w1 1 2 840 10045 3 0 17 */
3975&(nid_objs[701]),/* OBJ_X9_62_c2tnb359v1 1 2 840 10045 3 0 18 */
3976&(nid_objs[702]),/* OBJ_X9_62_c2pnb368w1 1 2 840 10045 3 0 19 */
3977&(nid_objs[703]),/* OBJ_X9_62_c2tnb431r1 1 2 840 10045 3 0 20 */
3398&(nid_objs[409]),/* OBJ_X9_62_prime192v1 1 2 840 10045 3 1 1 */ 3978&(nid_objs[409]),/* OBJ_X9_62_prime192v1 1 2 840 10045 3 1 1 */
3399&(nid_objs[410]),/* OBJ_X9_62_prime192v2 1 2 840 10045 3 1 2 */ 3979&(nid_objs[410]),/* OBJ_X9_62_prime192v2 1 2 840 10045 3 1 2 */
3400&(nid_objs[411]),/* OBJ_X9_62_prime192v3 1 2 840 10045 3 1 3 */ 3980&(nid_objs[411]),/* OBJ_X9_62_prime192v3 1 2 840 10045 3 1 3 */
@@ -3458,6 +4038,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
3458&(nid_objs[310]),/* OBJ_id_it_implicitConfirm 1 3 6 1 5 5 7 4 13 */ 4038&(nid_objs[310]),/* OBJ_id_it_implicitConfirm 1 3 6 1 5 5 7 4 13 */
3459&(nid_objs[311]),/* OBJ_id_it_confirmWaitTime 1 3 6 1 5 5 7 4 14 */ 4039&(nid_objs[311]),/* OBJ_id_it_confirmWaitTime 1 3 6 1 5 5 7 4 14 */
3460&(nid_objs[312]),/* OBJ_id_it_origPKIMessage 1 3 6 1 5 5 7 4 15 */ 4040&(nid_objs[312]),/* OBJ_id_it_origPKIMessage 1 3 6 1 5 5 7 4 15 */
4041&(nid_objs[784]),/* OBJ_id_it_suppLangTags 1 3 6 1 5 5 7 4 16 */
3461&(nid_objs[313]),/* OBJ_id_regCtrl 1 3 6 1 5 5 7 5 1 */ 4042&(nid_objs[313]),/* OBJ_id_regCtrl 1 3 6 1 5 5 7 5 1 */
3462&(nid_objs[314]),/* OBJ_id_regInfo 1 3 6 1 5 5 7 5 2 */ 4043&(nid_objs[314]),/* OBJ_id_regInfo 1 3 6 1 5 5 7 5 2 */
3463&(nid_objs[323]),/* OBJ_id_alg_des40 1 3 6 1 5 5 7 6 1 */ 4044&(nid_objs[323]),/* OBJ_id_alg_des40 1 3 6 1 5 5 7 6 1 */
@@ -3507,6 +4088,9 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
3507&(nid_objs[179]),/* OBJ_ad_ca_issuers 1 3 6 1 5 5 7 48 2 */ 4088&(nid_objs[179]),/* OBJ_ad_ca_issuers 1 3 6 1 5 5 7 48 2 */
3508&(nid_objs[363]),/* OBJ_ad_timeStamping 1 3 6 1 5 5 7 48 3 */ 4089&(nid_objs[363]),/* OBJ_ad_timeStamping 1 3 6 1 5 5 7 48 3 */
3509&(nid_objs[364]),/* OBJ_ad_dvcs 1 3 6 1 5 5 7 48 4 */ 4090&(nid_objs[364]),/* OBJ_ad_dvcs 1 3 6 1 5 5 7 48 4 */
4091&(nid_objs[785]),/* OBJ_caRepository 1 3 6 1 5 5 7 48 5 */
4092&(nid_objs[780]),/* OBJ_hmac_md5 1 3 6 1 5 5 8 1 1 */
4093&(nid_objs[781]),/* OBJ_hmac_sha1 1 3 6 1 5 5 8 1 2 */
3510&(nid_objs[58]),/* OBJ_netscape_cert_extension 2 16 840 1 113730 1 */ 4094&(nid_objs[58]),/* OBJ_netscape_cert_extension 2 16 840 1 113730 1 */
3511&(nid_objs[59]),/* OBJ_netscape_data_type 2 16 840 1 113730 2 */ 4095&(nid_objs[59]),/* OBJ_netscape_data_type 2 16 840 1 113730 2 */
3512&(nid_objs[438]),/* OBJ_pilotAttributeType 0 9 2342 19200300 100 1 */ 4096&(nid_objs[438]),/* OBJ_pilotAttributeType 0 9 2342 19200300 100 1 */
@@ -3515,6 +4099,8 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
3515&(nid_objs[441]),/* OBJ_pilotGroups 0 9 2342 19200300 100 10 */ 4099&(nid_objs[441]),/* OBJ_pilotGroups 0 9 2342 19200300 100 10 */
3516&(nid_objs[108]),/* OBJ_cast5_cbc 1 2 840 113533 7 66 10 */ 4100&(nid_objs[108]),/* OBJ_cast5_cbc 1 2 840 113533 7 66 10 */
3517&(nid_objs[112]),/* OBJ_pbeWithMD5AndCast5_CBC 1 2 840 113533 7 66 12 */ 4101&(nid_objs[112]),/* OBJ_pbeWithMD5AndCast5_CBC 1 2 840 113533 7 66 12 */
4102&(nid_objs[782]),/* OBJ_id_PasswordBasedMAC 1 2 840 113533 7 66 13 */
4103&(nid_objs[783]),/* OBJ_id_DHBasedMac 1 2 840 113533 7 66 30 */
3518&(nid_objs[ 6]),/* OBJ_rsaEncryption 1 2 840 113549 1 1 1 */ 4104&(nid_objs[ 6]),/* OBJ_rsaEncryption 1 2 840 113549 1 1 1 */
3519&(nid_objs[ 7]),/* OBJ_md2WithRSAEncryption 1 2 840 113549 1 1 2 */ 4105&(nid_objs[ 7]),/* OBJ_md2WithRSAEncryption 1 2 840 113549 1 1 2 */
3520&(nid_objs[396]),/* OBJ_md4WithRSAEncryption 1 2 840 113549 1 1 3 */ 4106&(nid_objs[396]),/* OBJ_md4WithRSAEncryption 1 2 840 113549 1 1 3 */
@@ -3555,6 +4141,9 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
3555&(nid_objs[188]),/* OBJ_SMIME 1 2 840 113549 1 9 16 */ 4141&(nid_objs[188]),/* OBJ_SMIME 1 2 840 113549 1 9 16 */
3556&(nid_objs[156]),/* OBJ_friendlyName 1 2 840 113549 1 9 20 */ 4142&(nid_objs[156]),/* OBJ_friendlyName 1 2 840 113549 1 9 20 */
3557&(nid_objs[157]),/* OBJ_localKeyID 1 2 840 113549 1 9 21 */ 4143&(nid_objs[157]),/* OBJ_localKeyID 1 2 840 113549 1 9 21 */
4144&(nid_objs[681]),/* OBJ_X9_62_onBasis 1 2 840 10045 1 2 3 1 */
4145&(nid_objs[682]),/* OBJ_X9_62_tpBasis 1 2 840 10045 1 2 3 2 */
4146&(nid_objs[683]),/* OBJ_X9_62_ppBasis 1 2 840 10045 1 2 3 3 */
3558&(nid_objs[417]),/* OBJ_ms_csp_name 1 3 6 1 4 1 311 17 1 */ 4147&(nid_objs[417]),/* OBJ_ms_csp_name 1 3 6 1 4 1 311 17 1 */
3559&(nid_objs[390]),/* OBJ_dcObject 1 3 6 1 4 1 1466 344 */ 4148&(nid_objs[390]),/* OBJ_dcObject 1 3 6 1 4 1 1466 344 */
3560&(nid_objs[91]),/* OBJ_bf_cbc 1 3 6 1 4 1 3029 1 2 */ 4149&(nid_objs[91]),/* OBJ_bf_cbc 1 3 6 1 4 1 3029 1 2 */
@@ -3581,14 +4170,17 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
3581&(nid_objs[419]),/* OBJ_aes_128_cbc 2 16 840 1 101 3 4 1 2 */ 4170&(nid_objs[419]),/* OBJ_aes_128_cbc 2 16 840 1 101 3 4 1 2 */
3582&(nid_objs[420]),/* OBJ_aes_128_ofb128 2 16 840 1 101 3 4 1 3 */ 4171&(nid_objs[420]),/* OBJ_aes_128_ofb128 2 16 840 1 101 3 4 1 3 */
3583&(nid_objs[421]),/* OBJ_aes_128_cfb128 2 16 840 1 101 3 4 1 4 */ 4172&(nid_objs[421]),/* OBJ_aes_128_cfb128 2 16 840 1 101 3 4 1 4 */
4173&(nid_objs[788]),/* OBJ_id_aes128_wrap 2 16 840 1 101 3 4 1 5 */
3584&(nid_objs[422]),/* OBJ_aes_192_ecb 2 16 840 1 101 3 4 1 21 */ 4174&(nid_objs[422]),/* OBJ_aes_192_ecb 2 16 840 1 101 3 4 1 21 */
3585&(nid_objs[423]),/* OBJ_aes_192_cbc 2 16 840 1 101 3 4 1 22 */ 4175&(nid_objs[423]),/* OBJ_aes_192_cbc 2 16 840 1 101 3 4 1 22 */
3586&(nid_objs[424]),/* OBJ_aes_192_ofb128 2 16 840 1 101 3 4 1 23 */ 4176&(nid_objs[424]),/* OBJ_aes_192_ofb128 2 16 840 1 101 3 4 1 23 */
3587&(nid_objs[425]),/* OBJ_aes_192_cfb128 2 16 840 1 101 3 4 1 24 */ 4177&(nid_objs[425]),/* OBJ_aes_192_cfb128 2 16 840 1 101 3 4 1 24 */
4178&(nid_objs[789]),/* OBJ_id_aes192_wrap 2 16 840 1 101 3 4 1 25 */
3588&(nid_objs[426]),/* OBJ_aes_256_ecb 2 16 840 1 101 3 4 1 41 */ 4179&(nid_objs[426]),/* OBJ_aes_256_ecb 2 16 840 1 101 3 4 1 41 */
3589&(nid_objs[427]),/* OBJ_aes_256_cbc 2 16 840 1 101 3 4 1 42 */ 4180&(nid_objs[427]),/* OBJ_aes_256_cbc 2 16 840 1 101 3 4 1 42 */
3590&(nid_objs[428]),/* OBJ_aes_256_ofb128 2 16 840 1 101 3 4 1 43 */ 4181&(nid_objs[428]),/* OBJ_aes_256_ofb128 2 16 840 1 101 3 4 1 43 */
3591&(nid_objs[429]),/* OBJ_aes_256_cfb128 2 16 840 1 101 3 4 1 44 */ 4182&(nid_objs[429]),/* OBJ_aes_256_cfb128 2 16 840 1 101 3 4 1 44 */
4183&(nid_objs[790]),/* OBJ_id_aes256_wrap 2 16 840 1 101 3 4 1 45 */
3592&(nid_objs[672]),/* OBJ_sha256 2 16 840 1 101 3 4 2 1 */ 4184&(nid_objs[672]),/* OBJ_sha256 2 16 840 1 101 3 4 2 1 */
3593&(nid_objs[673]),/* OBJ_sha384 2 16 840 1 101 3 4 2 2 */ 4185&(nid_objs[673]),/* OBJ_sha384 2 16 840 1 101 3 4 2 2 */
3594&(nid_objs[674]),/* OBJ_sha512 2 16 840 1 101 3 4 2 3 */ 4186&(nid_objs[674]),/* OBJ_sha512 2 16 840 1 101 3 4 2 3 */
@@ -3690,6 +4282,9 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
3690&(nid_objs[138]),/* OBJ_ms_efs 1 3 6 1 4 1 311 10 3 4 */ 4282&(nid_objs[138]),/* OBJ_ms_efs 1 3 6 1 4 1 311 10 3 4 */
3691&(nid_objs[648]),/* OBJ_ms_smartcard_login 1 3 6 1 4 1 311 20 2 2 */ 4283&(nid_objs[648]),/* OBJ_ms_smartcard_login 1 3 6 1 4 1 311 20 2 2 */
3692&(nid_objs[649]),/* OBJ_ms_upn 1 3 6 1 4 1 311 20 2 3 */ 4284&(nid_objs[649]),/* OBJ_ms_upn 1 3 6 1 4 1 311 20 2 3 */
4285&(nid_objs[751]),/* OBJ_camellia_128_cbc 1 2 392 200011 61 1 1 1 2 */
4286&(nid_objs[752]),/* OBJ_camellia_192_cbc 1 2 392 200011 61 1 1 1 3 */
4287&(nid_objs[753]),/* OBJ_camellia_256_cbc 1 2 392 200011 61 1 1 1 4 */
3693&(nid_objs[196]),/* OBJ_id_smime_mod_cms 1 2 840 113549 1 9 16 0 1 */ 4288&(nid_objs[196]),/* OBJ_id_smime_mod_cms 1 2 840 113549 1 9 16 0 1 */
3694&(nid_objs[197]),/* OBJ_id_smime_mod_ess 1 2 840 113549 1 9 16 0 2 */ 4289&(nid_objs[197]),/* OBJ_id_smime_mod_ess 1 2 840 113549 1 9 16 0 2 */
3695&(nid_objs[198]),/* OBJ_id_smime_mod_oid 1 2 840 113549 1 9 16 0 3 */ 4290&(nid_objs[198]),/* OBJ_id_smime_mod_oid 1 2 840 113549 1 9 16 0 3 */
@@ -3706,6 +4301,8 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
3706&(nid_objs[209]),/* OBJ_id_smime_ct_contentInfo 1 2 840 113549 1 9 16 1 6 */ 4301&(nid_objs[209]),/* OBJ_id_smime_ct_contentInfo 1 2 840 113549 1 9 16 1 6 */
3707&(nid_objs[210]),/* OBJ_id_smime_ct_DVCSRequestData 1 2 840 113549 1 9 16 1 7 */ 4302&(nid_objs[210]),/* OBJ_id_smime_ct_DVCSRequestData 1 2 840 113549 1 9 16 1 7 */
3708&(nid_objs[211]),/* OBJ_id_smime_ct_DVCSResponseData 1 2 840 113549 1 9 16 1 8 */ 4303&(nid_objs[211]),/* OBJ_id_smime_ct_DVCSResponseData 1 2 840 113549 1 9 16 1 8 */
4304&(nid_objs[786]),/* OBJ_id_smime_ct_compressedData 1 2 840 113549 1 9 16 1 9 */
4305&(nid_objs[787]),/* OBJ_id_ct_asciiTextWithCRLF 1 2 840 113549 1 9 16 1 27 */
3709&(nid_objs[212]),/* OBJ_id_smime_aa_receiptRequest 1 2 840 113549 1 9 16 2 1 */ 4306&(nid_objs[212]),/* OBJ_id_smime_aa_receiptRequest 1 2 840 113549 1 9 16 2 1 */
3710&(nid_objs[213]),/* OBJ_id_smime_aa_securityLabel 1 2 840 113549 1 9 16 2 2 */ 4307&(nid_objs[213]),/* OBJ_id_smime_aa_securityLabel 1 2 840 113549 1 9 16 2 2 */
3711&(nid_objs[214]),/* OBJ_id_smime_aa_mlExpandHistory 1 2 840 113549 1 9 16 2 3 */ 4308&(nid_objs[214]),/* OBJ_id_smime_aa_mlExpandHistory 1 2 840 113549 1 9 16 2 3 */
@@ -3742,6 +4339,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
3742&(nid_objs[245]),/* OBJ_id_smime_alg_ESDH 1 2 840 113549 1 9 16 3 5 */ 4339&(nid_objs[245]),/* OBJ_id_smime_alg_ESDH 1 2 840 113549 1 9 16 3 5 */
3743&(nid_objs[246]),/* OBJ_id_smime_alg_CMS3DESwrap 1 2 840 113549 1 9 16 3 6 */ 4340&(nid_objs[246]),/* OBJ_id_smime_alg_CMS3DESwrap 1 2 840 113549 1 9 16 3 6 */
3744&(nid_objs[247]),/* OBJ_id_smime_alg_CMSRC2wrap 1 2 840 113549 1 9 16 3 7 */ 4341&(nid_objs[247]),/* OBJ_id_smime_alg_CMSRC2wrap 1 2 840 113549 1 9 16 3 7 */
4342&(nid_objs[125]),/* OBJ_zlib_compression 1 2 840 113549 1 9 16 3 8 */
3745&(nid_objs[248]),/* OBJ_id_smime_cd_ldap 1 2 840 113549 1 9 16 4 1 */ 4343&(nid_objs[248]),/* OBJ_id_smime_cd_ldap 1 2 840 113549 1 9 16 4 1 */
3746&(nid_objs[249]),/* OBJ_id_smime_spq_ets_sqt_uri 1 2 840 113549 1 9 16 5 1 */ 4344&(nid_objs[249]),/* OBJ_id_smime_spq_ets_sqt_uri 1 2 840 113549 1 9 16 5 1 */
3747&(nid_objs[250]),/* OBJ_id_smime_spq_ets_sqt_unotice 1 2 840 113549 1 9 16 5 2 */ 4345&(nid_objs[250]),/* OBJ_id_smime_spq_ets_sqt_unotice 1 2 840 113549 1 9 16 5 2 */
diff --git a/src/lib/libcrypto/objects/obj_mac.h b/src/lib/libcrypto/objects/obj_mac.h
index 51bb50047f..76d5ec9c0b 100644
--- a/src/lib/libcrypto/objects/obj_mac.h
+++ b/src/lib/libcrypto/objects/obj_mac.h
@@ -67,30 +67,67 @@
67#define NID_undef 0 67#define NID_undef 0
68#define OBJ_undef 0L 68#define OBJ_undef 0L
69 69
70#define SN_ccitt "CCITT" 70#define SN_itu_t "ITU-T"
71#define LN_ccitt "ccitt" 71#define LN_itu_t "itu-t"
72#define NID_itu_t 645
73#define OBJ_itu_t 0L
74
72#define NID_ccitt 404 75#define NID_ccitt 404
73#define OBJ_ccitt 0L 76#define OBJ_ccitt OBJ_itu_t
74 77
75#define SN_iso "ISO" 78#define SN_iso "ISO"
76#define LN_iso "iso" 79#define LN_iso "iso"
77#define NID_iso 181 80#define NID_iso 181
78#define OBJ_iso 1L 81#define OBJ_iso 1L
79 82
80#define SN_joint_iso_ccitt "JOINT-ISO-CCITT" 83#define SN_joint_iso_itu_t "JOINT-ISO-ITU-T"
81#define LN_joint_iso_ccitt "joint-iso-ccitt" 84#define LN_joint_iso_itu_t "joint-iso-itu-t"
85#define NID_joint_iso_itu_t 646
86#define OBJ_joint_iso_itu_t 2L
87
82#define NID_joint_iso_ccitt 393 88#define NID_joint_iso_ccitt 393
83#define OBJ_joint_iso_ccitt 2L 89#define OBJ_joint_iso_ccitt OBJ_joint_iso_itu_t
84 90
85#define SN_member_body "member-body" 91#define SN_member_body "member-body"
86#define LN_member_body "ISO Member Body" 92#define LN_member_body "ISO Member Body"
87#define NID_member_body 182 93#define NID_member_body 182
88#define OBJ_member_body OBJ_iso,2L 94#define OBJ_member_body OBJ_iso,2L
89 95
96#define SN_identified_organization "identified-organization"
97#define NID_identified_organization 676
98#define OBJ_identified_organization OBJ_iso,3L
99
100#define SN_hmac_md5 "HMAC-MD5"
101#define LN_hmac_md5 "hmac-md5"
102#define NID_hmac_md5 780
103#define OBJ_hmac_md5 OBJ_identified_organization,6L,1L,5L,5L,8L,1L,1L
104
105#define SN_hmac_sha1 "HMAC-SHA1"
106#define LN_hmac_sha1 "hmac-sha1"
107#define NID_hmac_sha1 781
108#define OBJ_hmac_sha1 OBJ_identified_organization,6L,1L,5L,5L,8L,1L,2L
109
110#define SN_certicom_arc "certicom-arc"
111#define NID_certicom_arc 677
112#define OBJ_certicom_arc OBJ_identified_organization,132L
113
114#define SN_international_organizations "international-organizations"
115#define LN_international_organizations "International Organizations"
116#define NID_international_organizations 647
117#define OBJ_international_organizations OBJ_joint_iso_itu_t,23L
118
119#define SN_wap "wap"
120#define NID_wap 678
121#define OBJ_wap OBJ_international_organizations,43L
122
123#define SN_wap_wsg "wap-wsg"
124#define NID_wap_wsg 679
125#define OBJ_wap_wsg OBJ_wap,13L
126
90#define SN_selected_attribute_types "selected-attribute-types" 127#define SN_selected_attribute_types "selected-attribute-types"
91#define LN_selected_attribute_types "Selected Attribute Types" 128#define LN_selected_attribute_types "Selected Attribute Types"
92#define NID_selected_attribute_types 394 129#define NID_selected_attribute_types 394
93#define OBJ_selected_attribute_types OBJ_joint_iso_ccitt,5L,1L,5L 130#define OBJ_selected_attribute_types OBJ_joint_iso_itu_t,5L,1L,5L
94 131
95#define SN_clearance "clearance" 132#define SN_clearance "clearance"
96#define NID_clearance 395 133#define NID_clearance 395
@@ -136,6 +173,22 @@
136#define NID_X9_62_characteristic_two_field 407 173#define NID_X9_62_characteristic_two_field 407
137#define OBJ_X9_62_characteristic_two_field OBJ_X9_62_id_fieldType,2L 174#define OBJ_X9_62_characteristic_two_field OBJ_X9_62_id_fieldType,2L
138 175
176#define SN_X9_62_id_characteristic_two_basis "id-characteristic-two-basis"
177#define NID_X9_62_id_characteristic_two_basis 680
178#define OBJ_X9_62_id_characteristic_two_basis OBJ_X9_62_characteristic_two_field,3L
179
180#define SN_X9_62_onBasis "onBasis"
181#define NID_X9_62_onBasis 681
182#define OBJ_X9_62_onBasis OBJ_X9_62_id_characteristic_two_basis,1L
183
184#define SN_X9_62_tpBasis "tpBasis"
185#define NID_X9_62_tpBasis 682
186#define OBJ_X9_62_tpBasis OBJ_X9_62_id_characteristic_two_basis,2L
187
188#define SN_X9_62_ppBasis "ppBasis"
189#define NID_X9_62_ppBasis 683
190#define OBJ_X9_62_ppBasis OBJ_X9_62_id_characteristic_two_basis,3L
191
139#define OBJ_X9_62_id_publicKeyType OBJ_ansi_X9_62,2L 192#define OBJ_X9_62_id_publicKeyType OBJ_ansi_X9_62,2L
140 193
141#define SN_X9_62_id_ecPublicKey "id-ecPublicKey" 194#define SN_X9_62_id_ecPublicKey "id-ecPublicKey"
@@ -146,6 +199,86 @@
146 199
147#define OBJ_X9_62_c_TwoCurve OBJ_X9_62_ellipticCurve,0L 200#define OBJ_X9_62_c_TwoCurve OBJ_X9_62_ellipticCurve,0L
148 201
202#define SN_X9_62_c2pnb163v1 "c2pnb163v1"
203#define NID_X9_62_c2pnb163v1 684
204#define OBJ_X9_62_c2pnb163v1 OBJ_X9_62_c_TwoCurve,1L
205
206#define SN_X9_62_c2pnb163v2 "c2pnb163v2"
207#define NID_X9_62_c2pnb163v2 685
208#define OBJ_X9_62_c2pnb163v2 OBJ_X9_62_c_TwoCurve,2L
209
210#define SN_X9_62_c2pnb163v3 "c2pnb163v3"
211#define NID_X9_62_c2pnb163v3 686
212#define OBJ_X9_62_c2pnb163v3 OBJ_X9_62_c_TwoCurve,3L
213
214#define SN_X9_62_c2pnb176v1 "c2pnb176v1"
215#define NID_X9_62_c2pnb176v1 687
216#define OBJ_X9_62_c2pnb176v1 OBJ_X9_62_c_TwoCurve,4L
217
218#define SN_X9_62_c2tnb191v1 "c2tnb191v1"
219#define NID_X9_62_c2tnb191v1 688
220#define OBJ_X9_62_c2tnb191v1 OBJ_X9_62_c_TwoCurve,5L
221
222#define SN_X9_62_c2tnb191v2 "c2tnb191v2"
223#define NID_X9_62_c2tnb191v2 689
224#define OBJ_X9_62_c2tnb191v2 OBJ_X9_62_c_TwoCurve,6L
225
226#define SN_X9_62_c2tnb191v3 "c2tnb191v3"
227#define NID_X9_62_c2tnb191v3 690
228#define OBJ_X9_62_c2tnb191v3 OBJ_X9_62_c_TwoCurve,7L
229
230#define SN_X9_62_c2onb191v4 "c2onb191v4"
231#define NID_X9_62_c2onb191v4 691
232#define OBJ_X9_62_c2onb191v4 OBJ_X9_62_c_TwoCurve,8L
233
234#define SN_X9_62_c2onb191v5 "c2onb191v5"
235#define NID_X9_62_c2onb191v5 692
236#define OBJ_X9_62_c2onb191v5 OBJ_X9_62_c_TwoCurve,9L
237
238#define SN_X9_62_c2pnb208w1 "c2pnb208w1"
239#define NID_X9_62_c2pnb208w1 693
240#define OBJ_X9_62_c2pnb208w1 OBJ_X9_62_c_TwoCurve,10L
241
242#define SN_X9_62_c2tnb239v1 "c2tnb239v1"
243#define NID_X9_62_c2tnb239v1 694
244#define OBJ_X9_62_c2tnb239v1 OBJ_X9_62_c_TwoCurve,11L
245
246#define SN_X9_62_c2tnb239v2 "c2tnb239v2"
247#define NID_X9_62_c2tnb239v2 695
248#define OBJ_X9_62_c2tnb239v2 OBJ_X9_62_c_TwoCurve,12L
249
250#define SN_X9_62_c2tnb239v3 "c2tnb239v3"
251#define NID_X9_62_c2tnb239v3 696
252#define OBJ_X9_62_c2tnb239v3 OBJ_X9_62_c_TwoCurve,13L
253
254#define SN_X9_62_c2onb239v4 "c2onb239v4"
255#define NID_X9_62_c2onb239v4 697
256#define OBJ_X9_62_c2onb239v4 OBJ_X9_62_c_TwoCurve,14L
257
258#define SN_X9_62_c2onb239v5 "c2onb239v5"
259#define NID_X9_62_c2onb239v5 698
260#define OBJ_X9_62_c2onb239v5 OBJ_X9_62_c_TwoCurve,15L
261
262#define SN_X9_62_c2pnb272w1 "c2pnb272w1"
263#define NID_X9_62_c2pnb272w1 699
264#define OBJ_X9_62_c2pnb272w1 OBJ_X9_62_c_TwoCurve,16L
265
266#define SN_X9_62_c2pnb304w1 "c2pnb304w1"
267#define NID_X9_62_c2pnb304w1 700
268#define OBJ_X9_62_c2pnb304w1 OBJ_X9_62_c_TwoCurve,17L
269
270#define SN_X9_62_c2tnb359v1 "c2tnb359v1"
271#define NID_X9_62_c2tnb359v1 701
272#define OBJ_X9_62_c2tnb359v1 OBJ_X9_62_c_TwoCurve,18L
273
274#define SN_X9_62_c2pnb368w1 "c2pnb368w1"
275#define NID_X9_62_c2pnb368w1 702
276#define OBJ_X9_62_c2pnb368w1 OBJ_X9_62_c_TwoCurve,19L
277
278#define SN_X9_62_c2tnb431r1 "c2tnb431r1"
279#define NID_X9_62_c2tnb431r1 703
280#define OBJ_X9_62_c2tnb431r1 OBJ_X9_62_c_TwoCurve,20L
281
149#define OBJ_X9_62_primeCurve OBJ_X9_62_ellipticCurve,1L 282#define OBJ_X9_62_primeCurve OBJ_X9_62_ellipticCurve,1L
150 283
151#define SN_X9_62_prime192v1 "prime192v1" 284#define SN_X9_62_prime192v1 "prime192v1"
@@ -182,6 +315,178 @@
182#define NID_ecdsa_with_SHA1 416 315#define NID_ecdsa_with_SHA1 416
183#define OBJ_ecdsa_with_SHA1 OBJ_X9_62_id_ecSigType,1L 316#define OBJ_ecdsa_with_SHA1 OBJ_X9_62_id_ecSigType,1L
184 317
318#define OBJ_secg_ellipticCurve OBJ_certicom_arc,0L
319
320#define SN_secp112r1 "secp112r1"
321#define NID_secp112r1 704
322#define OBJ_secp112r1 OBJ_secg_ellipticCurve,6L
323
324#define SN_secp112r2 "secp112r2"
325#define NID_secp112r2 705
326#define OBJ_secp112r2 OBJ_secg_ellipticCurve,7L
327
328#define SN_secp128r1 "secp128r1"
329#define NID_secp128r1 706
330#define OBJ_secp128r1 OBJ_secg_ellipticCurve,28L
331
332#define SN_secp128r2 "secp128r2"
333#define NID_secp128r2 707
334#define OBJ_secp128r2 OBJ_secg_ellipticCurve,29L
335
336#define SN_secp160k1 "secp160k1"
337#define NID_secp160k1 708
338#define OBJ_secp160k1 OBJ_secg_ellipticCurve,9L
339
340#define SN_secp160r1 "secp160r1"
341#define NID_secp160r1 709
342#define OBJ_secp160r1 OBJ_secg_ellipticCurve,8L
343
344#define SN_secp160r2 "secp160r2"
345#define NID_secp160r2 710
346#define OBJ_secp160r2 OBJ_secg_ellipticCurve,30L
347
348#define SN_secp192k1 "secp192k1"
349#define NID_secp192k1 711
350#define OBJ_secp192k1 OBJ_secg_ellipticCurve,31L
351
352#define SN_secp224k1 "secp224k1"
353#define NID_secp224k1 712
354#define OBJ_secp224k1 OBJ_secg_ellipticCurve,32L
355
356#define SN_secp224r1 "secp224r1"
357#define NID_secp224r1 713
358#define OBJ_secp224r1 OBJ_secg_ellipticCurve,33L
359
360#define SN_secp256k1 "secp256k1"
361#define NID_secp256k1 714
362#define OBJ_secp256k1 OBJ_secg_ellipticCurve,10L
363
364#define SN_secp384r1 "secp384r1"
365#define NID_secp384r1 715
366#define OBJ_secp384r1 OBJ_secg_ellipticCurve,34L
367
368#define SN_secp521r1 "secp521r1"
369#define NID_secp521r1 716
370#define OBJ_secp521r1 OBJ_secg_ellipticCurve,35L
371
372#define SN_sect113r1 "sect113r1"
373#define NID_sect113r1 717
374#define OBJ_sect113r1 OBJ_secg_ellipticCurve,4L
375
376#define SN_sect113r2 "sect113r2"
377#define NID_sect113r2 718
378#define OBJ_sect113r2 OBJ_secg_ellipticCurve,5L
379
380#define SN_sect131r1 "sect131r1"
381#define NID_sect131r1 719
382#define OBJ_sect131r1 OBJ_secg_ellipticCurve,22L
383
384#define SN_sect131r2 "sect131r2"
385#define NID_sect131r2 720
386#define OBJ_sect131r2 OBJ_secg_ellipticCurve,23L
387
388#define SN_sect163k1 "sect163k1"
389#define NID_sect163k1 721
390#define OBJ_sect163k1 OBJ_secg_ellipticCurve,1L
391
392#define SN_sect163r1 "sect163r1"
393#define NID_sect163r1 722
394#define OBJ_sect163r1 OBJ_secg_ellipticCurve,2L
395
396#define SN_sect163r2 "sect163r2"
397#define NID_sect163r2 723
398#define OBJ_sect163r2 OBJ_secg_ellipticCurve,15L
399
400#define SN_sect193r1 "sect193r1"
401#define NID_sect193r1 724
402#define OBJ_sect193r1 OBJ_secg_ellipticCurve,24L
403
404#define SN_sect193r2 "sect193r2"
405#define NID_sect193r2 725
406#define OBJ_sect193r2 OBJ_secg_ellipticCurve,25L
407
408#define SN_sect233k1 "sect233k1"
409#define NID_sect233k1 726
410#define OBJ_sect233k1 OBJ_secg_ellipticCurve,26L
411
412#define SN_sect233r1 "sect233r1"
413#define NID_sect233r1 727
414#define OBJ_sect233r1 OBJ_secg_ellipticCurve,27L
415
416#define SN_sect239k1 "sect239k1"
417#define NID_sect239k1 728
418#define OBJ_sect239k1 OBJ_secg_ellipticCurve,3L
419
420#define SN_sect283k1 "sect283k1"
421#define NID_sect283k1 729
422#define OBJ_sect283k1 OBJ_secg_ellipticCurve,16L
423
424#define SN_sect283r1 "sect283r1"
425#define NID_sect283r1 730
426#define OBJ_sect283r1 OBJ_secg_ellipticCurve,17L
427
428#define SN_sect409k1 "sect409k1"
429#define NID_sect409k1 731
430#define OBJ_sect409k1 OBJ_secg_ellipticCurve,36L
431
432#define SN_sect409r1 "sect409r1"
433#define NID_sect409r1 732
434#define OBJ_sect409r1 OBJ_secg_ellipticCurve,37L
435
436#define SN_sect571k1 "sect571k1"
437#define NID_sect571k1 733
438#define OBJ_sect571k1 OBJ_secg_ellipticCurve,38L
439
440#define SN_sect571r1 "sect571r1"
441#define NID_sect571r1 734
442#define OBJ_sect571r1 OBJ_secg_ellipticCurve,39L
443
444#define OBJ_wap_wsg_idm_ecid OBJ_wap_wsg,4L
445
446#define SN_wap_wsg_idm_ecid_wtls1 "wap-wsg-idm-ecid-wtls1"
447#define NID_wap_wsg_idm_ecid_wtls1 735
448#define OBJ_wap_wsg_idm_ecid_wtls1 OBJ_wap_wsg_idm_ecid,1L
449
450#define SN_wap_wsg_idm_ecid_wtls3 "wap-wsg-idm-ecid-wtls3"
451#define NID_wap_wsg_idm_ecid_wtls3 736
452#define OBJ_wap_wsg_idm_ecid_wtls3 OBJ_wap_wsg_idm_ecid,3L
453
454#define SN_wap_wsg_idm_ecid_wtls4 "wap-wsg-idm-ecid-wtls4"
455#define NID_wap_wsg_idm_ecid_wtls4 737
456#define OBJ_wap_wsg_idm_ecid_wtls4 OBJ_wap_wsg_idm_ecid,4L
457
458#define SN_wap_wsg_idm_ecid_wtls5 "wap-wsg-idm-ecid-wtls5"
459#define NID_wap_wsg_idm_ecid_wtls5 738
460#define OBJ_wap_wsg_idm_ecid_wtls5 OBJ_wap_wsg_idm_ecid,5L
461
462#define SN_wap_wsg_idm_ecid_wtls6 "wap-wsg-idm-ecid-wtls6"
463#define NID_wap_wsg_idm_ecid_wtls6 739
464#define OBJ_wap_wsg_idm_ecid_wtls6 OBJ_wap_wsg_idm_ecid,6L
465
466#define SN_wap_wsg_idm_ecid_wtls7 "wap-wsg-idm-ecid-wtls7"
467#define NID_wap_wsg_idm_ecid_wtls7 740
468#define OBJ_wap_wsg_idm_ecid_wtls7 OBJ_wap_wsg_idm_ecid,7L
469
470#define SN_wap_wsg_idm_ecid_wtls8 "wap-wsg-idm-ecid-wtls8"
471#define NID_wap_wsg_idm_ecid_wtls8 741
472#define OBJ_wap_wsg_idm_ecid_wtls8 OBJ_wap_wsg_idm_ecid,8L
473
474#define SN_wap_wsg_idm_ecid_wtls9 "wap-wsg-idm-ecid-wtls9"
475#define NID_wap_wsg_idm_ecid_wtls9 742
476#define OBJ_wap_wsg_idm_ecid_wtls9 OBJ_wap_wsg_idm_ecid,9L
477
478#define SN_wap_wsg_idm_ecid_wtls10 "wap-wsg-idm-ecid-wtls10"
479#define NID_wap_wsg_idm_ecid_wtls10 743
480#define OBJ_wap_wsg_idm_ecid_wtls10 OBJ_wap_wsg_idm_ecid,10L
481
482#define SN_wap_wsg_idm_ecid_wtls11 "wap-wsg-idm-ecid-wtls11"
483#define NID_wap_wsg_idm_ecid_wtls11 744
484#define OBJ_wap_wsg_idm_ecid_wtls11 OBJ_wap_wsg_idm_ecid,11L
485
486#define SN_wap_wsg_idm_ecid_wtls12 "wap-wsg-idm-ecid-wtls12"
487#define NID_wap_wsg_idm_ecid_wtls12 745
488#define OBJ_wap_wsg_idm_ecid_wtls12 OBJ_wap_wsg_idm_ecid,12L
489
185#define SN_cast5_cbc "CAST5-CBC" 490#define SN_cast5_cbc "CAST5-CBC"
186#define LN_cast5_cbc "cast5-cbc" 491#define LN_cast5_cbc "cast5-cbc"
187#define NID_cast5_cbc 108 492#define NID_cast5_cbc 108
@@ -203,6 +508,16 @@
203#define NID_pbeWithMD5AndCast5_CBC 112 508#define NID_pbeWithMD5AndCast5_CBC 112
204#define OBJ_pbeWithMD5AndCast5_CBC OBJ_ISO_US,113533L,7L,66L,12L 509#define OBJ_pbeWithMD5AndCast5_CBC OBJ_ISO_US,113533L,7L,66L,12L
205 510
511#define SN_id_PasswordBasedMAC "id-PasswordBasedMAC"
512#define LN_id_PasswordBasedMAC "password based MAC"
513#define NID_id_PasswordBasedMAC 782
514#define OBJ_id_PasswordBasedMAC OBJ_ISO_US,113533L,7L,66L,13L
515
516#define SN_id_DHBasedMac "id-DHBasedMac"
517#define LN_id_DHBasedMac "Diffie-Hellman based MAC"
518#define NID_id_DHBasedMac 783
519#define OBJ_id_DHBasedMac OBJ_ISO_US,113533L,7L,66L,30L
520
206#define SN_rsadsi "rsadsi" 521#define SN_rsadsi "rsadsi"
207#define LN_rsadsi "RSA Data Security, Inc." 522#define LN_rsadsi "RSA Data Security, Inc."
208#define NID_rsadsi 1 523#define NID_rsadsi 1
@@ -490,6 +805,14 @@
490#define NID_id_smime_ct_DVCSResponseData 211 805#define NID_id_smime_ct_DVCSResponseData 211
491#define OBJ_id_smime_ct_DVCSResponseData OBJ_id_smime_ct,8L 806#define OBJ_id_smime_ct_DVCSResponseData OBJ_id_smime_ct,8L
492 807
808#define SN_id_smime_ct_compressedData "id-smime-ct-compressedData"
809#define NID_id_smime_ct_compressedData 786
810#define OBJ_id_smime_ct_compressedData OBJ_id_smime_ct,9L
811
812#define SN_id_ct_asciiTextWithCRLF "id-ct-asciiTextWithCRLF"
813#define NID_id_ct_asciiTextWithCRLF 787
814#define OBJ_id_ct_asciiTextWithCRLF OBJ_id_smime_ct,27L
815
493#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest" 816#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
494#define NID_id_smime_aa_receiptRequest 212 817#define NID_id_smime_aa_receiptRequest 212
495#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L 818#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
@@ -1218,6 +1541,10 @@
1218#define NID_id_it_origPKIMessage 312 1541#define NID_id_it_origPKIMessage 312
1219#define OBJ_id_it_origPKIMessage OBJ_id_it,15L 1542#define OBJ_id_it_origPKIMessage OBJ_id_it,15L
1220 1543
1544#define SN_id_it_suppLangTags "id-it-suppLangTags"
1545#define NID_id_it_suppLangTags 784
1546#define OBJ_id_it_suppLangTags OBJ_id_it,16L
1547
1221#define SN_id_regCtrl "id-regCtrl" 1548#define SN_id_regCtrl "id-regCtrl"
1222#define NID_id_regCtrl 313 1549#define NID_id_regCtrl 313
1223#define OBJ_id_regCtrl OBJ_id_pkip,1L 1550#define OBJ_id_regCtrl OBJ_id_pkip,1L
@@ -1453,6 +1780,11 @@
1453#define NID_ad_dvcs 364 1780#define NID_ad_dvcs 364
1454#define OBJ_ad_dvcs OBJ_id_ad,4L 1781#define OBJ_ad_dvcs OBJ_id_ad,4L
1455 1782
1783#define SN_caRepository "caRepository"
1784#define LN_caRepository "CA Repository"
1785#define NID_caRepository 785
1786#define OBJ_caRepository OBJ_id_ad,5L
1787
1456#define OBJ_id_pkix_OCSP OBJ_ad_OCSP 1788#define OBJ_id_pkix_OCSP OBJ_ad_OCSP
1457 1789
1458#define SN_id_pkix_OCSP_basic "basicOCSPResponse" 1790#define SN_id_pkix_OCSP_basic "basicOCSPResponse"
@@ -1749,6 +2081,11 @@
1749#define NID_id_ce 81 2081#define NID_id_ce 81
1750#define OBJ_id_ce OBJ_X500,29L 2082#define OBJ_id_ce OBJ_X500,29L
1751 2083
2084#define SN_subject_directory_attributes "subjectDirectoryAttributes"
2085#define LN_subject_directory_attributes "X509v3 Subject Directory Attributes"
2086#define NID_subject_directory_attributes 769
2087#define OBJ_subject_directory_attributes OBJ_id_ce,9L
2088
1752#define SN_subject_key_identifier "subjectKeyIdentifier" 2089#define SN_subject_key_identifier "subjectKeyIdentifier"
1753#define LN_subject_key_identifier "X509v3 Subject Key Identifier" 2090#define LN_subject_key_identifier "X509v3 Subject Key Identifier"
1754#define NID_subject_key_identifier 82 2091#define NID_subject_key_identifier 82
@@ -1799,6 +2136,16 @@
1799#define NID_delta_crl 140 2136#define NID_delta_crl 140
1800#define OBJ_delta_crl OBJ_id_ce,27L 2137#define OBJ_delta_crl OBJ_id_ce,27L
1801 2138
2139#define SN_issuing_distribution_point "issuingDistributionPoint"
2140#define LN_issuing_distribution_point "X509v3 Issuing Distrubution Point"
2141#define NID_issuing_distribution_point 770
2142#define OBJ_issuing_distribution_point OBJ_id_ce,28L
2143
2144#define SN_certificate_issuer "certificateIssuer"
2145#define LN_certificate_issuer "X509v3 Certificate Issuer"
2146#define NID_certificate_issuer 771
2147#define OBJ_certificate_issuer OBJ_id_ce,29L
2148
1802#define SN_name_constraints "nameConstraints" 2149#define SN_name_constraints "nameConstraints"
1803#define LN_name_constraints "X509v3 Name Constraints" 2150#define LN_name_constraints "X509v3 Name Constraints"
1804#define NID_name_constraints 666 2151#define NID_name_constraints 666
@@ -1814,6 +2161,16 @@
1814#define NID_certificate_policies 89 2161#define NID_certificate_policies 89
1815#define OBJ_certificate_policies OBJ_id_ce,32L 2162#define OBJ_certificate_policies OBJ_id_ce,32L
1816 2163
2164#define SN_any_policy "anyPolicy"
2165#define LN_any_policy "X509v3 Any Policy"
2166#define NID_any_policy 746
2167#define OBJ_any_policy OBJ_certificate_policies,0L
2168
2169#define SN_policy_mappings "policyMappings"
2170#define LN_policy_mappings "X509v3 Policy Mappings"
2171#define NID_policy_mappings 747
2172#define OBJ_policy_mappings OBJ_id_ce,33L
2173
1817#define SN_authority_key_identifier "authorityKeyIdentifier" 2174#define SN_authority_key_identifier "authorityKeyIdentifier"
1818#define LN_authority_key_identifier "X509v3 Authority Key Identifier" 2175#define LN_authority_key_identifier "X509v3 Authority Key Identifier"
1819#define NID_authority_key_identifier 90 2176#define NID_authority_key_identifier 90
@@ -1829,6 +2186,11 @@
1829#define NID_ext_key_usage 126 2186#define NID_ext_key_usage 126
1830#define OBJ_ext_key_usage OBJ_id_ce,37L 2187#define OBJ_ext_key_usage OBJ_id_ce,37L
1831 2188
2189#define SN_inhibit_any_policy "inhibitAnyPolicy"
2190#define LN_inhibit_any_policy "X509v3 Inhibit Any Policy"
2191#define NID_inhibit_any_policy 748
2192#define OBJ_inhibit_any_policy OBJ_id_ce,54L
2193
1832#define SN_target_information "targetInformation" 2194#define SN_target_information "targetInformation"
1833#define LN_target_information "X509v3 AC Targeting" 2195#define LN_target_information "X509v3 AC Targeting"
1834#define NID_target_information 402 2196#define NID_target_information 402
@@ -1998,7 +2360,7 @@
1998#define SN_zlib_compression "ZLIB" 2360#define SN_zlib_compression "ZLIB"
1999#define LN_zlib_compression "zlib compression" 2361#define LN_zlib_compression "zlib compression"
2000#define NID_zlib_compression 125 2362#define NID_zlib_compression 125
2001#define OBJ_zlib_compression 1L,1L,1L,1L,666L,2L 2363#define OBJ_zlib_compression OBJ_id_smime_alg,8L
2002 2364
2003#define OBJ_csor 2L,16L,840L,1L,101L,3L 2365#define OBJ_csor 2L,16L,840L,1L,101L,3L
2004 2366
@@ -2106,6 +2468,18 @@
2106#define LN_des_ede3_cfb8 "des-ede3-cfb8" 2468#define LN_des_ede3_cfb8 "des-ede3-cfb8"
2107#define NID_des_ede3_cfb8 659 2469#define NID_des_ede3_cfb8 659
2108 2470
2471#define SN_id_aes128_wrap "id-aes128-wrap"
2472#define NID_id_aes128_wrap 788
2473#define OBJ_id_aes128_wrap OBJ_aes,5L
2474
2475#define SN_id_aes192_wrap "id-aes192-wrap"
2476#define NID_id_aes192_wrap 789
2477#define OBJ_id_aes192_wrap OBJ_aes,25L
2478
2479#define SN_id_aes256_wrap "id-aes256-wrap"
2480#define NID_id_aes256_wrap 790
2481#define OBJ_id_aes256_wrap OBJ_aes,45L
2482
2109#define OBJ_nist_hashalgs OBJ_nistAlgorithms,2L 2483#define OBJ_nist_hashalgs OBJ_nistAlgorithms,2L
2110 2484
2111#define SN_sha256 "SHA256" 2485#define SN_sha256 "SHA256"
@@ -2152,7 +2526,7 @@
2152 2526
2153#define SN_data "data" 2527#define SN_data "data"
2154#define NID_data 434 2528#define NID_data 434
2155#define OBJ_data OBJ_ccitt,9L 2529#define OBJ_data OBJ_itu_t,9L
2156 2530
2157#define SN_pss "pss" 2531#define SN_pss "pss"
2158#define NID_pss 435 2532#define NID_pss 435
@@ -2441,7 +2815,7 @@
2441#define SN_id_set "id-set" 2815#define SN_id_set "id-set"
2442#define LN_id_set "Secure Electronic Transactions" 2816#define LN_id_set "Secure Electronic Transactions"
2443#define NID_id_set 512 2817#define NID_id_set 512
2444#define OBJ_id_set 2L,23L,42L 2818#define OBJ_id_set OBJ_international_organizations,42L
2445 2819
2446#define SN_set_ctype "set-ctype" 2820#define SN_set_ctype "set-ctype"
2447#define LN_set_ctype "content types" 2821#define LN_set_ctype "content types"
@@ -2985,3 +3359,124 @@
2985#define NID_rsaOAEPEncryptionSET 644 3359#define NID_rsaOAEPEncryptionSET 644
2986#define OBJ_rsaOAEPEncryptionSET OBJ_rsadsi,1L,1L,6L 3360#define OBJ_rsaOAEPEncryptionSET OBJ_rsadsi,1L,1L,6L
2987 3361
3362#define SN_ipsec3 "Oakley-EC2N-3"
3363#define LN_ipsec3 "ipsec3"
3364#define NID_ipsec3 749
3365
3366#define SN_ipsec4 "Oakley-EC2N-4"
3367#define LN_ipsec4 "ipsec4"
3368#define NID_ipsec4 750
3369
3370#define SN_camellia_128_cbc "CAMELLIA-128-CBC"
3371#define LN_camellia_128_cbc "camellia-128-cbc"
3372#define NID_camellia_128_cbc 751
3373#define OBJ_camellia_128_cbc 1L,2L,392L,200011L,61L,1L,1L,1L,2L
3374
3375#define SN_camellia_192_cbc "CAMELLIA-192-CBC"
3376#define LN_camellia_192_cbc "camellia-192-cbc"
3377#define NID_camellia_192_cbc 752
3378#define OBJ_camellia_192_cbc 1L,2L,392L,200011L,61L,1L,1L,1L,3L
3379
3380#define SN_camellia_256_cbc "CAMELLIA-256-CBC"
3381#define LN_camellia_256_cbc "camellia-256-cbc"
3382#define NID_camellia_256_cbc 753
3383#define OBJ_camellia_256_cbc 1L,2L,392L,200011L,61L,1L,1L,1L,4L
3384
3385#define OBJ_ntt_ds 0L,3L,4401L,5L
3386
3387#define OBJ_camellia OBJ_ntt_ds,3L,1L,9L
3388
3389#define SN_camellia_128_ecb "CAMELLIA-128-ECB"
3390#define LN_camellia_128_ecb "camellia-128-ecb"
3391#define NID_camellia_128_ecb 754
3392#define OBJ_camellia_128_ecb OBJ_camellia,1L
3393
3394#define SN_camellia_128_ofb128 "CAMELLIA-128-OFB"
3395#define LN_camellia_128_ofb128 "camellia-128-ofb"
3396#define NID_camellia_128_ofb128 766
3397#define OBJ_camellia_128_ofb128 OBJ_camellia,3L
3398
3399#define SN_camellia_128_cfb128 "CAMELLIA-128-CFB"
3400#define LN_camellia_128_cfb128 "camellia-128-cfb"
3401#define NID_camellia_128_cfb128 757
3402#define OBJ_camellia_128_cfb128 OBJ_camellia,4L
3403
3404#define SN_camellia_192_ecb "CAMELLIA-192-ECB"
3405#define LN_camellia_192_ecb "camellia-192-ecb"
3406#define NID_camellia_192_ecb 755
3407#define OBJ_camellia_192_ecb OBJ_camellia,21L
3408
3409#define SN_camellia_192_ofb128 "CAMELLIA-192-OFB"
3410#define LN_camellia_192_ofb128 "camellia-192-ofb"
3411#define NID_camellia_192_ofb128 767
3412#define OBJ_camellia_192_ofb128 OBJ_camellia,23L
3413
3414#define SN_camellia_192_cfb128 "CAMELLIA-192-CFB"
3415#define LN_camellia_192_cfb128 "camellia-192-cfb"
3416#define NID_camellia_192_cfb128 758
3417#define OBJ_camellia_192_cfb128 OBJ_camellia,24L
3418
3419#define SN_camellia_256_ecb "CAMELLIA-256-ECB"
3420#define LN_camellia_256_ecb "camellia-256-ecb"
3421#define NID_camellia_256_ecb 756
3422#define OBJ_camellia_256_ecb OBJ_camellia,41L
3423
3424#define SN_camellia_256_ofb128 "CAMELLIA-256-OFB"
3425#define LN_camellia_256_ofb128 "camellia-256-ofb"
3426#define NID_camellia_256_ofb128 768
3427#define OBJ_camellia_256_ofb128 OBJ_camellia,43L
3428
3429#define SN_camellia_256_cfb128 "CAMELLIA-256-CFB"
3430#define LN_camellia_256_cfb128 "camellia-256-cfb"
3431#define NID_camellia_256_cfb128 759
3432#define OBJ_camellia_256_cfb128 OBJ_camellia,44L
3433
3434#define SN_camellia_128_cfb1 "CAMELLIA-128-CFB1"
3435#define LN_camellia_128_cfb1 "camellia-128-cfb1"
3436#define NID_camellia_128_cfb1 760
3437
3438#define SN_camellia_192_cfb1 "CAMELLIA-192-CFB1"
3439#define LN_camellia_192_cfb1 "camellia-192-cfb1"
3440#define NID_camellia_192_cfb1 761
3441
3442#define SN_camellia_256_cfb1 "CAMELLIA-256-CFB1"
3443#define LN_camellia_256_cfb1 "camellia-256-cfb1"
3444#define NID_camellia_256_cfb1 762
3445
3446#define SN_camellia_128_cfb8 "CAMELLIA-128-CFB8"
3447#define LN_camellia_128_cfb8 "camellia-128-cfb8"
3448#define NID_camellia_128_cfb8 763
3449
3450#define SN_camellia_192_cfb8 "CAMELLIA-192-CFB8"
3451#define LN_camellia_192_cfb8 "camellia-192-cfb8"
3452#define NID_camellia_192_cfb8 764
3453
3454#define SN_camellia_256_cfb8 "CAMELLIA-256-CFB8"
3455#define LN_camellia_256_cfb8 "camellia-256-cfb8"
3456#define NID_camellia_256_cfb8 765
3457
3458#define SN_kisa "KISA"
3459#define LN_kisa "kisa"
3460#define NID_kisa 773
3461#define OBJ_kisa OBJ_member_body,410L,200004L
3462
3463#define SN_seed_ecb "SEED-ECB"
3464#define LN_seed_ecb "seed-ecb"
3465#define NID_seed_ecb 776
3466#define OBJ_seed_ecb OBJ_kisa,1L,3L
3467
3468#define SN_seed_cbc "SEED-CBC"
3469#define LN_seed_cbc "seed-cbc"
3470#define NID_seed_cbc 777
3471#define OBJ_seed_cbc OBJ_kisa,1L,4L
3472
3473#define SN_seed_cfb128 "SEED-CFB"
3474#define LN_seed_cfb128 "seed-cfb"
3475#define NID_seed_cfb128 779
3476#define OBJ_seed_cfb128 OBJ_kisa,1L,5L
3477
3478#define SN_seed_ofb128 "SEED-OFB"
3479#define LN_seed_ofb128 "seed-ofb"
3480#define NID_seed_ofb128 778
3481#define OBJ_seed_ofb128 OBJ_kisa,1L,6L
3482
diff --git a/src/lib/libcrypto/ocsp/Makefile b/src/lib/libcrypto/ocsp/Makefile
index 59f7098d9e..0fe028960e 100644
--- a/src/lib/libcrypto/ocsp/Makefile
+++ b/src/lib/libcrypto/ocsp/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include 8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -54,6 +49,7 @@ links:
54 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 49 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
55 50
56install: 51install:
52 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
57 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 53 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
58 do \ 54 do \
59 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 55 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -69,6 +65,7 @@ lint:
69 lint -DLINT $(INCLUDES) $(SRC)>fluff 65 lint -DLINT $(INCLUDES) $(SRC)>fluff
70 66
71depend: 67depend:
68 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
72 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC) 69 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
73 70
74dclean: 71dclean:
@@ -80,212 +77,137 @@ clean:
80 77
81# DO NOT DELETE THIS LINE -- make depend depends on it. 78# DO NOT DELETE THIS LINE -- make depend depends on it.
82 79
83ocsp_asn.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h 80ocsp_asn.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
84ocsp_asn.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h 81ocsp_asn.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
85ocsp_asn.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
86ocsp_asn.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
87ocsp_asn.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 82ocsp_asn.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
88ocsp_asn.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 83ocsp_asn.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
89ocsp_asn.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 84ocsp_asn.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
90ocsp_asn.o: ../../include/openssl/e_os2.h ../../include/openssl/evp.h 85ocsp_asn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
91ocsp_asn.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
92ocsp_asn.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
93ocsp_asn.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
94ocsp_asn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 86ocsp_asn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
95ocsp_asn.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h 87ocsp_asn.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h
96ocsp_asn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 88ocsp_asn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
97ocsp_asn.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 89ocsp_asn.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
98ocsp_asn.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 90ocsp_asn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
99ocsp_asn.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 91ocsp_asn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
100ocsp_asn.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 92ocsp_asn.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
101ocsp_asn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 93ocsp_asn.o: ocsp_asn.c
102ocsp_asn.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 94ocsp_cl.o: ../../e_os.h ../../include/openssl/asn1.h
103ocsp_asn.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 95ocsp_cl.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
104ocsp_asn.o: ../../include/openssl/x509v3.h ocsp_asn.c
105ocsp_cl.o: ../../e_os.h ../../include/openssl/aes.h
106ocsp_cl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
107ocsp_cl.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
108ocsp_cl.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
109ocsp_cl.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 96ocsp_cl.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
110ocsp_cl.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 97ocsp_cl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
111ocsp_cl.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 98ocsp_cl.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
112ocsp_cl.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 99ocsp_cl.o: ../../include/openssl/err.h ../../include/openssl/evp.h
113ocsp_cl.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 100ocsp_cl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
114ocsp_cl.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
115ocsp_cl.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
116ocsp_cl.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
117ocsp_cl.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h 101ocsp_cl.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
118ocsp_cl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 102ocsp_cl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
119ocsp_cl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h 103ocsp_cl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
120ocsp_cl.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h 104ocsp_cl.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
121ocsp_cl.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h 105ocsp_cl.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
122ocsp_cl.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 106ocsp_cl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
123ocsp_cl.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 107ocsp_cl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
124ocsp_cl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 108ocsp_cl.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
125ocsp_cl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 109ocsp_cl.o: ../cryptlib.h ocsp_cl.c
126ocsp_cl.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 110ocsp_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
127ocsp_cl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 111ocsp_err.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
128ocsp_cl.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_cl.c 112ocsp_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
129ocsp_err.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h 113ocsp_err.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
130ocsp_err.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 114ocsp_err.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
131ocsp_err.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 115ocsp_err.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
132ocsp_err.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
133ocsp_err.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
134ocsp_err.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
135ocsp_err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
136ocsp_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
137ocsp_err.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
138ocsp_err.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
139ocsp_err.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
140ocsp_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 116ocsp_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
141ocsp_err.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h 117ocsp_err.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h
142ocsp_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 118ocsp_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
143ocsp_err.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 119ocsp_err.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
144ocsp_err.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 120ocsp_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
145ocsp_err.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 121ocsp_err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
146ocsp_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 122ocsp_err.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
147ocsp_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 123ocsp_err.o: ocsp_err.c
148ocsp_err.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 124ocsp_ext.o: ../../e_os.h ../../include/openssl/asn1.h
149ocsp_err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 125ocsp_ext.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
150ocsp_err.o: ../../include/openssl/x509v3.h ocsp_err.c
151ocsp_ext.o: ../../e_os.h ../../include/openssl/aes.h
152ocsp_ext.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
153ocsp_ext.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
154ocsp_ext.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
155ocsp_ext.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 126ocsp_ext.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
156ocsp_ext.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 127ocsp_ext.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
157ocsp_ext.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 128ocsp_ext.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
158ocsp_ext.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 129ocsp_ext.o: ../../include/openssl/err.h ../../include/openssl/evp.h
159ocsp_ext.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 130ocsp_ext.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
160ocsp_ext.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
161ocsp_ext.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
162ocsp_ext.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
163ocsp_ext.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h 131ocsp_ext.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
164ocsp_ext.o: ../../include/openssl/opensslconf.h 132ocsp_ext.o: ../../include/openssl/opensslconf.h
165ocsp_ext.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 133ocsp_ext.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
166ocsp_ext.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h 134ocsp_ext.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
167ocsp_ext.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 135ocsp_ext.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
168ocsp_ext.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 136ocsp_ext.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
169ocsp_ext.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 137ocsp_ext.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
170ocsp_ext.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 138ocsp_ext.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_ext.c
171ocsp_ext.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 139ocsp_ht.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
172ocsp_ext.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 140ocsp_ht.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
173ocsp_ext.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h 141ocsp_ht.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
174ocsp_ext.o: ../cryptlib.h ocsp_ext.c 142ocsp_ht.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
175ocsp_ht.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h 143ocsp_ht.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
176ocsp_ht.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 144ocsp_ht.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
177ocsp_ht.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
178ocsp_ht.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
179ocsp_ht.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
180ocsp_ht.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
181ocsp_ht.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
182ocsp_ht.o: ../../include/openssl/err.h ../../include/openssl/evp.h
183ocsp_ht.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
184ocsp_ht.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
185ocsp_ht.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
186ocsp_ht.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 145ocsp_ht.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
187ocsp_ht.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h 146ocsp_ht.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h
188ocsp_ht.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 147ocsp_ht.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
189ocsp_ht.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 148ocsp_ht.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
190ocsp_ht.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 149ocsp_ht.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
191ocsp_ht.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 150ocsp_ht.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
192ocsp_ht.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 151ocsp_ht.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
193ocsp_ht.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 152ocsp_ht.o: ocsp_ht.c
194ocsp_ht.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 153ocsp_lib.o: ../../e_os.h ../../include/openssl/asn1.h
195ocsp_ht.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 154ocsp_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
196ocsp_ht.o: ../../include/openssl/x509v3.h ocsp_ht.c
197ocsp_lib.o: ../../e_os.h ../../include/openssl/aes.h
198ocsp_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
199ocsp_lib.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
200ocsp_lib.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
201ocsp_lib.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 155ocsp_lib.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
202ocsp_lib.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 156ocsp_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
203ocsp_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 157ocsp_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
204ocsp_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 158ocsp_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
205ocsp_lib.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 159ocsp_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
206ocsp_lib.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
207ocsp_lib.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
208ocsp_lib.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
209ocsp_lib.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h 160ocsp_lib.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
210ocsp_lib.o: ../../include/openssl/opensslconf.h 161ocsp_lib.o: ../../include/openssl/opensslconf.h
211ocsp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 162ocsp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
212ocsp_lib.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h 163ocsp_lib.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
213ocsp_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h 164ocsp_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
214ocsp_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 165ocsp_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
215ocsp_lib.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 166ocsp_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
216ocsp_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 167ocsp_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
217ocsp_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 168ocsp_lib.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_lib.c
218ocsp_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 169ocsp_prn.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
219ocsp_lib.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 170ocsp_prn.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
220ocsp_lib.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h 171ocsp_prn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
221ocsp_lib.o: ../cryptlib.h ocsp_lib.c 172ocsp_prn.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
222ocsp_prn.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h 173ocsp_prn.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
223ocsp_prn.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 174ocsp_prn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
224ocsp_prn.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
225ocsp_prn.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
226ocsp_prn.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
227ocsp_prn.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
228ocsp_prn.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
229ocsp_prn.o: ../../include/openssl/err.h ../../include/openssl/evp.h
230ocsp_prn.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
231ocsp_prn.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
232ocsp_prn.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
233ocsp_prn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 175ocsp_prn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
234ocsp_prn.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h 176ocsp_prn.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h
235ocsp_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 177ocsp_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
236ocsp_prn.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h 178ocsp_prn.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
237ocsp_prn.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 179ocsp_prn.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
238ocsp_prn.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 180ocsp_prn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
239ocsp_prn.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 181ocsp_prn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
240ocsp_prn.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 182ocsp_prn.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
241ocsp_prn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 183ocsp_prn.o: ocsp_prn.c
242ocsp_prn.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 184ocsp_srv.o: ../../e_os.h ../../include/openssl/asn1.h
243ocsp_prn.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 185ocsp_srv.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
244ocsp_prn.o: ../../include/openssl/x509v3.h ocsp_prn.c
245ocsp_srv.o: ../../e_os.h ../../include/openssl/aes.h
246ocsp_srv.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
247ocsp_srv.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
248ocsp_srv.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
249ocsp_srv.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 186ocsp_srv.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
250ocsp_srv.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 187ocsp_srv.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
251ocsp_srv.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 188ocsp_srv.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
252ocsp_srv.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 189ocsp_srv.o: ../../include/openssl/err.h ../../include/openssl/evp.h
253ocsp_srv.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 190ocsp_srv.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
254ocsp_srv.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
255ocsp_srv.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
256ocsp_srv.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
257ocsp_srv.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h 191ocsp_srv.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
258ocsp_srv.o: ../../include/openssl/opensslconf.h 192ocsp_srv.o: ../../include/openssl/opensslconf.h
259ocsp_srv.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 193ocsp_srv.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
260ocsp_srv.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h 194ocsp_srv.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
261ocsp_srv.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h 195ocsp_srv.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
262ocsp_srv.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 196ocsp_srv.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
263ocsp_srv.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 197ocsp_srv.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
264ocsp_srv.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 198ocsp_srv.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
265ocsp_srv.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 199ocsp_srv.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_srv.c
266ocsp_srv.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 200ocsp_vfy.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
267ocsp_srv.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 201ocsp_vfy.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
268ocsp_srv.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h 202ocsp_vfy.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
269ocsp_srv.o: ../cryptlib.h ocsp_srv.c 203ocsp_vfy.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
270ocsp_vfy.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h 204ocsp_vfy.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
271ocsp_vfy.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 205ocsp_vfy.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
272ocsp_vfy.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
273ocsp_vfy.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
274ocsp_vfy.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
275ocsp_vfy.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
276ocsp_vfy.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
277ocsp_vfy.o: ../../include/openssl/err.h ../../include/openssl/evp.h
278ocsp_vfy.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
279ocsp_vfy.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
280ocsp_vfy.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
281ocsp_vfy.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 206ocsp_vfy.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
282ocsp_vfy.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h 207ocsp_vfy.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h
283ocsp_vfy.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 208ocsp_vfy.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
284ocsp_vfy.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 209ocsp_vfy.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
285ocsp_vfy.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 210ocsp_vfy.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
286ocsp_vfy.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 211ocsp_vfy.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
287ocsp_vfy.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 212ocsp_vfy.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
288ocsp_vfy.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 213ocsp_vfy.o: ocsp_vfy.c
289ocsp_vfy.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
290ocsp_vfy.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
291ocsp_vfy.o: ../../include/openssl/x509v3.h ocsp_vfy.c
diff --git a/src/lib/libcrypto/opensslconf.h b/src/lib/libcrypto/opensslconf.h
index 492041bc7c..0850d4a693 100644
--- a/src/lib/libcrypto/opensslconf.h
+++ b/src/lib/libcrypto/opensslconf.h
@@ -4,20 +4,71 @@
4/* OpenSSL was configured with the following options: */ 4/* OpenSSL was configured with the following options: */
5#ifndef OPENSSL_DOING_MAKEDEPEND 5#ifndef OPENSSL_DOING_MAKEDEPEND
6 6
7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_NO_DYNAMIC_ENGINE
37# define OPENSSL_NO_DYNAMIC_ENGINE
38#endif
12 39
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 40/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 41 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 42 who haven't had the time to do the appropriate changes in their
16 applications. */ 43 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 44#ifdef OPENSSL_ALGORITHM_DEFINES
45# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
46# define NO_CAMELLIA
47# endif
48# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
49# define NO_CMS
50# endif
51# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
52# define NO_GMP
53# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 54# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 55# define NO_KRB5
20# endif 56# endif
57# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
58# define NO_MDC2
59# endif
60# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
61# define NO_RC5
62# endif
63# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
64# define NO_RFC3779
65# endif
66# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
67# define NO_SEED
68# endif
69# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
70# define NO_TLSEXT
71# endif
21#endif 72#endif
22 73
23/* crypto/opensslconf.h.in */ 74/* crypto/opensslconf.h.in */
@@ -27,6 +78,7 @@
27 78
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 79#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 80#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
81#define ENGINESDIR "/usr/local/ssl/lib/engines"
30#define OPENSSLDIR "/usr/local/ssl" 82#define OPENSSLDIR "/usr/local/ssl"
31#endif 83#endif
32#endif 84#endif
diff --git a/src/lib/libcrypto/opensslconf.h.in b/src/lib/libcrypto/opensslconf.h.in
index 685e83b7a3..cee83acf98 100644
--- a/src/lib/libcrypto/opensslconf.h.in
+++ b/src/lib/libcrypto/opensslconf.h.in
@@ -5,6 +5,7 @@
5 5
6#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 6#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
7#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 7#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
8#define ENGINESDIR "/usr/local/lib/engines"
8#define OPENSSLDIR "/usr/local/ssl" 9#define OPENSSLDIR "/usr/local/ssl"
9#endif 10#endif
10#endif 11#endif
diff --git a/src/lib/libcrypto/pem/Makefile b/src/lib/libcrypto/pem/Makefile
index fbc2b5d056..742194fd24 100644
--- a/src/lib/libcrypto/pem/Makefile
+++ b/src/lib/libcrypto/pem/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include 8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -54,6 +49,7 @@ links: $(EXHEADER)
54 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 49 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
55 50
56install: 51install:
52 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
57 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 53 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
58 do \ 54 do \
59 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 55 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -69,6 +65,7 @@ lint:
69 lint -DLINT $(INCLUDES) $(SRC)>fluff 65 lint -DLINT $(INCLUDES) $(SRC)>fluff
70 66
71depend: 67depend:
68 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
72 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC) 69 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
73 70
74dclean: 71dclean:
@@ -80,256 +77,165 @@ clean:
80 77
81# DO NOT DELETE THIS LINE -- make depend depends on it. 78# DO NOT DELETE THIS LINE -- make depend depends on it.
82 79
83pem_all.o: ../../e_os.h ../../include/openssl/aes.h 80pem_all.o: ../../e_os.h ../../include/openssl/asn1.h
84pem_all.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 81pem_all.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
85pem_all.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 82pem_all.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
86pem_all.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
87pem_all.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
88pem_all.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
89pem_all.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h 83pem_all.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
90pem_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h 84pem_all.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
91pem_all.o: ../../include/openssl/fips.h ../../include/openssl/idea.h 85pem_all.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
92pem_all.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 86pem_all.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
93pem_all.o: ../../include/openssl/md4.h ../../include/openssl/md5.h 87pem_all.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
94pem_all.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h 88pem_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
95pem_all.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 89pem_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
96pem_all.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 90pem_all.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
97pem_all.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h 91pem_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
98pem_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 92pem_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
99pem_all.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 93pem_all.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
100pem_all.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 94pem_all.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_all.c
101pem_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 95pem_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
102pem_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 96pem_err.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
103pem_all.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 97pem_err.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
104pem_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 98pem_err.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
105pem_all.o: ../cryptlib.h pem_all.c 99pem_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
106pem_err.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h 100pem_err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
107pem_err.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
108pem_err.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
109pem_err.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
110pem_err.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
111pem_err.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
112pem_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
113pem_err.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
114pem_err.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
115pem_err.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
116pem_err.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
117pem_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 101pem_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
118pem_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 102pem_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
119pem_err.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h 103pem_err.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
120pem_err.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 104pem_err.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
121pem_err.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 105pem_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
122pem_err.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 106pem_err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
123pem_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 107pem_err.o: ../../include/openssl/x509_vfy.h pem_err.c
124pem_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 108pem_info.o: ../../e_os.h ../../include/openssl/asn1.h
125pem_err.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 109pem_info.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
126pem_err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 110pem_info.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h
127pem_err.o: pem_err.c 111pem_info.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
128pem_info.o: ../../e_os.h ../../include/openssl/aes.h 112pem_info.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
129pem_info.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
130pem_info.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
131pem_info.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
132pem_info.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
133pem_info.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
134pem_info.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
135pem_info.o: ../../include/openssl/err.h ../../include/openssl/evp.h 113pem_info.o: ../../include/openssl/err.h ../../include/openssl/evp.h
136pem_info.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 114pem_info.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
137pem_info.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 115pem_info.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
138pem_info.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
139pem_info.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
140pem_info.o: ../../include/openssl/opensslconf.h
141pem_info.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 116pem_info.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
142pem_info.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h 117pem_info.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
143pem_info.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 118pem_info.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
144pem_info.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
145pem_info.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
146pem_info.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 119pem_info.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
147pem_info.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 120pem_info.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
148pem_info.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
149pem_info.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 121pem_info.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
150pem_info.o: ../cryptlib.h pem_info.c 122pem_info.o: ../cryptlib.h pem_info.c
151pem_lib.o: ../../e_os.h ../../include/openssl/aes.h 123pem_lib.o: ../../e_os.h ../../include/openssl/asn1.h
152pem_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 124pem_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
153pem_lib.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
154pem_lib.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
155pem_lib.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 125pem_lib.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
156pem_lib.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h 126pem_lib.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
157pem_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h 127pem_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
158pem_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h 128pem_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
159pem_lib.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 129pem_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
160pem_lib.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
161pem_lib.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
162pem_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 130pem_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
163pem_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 131pem_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
164pem_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h 132pem_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
165pem_lib.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h 133pem_lib.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h
166pem_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h 134pem_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
167pem_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 135pem_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
168pem_lib.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 136pem_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
169pem_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 137pem_lib.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
170pem_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 138pem_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
171pem_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 139pem_lib.o: ../cryptlib.h pem_lib.c
172pem_lib.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 140pem_oth.o: ../../e_os.h ../../include/openssl/asn1.h
173pem_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_lib.c 141pem_oth.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
174pem_oth.o: ../../e_os.h ../../include/openssl/aes.h 142pem_oth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
175pem_oth.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 143pem_oth.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
176pem_oth.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 144pem_oth.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
177pem_oth.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 145pem_oth.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
178pem_oth.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
179pem_oth.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
180pem_oth.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
181pem_oth.o: ../../include/openssl/err.h ../../include/openssl/evp.h
182pem_oth.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
183pem_oth.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
184pem_oth.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
185pem_oth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 146pem_oth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
186pem_oth.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 147pem_oth.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
187pem_oth.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h 148pem_oth.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
188pem_oth.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h 149pem_oth.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
189pem_oth.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h 150pem_oth.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
190pem_oth.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 151pem_oth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
191pem_oth.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 152pem_oth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
192pem_oth.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 153pem_oth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_oth.c
193pem_oth.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 154pem_pk8.o: ../../e_os.h ../../include/openssl/asn1.h
194pem_oth.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 155pem_pk8.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
195pem_oth.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 156pem_pk8.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
196pem_oth.o: ../cryptlib.h pem_oth.c 157pem_pk8.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
197pem_pk8.o: ../../e_os.h ../../include/openssl/aes.h 158pem_pk8.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
198pem_pk8.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 159pem_pk8.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
199pem_pk8.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
200pem_pk8.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
201pem_pk8.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
202pem_pk8.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
203pem_pk8.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
204pem_pk8.o: ../../include/openssl/err.h ../../include/openssl/evp.h
205pem_pk8.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
206pem_pk8.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
207pem_pk8.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
208pem_pk8.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 160pem_pk8.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
209pem_pk8.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 161pem_pk8.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
210pem_pk8.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h 162pem_pk8.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
211pem_pk8.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h 163pem_pk8.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h
212pem_pk8.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h 164pem_pk8.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
213pem_pk8.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 165pem_pk8.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
214pem_pk8.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 166pem_pk8.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
215pem_pk8.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 167pem_pk8.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
216pem_pk8.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 168pem_pk8.o: ../cryptlib.h pem_pk8.c
217pem_pk8.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 169pem_pkey.o: ../../e_os.h ../../include/openssl/asn1.h
218pem_pk8.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 170pem_pkey.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
219pem_pk8.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_pk8.c 171pem_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
220pem_pkey.o: ../../e_os.h ../../include/openssl/aes.h 172pem_pkey.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
221pem_pkey.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 173pem_pkey.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
222pem_pkey.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 174pem_pkey.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
223pem_pkey.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
224pem_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
225pem_pkey.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
226pem_pkey.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
227pem_pkey.o: ../../include/openssl/err.h ../../include/openssl/evp.h
228pem_pkey.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
229pem_pkey.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
230pem_pkey.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
231pem_pkey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 175pem_pkey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
232pem_pkey.o: ../../include/openssl/opensslconf.h 176pem_pkey.o: ../../include/openssl/opensslconf.h
233pem_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 177pem_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
234pem_pkey.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h 178pem_pkey.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
235pem_pkey.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h 179pem_pkey.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
236pem_pkey.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h 180pem_pkey.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
237pem_pkey.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 181pem_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
238pem_pkey.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 182pem_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
239pem_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 183pem_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_pkey.c
240pem_pkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 184pem_seal.o: ../../e_os.h ../../include/openssl/asn1.h
241pem_pkey.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 185pem_seal.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
242pem_pkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 186pem_seal.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
243pem_pkey.o: ../cryptlib.h pem_pkey.c 187pem_seal.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
244pem_seal.o: ../../e_os.h ../../include/openssl/aes.h 188pem_seal.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
245pem_seal.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 189pem_seal.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
246pem_seal.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
247pem_seal.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
248pem_seal.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
249pem_seal.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
250pem_seal.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
251pem_seal.o: ../../include/openssl/err.h ../../include/openssl/evp.h
252pem_seal.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
253pem_seal.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
254pem_seal.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
255pem_seal.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 190pem_seal.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
256pem_seal.o: ../../include/openssl/opensslconf.h 191pem_seal.o: ../../include/openssl/opensslconf.h
257pem_seal.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 192pem_seal.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
258pem_seal.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h 193pem_seal.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
259pem_seal.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h 194pem_seal.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
260pem_seal.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
261pem_seal.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
262pem_seal.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 195pem_seal.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
263pem_seal.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 196pem_seal.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
264pem_seal.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 197pem_seal.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
265pem_seal.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
266pem_seal.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_seal.c 198pem_seal.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_seal.c
267pem_sign.o: ../../e_os.h ../../include/openssl/aes.h 199pem_sign.o: ../../e_os.h ../../include/openssl/asn1.h
268pem_sign.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 200pem_sign.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
269pem_sign.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 201pem_sign.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
270pem_sign.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 202pem_sign.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
271pem_sign.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 203pem_sign.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
272pem_sign.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h 204pem_sign.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
273pem_sign.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
274pem_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h
275pem_sign.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
276pem_sign.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
277pem_sign.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
278pem_sign.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 205pem_sign.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
279pem_sign.o: ../../include/openssl/opensslconf.h 206pem_sign.o: ../../include/openssl/opensslconf.h
280pem_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 207pem_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
281pem_sign.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h 208pem_sign.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
282pem_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h 209pem_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
283pem_sign.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 210pem_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
284pem_sign.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 211pem_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
285pem_sign.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 212pem_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
286pem_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 213pem_sign.o: ../cryptlib.h pem_sign.c
287pem_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 214pem_x509.o: ../../e_os.h ../../include/openssl/asn1.h
288pem_sign.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 215pem_x509.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
289pem_sign.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_sign.c 216pem_x509.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
290pem_x509.o: ../../e_os.h ../../include/openssl/aes.h 217pem_x509.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
291pem_x509.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 218pem_x509.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
292pem_x509.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 219pem_x509.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
293pem_x509.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
294pem_x509.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
295pem_x509.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
296pem_x509.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
297pem_x509.o: ../../include/openssl/err.h ../../include/openssl/evp.h
298pem_x509.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
299pem_x509.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
300pem_x509.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
301pem_x509.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 220pem_x509.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
302pem_x509.o: ../../include/openssl/opensslconf.h 221pem_x509.o: ../../include/openssl/opensslconf.h
303pem_x509.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 222pem_x509.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
304pem_x509.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h 223pem_x509.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
305pem_x509.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 224pem_x509.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
306pem_x509.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 225pem_x509.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
307pem_x509.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 226pem_x509.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
308pem_x509.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 227pem_x509.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_x509.c
309pem_x509.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 228pem_xaux.o: ../../e_os.h ../../include/openssl/asn1.h
310pem_x509.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 229pem_xaux.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
311pem_x509.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 230pem_xaux.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
312pem_x509.o: ../cryptlib.h pem_x509.c 231pem_xaux.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
313pem_xaux.o: ../../e_os.h ../../include/openssl/aes.h 232pem_xaux.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
314pem_xaux.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 233pem_xaux.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
315pem_xaux.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
316pem_xaux.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
317pem_xaux.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
318pem_xaux.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
319pem_xaux.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
320pem_xaux.o: ../../include/openssl/err.h ../../include/openssl/evp.h
321pem_xaux.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
322pem_xaux.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
323pem_xaux.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
324pem_xaux.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 234pem_xaux.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
325pem_xaux.o: ../../include/openssl/opensslconf.h 235pem_xaux.o: ../../include/openssl/opensslconf.h
326pem_xaux.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 236pem_xaux.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
327pem_xaux.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h 237pem_xaux.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
328pem_xaux.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 238pem_xaux.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
329pem_xaux.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 239pem_xaux.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
330pem_xaux.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 240pem_xaux.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
331pem_xaux.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 241pem_xaux.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_xaux.c
332pem_xaux.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
333pem_xaux.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
334pem_xaux.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
335pem_xaux.o: ../cryptlib.h pem_xaux.c
diff --git a/src/lib/libcrypto/perlasm/x86ms.pl b/src/lib/libcrypto/perlasm/x86ms.pl
index b6bd744057..a0be2934c2 100644
--- a/src/lib/libcrypto/perlasm/x86ms.pl
+++ b/src/lib/libcrypto/perlasm/x86ms.pl
@@ -27,7 +27,13 @@ $label="L000";
27sub main'asm_init_output { @out=(); } 27sub main'asm_init_output { @out=(); }
28sub main'asm_get_output { return(@out); } 28sub main'asm_get_output { return(@out); }
29sub main'get_labels { return(@labels); } 29sub main'get_labels { return(@labels); }
30sub main'external_label { push(@labels,@_); } 30sub main'external_label
31{
32 push(@labels,@_);
33 foreach (@_) {
34 push(@out, "EXTRN\t_$_:DWORD\n");
35 }
36}
31 37
32sub main'LB 38sub main'LB
33 { 39 {
@@ -51,6 +57,11 @@ sub main'DWP
51 &get_mem("DWORD",@_); 57 &get_mem("DWORD",@_);
52 } 58 }
53 59
60sub main'QWP
61 {
62 &get_mem("QWORD",@_);
63 }
64
54sub main'BC 65sub main'BC
55 { 66 {
56 return @_; 67 return @_;
@@ -87,7 +98,7 @@ sub get_mem
87 $reg2=&conv($1); 98 $reg2=&conv($1);
88 $addr="_$2"; 99 $addr="_$2";
89 } 100 }
90 elsif ($addr =~ /^[_a-zA-Z]/) 101 elsif ($addr =~ /^[_a-z][_a-z0-9]*$/i)
91 { 102 {
92 $addr="_$addr"; 103 $addr="_$addr";
93 } 104 }
@@ -128,12 +139,14 @@ sub main'xorb { &out2("xor",@_); }
128sub main'add { &out2("add",@_); } 139sub main'add { &out2("add",@_); }
129sub main'adc { &out2("adc",@_); } 140sub main'adc { &out2("adc",@_); }
130sub main'sub { &out2("sub",@_); } 141sub main'sub { &out2("sub",@_); }
142sub main'sbb { &out2("sbb",@_); }
131sub main'rotl { &out2("rol",@_); } 143sub main'rotl { &out2("rol",@_); }
132sub main'rotr { &out2("ror",@_); } 144sub main'rotr { &out2("ror",@_); }
133sub main'exch { &out2("xchg",@_); } 145sub main'exch { &out2("xchg",@_); }
134sub main'cmp { &out2("cmp",@_); } 146sub main'cmp { &out2("cmp",@_); }
135sub main'lea { &out2("lea",@_); } 147sub main'lea { &out2("lea",@_); }
136sub main'mul { &out1("mul",@_); } 148sub main'mul { &out1("mul",@_); }
149sub main'imul { &out2("imul",@_); }
137sub main'div { &out1("div",@_); } 150sub main'div { &out1("div",@_); }
138sub main'dec { &out1("dec",@_); } 151sub main'dec { &out1("dec",@_); }
139sub main'inc { &out1("inc",@_); } 152sub main'inc { &out1("inc",@_); }
@@ -155,26 +168,54 @@ sub main'jne { &out1("jne",@_); }
155sub main'jno { &out1("jno",@_); } 168sub main'jno { &out1("jno",@_); }
156sub main'push { &out1("push",@_); $stack+=4; } 169sub main'push { &out1("push",@_); $stack+=4; }
157sub main'pop { &out1("pop",@_); $stack-=4; } 170sub main'pop { &out1("pop",@_); $stack-=4; }
171sub main'pushf { &out0("pushfd"); $stack+=4; }
172sub main'popf { &out0("popfd"); $stack-=4; }
158sub main'bswap { &out1("bswap",@_); &using486(); } 173sub main'bswap { &out1("bswap",@_); &using486(); }
159sub main'not { &out1("not",@_); } 174sub main'not { &out1("not",@_); }
160sub main'call { &out1("call",($_[0]=~/^\$L/?'':'_').$_[0]); } 175sub main'call { &out1("call",($_[0]=~/^\$L/?'':'_').$_[0]); }
176sub main'call_ptr { &out1p("call",@_); }
161sub main'ret { &out0("ret"); } 177sub main'ret { &out0("ret"); }
162sub main'nop { &out0("nop"); } 178sub main'nop { &out0("nop"); }
179sub main'test { &out2("test",@_); }
180sub main'bt { &out2("bt",@_); }
181sub main'leave { &out0("leave"); }
182sub main'cpuid { &out0("DW\t0A20Fh"); }
183sub main'rdtsc { &out0("DW\t0310Fh"); }
184sub main'halt { &out0("hlt"); }
163sub main'movz { &out2("movzx",@_); } 185sub main'movz { &out2("movzx",@_); }
186sub main'neg { &out1("neg",@_); }
187sub main'cld { &out0("cld"); }
188
189# SSE2
190sub main'emms { &out0("emms"); }
191sub main'movd { &out2("movd",@_); }
192sub main'movq { &out2("movq",@_); }
193sub main'movdqu { &out2("movdqu",@_); }
194sub main'movdqa { &out2("movdqa",@_); }
195sub main'movdq2q{ &out2("movdq2q",@_); }
196sub main'movq2dq{ &out2("movq2dq",@_); }
197sub main'paddq { &out2("paddq",@_); }
198sub main'pmuludq{ &out2("pmuludq",@_); }
199sub main'psrlq { &out2("psrlq",@_); }
200sub main'psllq { &out2("psllq",@_); }
201sub main'pxor { &out2("pxor",@_); }
202sub main'por { &out2("por",@_); }
203sub main'pand { &out2("pand",@_); }
164 204
165sub out2 205sub out2
166 { 206 {
167 local($name,$p1,$p2)=@_; 207 local($name,$p1,$p2)=@_;
168 local($l,$t); 208 local($l,$t,$line);
169 209
170 push(@out,"\t$name\t"); 210 $line="\t$name\t";
171 $t=&conv($p1).","; 211 $t=&conv($p1).",";
172 $l=length($t); 212 $l=length($t);
173 push(@out,$t); 213 $line.="$t";
174 $l=4-($l+9)/8; 214 $l=4-($l+9)/8;
175 push(@out,"\t" x $l); 215 $line.="\t" x $l;
176 push(@out,&conv($p2)); 216 $line.=&conv($p2);
177 push(@out,"\n"); 217 if ($line=~/\bxmm[0-7]\b/i) { $line=~s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i; }
218 push(@out,$line."\n");
178 } 219 }
179 220
180sub out0 221sub out0
@@ -214,7 +255,9 @@ sub main'file
214 local($tmp)=<<"EOF"; 255 local($tmp)=<<"EOF";
215 TITLE $file.asm 256 TITLE $file.asm
216 .386 257 .386
217.model FLAT 258.model FLAT
259_TEXT\$ SEGMENT PAGE 'CODE'
260
218EOF 261EOF
219 push(@out,$tmp); 262 push(@out,$tmp);
220 } 263 }
@@ -226,7 +269,6 @@ sub main'function_begin
226 push(@labels,$func); 269 push(@labels,$func);
227 270
228 local($tmp)=<<"EOF"; 271 local($tmp)=<<"EOF";
229_TEXT SEGMENT
230PUBLIC _$func 272PUBLIC _$func
231$extra 273$extra
232_$func PROC NEAR 274_$func PROC NEAR
@@ -244,7 +286,6 @@ sub main'function_begin_B
244 local($func,$extra)=@_; 286 local($func,$extra)=@_;
245 287
246 local($tmp)=<<"EOF"; 288 local($tmp)=<<"EOF";
247_TEXT SEGMENT
248PUBLIC _$func 289PUBLIC _$func
249$extra 290$extra
250_$func PROC NEAR 291_$func PROC NEAR
@@ -264,7 +305,6 @@ sub main'function_end
264 pop ebp 305 pop ebp
265 ret 306 ret
266_$func ENDP 307_$func ENDP
267_TEXT ENDS
268EOF 308EOF
269 push(@out,$tmp); 309 push(@out,$tmp);
270 $stack=0; 310 $stack=0;
@@ -277,7 +317,6 @@ sub main'function_end_B
277 317
278 local($tmp)=<<"EOF"; 318 local($tmp)=<<"EOF";
279_$func ENDP 319_$func ENDP
280_TEXT ENDS
281EOF 320EOF
282 push(@out,$tmp); 321 push(@out,$tmp);
283 $stack=0; 322 $stack=0;
@@ -300,6 +339,20 @@ EOF
300 339
301sub main'file_end 340sub main'file_end
302 { 341 {
342 # try to detect if SSE2 or MMX extensions were used...
343 my $xmmheader=<<___;
344.686
345.XMM
346IF \@Version LT 800
347XMMWORD STRUCT 16
348 DQ 2 dup (?)
349XMMWORD ENDS
350ENDIF
351___
352 if (grep {/\b[x]?mm[0-7]\b/i} @out) {
353 grep {s/\.[3-7]86/$xmmheader/} @out;
354 }
355 push(@out,"_TEXT\$ ENDS\n");
303 push(@out,"END\n"); 356 push(@out,"END\n");
304 } 357 }
305 358
@@ -331,6 +384,12 @@ sub main'comment
331 } 384 }
332 } 385 }
333 386
387sub main'public_label
388 {
389 $label{$_[0]}="_$_[0]" if (!defined($label{$_[0]}));
390 push(@out,"PUBLIC\t$label{$_[0]}\n");
391 }
392
334sub main'label 393sub main'label
335 { 394 {
336 if (!defined($label{$_[0]})) 395 if (!defined($label{$_[0]}))
@@ -348,19 +407,37 @@ sub main'set_label
348 $label{$_[0]}="\$${label}${_[0]}"; 407 $label{$_[0]}="\$${label}${_[0]}";
349 $label++; 408 $label++;
350 } 409 }
410 if ($_[1]!=0 && $_[1]>1)
411 {
412 main'align($_[1]);
413 }
351 if((defined $_[2]) && ($_[2] == 1)) 414 if((defined $_[2]) && ($_[2] == 1))
352 { 415 {
353 push(@out,"$label{$_[0]}::\n"); 416 push(@out,"$label{$_[0]}::\n");
354 } 417 }
418 elsif ($label{$_[0]} !~ /^\$/)
419 {
420 push(@out,"$label{$_[0]}\tLABEL PTR\n");
421 }
355 else 422 else
356 { 423 {
357 push(@out,"$label{$_[0]}:\n"); 424 push(@out,"$label{$_[0]}:\n");
358 } 425 }
359 } 426 }
360 427
428sub main'data_byte
429 {
430 push(@out,"\tDB\t".join(',',@_)."\n");
431 }
432
361sub main'data_word 433sub main'data_word
362 { 434 {
363 push(@out,"\tDD\t$_[0]\n"); 435 push(@out,"\tDD\t".join(',',@_)."\n");
436 }
437
438sub main'align
439 {
440 push(@out,"\tALIGN\t$_[0]\n");
364 } 441 }
365 442
366sub out1p 443sub out1p
@@ -368,7 +445,7 @@ sub out1p
368 local($name,$p1)=@_; 445 local($name,$p1)=@_;
369 local($l,$t); 446 local($l,$t);
370 447
371 push(@out,"\t$name\t ".&conv($p1)."\n"); 448 push(@out,"\t$name\t".&conv($p1)."\n");
372 } 449 }
373 450
374sub main'picmeup 451sub main'picmeup
@@ -378,3 +455,18 @@ sub main'picmeup
378 } 455 }
379 456
380sub main'blindpop { &out1("pop",@_); } 457sub main'blindpop { &out1("pop",@_); }
458
459sub main'initseg
460 {
461 local($f)=@_;
462 local($tmp)=<<___;
463OPTION DOTNAME
464.CRT\$XCU SEGMENT DWORD PUBLIC 'DATA'
465EXTRN _$f:NEAR
466DD _$f
467.CRT\$XCU ENDS
468___
469 push(@out,$tmp);
470 }
471
4721;
diff --git a/src/lib/libcrypto/perlasm/x86nasm.pl b/src/lib/libcrypto/perlasm/x86nasm.pl
index 4bdb3fe180..fa38f89c09 100644
--- a/src/lib/libcrypto/perlasm/x86nasm.pl
+++ b/src/lib/libcrypto/perlasm/x86nasm.pl
@@ -3,6 +3,7 @@
3package x86nasm; 3package x86nasm;
4 4
5$label="L000"; 5$label="L000";
6$under=($main'netware)?'':'_';
6 7
7%lb=( 'eax', 'al', 8%lb=( 'eax', 'al',
8 'ebx', 'bl', 9 'ebx', 'bl',
@@ -32,7 +33,8 @@ sub main'external_label
32{ 33{
33 push(@labels,@_); 34 push(@labels,@_);
34 foreach (@_) { 35 foreach (@_) {
35 push(@out, "extern\t_$_\n"); 36 push(@out,".") if ($main'mwerks);
37 push(@out, "extern\t${under}$_\n");
36 } 38 }
37} 39}
38 40
@@ -58,14 +60,19 @@ sub main'DWP
58 &get_mem("DWORD",@_); 60 &get_mem("DWORD",@_);
59 } 61 }
60 62
63sub main'QWP
64 {
65 &get_mem("",@_);
66 }
67
61sub main'BC 68sub main'BC
62 { 69 {
63 return "BYTE @_"; 70 return (($main'mwerks)?"":"BYTE ")."@_";
64 } 71 }
65 72
66sub main'DWC 73sub main'DWC
67 { 74 {
68 return "DWORD @_"; 75 return (($main'mwerks)?"":"DWORD ")."@_";
69 } 76 }
70 77
71sub main'stack_push 78sub main'stack_push
@@ -86,16 +93,22 @@ sub get_mem
86 { 93 {
87 my($size,$addr,$reg1,$reg2,$idx)=@_; 94 my($size,$addr,$reg1,$reg2,$idx)=@_;
88 my($t,$post); 95 my($t,$post);
89 my($ret)="$size ["; 96 my($ret)=$size;
97 if ($ret ne "")
98 {
99 $ret .= " PTR" if ($main'mwerks);
100 $ret .= " ";
101 }
102 $ret .= "[";
90 $addr =~ s/^\s+//; 103 $addr =~ s/^\s+//;
91 if ($addr =~ /^(.+)\+(.+)$/) 104 if ($addr =~ /^(.+)\+(.+)$/)
92 { 105 {
93 $reg2=&conv($1); 106 $reg2=&conv($1);
94 $addr="_$2"; 107 $addr="$under$2";
95 } 108 }
96 elsif ($addr =~ /^[_a-zA-Z]/) 109 elsif ($addr =~ /^[_a-z][_a-z0-9]*$/i)
97 { 110 {
98 $addr="_$addr"; 111 $addr="$under$addr";
99 } 112 }
100 113
101 if ($addr =~ /^.+\-.+$/) { $addr="($addr)"; } 114 if ($addr =~ /^.+\-.+$/) { $addr="($addr)"; }
@@ -134,12 +147,14 @@ sub main'xorb { &out2("xor",@_); }
134sub main'add { &out2("add",@_); } 147sub main'add { &out2("add",@_); }
135sub main'adc { &out2("adc",@_); } 148sub main'adc { &out2("adc",@_); }
136sub main'sub { &out2("sub",@_); } 149sub main'sub { &out2("sub",@_); }
150sub main'sbb { &out2("sbb",@_); }
137sub main'rotl { &out2("rol",@_); } 151sub main'rotl { &out2("rol",@_); }
138sub main'rotr { &out2("ror",@_); } 152sub main'rotr { &out2("ror",@_); }
139sub main'exch { &out2("xchg",@_); } 153sub main'exch { &out2("xchg",@_); }
140sub main'cmp { &out2("cmp",@_); } 154sub main'cmp { &out2("cmp",@_); }
141sub main'lea { &out2("lea",@_); } 155sub main'lea { &out2("lea",@_); }
142sub main'mul { &out1("mul",@_); } 156sub main'mul { &out1("mul",@_); }
157sub main'imul { &out2("imul",@_); }
143sub main'div { &out1("div",@_); } 158sub main'div { &out1("div",@_); }
144sub main'dec { &out1("dec",@_); } 159sub main'dec { &out1("dec",@_); }
145sub main'inc { &out1("inc",@_); } 160sub main'inc { &out1("inc",@_); }
@@ -147,29 +162,57 @@ sub main'jmp { &out1("jmp",@_); }
147sub main'jmp_ptr { &out1p("jmp",@_); } 162sub main'jmp_ptr { &out1p("jmp",@_); }
148 163
149# This is a bit of a kludge: declare all branches as NEAR. 164# This is a bit of a kludge: declare all branches as NEAR.
150sub main'je { &out1("je NEAR",@_); } 165$near=($main'mwerks)?'':'NEAR';
151sub main'jle { &out1("jle NEAR",@_); } 166sub main'je { &out1("je $near",@_); }
152sub main'jz { &out1("jz NEAR",@_); } 167sub main'jle { &out1("jle $near",@_); }
153sub main'jge { &out1("jge NEAR",@_); } 168sub main'jz { &out1("jz $near",@_); }
154sub main'jl { &out1("jl NEAR",@_); } 169sub main'jge { &out1("jge $near",@_); }
155sub main'ja { &out1("ja NEAR",@_); } 170sub main'jl { &out1("jl $near",@_); }
156sub main'jae { &out1("jae NEAR",@_); } 171sub main'ja { &out1("ja $near",@_); }
157sub main'jb { &out1("jb NEAR",@_); } 172sub main'jae { &out1("jae $near",@_); }
158sub main'jbe { &out1("jbe NEAR",@_); } 173sub main'jb { &out1("jb $near",@_); }
159sub main'jc { &out1("jc NEAR",@_); } 174sub main'jbe { &out1("jbe $near",@_); }
160sub main'jnc { &out1("jnc NEAR",@_); } 175sub main'jc { &out1("jc $near",@_); }
161sub main'jnz { &out1("jnz NEAR",@_); } 176sub main'jnc { &out1("jnc $near",@_); }
162sub main'jne { &out1("jne NEAR",@_); } 177sub main'jnz { &out1("jnz $near",@_); }
163sub main'jno { &out1("jno NEAR",@_); } 178sub main'jne { &out1("jne $near",@_); }
179sub main'jno { &out1("jno $near",@_); }
164 180
165sub main'push { &out1("push",@_); $stack+=4; } 181sub main'push { &out1("push",@_); $stack+=4; }
166sub main'pop { &out1("pop",@_); $stack-=4; } 182sub main'pop { &out1("pop",@_); $stack-=4; }
183sub main'pushf { &out0("pushfd"); $stack+=4; }
184sub main'popf { &out0("popfd"); $stack-=4; }
167sub main'bswap { &out1("bswap",@_); &using486(); } 185sub main'bswap { &out1("bswap",@_); &using486(); }
168sub main'not { &out1("not",@_); } 186sub main'not { &out1("not",@_); }
169sub main'call { &out1("call",($_[0]=~/^\$L/?'':'_').$_[0]); } 187sub main'call { &out1("call",($_[0]=~/^\@L/?'':$under).$_[0]); }
188sub main'call_ptr { &out1p("call",@_); }
170sub main'ret { &out0("ret"); } 189sub main'ret { &out0("ret"); }
171sub main'nop { &out0("nop"); } 190sub main'nop { &out0("nop"); }
191sub main'test { &out2("test",@_); }
192sub main'bt { &out2("bt",@_); }
193sub main'leave { &out0("leave"); }
194sub main'cpuid { &out0("cpuid"); }
195sub main'rdtsc { &out0("rdtsc"); }
196sub main'halt { &out0("hlt"); }
172sub main'movz { &out2("movzx",@_); } 197sub main'movz { &out2("movzx",@_); }
198sub main'neg { &out1("neg",@_); }
199sub main'cld { &out0("cld"); }
200
201# SSE2
202sub main'emms { &out0("emms"); }
203sub main'movd { &out2("movd",@_); }
204sub main'movq { &out2("movq",@_); }
205sub main'movdqu { &out2("movdqu",@_); }
206sub main'movdqa { &out2("movdqa",@_); }
207sub main'movdq2q{ &out2("movdq2q",@_); }
208sub main'movq2dq{ &out2("movq2dq",@_); }
209sub main'paddq { &out2("paddq",@_); }
210sub main'pmuludq{ &out2("pmuludq",@_); }
211sub main'psrlq { &out2("psrlq",@_); }
212sub main'psllq { &out2("psllq",@_); }
213sub main'pxor { &out2("pxor",@_); }
214sub main'por { &out2("por",@_); }
215sub main'pand { &out2("pand",@_); }
173 216
174sub out2 217sub out2
175 { 218 {
@@ -177,7 +220,7 @@ sub out2
177 my($l,$t); 220 my($l,$t);
178 221
179 push(@out,"\t$name\t"); 222 push(@out,"\t$name\t");
180 if ($name eq "lea") 223 if (!$main'mwerks and $name eq "lea")
181 { 224 {
182 $p1 =~ s/^[^\[]*\[/\[/; 225 $p1 =~ s/^[^\[]*\[/\[/;
183 $p2 =~ s/^[^\[]*\[/\[/; 226 $p2 =~ s/^[^\[]*\[/\[/;
@@ -221,15 +264,17 @@ sub using486
221 264
222sub main'file 265sub main'file
223 { 266 {
224 local $tmp; 267 if ($main'mwerks) { push(@out,".section\t.text\n"); }
225 $tmp=<<___; 268 else {
269 local $tmp=<<___;
226%ifdef __omf__ 270%ifdef __omf__
227section code use32 class=code 271section code use32 class=code
228%else 272%else
229section .text 273section .text
230%endif 274%endif
231___ 275___
232 push(@out,$tmp); 276 push(@out,$tmp);
277 }
233 } 278 }
234 279
235sub main'function_begin 280sub main'function_begin
@@ -237,9 +282,10 @@ sub main'function_begin
237 my($func,$extra)=@_; 282 my($func,$extra)=@_;
238 283
239 push(@labels,$func); 284 push(@labels,$func);
285 push(@out,".") if ($main'mwerks);
240 my($tmp)=<<"EOF"; 286 my($tmp)=<<"EOF";
241global _$func 287global $under$func
242_$func: 288$under$func:
243 push ebp 289 push ebp
244 push ebx 290 push ebx
245 push esi 291 push esi
@@ -252,9 +298,10 @@ EOF
252sub main'function_begin_B 298sub main'function_begin_B
253 { 299 {
254 my($func,$extra)=@_; 300 my($func,$extra)=@_;
301 push(@out,".") if ($main'mwerks);
255 my($tmp)=<<"EOF"; 302 my($tmp)=<<"EOF";
256global _$func 303global $under$func
257_$func: 304$under$func:
258EOF 305EOF
259 push(@out,$tmp); 306 push(@out,$tmp);
260 $stack=4; 307 $stack=4;
@@ -328,11 +375,18 @@ sub main'comment
328 } 375 }
329 } 376 }
330 377
378sub main'public_label
379 {
380 $label{$_[0]}="${under}${_[0]}" if (!defined($label{$_[0]}));
381 push(@out,".") if ($main'mwerks);
382 push(@out,"global\t$label{$_[0]}\n");
383 }
384
331sub main'label 385sub main'label
332 { 386 {
333 if (!defined($label{$_[0]})) 387 if (!defined($label{$_[0]}))
334 { 388 {
335 $label{$_[0]}="\$${label}${_[0]}"; 389 $label{$_[0]}="\@${label}${_[0]}";
336 $label++; 390 $label++;
337 } 391 }
338 return($label{$_[0]}); 392 return($label{$_[0]});
@@ -342,15 +396,30 @@ sub main'set_label
342 { 396 {
343 if (!defined($label{$_[0]})) 397 if (!defined($label{$_[0]}))
344 { 398 {
345 $label{$_[0]}="\$${label}${_[0]}"; 399 $label{$_[0]}="\@${label}${_[0]}";
346 $label++; 400 $label++;
347 } 401 }
402 if ($_[1]!=0 && $_[1]>1)
403 {
404 main'align($_[1]);
405 }
348 push(@out,"$label{$_[0]}:\n"); 406 push(@out,"$label{$_[0]}:\n");
349 } 407 }
350 408
409sub main'data_byte
410 {
411 push(@out,(($main'mwerks)?".byte\t":"DB\t").join(',',@_)."\n");
412 }
413
351sub main'data_word 414sub main'data_word
352 { 415 {
353 push(@out,"\tDD\t$_[0]\n"); 416 push(@out,(($main'mwerks)?".long\t":"DD\t").join(',',@_)."\n");
417 }
418
419sub main'align
420 {
421 push(@out,".") if ($main'mwerks);
422 push(@out,"align\t$_[0]\n");
354 } 423 }
355 424
356sub out1p 425sub out1p
@@ -358,7 +427,7 @@ sub out1p
358 my($name,$p1)=@_; 427 my($name,$p1)=@_;
359 my($l,$t); 428 my($l,$t);
360 429
361 push(@out,"\t$name\t ".&conv($p1)."\n"); 430 push(@out,"\t$name\t".&conv($p1)."\n");
362 } 431 }
363 432
364sub main'picmeup 433sub main'picmeup
@@ -368,3 +437,19 @@ sub main'picmeup
368 } 437 }
369 438
370sub main'blindpop { &out1("pop",@_); } 439sub main'blindpop { &out1("pop",@_); }
440
441sub main'initseg
442 {
443 local($f)=@_;
444 if ($main'win32)
445 {
446 local($tmp)=<<___;
447segment .CRT\$XCU data
448extern $under$f
449DD $under$f
450___
451 push(@out,$tmp);
452 }
453 }
454
4551;
diff --git a/src/lib/libcrypto/perlasm/x86unix.pl b/src/lib/libcrypto/perlasm/x86unix.pl
index a31a25c12b..a4c947165e 100644
--- a/src/lib/libcrypto/perlasm/x86unix.pl
+++ b/src/lib/libcrypto/perlasm/x86unix.pl
@@ -1,14 +1,15 @@
1#!/usr/local/bin/perl 1#!/usr/local/bin/perl
2 2
3package x86unix; 3package x86unix; # GAS actually...
4 4
5$label="L000"; 5$label="L000";
6$const=""; 6$const="";
7$constl=0; 7$constl=0;
8 8
9$align=($main'aout)?"4":"16"; 9$align=($main'aout)?"4":"16";
10$under=($main'aout)?"_":""; 10$under=($main'aout or $main'coff)?"_":"";
11$com_start=($main'sol)?"/":"#"; 11$dot=($main'aout)?"":".";
12$com_start="#" if ($main'aout or $main'coff);
12 13
13sub main'asm_init_output { @out=(); } 14sub main'asm_init_output { @out=(); }
14sub main'asm_get_output { return(@out); } 15sub main'asm_get_output { return(@out); }
@@ -51,6 +52,24 @@ if ($main'cpp)
51 'edi', '%edi', 52 'edi', '%edi',
52 'ebp', '%ebp', 53 'ebp', '%ebp',
53 'esp', '%esp', 54 'esp', '%esp',
55
56 'mm0', '%mm0',
57 'mm1', '%mm1',
58 'mm2', '%mm2',
59 'mm3', '%mm3',
60 'mm4', '%mm4',
61 'mm5', '%mm5',
62 'mm6', '%mm6',
63 'mm7', '%mm7',
64
65 'xmm0', '%xmm0',
66 'xmm1', '%xmm1',
67 'xmm2', '%xmm2',
68 'xmm3', '%xmm3',
69 'xmm4', '%xmm4',
70 'xmm5', '%xmm5',
71 'xmm6', '%xmm6',
72 'xmm7', '%xmm7',
54 ); 73 );
55 74
56%reg_val=( 75%reg_val=(
@@ -97,6 +116,11 @@ sub main'DWP
97 return($ret); 116 return($ret);
98 } 117 }
99 118
119sub main'QWP
120 {
121 return(&main'DWP(@_));
122 }
123
100sub main'BP 124sub main'BP
101 { 125 {
102 return(&main'DWP(@_)); 126 return(&main'DWP(@_));
@@ -140,12 +164,14 @@ sub main'xorb { &out2("xorb",@_); }
140sub main'add { &out2($_[0]=~/%[a-d][lh]/?"addb":"addl",@_); } 164sub main'add { &out2($_[0]=~/%[a-d][lh]/?"addb":"addl",@_); }
141sub main'adc { &out2("adcl",@_); } 165sub main'adc { &out2("adcl",@_); }
142sub main'sub { &out2("subl",@_); } 166sub main'sub { &out2("subl",@_); }
167sub main'sbb { &out2("sbbl",@_); }
143sub main'rotl { &out2("roll",@_); } 168sub main'rotl { &out2("roll",@_); }
144sub main'rotr { &out2("rorl",@_); } 169sub main'rotr { &out2("rorl",@_); }
145sub main'exch { &out2($_[0]=~/%[a-d][lh]/?"xchgb":"xchgl",@_); } 170sub main'exch { &out2($_[0]=~/%[a-d][lh]/?"xchgb":"xchgl",@_); }
146sub main'cmp { &out2("cmpl",@_); } 171sub main'cmp { &out2("cmpl",@_); }
147sub main'lea { &out2("leal",@_); } 172sub main'lea { &out2("leal",@_); }
148sub main'mul { &out1("mull",@_); } 173sub main'mul { &out1("mull",@_); }
174sub main'imul { &out2("imull",@_); }
149sub main'div { &out1("divl",@_); } 175sub main'div { &out1("divl",@_); }
150sub main'jmp { &out1("jmp",@_); } 176sub main'jmp { &out1("jmp",@_); }
151sub main'jmp_ptr { &out1p("jmp",@_); } 177sub main'jmp_ptr { &out1p("jmp",@_); }
@@ -167,13 +193,48 @@ sub main'dec { &out1("decl",@_); }
167sub main'inc { &out1($_[0]=~/%[a-d][hl]/?"incb":"incl",@_); } 193sub main'inc { &out1($_[0]=~/%[a-d][hl]/?"incb":"incl",@_); }
168sub main'push { &out1("pushl",@_); $stack+=4; } 194sub main'push { &out1("pushl",@_); $stack+=4; }
169sub main'pop { &out1("popl",@_); $stack-=4; } 195sub main'pop { &out1("popl",@_); $stack-=4; }
170sub main'pushf { &out0("pushf"); $stack+=4; } 196sub main'pushf { &out0("pushfl"); $stack+=4; }
171sub main'popf { &out0("popf"); $stack-=4; } 197sub main'popf { &out0("popfl"); $stack-=4; }
172sub main'not { &out1("notl",@_); } 198sub main'not { &out1("notl",@_); }
173sub main'call { &out1("call",($_[0]=~/^\.L/?'':$under).$_[0]); } 199sub main'call { my $pre=$under;
200 foreach $i (%label)
201 { if ($label{$i} eq $_[0]) { $pre=''; last; } }
202 &out1("call",$pre.$_[0]);
203 }
204sub main'call_ptr { &out1p("call",@_); }
174sub main'ret { &out0("ret"); } 205sub main'ret { &out0("ret"); }
175sub main'nop { &out0("nop"); } 206sub main'nop { &out0("nop"); }
207sub main'test { &out2("testl",@_); }
208sub main'bt { &out2("btl",@_); }
209sub main'leave { &out0("leave"); }
210sub main'cpuid { &out0(".byte\t0x0f,0xa2"); }
211sub main'rdtsc { &out0(".byte\t0x0f,0x31"); }
212sub main'halt { &out0("hlt"); }
176sub main'movz { &out2("movzbl",@_); } 213sub main'movz { &out2("movzbl",@_); }
214sub main'neg { &out1("negl",@_); }
215sub main'cld { &out0("cld"); }
216
217# SSE2
218sub main'emms { &out0("emms"); }
219sub main'movd { &out2("movd",@_); }
220sub main'movdqu { &out2("movdqu",@_); }
221sub main'movdqa { &out2("movdqa",@_); }
222sub main'movdq2q{ &out2("movdq2q",@_); }
223sub main'movq2dq{ &out2("movq2dq",@_); }
224sub main'paddq { &out2("paddq",@_); }
225sub main'pmuludq{ &out2("pmuludq",@_); }
226sub main'psrlq { &out2("psrlq",@_); }
227sub main'psllq { &out2("psllq",@_); }
228sub main'pxor { &out2("pxor",@_); }
229sub main'por { &out2("por",@_); }
230sub main'pand { &out2("pand",@_); }
231sub main'movq {
232 local($p1,$p2,$optimize)=@_;
233 if ($optimize && $p1=~/^mm[0-7]$/ && $p2=~/^mm[0-7]$/)
234 # movq between mmx registers can sink Intel CPUs
235 { push(@out,"\tpshufw\t\$0xe4,%$p2,%$p1\n"); }
236 else { &out2("movq",@_); }
237 }
177 238
178# The bswapl instruction is new for the 486. Emulate if i386. 239# The bswapl instruction is new for the 486. Emulate if i386.
179sub main'bswap 240sub main'bswap
@@ -279,8 +340,6 @@ sub main'file
279 340
280 local($tmp)=<<"EOF"; 341 local($tmp)=<<"EOF";
281 .file "$file.s" 342 .file "$file.s"
282 .version "01.01"
283gcc2_compiled.:
284EOF 343EOF
285 push(@out,$tmp); 344 push(@out,$tmp);
286 } 345 }
@@ -294,15 +353,17 @@ sub main'function_begin
294 353
295 local($tmp)=<<"EOF"; 354 local($tmp)=<<"EOF";
296.text 355.text
297 .align $align 356.globl $func
298.globl $func
299EOF 357EOF
300 push(@out,$tmp); 358 push(@out,$tmp);
301 if ($main'cpp) 359 if ($main'cpp)
302 { $tmp=push(@out,"\tTYPE($func,\@function)\n"); } 360 { $tmp=push(@out,"TYPE($func,\@function)\n"); }
303 elsif ($main'gaswin) 361 elsif ($main'coff)
304 { $tmp=push(@out,"\t.def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); } 362 { $tmp=push(@out,".def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); }
305 else { $tmp=push(@out,"\t.type\t$func,\@function\n"); } 363 elsif ($main'aout and !$main'pic)
364 { }
365 else { $tmp=push(@out,".type\t$func,\@function\n"); }
366 push(@out,".align\t$align\n");
306 push(@out,"$func:\n"); 367 push(@out,"$func:\n");
307 $tmp=<<"EOF"; 368 $tmp=<<"EOF";
308 pushl %ebp 369 pushl %ebp
@@ -324,15 +385,17 @@ sub main'function_begin_B
324 385
325 local($tmp)=<<"EOF"; 386 local($tmp)=<<"EOF";
326.text 387.text
327 .align $align 388.globl $func
328.globl $func
329EOF 389EOF
330 push(@out,$tmp); 390 push(@out,$tmp);
331 if ($main'cpp) 391 if ($main'cpp)
332 { push(@out,"\tTYPE($func,\@function)\n"); } 392 { push(@out,"TYPE($func,\@function)\n"); }
333 elsif ($main'gaswin) 393 elsif ($main'coff)
334 { $tmp=push(@out,"\t.def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); } 394 { $tmp=push(@out,".def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); }
335 else { push(@out,"\t.type $func,\@function\n"); } 395 elsif ($main'aout and !$main'pic)
396 { }
397 else { push(@out,".type $func,\@function\n"); }
398 push(@out,".align\t$align\n");
336 push(@out,"$func:\n"); 399 push(@out,"$func:\n");
337 $stack=4; 400 $stack=4;
338 } 401 }
@@ -349,15 +412,15 @@ sub main'function_end
349 popl %ebx 412 popl %ebx
350 popl %ebp 413 popl %ebp
351 ret 414 ret
352.L_${func}_end: 415${dot}L_${func}_end:
353EOF 416EOF
354 push(@out,$tmp); 417 push(@out,$tmp);
355 418
356 if ($main'cpp) 419 if ($main'cpp)
357 { push(@out,"\tSIZE($func,.L_${func}_end-$func)\n"); } 420 { push(@out,"SIZE($func,${dot}L_${func}_end-$func)\n"); }
358 elsif ($main'gaswin) 421 elsif ($main'coff or $main'aout)
359 { $tmp=push(@out,"\t.align 4\n"); } 422 { }
360 else { push(@out,"\t.size\t$func,.L_${func}_end-$func\n"); } 423 else { push(@out,".size\t$func,${dot}L_${func}_end-$func\n"); }
361 push(@out,".ident \"$func\"\n"); 424 push(@out,".ident \"$func\"\n");
362 $stack=0; 425 $stack=0;
363 %label=(); 426 %label=();
@@ -383,13 +446,13 @@ sub main'function_end_B
383 446
384 $func=$under.$func; 447 $func=$under.$func;
385 448
386 push(@out,".L_${func}_end:\n"); 449 push(@out,"${dot}L_${func}_end:\n");
387 if ($main'cpp) 450 if ($main'cpp)
388 { push(@out,"\tSIZE($func,.L_${func}_end-$func)\n"); } 451 { push(@out,"SIZE($func,${dot}L_${func}_end-$func)\n"); }
389 elsif ($main'gaswin) 452 elsif ($main'coff or $main'aout)
390 { push(@out,"\t.align 4\n"); } 453 { }
391 else { push(@out,"\t.size\t$func,.L_${func}_end-$func\n"); } 454 else { push(@out,".size\t$func,${dot}L_${func}_end-$func\n"); }
392 push(@out,".ident \"desasm.pl\"\n"); 455 push(@out,".ident \"$func\"\n");
393 $stack=0; 456 $stack=0;
394 %label=(); 457 %label=();
395 } 458 }
@@ -430,9 +493,10 @@ sub main'swtmp
430 493
431sub main'comment 494sub main'comment
432 { 495 {
433 if ($main'elf) # GNU and SVR4 as'es use different comment delimiters, 496 if (!defined($com_start) or $main'elf)
434 { # so we just skip comments... 497 { # Regarding $main'elf above...
435 push(@out,"\n"); 498 # GNU and SVR4 as'es use different comment delimiters,
499 push(@out,"\n"); # so we just skip ELF comments...
436 return; 500 return;
437 } 501 }
438 foreach (@_) 502 foreach (@_)
@@ -444,11 +508,17 @@ sub main'comment
444 } 508 }
445 } 509 }
446 510
511sub main'public_label
512 {
513 $label{$_[0]}="${under}${_[0]}" if (!defined($label{$_[0]}));
514 push(@out,".globl\t$label{$_[0]}\n");
515 }
516
447sub main'label 517sub main'label
448 { 518 {
449 if (!defined($label{$_[0]})) 519 if (!defined($label{$_[0]}))
450 { 520 {
451 $label{$_[0]}=".${label}${_[0]}"; 521 $label{$_[0]}="${dot}${label}${_[0]}";
452 $label++; 522 $label++;
453 } 523 }
454 return($label{$_[0]}); 524 return($label{$_[0]});
@@ -458,15 +528,29 @@ sub main'set_label
458 { 528 {
459 if (!defined($label{$_[0]})) 529 if (!defined($label{$_[0]}))
460 { 530 {
461 $label{$_[0]}=".${label}${_[0]}"; 531 $label{$_[0]}="${dot}${label}${_[0]}";
462 $label++; 532 $label++;
463 } 533 }
464 push(@out,".align $align\n") if ($_[1] != 0); 534 if ($_[1]!=0)
535 {
536 if ($_[1]>1) { main'align($_[1]); }
537 else { push(@out,".align $align\n"); }
538 }
465 push(@out,"$label{$_[0]}:\n"); 539 push(@out,"$label{$_[0]}:\n");
466 } 540 }
467 541
468sub main'file_end 542sub main'file_end
469 { 543 {
544 # try to detect if SSE2 or MMX extensions were used on ELF platform...
545 if ($main'elf && grep {/\b%[x]*mm[0-7]\b|OPENSSL_ia32cap_P\b/i} @out) {
546 local($tmp);
547
548 push (@out,"\n.section\t.bss\n");
549 push (@out,".comm\t${under}OPENSSL_ia32cap_P,4,4\n");
550
551 return;
552 }
553
470 if ($const ne "") 554 if ($const ne "")
471 { 555 {
472 push(@out,".section .rodata\n"); 556 push(@out,".section .rodata\n");
@@ -475,9 +559,25 @@ sub main'file_end
475 } 559 }
476 } 560 }
477 561
562sub main'data_byte
563 {
564 push(@out,"\t.byte\t".join(',',@_)."\n");
565 }
566
478sub main'data_word 567sub main'data_word
479 { 568 {
480 push(@out,"\t.long $_[0]\n"); 569 push(@out,"\t.long\t".join(',',@_)."\n");
570 }
571
572sub main'align
573 {
574 my $val=$_[0],$p2,$i;
575 if ($main'aout) {
576 for ($p2=0;$val!=0;$val>>=1) { $p2++; }
577 $val=$p2-1;
578 $val.=",0x90";
579 }
580 push(@out,".align\t$val\n");
481 } 581 }
482 582
483# debug output functions: puts, putx, printf 583# debug output functions: puts, putx, printf
@@ -559,7 +659,6 @@ sub main'picmeup
559 { 659 {
560 local($tmp)=<<___; 660 local($tmp)=<<___;
561#if (defined(ELF) || defined(SOL)) && defined(PIC) 661#if (defined(ELF) || defined(SOL)) && defined(PIC)
562 .align 8
563 call 1f 662 call 1f
5641: popl $regs{$dst} 6631: popl $regs{$dst}
565 addl \$_GLOBAL_OFFSET_TABLE_+[.-1b],$regs{$dst} 664 addl \$_GLOBAL_OFFSET_TABLE_+[.-1b],$regs{$dst}
@@ -572,13 +671,12 @@ ___
572 } 671 }
573 elsif ($main'pic && ($main'elf || $main'aout)) 672 elsif ($main'pic && ($main'elf || $main'aout))
574 { 673 {
575 push(@out,"\t.align\t8\n");
576 &main'call(&main'label("PIC_me_up")); 674 &main'call(&main'label("PIC_me_up"));
577 &main'set_label("PIC_me_up"); 675 &main'set_label("PIC_me_up");
578 &main'blindpop($dst); 676 &main'blindpop($dst);
579 &main'add($dst,"\$$under"."_GLOBAL_OFFSET_TABLE_+[.-". 677 &main'add($dst,"\$${under}_GLOBAL_OFFSET_TABLE_+[.-".
580 &main'label("PIC_me_up") . "]"); 678 &main'label("PIC_me_up") . "]");
581 &main'mov($dst,&main'DWP($sym."\@GOT",$dst)); 679 &main'mov($dst,&main'DWP($under.$sym."\@GOT",$dst));
582 } 680 }
583 else 681 else
584 { 682 {
@@ -587,3 +685,41 @@ ___
587 } 685 }
588 686
589sub main'blindpop { &out1("popl",@_); } 687sub main'blindpop { &out1("popl",@_); }
688
689sub main'initseg
690 {
691 local($f)=@_;
692 local($tmp);
693 if ($main'elf)
694 {
695 $tmp=<<___;
696.section .init
697 call $under$f
698 jmp .Linitalign
699.align $align
700.Linitalign:
701___
702 }
703 elsif ($main'coff)
704 {
705 $tmp=<<___; # applies to both Cygwin and Mingw
706.section .ctors
707.long $under$f
708___
709 }
710 elsif ($main'aout)
711 {
712 local($ctor)="${under}_GLOBAL_\$I\$$f";
713 $tmp=".text\n";
714 $tmp.=".type $ctor,\@function\n" if ($main'pic);
715 $tmp.=<<___; # OpenBSD way...
716.globl $ctor
717.align 2
718$ctor:
719 jmp $under$f
720___
721 }
722 push(@out,$tmp) if ($tmp);
723 }
724
7251;
diff --git a/src/lib/libcrypto/pkcs12/Makefile b/src/lib/libcrypto/pkcs12/Makefile
index bef4f27912..3a7498fe7a 100644
--- a/src/lib/libcrypto/pkcs12/Makefile
+++ b/src/lib/libcrypto/pkcs12/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include 8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -57,6 +52,7 @@ links:
57 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 52 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
58 53
59install: 54install:
55 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
60 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 56 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
61 do \ 57 do \
62 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 58 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -72,6 +68,7 @@ lint:
72 lint -DLINT $(INCLUDES) $(SRC)>fluff 68 lint -DLINT $(INCLUDES) $(SRC)>fluff
73 69
74depend: 70depend:
71 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
75 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 72 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
76 73
77dclean: 74dclean:
@@ -83,333 +80,207 @@ clean:
83 80
84# DO NOT DELETE THIS LINE -- make depend depends on it. 81# DO NOT DELETE THIS LINE -- make depend depends on it.
85 82
86p12_add.o: ../../e_os.h ../../include/openssl/aes.h 83p12_add.o: ../../e_os.h ../../include/openssl/asn1.h
87p12_add.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 84p12_add.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
88p12_add.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 85p12_add.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
89p12_add.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 86p12_add.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
90p12_add.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 87p12_add.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
91p12_add.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h 88p12_add.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
92p12_add.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
93p12_add.o: ../../include/openssl/err.h ../../include/openssl/evp.h
94p12_add.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
95p12_add.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
96p12_add.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
97p12_add.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 89p12_add.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
98p12_add.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 90p12_add.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
99p12_add.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h 91p12_add.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h
100p12_add.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 92p12_add.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
101p12_add.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 93p12_add.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
102p12_add.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 94p12_add.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
103p12_add.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 95p12_add.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_add.c
104p12_add.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 96p12_asn.o: ../../e_os.h ../../include/openssl/asn1.h
105p12_add.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 97p12_asn.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
106p12_add.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 98p12_asn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
107p12_add.o: ../cryptlib.h p12_add.c 99p12_asn.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
108p12_asn.o: ../../e_os.h ../../include/openssl/aes.h 100p12_asn.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
109p12_asn.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h 101p12_asn.o: ../../include/openssl/err.h ../../include/openssl/evp.h
110p12_asn.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 102p12_asn.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
111p12_asn.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
112p12_asn.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
113p12_asn.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
114p12_asn.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
115p12_asn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
116p12_asn.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
117p12_asn.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
118p12_asn.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
119p12_asn.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
120p12_asn.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 103p12_asn.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
121p12_asn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 104p12_asn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
122p12_asn.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h 105p12_asn.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
123p12_asn.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 106p12_asn.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
124p12_asn.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 107p12_asn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
125p12_asn.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 108p12_asn.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
126p12_asn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 109p12_asn.o: ../cryptlib.h p12_asn.c
127p12_asn.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 110p12_attr.o: ../../e_os.h ../../include/openssl/asn1.h
128p12_asn.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 111p12_attr.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
129p12_asn.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_asn.c 112p12_attr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
130p12_attr.o: ../../e_os.h ../../include/openssl/aes.h 113p12_attr.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
131p12_attr.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 114p12_attr.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
132p12_attr.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 115p12_attr.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
133p12_attr.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
134p12_attr.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
135p12_attr.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
136p12_attr.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
137p12_attr.o: ../../include/openssl/err.h ../../include/openssl/evp.h
138p12_attr.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
139p12_attr.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
140p12_attr.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
141p12_attr.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 116p12_attr.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
142p12_attr.o: ../../include/openssl/opensslconf.h 117p12_attr.o: ../../include/openssl/opensslconf.h
143p12_attr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 118p12_attr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
144p12_attr.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h 119p12_attr.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
145p12_attr.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 120p12_attr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
146p12_attr.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 121p12_attr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
147p12_attr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 122p12_attr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
148p12_attr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 123p12_attr.o: ../cryptlib.h p12_attr.c
149p12_attr.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 124p12_crpt.o: ../../e_os.h ../../include/openssl/asn1.h
150p12_attr.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 125p12_crpt.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
151p12_attr.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_attr.c 126p12_crpt.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
152p12_crpt.o: ../../e_os.h ../../include/openssl/aes.h 127p12_crpt.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
153p12_crpt.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 128p12_crpt.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
154p12_crpt.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 129p12_crpt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
155p12_crpt.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
156p12_crpt.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
157p12_crpt.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
158p12_crpt.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
159p12_crpt.o: ../../include/openssl/err.h ../../include/openssl/evp.h
160p12_crpt.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
161p12_crpt.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
162p12_crpt.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
163p12_crpt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 130p12_crpt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
164p12_crpt.o: ../../include/openssl/opensslconf.h 131p12_crpt.o: ../../include/openssl/opensslconf.h
165p12_crpt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 132p12_crpt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
166p12_crpt.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h 133p12_crpt.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
167p12_crpt.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 134p12_crpt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
168p12_crpt.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 135p12_crpt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
169p12_crpt.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 136p12_crpt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
170p12_crpt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 137p12_crpt.o: ../cryptlib.h p12_crpt.c
171p12_crpt.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 138p12_crt.o: ../../e_os.h ../../include/openssl/asn1.h
172p12_crpt.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 139p12_crt.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
173p12_crpt.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_crpt.c 140p12_crt.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
174p12_crt.o: ../../e_os.h ../../include/openssl/aes.h 141p12_crt.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
175p12_crt.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 142p12_crt.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
176p12_crt.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 143p12_crt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
177p12_crt.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
178p12_crt.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
179p12_crt.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
180p12_crt.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
181p12_crt.o: ../../include/openssl/err.h ../../include/openssl/evp.h
182p12_crt.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
183p12_crt.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
184p12_crt.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
185p12_crt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 144p12_crt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
186p12_crt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 145p12_crt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
187p12_crt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h 146p12_crt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h
188p12_crt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 147p12_crt.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
189p12_crt.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 148p12_crt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
190p12_crt.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 149p12_crt.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
191p12_crt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 150p12_crt.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_crt.c
192p12_crt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 151p12_decr.o: ../../e_os.h ../../include/openssl/asn1.h
193p12_crt.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 152p12_decr.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
194p12_crt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 153p12_decr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
195p12_crt.o: ../cryptlib.h p12_crt.c 154p12_decr.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
196p12_decr.o: ../../e_os.h ../../include/openssl/aes.h 155p12_decr.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
197p12_decr.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 156p12_decr.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
198p12_decr.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
199p12_decr.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
200p12_decr.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
201p12_decr.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
202p12_decr.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
203p12_decr.o: ../../include/openssl/err.h ../../include/openssl/evp.h
204p12_decr.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
205p12_decr.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
206p12_decr.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
207p12_decr.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 157p12_decr.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
208p12_decr.o: ../../include/openssl/opensslconf.h 158p12_decr.o: ../../include/openssl/opensslconf.h
209p12_decr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 159p12_decr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
210p12_decr.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h 160p12_decr.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
211p12_decr.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 161p12_decr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
212p12_decr.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 162p12_decr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
213p12_decr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 163p12_decr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
214p12_decr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 164p12_decr.o: ../cryptlib.h p12_decr.c
215p12_decr.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 165p12_init.o: ../../e_os.h ../../include/openssl/asn1.h
216p12_decr.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 166p12_init.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
217p12_decr.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_decr.c 167p12_init.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
218p12_init.o: ../../e_os.h ../../include/openssl/aes.h 168p12_init.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
219p12_init.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 169p12_init.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
220p12_init.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 170p12_init.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
221p12_init.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
222p12_init.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
223p12_init.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
224p12_init.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
225p12_init.o: ../../include/openssl/err.h ../../include/openssl/evp.h
226p12_init.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
227p12_init.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
228p12_init.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
229p12_init.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 171p12_init.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
230p12_init.o: ../../include/openssl/opensslconf.h 172p12_init.o: ../../include/openssl/opensslconf.h
231p12_init.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 173p12_init.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
232p12_init.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h 174p12_init.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
233p12_init.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 175p12_init.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
234p12_init.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 176p12_init.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
235p12_init.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 177p12_init.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
236p12_init.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 178p12_init.o: ../cryptlib.h p12_init.c
237p12_init.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 179p12_key.o: ../../e_os.h ../../include/openssl/asn1.h
238p12_init.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 180p12_key.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
239p12_init.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_init.c 181p12_key.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
240p12_key.o: ../../e_os.h ../../include/openssl/aes.h 182p12_key.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
241p12_key.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 183p12_key.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
242p12_key.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
243p12_key.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
244p12_key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
245p12_key.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
246p12_key.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
247p12_key.o: ../../include/openssl/err.h ../../include/openssl/evp.h 184p12_key.o: ../../include/openssl/err.h ../../include/openssl/evp.h
248p12_key.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 185p12_key.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
249p12_key.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 186p12_key.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
250p12_key.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h 187p12_key.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
251p12_key.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 188p12_key.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
252p12_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
253p12_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h
254p12_key.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
255p12_key.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
256p12_key.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
257p12_key.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 189p12_key.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
258p12_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 190p12_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
259p12_key.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
260p12_key.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 191p12_key.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
261p12_key.o: ../cryptlib.h p12_key.c 192p12_key.o: ../cryptlib.h p12_key.c
262p12_kiss.o: ../../e_os.h ../../include/openssl/aes.h 193p12_kiss.o: ../../e_os.h ../../include/openssl/asn1.h
263p12_kiss.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 194p12_kiss.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
264p12_kiss.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 195p12_kiss.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
265p12_kiss.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 196p12_kiss.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
266p12_kiss.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 197p12_kiss.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
267p12_kiss.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h 198p12_kiss.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
268p12_kiss.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
269p12_kiss.o: ../../include/openssl/err.h ../../include/openssl/evp.h
270p12_kiss.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
271p12_kiss.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
272p12_kiss.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
273p12_kiss.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 199p12_kiss.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
274p12_kiss.o: ../../include/openssl/opensslconf.h 200p12_kiss.o: ../../include/openssl/opensslconf.h
275p12_kiss.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 201p12_kiss.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
276p12_kiss.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h 202p12_kiss.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
277p12_kiss.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 203p12_kiss.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
278p12_kiss.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 204p12_kiss.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
279p12_kiss.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 205p12_kiss.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
280p12_kiss.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 206p12_kiss.o: ../cryptlib.h p12_kiss.c
281p12_kiss.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 207p12_mutl.o: ../../e_os.h ../../include/openssl/asn1.h
282p12_kiss.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 208p12_mutl.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
283p12_kiss.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_kiss.c 209p12_mutl.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
284p12_mutl.o: ../../e_os.h ../../include/openssl/aes.h 210p12_mutl.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
285p12_mutl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 211p12_mutl.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
286p12_mutl.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 212p12_mutl.o: ../../include/openssl/evp.h ../../include/openssl/hmac.h
287p12_mutl.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 213p12_mutl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
288p12_mutl.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
289p12_mutl.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
290p12_mutl.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
291p12_mutl.o: ../../include/openssl/err.h ../../include/openssl/evp.h
292p12_mutl.o: ../../include/openssl/hmac.h ../../include/openssl/idea.h
293p12_mutl.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
294p12_mutl.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
295p12_mutl.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
296p12_mutl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 214p12_mutl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
297p12_mutl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 215p12_mutl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
298p12_mutl.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h 216p12_mutl.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
299p12_mutl.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h 217p12_mutl.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
300p12_mutl.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 218p12_mutl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
301p12_mutl.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 219p12_mutl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
302p12_mutl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 220p12_mutl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_mutl.c
303p12_mutl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 221p12_npas.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
304p12_mutl.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 222p12_npas.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
305p12_mutl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 223p12_npas.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
306p12_mutl.o: ../cryptlib.h p12_mutl.c 224p12_npas.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
307p12_npas.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h 225p12_npas.o: ../../include/openssl/err.h ../../include/openssl/evp.h
308p12_npas.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 226p12_npas.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
309p12_npas.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
310p12_npas.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
311p12_npas.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
312p12_npas.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
313p12_npas.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
314p12_npas.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
315p12_npas.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
316p12_npas.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
317p12_npas.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
318p12_npas.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 227p12_npas.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
319p12_npas.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 228p12_npas.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
320p12_npas.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h 229p12_npas.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
321p12_npas.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h 230p12_npas.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
322p12_npas.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 231p12_npas.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
323p12_npas.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 232p12_npas.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
324p12_npas.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 233p12_npas.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
325p12_npas.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 234p12_npas.o: p12_npas.c
326p12_npas.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 235p12_p8d.o: ../../e_os.h ../../include/openssl/asn1.h
327p12_npas.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 236p12_p8d.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
328p12_npas.o: ../../include/openssl/x509_vfy.h p12_npas.c 237p12_p8d.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
329p12_p8d.o: ../../e_os.h ../../include/openssl/aes.h 238p12_p8d.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
330p12_p8d.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 239p12_p8d.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
331p12_p8d.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 240p12_p8d.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
332p12_p8d.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
333p12_p8d.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
334p12_p8d.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
335p12_p8d.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
336p12_p8d.o: ../../include/openssl/err.h ../../include/openssl/evp.h
337p12_p8d.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
338p12_p8d.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
339p12_p8d.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
340p12_p8d.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 241p12_p8d.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
341p12_p8d.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 242p12_p8d.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
342p12_p8d.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h 243p12_p8d.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h
343p12_p8d.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 244p12_p8d.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
344p12_p8d.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 245p12_p8d.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
345p12_p8d.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 246p12_p8d.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
346p12_p8d.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 247p12_p8d.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_p8d.c
347p12_p8d.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 248p12_p8e.o: ../../e_os.h ../../include/openssl/asn1.h
348p12_p8d.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 249p12_p8e.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
349p12_p8d.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 250p12_p8e.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
350p12_p8d.o: ../cryptlib.h p12_p8d.c 251p12_p8e.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
351p12_p8e.o: ../../e_os.h ../../include/openssl/aes.h 252p12_p8e.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
352p12_p8e.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 253p12_p8e.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
353p12_p8e.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
354p12_p8e.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
355p12_p8e.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
356p12_p8e.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
357p12_p8e.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
358p12_p8e.o: ../../include/openssl/err.h ../../include/openssl/evp.h
359p12_p8e.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
360p12_p8e.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
361p12_p8e.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
362p12_p8e.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 254p12_p8e.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
363p12_p8e.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 255p12_p8e.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
364p12_p8e.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h 256p12_p8e.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h
365p12_p8e.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 257p12_p8e.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
366p12_p8e.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 258p12_p8e.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
367p12_p8e.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 259p12_p8e.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
368p12_p8e.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 260p12_p8e.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_p8e.c
369p12_p8e.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 261p12_utl.o: ../../e_os.h ../../include/openssl/asn1.h
370p12_p8e.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 262p12_utl.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
371p12_p8e.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 263p12_utl.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
372p12_p8e.o: ../cryptlib.h p12_p8e.c 264p12_utl.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
373p12_utl.o: ../../e_os.h ../../include/openssl/aes.h 265p12_utl.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
374p12_utl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 266p12_utl.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
375p12_utl.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
376p12_utl.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
377p12_utl.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
378p12_utl.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
379p12_utl.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
380p12_utl.o: ../../include/openssl/err.h ../../include/openssl/evp.h
381p12_utl.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
382p12_utl.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
383p12_utl.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
384p12_utl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 267p12_utl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
385p12_utl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 268p12_utl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
386p12_utl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h 269p12_utl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h
387p12_utl.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 270p12_utl.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
388p12_utl.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 271p12_utl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
389p12_utl.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 272p12_utl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
390p12_utl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 273p12_utl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p12_utl.c
391p12_utl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 274pk12err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
392p12_utl.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 275pk12err.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
393p12_utl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 276pk12err.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
394p12_utl.o: ../cryptlib.h p12_utl.c 277pk12err.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
395pk12err.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h 278pk12err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
396pk12err.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 279pk12err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
397pk12err.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
398pk12err.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
399pk12err.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
400pk12err.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
401pk12err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
402pk12err.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
403pk12err.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
404pk12err.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
405pk12err.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
406pk12err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 280pk12err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
407pk12err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 281pk12err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
408pk12err.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h 282pk12err.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
409pk12err.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 283pk12err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
410pk12err.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 284pk12err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
411pk12err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 285pk12err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
412pk12err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 286pk12err.o: pk12err.c
413pk12err.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
414pk12err.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
415pk12err.o: ../../include/openssl/x509_vfy.h pk12err.c
diff --git a/src/lib/libcrypto/pkcs7/Makefile b/src/lib/libcrypto/pkcs7/Makefile
index a213ae2227..3f7e88b40f 100644
--- a/src/lib/libcrypto/pkcs7/Makefile
+++ b/src/lib/libcrypto/pkcs7/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include 8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -72,6 +67,7 @@ links:
72 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 67 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
73 68
74install: 69install:
70 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
75 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 71 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
76 do \ 72 do \
77 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 73 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -87,6 +83,7 @@ lint:
87 lint -DLINT $(INCLUDES) $(SRC)>fluff 83 lint -DLINT $(INCLUDES) $(SRC)>fluff
88 84
89depend: 85depend:
86 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
90 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 87 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
91 88
92dclean: 89dclean:
@@ -98,143 +95,92 @@ clean:
98 95
99# DO NOT DELETE THIS LINE -- make depend depends on it. 96# DO NOT DELETE THIS LINE -- make depend depends on it.
100 97
101pk7_asn1.o: ../../e_os.h ../../include/openssl/aes.h 98pk7_asn1.o: ../../e_os.h ../../include/openssl/asn1.h
102pk7_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h 99pk7_asn1.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
103pk7_asn1.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 100pk7_asn1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
104pk7_asn1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 101pk7_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
105pk7_asn1.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 102pk7_asn1.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
106pk7_asn1.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 103pk7_asn1.o: ../../include/openssl/err.h ../../include/openssl/evp.h
107pk7_asn1.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 104pk7_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
108pk7_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
109pk7_asn1.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
110pk7_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
111pk7_asn1.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
112pk7_asn1.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
113pk7_asn1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 105pk7_asn1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
114pk7_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 106pk7_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
115pk7_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 107pk7_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
116pk7_asn1.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 108pk7_asn1.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
117pk7_asn1.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 109pk7_asn1.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
118pk7_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 110pk7_asn1.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pk7_asn1.c
119pk7_asn1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 111pk7_attr.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
120pk7_asn1.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 112pk7_attr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
121pk7_asn1.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 113pk7_attr.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
122pk7_asn1.o: ../cryptlib.h pk7_asn1.c 114pk7_attr.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
123pk7_attr.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h 115pk7_attr.o: ../../include/openssl/err.h ../../include/openssl/evp.h
124pk7_attr.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 116pk7_attr.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
125pk7_attr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
126pk7_attr.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
127pk7_attr.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
128pk7_attr.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
129pk7_attr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
130pk7_attr.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
131pk7_attr.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
132pk7_attr.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
133pk7_attr.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
134pk7_attr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 117pk7_attr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
135pk7_attr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 118pk7_attr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
136pk7_attr.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h 119pk7_attr.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
137pk7_attr.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 120pk7_attr.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
138pk7_attr.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 121pk7_attr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
139pk7_attr.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 122pk7_attr.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
140pk7_attr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 123pk7_attr.o: ../../include/openssl/x509_vfy.h pk7_attr.c
141pk7_attr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 124pk7_doit.o: ../../e_os.h ../../include/openssl/asn1.h
142pk7_attr.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 125pk7_doit.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
143pk7_attr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
144pk7_attr.o: pk7_attr.c
145pk7_doit.o: ../../e_os.h ../../include/openssl/aes.h
146pk7_doit.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
147pk7_doit.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
148pk7_doit.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
149pk7_doit.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 126pk7_doit.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
150pk7_doit.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 127pk7_doit.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
151pk7_doit.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 128pk7_doit.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
152pk7_doit.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 129pk7_doit.o: ../../include/openssl/err.h ../../include/openssl/evp.h
153pk7_doit.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 130pk7_doit.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
154pk7_doit.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
155pk7_doit.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
156pk7_doit.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
157pk7_doit.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 131pk7_doit.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
158pk7_doit.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 132pk7_doit.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
159pk7_doit.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h 133pk7_doit.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
160pk7_doit.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 134pk7_doit.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
161pk7_doit.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 135pk7_doit.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
162pk7_doit.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 136pk7_doit.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
163pk7_doit.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 137pk7_doit.o: ../../include/openssl/x509v3.h ../cryptlib.h pk7_doit.c
164pk7_doit.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 138pk7_lib.o: ../../e_os.h ../../include/openssl/asn1.h
165pk7_doit.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 139pk7_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
166pk7_doit.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h 140pk7_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
167pk7_doit.o: ../cryptlib.h pk7_doit.c 141pk7_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
168pk7_lib.o: ../../e_os.h ../../include/openssl/aes.h 142pk7_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
169pk7_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 143pk7_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
170pk7_lib.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
171pk7_lib.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
172pk7_lib.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
173pk7_lib.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
174pk7_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
175pk7_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
176pk7_lib.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
177pk7_lib.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
178pk7_lib.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
179pk7_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 144pk7_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
180pk7_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 145pk7_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
181pk7_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 146pk7_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
182pk7_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 147pk7_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
183pk7_lib.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 148pk7_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
184pk7_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 149pk7_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
185pk7_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 150pk7_lib.o: ../cryptlib.h pk7_lib.c
186pk7_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 151pk7_mime.o: ../../e_os.h ../../include/openssl/asn1.h
187pk7_lib.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 152pk7_mime.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
188pk7_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pk7_lib.c 153pk7_mime.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
189pk7_mime.o: ../../e_os.h ../../include/openssl/aes.h 154pk7_mime.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
190pk7_mime.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 155pk7_mime.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
191pk7_mime.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 156pk7_mime.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
192pk7_mime.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
193pk7_mime.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
194pk7_mime.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
195pk7_mime.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
196pk7_mime.o: ../../include/openssl/err.h ../../include/openssl/evp.h
197pk7_mime.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
198pk7_mime.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
199pk7_mime.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
200pk7_mime.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 157pk7_mime.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
201pk7_mime.o: ../../include/openssl/opensslconf.h 158pk7_mime.o: ../../include/openssl/opensslconf.h
202pk7_mime.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 159pk7_mime.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
203pk7_mime.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h 160pk7_mime.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
204pk7_mime.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 161pk7_mime.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
205pk7_mime.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 162pk7_mime.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
206pk7_mime.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 163pk7_mime.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
207pk7_mime.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 164pk7_mime.o: ../cryptlib.h pk7_mime.c
208pk7_mime.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 165pk7_smime.o: ../../e_os.h ../../include/openssl/asn1.h
209pk7_mime.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 166pk7_smime.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
210pk7_mime.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pk7_mime.c
211pk7_smime.o: ../../e_os.h ../../include/openssl/aes.h
212pk7_smime.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
213pk7_smime.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
214pk7_smime.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
215pk7_smime.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 167pk7_smime.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
216pk7_smime.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 168pk7_smime.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
217pk7_smime.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 169pk7_smime.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
218pk7_smime.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 170pk7_smime.o: ../../include/openssl/err.h ../../include/openssl/evp.h
219pk7_smime.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 171pk7_smime.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
220pk7_smime.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
221pk7_smime.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
222pk7_smime.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
223pk7_smime.o: ../../include/openssl/objects.h 172pk7_smime.o: ../../include/openssl/objects.h
224pk7_smime.o: ../../include/openssl/opensslconf.h 173pk7_smime.o: ../../include/openssl/opensslconf.h
225pk7_smime.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 174pk7_smime.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
226pk7_smime.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 175pk7_smime.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
227pk7_smime.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 176pk7_smime.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
228pk7_smime.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 177pk7_smime.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
229pk7_smime.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 178pk7_smime.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
230pk7_smime.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 179pk7_smime.o: ../cryptlib.h pk7_smime.c
231pk7_smime.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
232pk7_smime.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
233pk7_smime.o: ../../include/openssl/x509v3.h ../cryptlib.h pk7_smime.c
234pkcs7err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 180pkcs7err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
235pkcs7err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h 181pkcs7err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
236pkcs7err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 182pkcs7err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
237pkcs7err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 183pkcs7err.o: ../../include/openssl/opensslconf.h
238pkcs7err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 184pkcs7err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
239pkcs7err.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h 185pkcs7err.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
240pkcs7err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 186pkcs7err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
diff --git a/src/lib/libcrypto/pkcs7/bio_ber.c b/src/lib/libcrypto/pkcs7/bio_ber.c
index 895a91177b..31973fcd1f 100644
--- a/src/lib/libcrypto/pkcs7/bio_ber.c
+++ b/src/lib/libcrypto/pkcs7/bio_ber.c
@@ -204,7 +204,7 @@ int bio_ber_get_header(BIO *bio, BIO_BER_CTX *ctx)
204 if ((ctx->buf_len < BER_BUF_SIZE) && 204 if ((ctx->buf_len < BER_BUF_SIZE) &&
205 (ERR_GET_REASON(ERR_peek_error()) == ASN1_R_TOO_LONG)) 205 (ERR_GET_REASON(ERR_peek_error()) == ASN1_R_TOO_LONG))
206 { 206 {
207 ERR_get_error(); /* clear the error */ 207 ERR_clear_error(); /* clear the error */
208 BIO_set_retry_read(b); 208 BIO_set_retry_read(b);
209 } 209 }
210 return(-1); 210 return(-1);
diff --git a/src/lib/libcrypto/pkcs7/example.c b/src/lib/libcrypto/pkcs7/example.c
index c993947cc3..2953d04b5c 100644
--- a/src/lib/libcrypto/pkcs7/example.c
+++ b/src/lib/libcrypto/pkcs7/example.c
@@ -123,7 +123,7 @@ int get_signed_seq2string(PKCS7_SIGNER_INFO *si, char **str1, char **str2)
123 so=PKCS7_get_signed_attribute(si,signed_seq2string_nid); 123 so=PKCS7_get_signed_attribute(si,signed_seq2string_nid);
124 if (so && (so->type == V_ASN1_SEQUENCE)) 124 if (so && (so->type == V_ASN1_SEQUENCE))
125 { 125 {
126 ASN1_CTX c; 126 ASN1_const_CTX c;
127 ASN1_STRING *s; 127 ASN1_STRING *s;
128 long length; 128 long length;
129 ASN1_OCTET_STRING *os1,*os2; 129 ASN1_OCTET_STRING *os1,*os2;
@@ -144,7 +144,7 @@ int get_signed_seq2string(PKCS7_SIGNER_INFO *si, char **str1, char **str2)
144 goto err; 144 goto err;
145 c.slen-=(c.p-c.q); 145 c.slen-=(c.p-c.q);
146 146
147 if (!asn1_Finish(&c)) goto err; 147 if (!asn1_const_Finish(&c)) goto err;
148 *str1=malloc(os1->length+1); 148 *str1=malloc(os1->length+1);
149 *str2=malloc(os2->length+1); 149 *str2=malloc(os2->length+1);
150 memcpy(*str1,os1->data,os1->length); 150 memcpy(*str1,os1->data,os1->length);
@@ -290,7 +290,7 @@ int sk_get_seq2string(STACK_OF(X509_ATTRIBUTE) *sk, char **str1, char **str2)
290 so=PKCS7_get_signed_attribute(&si,signed_seq2string_nid); 290 so=PKCS7_get_signed_attribute(&si,signed_seq2string_nid);
291 if (so->type == V_ASN1_SEQUENCE) 291 if (so->type == V_ASN1_SEQUENCE)
292 { 292 {
293 ASN1_CTX c; 293 ASN1_const_CTX c;
294 ASN1_STRING *s; 294 ASN1_STRING *s;
295 long length; 295 long length;
296 ASN1_OCTET_STRING *os1,*os2; 296 ASN1_OCTET_STRING *os1,*os2;
@@ -311,7 +311,7 @@ int sk_get_seq2string(STACK_OF(X509_ATTRIBUTE) *sk, char **str1, char **str2)
311 goto err; 311 goto err;
312 c.slen-=(c.p-c.q); 312 c.slen-=(c.p-c.q);
313 313
314 if (!asn1_Finish(&c)) goto err; 314 if (!asn1_const_Finish(&c)) goto err;
315 *str1=malloc(os1->length+1); 315 *str1=malloc(os1->length+1);
316 *str2=malloc(os2->length+1); 316 *str2=malloc(os2->length+1);
317 memcpy(*str1,os1->data,os1->length); 317 memcpy(*str1,os1->data,os1->length);
diff --git a/src/lib/libcrypto/pqueue/pq_compat.h b/src/lib/libcrypto/pqueue/pq_compat.h
new file mode 100644
index 0000000000..fd36578882
--- /dev/null
+++ b/src/lib/libcrypto/pqueue/pq_compat.h
@@ -0,0 +1,147 @@
1/* crypto/pqueue/pqueue_compat.h */
2/*
3 * DTLS implementation written by Nagendra Modadugu
4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
5 */
6/* ====================================================================
7 * Copyright (c) 1999-2005 The OpenSSL Project. All rights reserved.
8 *
9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions
11 * are met:
12 *
13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer.
15 *
16 * 2. Redistributions in binary form must reproduce the above copyright
17 * notice, this list of conditions and the following disclaimer in
18 * the documentation and/or other materials provided with the
19 * distribution.
20 *
21 * 3. All advertising materials mentioning features or use of this
22 * software must display the following acknowledgment:
23 * "This product includes software developed by the OpenSSL Project
24 * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
25 *
26 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
27 * endorse or promote products derived from this software without
28 * prior written permission. For written permission, please contact
29 * openssl-core@OpenSSL.org.
30 *
31 * 5. Products derived from this software may not be called "OpenSSL"
32 * nor may "OpenSSL" appear in their names without prior written
33 * permission of the OpenSSL Project.
34 *
35 * 6. Redistributions of any form whatsoever must retain the following
36 * acknowledgment:
37 * "This product includes software developed by the OpenSSL Project
38 * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
39 *
40 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
41 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
42 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
43 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
44 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
45 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
46 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
47 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
48 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
49 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
50 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
51 * OF THE POSSIBILITY OF SUCH DAMAGE.
52 * ====================================================================
53 *
54 * This product includes cryptographic software written by Eric Young
55 * (eay@cryptsoft.com). This product includes software written by Tim
56 * Hudson (tjh@cryptsoft.com).
57 *
58 */
59
60#include <openssl/opensslconf.h>
61#include <openssl/bn.h>
62
63/*
64 * The purpose of this header file is for supporting 64-bit integer
65 * manipulation on 32-bit (and lower) machines. Currently the only
66 * such environment is VMS, Utrix and those with smaller default integer
67 * sizes than 32 bits. For all such environment, we fall back to using
68 * BIGNUM. We may need to fine tune the conditions for systems that
69 * are incorrectly configured.
70 *
71 * The only clients of this code are (1) pqueue for priority, and
72 * (2) DTLS, for sequence number manipulation.
73 */
74
75#if (defined(THIRTY_TWO_BIT) && !defined(BN_LLONG)) || defined(SIXTEEN_BIT) || defined(EIGHT_BIT)
76
77#define PQ_64BIT_IS_INTEGER 0
78#define PQ_64BIT_IS_BIGNUM 1
79
80#define PQ_64BIT BIGNUM
81#define PQ_64BIT_CTX BN_CTX
82
83#define pq_64bit_init(x) BN_init(x)
84#define pq_64bit_free(x) BN_free(x)
85
86#define pq_64bit_ctx_new(ctx) BN_CTX_new()
87#define pq_64bit_ctx_free(x) BN_CTX_free(x)
88
89#define pq_64bit_assign(x, y) BN_copy(x, y)
90#define pq_64bit_assign_word(x, y) BN_set_word(x, y)
91#define pq_64bit_gt(x, y) BN_ucmp(x, y) >= 1 ? 1 : 0
92#define pq_64bit_eq(x, y) BN_ucmp(x, y) == 0 ? 1 : 0
93#define pq_64bit_add_word(x, w) BN_add_word(x, w)
94#define pq_64bit_sub(r, x, y) BN_sub(r, x, y)
95#define pq_64bit_sub_word(x, w) BN_sub_word(x, w)
96#define pq_64bit_mod(r, x, n, ctx) BN_mod(r, x, n, ctx)
97
98#define pq_64bit_bin2num(bn, bytes, len) BN_bin2bn(bytes, len, bn)
99#define pq_64bit_num2bin(bn, bytes) BN_bn2bin(bn, bytes)
100#define pq_64bit_get_word(x) BN_get_word(x)
101#define pq_64bit_is_bit_set(x, offset) BN_is_bit_set(x, offset)
102#define pq_64bit_lshift(r, x, shift) BN_lshift(r, x, shift)
103#define pq_64bit_set_bit(x, num) BN_set_bit(x, num)
104#define pq_64bit_get_length(x) BN_num_bits((x))
105
106#else
107
108#define PQ_64BIT_IS_INTEGER 1
109#define PQ_64BIT_IS_BIGNUM 0
110
111#if defined(SIXTY_FOUR_BIT)
112#define PQ_64BIT BN_ULONG
113#define PQ_64BIT_PRINT "%lld"
114#elif defined(SIXTY_FOUR_BIT_LONG)
115#define PQ_64BIT BN_ULONG
116#define PQ_64BIT_PRINT "%ld"
117#elif defined(THIRTY_TWO_BIT)
118#define PQ_64BIT BN_ULLONG
119#define PQ_64BIT_PRINT "%lld"
120#endif
121
122#define PQ_64BIT_CTX void
123
124#define pq_64bit_init(x)
125#define pq_64bit_free(x)
126#define pq_64bit_ctx_new(ctx) (ctx)
127#define pq_64bit_ctx_free(x)
128
129#define pq_64bit_assign(x, y) (*(x) = *(y))
130#define pq_64bit_assign_word(x, y) (*(x) = y)
131#define pq_64bit_gt(x, y) (*(x) > *(y))
132#define pq_64bit_eq(x, y) (*(x) == *(y))
133#define pq_64bit_add_word(x, w) (*(x) = (*(x) + (w)))
134#define pq_64bit_sub(r, x, y) (*(r) = (*(x) - *(y)))
135#define pq_64bit_sub_word(x, w) (*(x) = (*(x) - (w)))
136#define pq_64bit_mod(r, x, n, ctx)
137
138#define pq_64bit_bin2num(num, bytes, len) bytes_to_long_long(bytes, num)
139#define pq_64bit_num2bin(num, bytes) long_long_to_bytes(num, bytes)
140#define pq_64bit_get_word(x) *(x)
141#define pq_64bit_lshift(r, x, shift) (*(r) = (*(x) << (shift)))
142#define pq_64bit_set_bit(x, num) do { \
143 PQ_64BIT mask = 1; \
144 mask = mask << (num); \
145 *(x) |= mask; \
146 } while(0)
147#endif /* OPENSSL_SYS_VMS */
diff --git a/src/lib/libcrypto/rand/Makefile b/src/lib/libcrypto/rand/Makefile
index b1d1a75f98..3c1ab5bbae 100644
--- a/src/lib/libcrypto/rand/Makefile
+++ b/src/lib/libcrypto/rand/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= 8INCLUDES=
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -23,9 +18,9 @@ APPS=
23 18
24LIB=$(TOP)/libcrypto.a 19LIB=$(TOP)/libcrypto.a
25LIBSRC=md_rand.c randfile.c rand_lib.c rand_err.c rand_egd.c \ 20LIBSRC=md_rand.c randfile.c rand_lib.c rand_err.c rand_egd.c \
26 rand_win.c rand_unix.c rand_os2.c 21 rand_win.c rand_unix.c rand_os2.c rand_nw.c
27LIBOBJ=md_rand.o randfile.o rand_lib.o rand_err.o rand_egd.o \ 22LIBOBJ=md_rand.o randfile.o rand_lib.o rand_err.o rand_egd.o \
28 rand_win.o rand_unix.o rand_os2.o 23 rand_win.o rand_unix.o rand_os2.o rand_nw.o
29 24
30SRC= $(LIBSRC) 25SRC= $(LIBSRC)
31 26
@@ -53,6 +48,7 @@ links:
53 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 48 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
54 49
55install: 50install:
51 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
56 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 52 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
57 do \ 53 do \
58 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 54 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -68,6 +64,7 @@ lint:
68 lint -DLINT $(INCLUDES) $(SRC)>fluff 64 lint -DLINT $(INCLUDES) $(SRC)>fluff
69 65
70depend: 66depend:
67 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
71 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 68 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
72 69
73dclean: 70dclean:
@@ -79,26 +76,16 @@ clean:
79 76
80# DO NOT DELETE THIS LINE -- make depend depends on it. 77# DO NOT DELETE THIS LINE -- make depend depends on it.
81 78
82md_rand.o: ../../e_os.h ../../include/openssl/aes.h 79md_rand.o: ../../e_os.h ../../include/openssl/asn1.h
83md_rand.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 80md_rand.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
84md_rand.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
85md_rand.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
86md_rand.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
87md_rand.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
88md_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 81md_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
89md_rand.o: ../../include/openssl/evp.h ../../include/openssl/fips.h 82md_rand.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
90md_rand.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
91md_rand.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
92md_rand.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
93md_rand.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 83md_rand.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
94md_rand.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 84md_rand.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
95md_rand.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h 85md_rand.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
96md_rand.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 86md_rand.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
97md_rand.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 87md_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
98md_rand.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 88md_rand.o: md_rand.c rand_lcl.h
99md_rand.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
100md_rand.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
101md_rand.o: ../../include/openssl/ui_compat.h md_rand.c rand_lcl.h
102rand_egd.o: ../../include/openssl/buffer.h ../../include/openssl/e_os2.h 89rand_egd.o: ../../include/openssl/buffer.h ../../include/openssl/e_os2.h
103rand_egd.o: ../../include/openssl/opensslconf.h 90rand_egd.o: ../../include/openssl/opensslconf.h
104rand_egd.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h 91rand_egd.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
@@ -110,83 +97,59 @@ rand_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
110rand_err.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h 97rand_err.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
111rand_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 98rand_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
112rand_err.o: rand_err.c 99rand_err.o: rand_err.c
113rand_lib.o: ../../e_os.h ../../include/openssl/asn1.h 100rand_lib.o: ../../e_os.h ../../include/openssl/bio.h
114rand_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
115rand_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 101rand_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
116rand_lib.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
117rand_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
118rand_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h 102rand_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
119rand_lib.o: ../../include/openssl/err.h ../../include/openssl/fips.h 103rand_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
120rand_lib.o: ../../include/openssl/fips_rand.h ../../include/openssl/lhash.h
121rand_lib.o: ../../include/openssl/opensslconf.h 104rand_lib.o: ../../include/openssl/opensslconf.h
122rand_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 105rand_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
123rand_lib.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h 106rand_lib.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
124rand_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 107rand_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
125rand_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 108rand_lib.o: ../cryptlib.h rand_lib.c
126rand_lib.o: ../../include/openssl/ui_compat.h ../cryptlib.h rand_lib.c 109rand_nw.o: ../../e_os.h ../../include/openssl/asn1.h
127rand_os2.o: ../../e_os.h ../../include/openssl/aes.h 110rand_nw.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
128rand_os2.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 111rand_nw.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
129rand_os2.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 112rand_nw.o: ../../include/openssl/err.h ../../include/openssl/evp.h
130rand_os2.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 113rand_nw.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
131rand_os2.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 114rand_nw.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
132rand_os2.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h 115rand_nw.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
133rand_os2.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h 116rand_nw.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
117rand_nw.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
118rand_nw.o: ../../include/openssl/symhacks.h ../cryptlib.h rand_lcl.h rand_nw.c
119rand_os2.o: ../../e_os.h ../../include/openssl/asn1.h
120rand_os2.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
121rand_os2.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
134rand_os2.o: ../../include/openssl/err.h ../../include/openssl/evp.h 122rand_os2.o: ../../include/openssl/err.h ../../include/openssl/evp.h
135rand_os2.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 123rand_os2.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
136rand_os2.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 124rand_os2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
137rand_os2.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
138rand_os2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
139rand_os2.o: ../../include/openssl/opensslconf.h
140rand_os2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 125rand_os2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
141rand_os2.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h 126rand_os2.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
142rand_os2.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 127rand_os2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
143rand_os2.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 128rand_os2.o: ../../include/openssl/symhacks.h ../cryptlib.h rand_lcl.h
144rand_os2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 129rand_os2.o: rand_os2.c
145rand_os2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 130rand_unix.o: ../../e_os.h ../../include/openssl/asn1.h
146rand_os2.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 131rand_unix.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
147rand_os2.o: ../cryptlib.h rand_lcl.h rand_os2.c 132rand_unix.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
148rand_unix.o: ../../e_os.h ../../include/openssl/aes.h
149rand_unix.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
150rand_unix.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
151rand_unix.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
152rand_unix.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
153rand_unix.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
154rand_unix.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
155rand_unix.o: ../../include/openssl/err.h ../../include/openssl/evp.h 133rand_unix.o: ../../include/openssl/err.h ../../include/openssl/evp.h
156rand_unix.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 134rand_unix.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
157rand_unix.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 135rand_unix.o: ../../include/openssl/objects.h
158rand_unix.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
159rand_unix.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
160rand_unix.o: ../../include/openssl/opensslconf.h 136rand_unix.o: ../../include/openssl/opensslconf.h
161rand_unix.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 137rand_unix.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
162rand_unix.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h 138rand_unix.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
163rand_unix.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 139rand_unix.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
164rand_unix.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 140rand_unix.o: ../../include/openssl/symhacks.h ../cryptlib.h rand_lcl.h
165rand_unix.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 141rand_unix.o: rand_unix.c
166rand_unix.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 142rand_win.o: ../../e_os.h ../../include/openssl/asn1.h
167rand_unix.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 143rand_win.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
168rand_unix.o: ../cryptlib.h rand_lcl.h rand_unix.c 144rand_win.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
169rand_win.o: ../../e_os.h ../../include/openssl/aes.h
170rand_win.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
171rand_win.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
172rand_win.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
173rand_win.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
174rand_win.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
175rand_win.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
176rand_win.o: ../../include/openssl/err.h ../../include/openssl/evp.h 145rand_win.o: ../../include/openssl/err.h ../../include/openssl/evp.h
177rand_win.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 146rand_win.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
178rand_win.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 147rand_win.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
179rand_win.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
180rand_win.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
181rand_win.o: ../../include/openssl/opensslconf.h
182rand_win.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 148rand_win.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
183rand_win.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h 149rand_win.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
184rand_win.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 150rand_win.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
185rand_win.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 151rand_win.o: ../../include/openssl/symhacks.h ../cryptlib.h rand_lcl.h
186rand_win.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 152rand_win.o: rand_win.c
187rand_win.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
188rand_win.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
189rand_win.o: ../cryptlib.h rand_lcl.h rand_win.c
190randfile.o: ../../e_os.h ../../include/openssl/buffer.h 153randfile.o: ../../e_os.h ../../include/openssl/buffer.h
191randfile.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 154randfile.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
192randfile.o: ../../include/openssl/opensslconf.h 155randfile.o: ../../include/openssl/opensslconf.h
diff --git a/src/lib/libcrypto/rand/md_rand.c b/src/lib/libcrypto/rand/md_rand.c
index c84968df88..9783d0c23e 100644
--- a/src/lib/libcrypto/rand/md_rand.c
+++ b/src/lib/libcrypto/rand/md_rand.c
@@ -126,7 +126,6 @@
126 126
127#include <openssl/crypto.h> 127#include <openssl/crypto.h>
128#include <openssl/err.h> 128#include <openssl/err.h>
129#include <openssl/fips.h>
130 129
131#ifdef BN_DEBUG 130#ifdef BN_DEBUG
132# define PREDICT 131# define PREDICT
@@ -153,7 +152,7 @@ static unsigned long locking_thread = 0; /* valid iff crypto_lock_rand is set */
153int rand_predictable=0; 152int rand_predictable=0;
154#endif 153#endif
155 154
156const char *RAND_version="RAND" OPENSSL_VERSION_PTEXT; 155const char RAND_version[]="RAND" OPENSSL_VERSION_PTEXT;
157 156
158static void ssleay_rand_cleanup(void); 157static void ssleay_rand_cleanup(void);
159static void ssleay_rand_seed(const void *buf, int num); 158static void ssleay_rand_seed(const void *buf, int num);
@@ -301,7 +300,7 @@ static void ssleay_rand_add(const void *buf, int num, double add)
301 * other thread's seeding remains without effect (except for 300 * other thread's seeding remains without effect (except for
302 * the incremented counter). By XORing it we keep at least as 301 * the incremented counter). By XORing it we keep at least as
303 * much entropy as fits into md. */ 302 * much entropy as fits into md. */
304 for (k = 0; k < sizeof md; k++) 303 for (k = 0; k < (int)sizeof(md); k++)
305 { 304 {
306 md[k] ^= local_md[k]; 305 md[k] ^= local_md[k];
307 } 306 }
@@ -316,7 +315,7 @@ static void ssleay_rand_add(const void *buf, int num, double add)
316 315
317static void ssleay_rand_seed(const void *buf, int num) 316static void ssleay_rand_seed(const void *buf, int num)
318 { 317 {
319 ssleay_rand_add(buf, num, num); 318 ssleay_rand_add(buf, num, (double)num);
320 } 319 }
321 320
322static int ssleay_rand_bytes(unsigned char *buf, int num) 321static int ssleay_rand_bytes(unsigned char *buf, int num)
@@ -333,14 +332,6 @@ static int ssleay_rand_bytes(unsigned char *buf, int num)
333#endif 332#endif
334 int do_stir_pool = 0; 333 int do_stir_pool = 0;
335 334
336#ifdef OPENSSL_FIPS
337 if(FIPS_mode())
338 {
339 FIPSerr(FIPS_F_SSLEAY_RAND_BYTES,FIPS_R_NON_FIPS_METHOD);
340 return 0;
341 }
342#endif
343
344#ifdef PREDICT 335#ifdef PREDICT
345 if (rand_predictable) 336 if (rand_predictable)
346 { 337 {
@@ -529,7 +520,7 @@ static int ssleay_rand_pseudo_bytes(unsigned char *buf, int num)
529 err = ERR_peek_error(); 520 err = ERR_peek_error();
530 if (ERR_GET_LIB(err) == ERR_LIB_RAND && 521 if (ERR_GET_LIB(err) == ERR_LIB_RAND &&
531 ERR_GET_REASON(err) == RAND_R_PRNG_NOT_SEEDED) 522 ERR_GET_REASON(err) == RAND_R_PRNG_NOT_SEEDED)
532 (void)ERR_get_error(); 523 ERR_clear_error();
533 } 524 }
534 return (ret); 525 return (ret);
535 } 526 }
diff --git a/src/lib/libcrypto/rand/rand_egd.c b/src/lib/libcrypto/rand/rand_egd.c
index cd666abfcb..50bce6caba 100644
--- a/src/lib/libcrypto/rand/rand_egd.c
+++ b/src/lib/libcrypto/rand/rand_egd.c
@@ -95,7 +95,7 @@
95 * RAND_egd() is a wrapper for RAND_egd_bytes() with numbytes=255. 95 * RAND_egd() is a wrapper for RAND_egd_bytes() with numbytes=255.
96 */ 96 */
97 97
98#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_VOS) 98#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_VOS)
99int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes) 99int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes)
100 { 100 {
101 return(-1); 101 return(-1);
diff --git a/src/lib/libcrypto/rand/rand_unix.c b/src/lib/libcrypto/rand/rand_unix.c
index 9376554fae..6c2be5cb96 100644
--- a/src/lib/libcrypto/rand/rand_unix.c
+++ b/src/lib/libcrypto/rand/rand_unix.c
@@ -56,7 +56,7 @@
56 * [including the GNU Public Licence.] 56 * [including the GNU Public Licence.]
57 */ 57 */
58/* ==================================================================== 58/* ====================================================================
59 * Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved. 59 * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved.
60 * 60 *
61 * Redistribution and use in source and binary forms, with or without 61 * Redistribution and use in source and binary forms, with or without
62 * modification, are permitted provided that the following conditions 62 * modification, are permitted provided that the following conditions
@@ -108,6 +108,7 @@
108 * Hudson (tjh@cryptsoft.com). 108 * Hudson (tjh@cryptsoft.com).
109 * 109 *
110 */ 110 */
111#include <stdio.h>
111 112
112#define USE_SOCKETS 113#define USE_SOCKETS
113#include "e_os.h" 114#include "e_os.h"
@@ -115,7 +116,7 @@
115#include <openssl/rand.h> 116#include <openssl/rand.h>
116#include "rand_lcl.h" 117#include "rand_lcl.h"
117 118
118#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_VXWORKS)) 119#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE))
119 120
120#include <sys/types.h> 121#include <sys/types.h>
121#include <sys/time.h> 122#include <sys/time.h>
@@ -124,6 +125,13 @@
124#include <fcntl.h> 125#include <fcntl.h>
125#include <unistd.h> 126#include <unistd.h>
126#include <time.h> 127#include <time.h>
128#if defined(OPENSSL_SYS_LINUX) /* should actually be available virtually everywhere */
129# include <poll.h>
130#endif
131#include <limits.h>
132#ifndef FD_SETSIZE
133# define FD_SETSIZE (8*sizeof(fd_set))
134#endif
127 135
128#ifdef __OpenBSD__ 136#ifdef __OpenBSD__
129int RAND_poll(void) 137int RAND_poll(void)
@@ -142,7 +150,7 @@ int RAND_poll(void)
142 150
143 return 1; 151 return 1;
144} 152}
145#else 153#else /* !defined(__OpenBSD__) */
146int RAND_poll(void) 154int RAND_poll(void)
147{ 155{
148 unsigned long l; 156 unsigned long l;
@@ -154,7 +162,8 @@ int RAND_poll(void)
154#ifdef DEVRANDOM 162#ifdef DEVRANDOM
155 static const char *randomfiles[] = { DEVRANDOM }; 163 static const char *randomfiles[] = { DEVRANDOM };
156 struct stat randomstats[sizeof(randomfiles)/sizeof(randomfiles[0])]; 164 struct stat randomstats[sizeof(randomfiles)/sizeof(randomfiles[0])];
157 int fd,i; 165 int fd;
166 size_t i;
158#endif 167#endif
159#ifdef DEVRANDOM_EGD 168#ifdef DEVRANDOM_EGD
160 static const char *egdsockets[] = { DEVRANDOM_EGD, NULL }; 169 static const char *egdsockets[] = { DEVRANDOM_EGD, NULL };
@@ -182,10 +191,9 @@ int RAND_poll(void)
182#endif 191#endif
183 )) >= 0) 192 )) >= 0)
184 { 193 {
185 struct timeval t = { 0, 10*1000 }; /* Spend 10ms on 194 int usec = 10*1000; /* spend 10ms on each file */
186 each file. */ 195 int r;
187 int r,j; 196 size_t j;
188 fd_set fset;
189 struct stat *st=&randomstats[i]; 197 struct stat *st=&randomstats[i];
190 198
191 /* Avoid using same input... Used to be O_NOFOLLOW 199 /* Avoid using same input... Used to be O_NOFOLLOW
@@ -201,35 +209,75 @@ int RAND_poll(void)
201 209
202 do 210 do
203 { 211 {
204 FD_ZERO(&fset); 212 int try_read = 0;
205 FD_SET(fd, &fset);
206 r = -1;
207 213
208 if (select(fd+1,&fset,NULL,NULL,&t) < 0) 214#if defined(OPENSSL_SYS_LINUX)
209 t.tv_usec=0; 215 /* use poll() */
210 else if (FD_ISSET(fd, &fset)) 216 struct pollfd pset;
217
218 pset.fd = fd;
219 pset.events = POLLIN;
220 pset.revents = 0;
221
222 if (poll(&pset, 1, usec / 1000) < 0)
223 usec = 0;
224 else
225 try_read = (pset.revents & POLLIN) != 0;
226
227#else
228 /* use select() */
229 fd_set fset;
230 struct timeval t;
231
232 t.tv_sec = 0;
233 t.tv_usec = usec;
234
235 if (FD_SETSIZE > 0 && fd >= FD_SETSIZE)
236 {
237 /* can't use select, so just try to read once anyway */
238 try_read = 1;
239 }
240 else
241 {
242 FD_ZERO(&fset);
243 FD_SET(fd, &fset);
244
245 if (select(fd+1,&fset,NULL,NULL,&t) >= 0)
246 {
247 usec = t.tv_usec;
248 if (FD_ISSET(fd, &fset))
249 try_read = 1;
250 }
251 else
252 usec = 0;
253 }
254#endif
255
256 if (try_read)
211 { 257 {
212 r=read(fd,(unsigned char *)tmpbuf+n, 258 r = read(fd,(unsigned char *)tmpbuf+n, ENTROPY_NEEDED-n);
213 ENTROPY_NEEDED-n);
214 if (r > 0) 259 if (r > 0)
215 n += r; 260 n += r;
216 } 261 }
217 262 else
218 /* Some Unixen will update t, some 263 r = -1;
219 won't. For those who won't, give 264
220 up here, otherwise, we will do 265 /* Some Unixen will update t in select(), some
266 won't. For those who won't, or if we
267 didn't use select() in the first place,
268 give up here, otherwise, we will do
221 this once again for the remaining 269 this once again for the remaining
222 time. */ 270 time. */
223 if (t.tv_usec == 10*1000) 271 if (usec == 10*1000)
224 t.tv_usec=0; 272 usec = 0;
225 } 273 }
226 while ((r > 0 || (errno == EINTR || errno == EAGAIN)) 274 while ((r > 0 ||
227 && t.tv_usec != 0 && n < ENTROPY_NEEDED); 275 (errno == EINTR || errno == EAGAIN)) && usec != 0 && n < ENTROPY_NEEDED);
228 276
229 close(fd); 277 close(fd);
230 } 278 }
231 } 279 }
232#endif 280#endif /* defined(DEVRANDOM) */
233 281
234#ifdef DEVRANDOM_EGD 282#ifdef DEVRANDOM_EGD
235 /* Use an EGD socket to read entropy from an EGD or PRNGD entropy 283 /* Use an EGD socket to read entropy from an EGD or PRNGD entropy
@@ -244,24 +292,24 @@ int RAND_poll(void)
244 if (r > 0) 292 if (r > 0)
245 n += r; 293 n += r;
246 } 294 }
247#endif 295#endif /* defined(DEVRANDOM_EGD) */
248 296
249#if defined(DEVRANDOM) || defined(DEVRANDOM_EGD) 297#if defined(DEVRANDOM) || defined(DEVRANDOM_EGD)
250 if (n > 0) 298 if (n > 0)
251 { 299 {
252 RAND_add(tmpbuf,sizeof tmpbuf,n); 300 RAND_add(tmpbuf,sizeof tmpbuf,(double)n);
253 OPENSSL_cleanse(tmpbuf,n); 301 OPENSSL_cleanse(tmpbuf,n);
254 } 302 }
255#endif 303#endif
256 304
257 /* put in some default random data, we need more than just this */ 305 /* put in some default random data, we need more than just this */
258 l=curr_pid; 306 l=curr_pid;
259 RAND_add(&l,sizeof(l),0); 307 RAND_add(&l,sizeof(l),0.0);
260 l=getuid(); 308 l=getuid();
261 RAND_add(&l,sizeof(l),0); 309 RAND_add(&l,sizeof(l),0.0);
262 310
263 l=time(NULL); 311 l=time(NULL);
264 RAND_add(&l,sizeof(l),0); 312 RAND_add(&l,sizeof(l),0.0);
265 313
266#if defined(DEVRANDOM) || defined(DEVRANDOM_EGD) 314#if defined(DEVRANDOM) || defined(DEVRANDOM_EGD)
267 return 1; 315 return 1;
@@ -270,12 +318,13 @@ int RAND_poll(void)
270#endif 318#endif
271} 319}
272 320
273#endif 321#endif /* defined(__OpenBSD__) */
274#endif 322#endif /* !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE)) */
323
275 324
276#if defined(OPENSSL_SYS_VXWORKS) 325#if defined(OPENSSL_SYS_VXWORKS)
277int RAND_poll(void) 326int RAND_poll(void)
278{ 327 {
279 return 0; 328 return 0;
280} 329 }
281#endif 330#endif
diff --git a/src/lib/libcrypto/rand/rand_win.c b/src/lib/libcrypto/rand/rand_win.c
index 30c69161ef..00dbe4232c 100644
--- a/src/lib/libcrypto/rand/rand_win.c
+++ b/src/lib/libcrypto/rand/rand_win.c
@@ -121,6 +121,10 @@
121#include <wincrypt.h> 121#include <wincrypt.h>
122#include <tlhelp32.h> 122#include <tlhelp32.h>
123 123
124/* Limit the time spent walking through the heap, processes, threads and modules to
125 a maximum of 1000 miliseconds each, unless CryptoGenRandom failed */
126#define MAXDELAY 1000
127
124/* Intel hardware RNG CSP -- available from 128/* Intel hardware RNG CSP -- available from
125 * http://developer.intel.com/design/security/rng/redist_license.htm 129 * http://developer.intel.com/design/security/rng/redist_license.htm
126 */ 130 */
@@ -152,6 +156,7 @@ typedef struct tagCURSORINFO
152#define CURSOR_SHOWING 0x00000001 156#define CURSOR_SHOWING 0x00000001
153#endif /* CURSOR_SHOWING */ 157#endif /* CURSOR_SHOWING */
154 158
159#if !defined(OPENSSL_SYS_WINCE)
155typedef BOOL (WINAPI *CRYPTACQUIRECONTEXTW)(HCRYPTPROV *, LPCWSTR, LPCWSTR, 160typedef BOOL (WINAPI *CRYPTACQUIRECONTEXTW)(HCRYPTPROV *, LPCWSTR, LPCWSTR,
156 DWORD, DWORD); 161 DWORD, DWORD);
157typedef BOOL (WINAPI *CRYPTGENRANDOM)(HCRYPTPROV, DWORD, BYTE *); 162typedef BOOL (WINAPI *CRYPTGENRANDOM)(HCRYPTPROV, DWORD, BYTE *);
@@ -163,7 +168,7 @@ typedef DWORD (WINAPI *GETQUEUESTATUS)(UINT);
163 168
164typedef HANDLE (WINAPI *CREATETOOLHELP32SNAPSHOT)(DWORD, DWORD); 169typedef HANDLE (WINAPI *CREATETOOLHELP32SNAPSHOT)(DWORD, DWORD);
165typedef BOOL (WINAPI *CLOSETOOLHELP32SNAPSHOT)(HANDLE); 170typedef BOOL (WINAPI *CLOSETOOLHELP32SNAPSHOT)(HANDLE);
166typedef BOOL (WINAPI *HEAP32FIRST)(LPHEAPENTRY32, DWORD, DWORD); 171typedef BOOL (WINAPI *HEAP32FIRST)(LPHEAPENTRY32, DWORD, size_t);
167typedef BOOL (WINAPI *HEAP32NEXT)(LPHEAPENTRY32); 172typedef BOOL (WINAPI *HEAP32NEXT)(LPHEAPENTRY32);
168typedef BOOL (WINAPI *HEAP32LIST)(HANDLE, LPHEAPLIST32); 173typedef BOOL (WINAPI *HEAP32LIST)(HANDLE, LPHEAPLIST32);
169typedef BOOL (WINAPI *PROCESS32)(HANDLE, LPPROCESSENTRY32); 174typedef BOOL (WINAPI *PROCESS32)(HANDLE, LPPROCESSENTRY32);
@@ -171,9 +176,7 @@ typedef BOOL (WINAPI *THREAD32)(HANDLE, LPTHREADENTRY32);
171typedef BOOL (WINAPI *MODULE32)(HANDLE, LPMODULEENTRY32); 176typedef BOOL (WINAPI *MODULE32)(HANDLE, LPMODULEENTRY32);
172 177
173#include <lmcons.h> 178#include <lmcons.h>
174#ifndef OPENSSL_SYS_WINCE
175#include <lmstats.h> 179#include <lmstats.h>
176#endif
177#if 1 /* The NET API is Unicode only. It requires the use of the UNICODE 180#if 1 /* The NET API is Unicode only. It requires the use of the UNICODE
178 * macro. When UNICODE is defined LPTSTR becomes LPWSTR. LMSTR was 181 * macro. When UNICODE is defined LPTSTR becomes LPWSTR. LMSTR was
179 * was added to the Platform SDK to allow the NET API to be used in 182 * was added to the Platform SDK to allow the NET API to be used in
@@ -184,26 +187,14 @@ typedef NET_API_STATUS (NET_API_FUNCTION * NETSTATGET)
184 (LPWSTR, LPWSTR, DWORD, DWORD, LPBYTE*); 187 (LPWSTR, LPWSTR, DWORD, DWORD, LPBYTE*);
185typedef NET_API_STATUS (NET_API_FUNCTION * NETFREE)(LPBYTE); 188typedef NET_API_STATUS (NET_API_FUNCTION * NETFREE)(LPBYTE);
186#endif /* 1 */ 189#endif /* 1 */
190#endif /* !OPENSSL_SYS_WINCE */
187 191
188int RAND_poll(void) 192int RAND_poll(void)
189{ 193{
190 MEMORYSTATUS m; 194 MEMORYSTATUS m;
191 HCRYPTPROV hProvider = 0; 195 HCRYPTPROV hProvider = 0;
192 BYTE buf[64];
193 DWORD w; 196 DWORD w;
194 HWND h; 197 int good = 0;
195
196 HMODULE advapi, kernel, user, netapi;
197 CRYPTACQUIRECONTEXTW acquire = 0;
198 CRYPTGENRANDOM gen = 0;
199 CRYPTRELEASECONTEXT release = 0;
200#if 1 /* There was previously a problem with NETSTATGET. Currently, this
201 * section is still experimental, but if all goes well, this conditional
202 * will be removed
203 */
204 NETSTATGET netstatget = 0;
205 NETFREE netfree = 0;
206#endif /* 1 */
207 198
208 /* Determine the OS version we are on so we can turn off things 199 /* Determine the OS version we are on so we can turn off things
209 * that do not work properly. 200 * that do not work properly.
@@ -212,21 +203,24 @@ int RAND_poll(void)
212 osverinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO) ; 203 osverinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO) ;
213 GetVersionEx( &osverinfo ) ; 204 GetVersionEx( &osverinfo ) ;
214 205
215#if defined(OPENSSL_SYS_WINCE) && WCEPLATFORM!=MS_HPC_PRO 206#if defined(OPENSSL_SYS_WINCE)
216#ifndef CryptAcquireContext 207# if defined(_WIN32_WCE) && _WIN32_WCE>=300
217#define CryptAcquireContext CryptAcquireContextW 208/* Even though MSDN says _WIN32_WCE>=210, it doesn't seem to be available
218#endif 209 * in commonly available implementations prior 300... */
210 {
211 BYTE buf[64];
219 /* poll the CryptoAPI PRNG */ 212 /* poll the CryptoAPI PRNG */
220 /* The CryptoAPI returns sizeof(buf) bytes of randomness */ 213 /* The CryptoAPI returns sizeof(buf) bytes of randomness */
221 if (CryptAcquireContext(&hProvider, 0, 0, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) 214 if (CryptAcquireContextW(&hProvider, NULL, NULL, PROV_RSA_FULL,
215 CRYPT_VERIFYCONTEXT))
222 { 216 {
223 if (CryptGenRandom(hProvider, sizeof(buf), buf)) 217 if (CryptGenRandom(hProvider, sizeof(buf), buf))
224 RAND_add(buf, sizeof(buf), sizeof(buf)); 218 RAND_add(buf, sizeof(buf), sizeof(buf));
225 CryptReleaseContext(hProvider, 0); 219 CryptReleaseContext(hProvider, 0);
226 } 220 }
227#endif 221 }
228 222# endif
229#ifndef OPENSSL_SYS_WINCE 223#else /* OPENSSL_SYS_WINCE */
230 /* 224 /*
231 * None of below libraries are present on Windows CE, which is 225 * None of below libraries are present on Windows CE, which is
232 * why we #ifndef the whole section. This also excuses us from 226 * why we #ifndef the whole section. This also excuses us from
@@ -240,17 +234,19 @@ int RAND_poll(void)
240 * implement own shim routine, which would accept ANSI argument 234 * implement own shim routine, which would accept ANSI argument
241 * and expand it to Unicode. 235 * and expand it to Unicode.
242 */ 236 */
243 237 {
244 /* load functions dynamically - not available on all systems */ 238 /* load functions dynamically - not available on all systems */
245 advapi = LoadLibrary(TEXT("ADVAPI32.DLL")); 239 HMODULE advapi = LoadLibrary(TEXT("ADVAPI32.DLL"));
246 kernel = LoadLibrary(TEXT("KERNEL32.DLL")); 240 HMODULE kernel = LoadLibrary(TEXT("KERNEL32.DLL"));
247 user = LoadLibrary(TEXT("USER32.DLL")); 241 HMODULE user = NULL;
248 netapi = LoadLibrary(TEXT("NETAPI32.DLL")); 242 HMODULE netapi = LoadLibrary(TEXT("NETAPI32.DLL"));
249 243 CRYPTACQUIRECONTEXTW acquire = NULL;
250#if 1 /* There was previously a problem with NETSTATGET. Currently, this 244 CRYPTGENRANDOM gen = NULL;
251 * section is still experimental, but if all goes well, this conditional 245 CRYPTRELEASECONTEXT release = NULL;
252 * will be removed 246 NETSTATGET netstatget = NULL;
253 */ 247 NETFREE netfree = NULL;
248 BYTE buf[64];
249
254 if (netapi) 250 if (netapi)
255 { 251 {
256 netstatget = (NETSTATGET) GetProcAddress(netapi,"NetStatisticsGet"); 252 netstatget = (NETSTATGET) GetProcAddress(netapi,"NetStatisticsGet");
@@ -280,7 +276,6 @@ int RAND_poll(void)
280 276
281 if (netapi) 277 if (netapi)
282 FreeLibrary(netapi); 278 FreeLibrary(netapi);
283#endif /* 1 */
284 279
285 /* It appears like this can cause an exception deep within ADVAPI32.DLL 280 /* It appears like this can cause an exception deep within ADVAPI32.DLL
286 * at random times on Windows 2000. Reported by Jeffrey Altman. 281 * at random times on Windows 2000. Reported by Jeffrey Altman.
@@ -356,12 +351,13 @@ int RAND_poll(void)
356 { 351 {
357 /* poll the CryptoAPI PRNG */ 352 /* poll the CryptoAPI PRNG */
358 /* The CryptoAPI returns sizeof(buf) bytes of randomness */ 353 /* The CryptoAPI returns sizeof(buf) bytes of randomness */
359 if (acquire(&hProvider, 0, 0, PROV_RSA_FULL, 354 if (acquire(&hProvider, NULL, NULL, PROV_RSA_FULL,
360 CRYPT_VERIFYCONTEXT)) 355 CRYPT_VERIFYCONTEXT))
361 { 356 {
362 if (gen(hProvider, sizeof(buf), buf) != 0) 357 if (gen(hProvider, sizeof(buf), buf) != 0)
363 { 358 {
364 RAND_add(buf, sizeof(buf), 0); 359 RAND_add(buf, sizeof(buf), 0);
360 good = 1;
365#if 0 361#if 0
366 printf("randomness from PROV_RSA_FULL\n"); 362 printf("randomness from PROV_RSA_FULL\n");
367#endif 363#endif
@@ -375,6 +371,7 @@ int RAND_poll(void)
375 if (gen(hProvider, sizeof(buf), buf) != 0) 371 if (gen(hProvider, sizeof(buf), buf) != 0)
376 { 372 {
377 RAND_add(buf, sizeof(buf), sizeof(buf)); 373 RAND_add(buf, sizeof(buf), sizeof(buf));
374 good = 1;
378#if 0 375#if 0
379 printf("randomness from PROV_INTEL_SEC\n"); 376 printf("randomness from PROV_INTEL_SEC\n");
380#endif 377#endif
@@ -386,7 +383,9 @@ int RAND_poll(void)
386 if (advapi) 383 if (advapi)
387 FreeLibrary(advapi); 384 FreeLibrary(advapi);
388 385
389 if (user) 386 if ((osverinfo.dwPlatformId != VER_PLATFORM_WIN32_NT ||
387 !OPENSSL_isservice()) &&
388 (user = LoadLibrary(TEXT("USER32.DLL"))))
390 { 389 {
391 GETCURSORINFO cursor; 390 GETCURSORINFO cursor;
392 GETFOREGROUNDWINDOW win; 391 GETFOREGROUNDWINDOW win;
@@ -399,7 +398,7 @@ int RAND_poll(void)
399 if (win) 398 if (win)
400 { 399 {
401 /* window handle */ 400 /* window handle */
402 h = win(); 401 HWND h = win();
403 RAND_add(&h, sizeof(h), 0); 402 RAND_add(&h, sizeof(h), 0);
404 } 403 }
405 if (cursor) 404 if (cursor)
@@ -464,6 +463,7 @@ int RAND_poll(void)
464 PROCESSENTRY32 p; 463 PROCESSENTRY32 p;
465 THREADENTRY32 t; 464 THREADENTRY32 t;
466 MODULEENTRY32 m; 465 MODULEENTRY32 m;
466 DWORD stoptime = 0;
467 467
468 snap = (CREATETOOLHELP32SNAPSHOT) 468 snap = (CREATETOOLHELP32SNAPSHOT)
469 GetProcAddress(kernel, "CreateToolhelp32Snapshot"); 469 GetProcAddress(kernel, "CreateToolhelp32Snapshot");
@@ -495,6 +495,7 @@ int RAND_poll(void)
495 * of entropy. 495 * of entropy.
496 */ 496 */
497 hlist.dwSize = sizeof(HEAPLIST32); 497 hlist.dwSize = sizeof(HEAPLIST32);
498 if (good) stoptime = GetTickCount() + MAXDELAY;
498 if (heaplist_first(handle, &hlist)) 499 if (heaplist_first(handle, &hlist))
499 do 500 do
500 { 501 {
@@ -512,18 +513,20 @@ int RAND_poll(void)
512 && --entrycnt > 0); 513 && --entrycnt > 0);
513 } 514 }
514 } while (heaplist_next(handle, 515 } while (heaplist_next(handle,
515 &hlist)); 516 &hlist) && GetTickCount() < stoptime);
516 517
517 /* process walking */ 518 /* process walking */
518 /* PROCESSENTRY32 contains 9 fields that will change 519 /* PROCESSENTRY32 contains 9 fields that will change
519 * with each entry. Consider each field a source of 520 * with each entry. Consider each field a source of
520 * 1 byte of entropy. 521 * 1 byte of entropy.
521 */ 522 */
522 p.dwSize = sizeof(PROCESSENTRY32); 523 p.dwSize = sizeof(PROCESSENTRY32);
524
525 if (good) stoptime = GetTickCount() + MAXDELAY;
523 if (process_first(handle, &p)) 526 if (process_first(handle, &p))
524 do 527 do
525 RAND_add(&p, p.dwSize, 9); 528 RAND_add(&p, p.dwSize, 9);
526 while (process_next(handle, &p)); 529 while (process_next(handle, &p) && GetTickCount() < stoptime);
527 530
528 /* thread walking */ 531 /* thread walking */
529 /* THREADENTRY32 contains 6 fields that will change 532 /* THREADENTRY32 contains 6 fields that will change
@@ -531,10 +534,11 @@ int RAND_poll(void)
531 * 1 byte of entropy. 534 * 1 byte of entropy.
532 */ 535 */
533 t.dwSize = sizeof(THREADENTRY32); 536 t.dwSize = sizeof(THREADENTRY32);
537 if (good) stoptime = GetTickCount() + MAXDELAY;
534 if (thread_first(handle, &t)) 538 if (thread_first(handle, &t))
535 do 539 do
536 RAND_add(&t, t.dwSize, 6); 540 RAND_add(&t, t.dwSize, 6);
537 while (thread_next(handle, &t)); 541 while (thread_next(handle, &t) && GetTickCount() < stoptime);
538 542
539 /* module walking */ 543 /* module walking */
540 /* MODULEENTRY32 contains 9 fields that will change 544 /* MODULEENTRY32 contains 9 fields that will change
@@ -542,18 +546,22 @@ int RAND_poll(void)
542 * 1 byte of entropy. 546 * 1 byte of entropy.
543 */ 547 */
544 m.dwSize = sizeof(MODULEENTRY32); 548 m.dwSize = sizeof(MODULEENTRY32);
549 if (good) stoptime = GetTickCount() + MAXDELAY;
545 if (module_first(handle, &m)) 550 if (module_first(handle, &m))
546 do 551 do
547 RAND_add(&m, m.dwSize, 9); 552 RAND_add(&m, m.dwSize, 9);
548 while (module_next(handle, &m)); 553 while (module_next(handle, &m)
554 && (GetTickCount() < stoptime));
549 if (close_snap) 555 if (close_snap)
550 close_snap(handle); 556 close_snap(handle);
551 else 557 else
552 CloseHandle(handle); 558 CloseHandle(handle);
559
553 } 560 }
554 561
555 FreeLibrary(kernel); 562 FreeLibrary(kernel);
556 } 563 }
564 }
557#endif /* !OPENSSL_SYS_WINCE */ 565#endif /* !OPENSSL_SYS_WINCE */
558 566
559 /* timer data */ 567 /* timer data */
@@ -693,6 +701,9 @@ static void readscreen(void)
693 int y; /* y-coordinate of screen lines to grab */ 701 int y; /* y-coordinate of screen lines to grab */
694 int n = 16; /* number of screen lines to grab at a time */ 702 int n = 16; /* number of screen lines to grab at a time */
695 703
704 if (GetVersion() >= 0x80000000 || !OPENSSL_isservice())
705 return;
706
696 /* Create a screen DC and a memory DC compatible to screen DC */ 707 /* Create a screen DC and a memory DC compatible to screen DC */
697 hScrDC = CreateDC(TEXT("DISPLAY"), NULL, NULL, NULL); 708 hScrDC = CreateDC(TEXT("DISPLAY"), NULL, NULL, NULL);
698 hMemDC = CreateCompatibleDC(hScrDC); 709 hMemDC = CreateCompatibleDC(hScrDC);
diff --git a/src/lib/libcrypto/rand/randtest.c b/src/lib/libcrypto/rand/randtest.c
index 701932e6ee..9e92a70b03 100644
--- a/src/lib/libcrypto/rand/randtest.c
+++ b/src/lib/libcrypto/rand/randtest.c
@@ -65,7 +65,7 @@
65/* some FIPS 140-1 random number test */ 65/* some FIPS 140-1 random number test */
66/* some simple tests */ 66/* some simple tests */
67 67
68int main() 68int main(int argc,char **argv)
69 { 69 {
70 unsigned char buf[2500]; 70 unsigned char buf[2500];
71 int i,j,k,s,sign,nsign,err=0; 71 int i,j,k,s,sign,nsign,err=0;
@@ -211,6 +211,9 @@ int main()
211 printf("test 4 done\n"); 211 printf("test 4 done\n");
212 err: 212 err:
213 err=((err)?1:0); 213 err=((err)?1:0);
214#ifdef OPENSSL_SYS_NETWARE
215 if (err) printf("ERROR: %d\n", err);
216#endif
214 EXIT(err); 217 EXIT(err);
215 return(err); 218 return(err);
216 } 219 }
diff --git a/src/lib/libcrypto/rc2/Makefile b/src/lib/libcrypto/rc2/Makefile
index 34080ab741..73eac347e7 100644
--- a/src/lib/libcrypto/rc2/Makefile
+++ b/src/lib/libcrypto/rc2/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= 8INCLUDES=
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -51,6 +46,7 @@ links:
51 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 46 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
52 47
53install: 48install:
49 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
54 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 50 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
55 do \ 51 do \
56 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 52 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -66,6 +62,7 @@ lint:
66 lint -DLINT $(INCLUDES) $(SRC)>fluff 62 lint -DLINT $(INCLUDES) $(SRC)>fluff
67 63
68depend: 64depend:
65 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
69 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 66 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
70 67
71dclean: 68dclean:
@@ -81,11 +78,8 @@ rc2_cbc.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h
81rc2_cbc.o: rc2_cbc.c rc2_locl.h 78rc2_cbc.o: rc2_cbc.c rc2_locl.h
82rc2_ecb.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 79rc2_ecb.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
83rc2_ecb.o: ../../include/openssl/rc2.h rc2_ecb.c rc2_locl.h 80rc2_ecb.o: ../../include/openssl/rc2.h rc2_ecb.c rc2_locl.h
84rc2_skey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 81rc2_skey.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h
85rc2_skey.o: ../../include/openssl/fips.h ../../include/openssl/opensslconf.h 82rc2_skey.o: rc2_locl.h rc2_skey.c
86rc2_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
87rc2_skey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
88rc2_skey.o: ../../include/openssl/symhacks.h rc2_locl.h rc2_skey.c
89rc2cfb64.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h 83rc2cfb64.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h
90rc2cfb64.o: rc2_locl.h rc2cfb64.c 84rc2cfb64.o: rc2_locl.h rc2cfb64.c
91rc2ofb64.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h 85rc2ofb64.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h
diff --git a/src/lib/libcrypto/rc2/rc2speed.c b/src/lib/libcrypto/rc2/rc2speed.c
index 4d0e1242ea..85cf6f65bf 100644
--- a/src/lib/libcrypto/rc2/rc2speed.c
+++ b/src/lib/libcrypto/rc2/rc2speed.c
@@ -69,7 +69,10 @@
69#include OPENSSL_UNISTD_IO 69#include OPENSSL_UNISTD_IO
70OPENSSL_DECLARE_EXIT 70OPENSSL_DECLARE_EXIT
71 71
72#ifndef OPENSSL_SYS_NETWARE
72#include <signal.h> 73#include <signal.h>
74#endif
75
73#ifndef _IRIX 76#ifndef _IRIX
74#include <time.h> 77#include <time.h>
75#endif 78#endif
diff --git a/src/lib/libcrypto/rc2/rc2test.c b/src/lib/libcrypto/rc2/rc2test.c
index b67bafb49f..0e117436bb 100644
--- a/src/lib/libcrypto/rc2/rc2test.c
+++ b/src/lib/libcrypto/rc2/rc2test.c
@@ -205,6 +205,9 @@ int main(int argc, char *argv[])
205 printf("ok\n"); 205 printf("ok\n");
206#endif 206#endif
207 207
208#ifdef OPENSSL_SYS_NETWARE
209 if (err) printf("ERROR: %d\n", err);
210#endif
208 EXIT(err); 211 EXIT(err);
209 return(err); 212 return(err);
210 } 213 }
diff --git a/src/lib/libcrypto/rc4/Makefile b/src/lib/libcrypto/rc4/Makefile
index 20d078ec87..187ed5c668 100644
--- a/src/lib/libcrypto/rc4/Makefile
+++ b/src/lib/libcrypto/rc4/Makefile
@@ -8,23 +8,13 @@ CC= cc
8CPP= $(CC) -E 8CPP= $(CC) -E
9INCLUDES= 9INCLUDES=
10CFLAG=-g 10CFLAG=-g
11INSTALL_PREFIX=
12OPENSSLDIR= /usr/local/ssl
13INSTALLTOP=/usr/local/ssl
14MAKEDEPPROG= makedepend
15MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
16MAKEFILE= Makefile
17AR= ar r 11AR= ar r
18 12
19RC4_ENC=rc4_enc.o 13RC4_ENC=rc4_enc.o rc4_skey.o
20# or use
21#RC4_ENC=asm/rx86-elf.o
22#RC4_ENC=asm/rx86-out.o
23#RC4_ENC=asm/rx86-sol.o
24#RC4_ENC=asm/rx86bdsi.o
25 14
26CFLAGS= $(INCLUDES) $(CFLAG) 15CFLAGS= $(INCLUDES) $(CFLAG)
27ASFLAGS= $(INCLUDES) $(ASFLAG) 16ASFLAGS= $(INCLUDES) $(ASFLAG)
17AFLAGS= $(ASFLAGS)
28 18
29GENERAL=Makefile 19GENERAL=Makefile
30TEST=rc4test.c 20TEST=rc4test.c
@@ -32,7 +22,7 @@ APPS=
32 22
33LIB=$(TOP)/libcrypto.a 23LIB=$(TOP)/libcrypto.a
34LIBSRC=rc4_skey.c rc4_enc.c 24LIBSRC=rc4_skey.c rc4_enc.c
35LIBOBJ=rc4_skey.o $(RC4_ENC) 25LIBOBJ=$(RC4_ENC)
36 26
37SRC= $(LIBSRC) 27SRC= $(LIBSRC)
38 28
@@ -51,24 +41,19 @@ lib: $(LIBOBJ)
51 $(RANLIB) $(LIB) || echo Never mind. 41 $(RANLIB) $(LIB) || echo Never mind.
52 @touch lib 42 @touch lib
53 43
54# elf 44# ELF
55asm/rx86-elf.s: asm/rc4-586.pl ../perlasm/x86asm.pl 45rx86-elf.s: asm/rc4-586.pl ../perlasm/x86asm.pl
56 (cd asm; $(PERL) rc4-586.pl elf $(CFLAGS) > rx86-elf.s) 46 (cd asm; $(PERL) rc4-586.pl elf $(CFLAGS) > ../$@)
57 47# COFF
48rx86-cof.s: asm/rc4-586.pl ../perlasm/x86asm.pl
49 (cd asm; $(PERL) rc4-586.pl coff $(CFLAGS) > ../$@)
58# a.out 50# a.out
59asm/rx86-out.o: asm/rx86unix.cpp 51rx86-out.s: asm/rc4-586.pl ../perlasm/x86asm.pl
60 $(CPP) -DOUT asm/rx86unix.cpp | as -o asm/rx86-out.o 52 (cd asm; $(PERL) rc4-586.pl a.out $(CFLAGS) > ../$@)
61
62# bsdi
63asm/rx86bsdi.o: asm/rx86unix.cpp
64 $(CPP) -DBSDI asm/rx86unix.cpp | sed 's/ :/:/' | as -o asm/rx86bsdi.o
65
66asm/rx86unix.cpp: asm/rc4-586.pl ../perlasm/x86asm.pl
67 (cd asm; $(PERL) rc4-586.pl cpp >rx86unix.cpp)
68 53
69asm/rc4-x86_64.s: asm/rc4-x86_64.pl; $(PERL) asm/rc4-x86_64.pl $@ 54rc4-x86_64.s: asm/rc4-x86_64.pl; $(PERL) asm/rc4-x86_64.pl $@
70 55
71asm/rc4-ia64.s: asm/rc4-ia64.S 56rc4-ia64.s: asm/rc4-ia64.S
72 @case `awk '/^#define RC4_INT/{print$$NF}' $(TOP)/include/openssl/opensslconf.h` in \ 57 @case `awk '/^#define RC4_INT/{print$$NF}' $(TOP)/include/openssl/opensslconf.h` in \
73 int) set -x; $(CC) $(CFLAGS) -DSZ=4 -E asm/rc4-ia64.S > $@ ;; \ 58 int) set -x; $(CC) $(CFLAGS) -DSZ=4 -E asm/rc4-ia64.S > $@ ;; \
74 char) set -x; $(CC) $(CFLAGS) -DSZ=1 -E asm/rc4-ia64.S > $@ ;; \ 59 char) set -x; $(CC) $(CFLAGS) -DSZ=1 -E asm/rc4-ia64.S > $@ ;; \
@@ -84,6 +69,7 @@ links:
84 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 69 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
85 70
86install: 71install:
72 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
87 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 73 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
88 do \ 74 do \
89 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 75 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -99,6 +85,7 @@ lint:
99 lint -DLINT $(INCLUDES) $(SRC)>fluff 85 lint -DLINT $(INCLUDES) $(SRC)>fluff
100 86
101depend: 87depend:
88 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
102 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 89 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
103 90
104dclean: 91dclean:
@@ -106,7 +93,7 @@ dclean:
106 mv -f Makefile.new $(MAKEFILE) 93 mv -f Makefile.new $(MAKEFILE)
107 94
108clean: 95clean:
109 rm -f asm/rx86unix.cpp asm/*-elf.* *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff asm/*.o 96 rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
110 97
111# DO NOT DELETE THIS LINE -- make depend depends on it. 98# DO NOT DELETE THIS LINE -- make depend depends on it.
112 99
@@ -114,15 +101,15 @@ rc4_enc.o: ../../e_os.h ../../include/openssl/bio.h
114rc4_enc.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 101rc4_enc.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
115rc4_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 102rc4_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
116rc4_enc.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 103rc4_enc.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
117rc4_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/rc4.h 104rc4_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
118rc4_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 105rc4_enc.o: ../../include/openssl/rc4.h ../../include/openssl/safestack.h
119rc4_enc.o: ../../include/openssl/symhacks.h ../cryptlib.h rc4_enc.c rc4_locl.h 106rc4_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
107rc4_enc.o: ../cryptlib.h rc4_enc.c rc4_locl.h
120rc4_skey.o: ../../e_os.h ../../include/openssl/bio.h 108rc4_skey.o: ../../e_os.h ../../include/openssl/bio.h
121rc4_skey.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 109rc4_skey.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
122rc4_skey.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 110rc4_skey.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
123rc4_skey.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h 111rc4_skey.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
124rc4_skey.o: ../../include/openssl/opensslconf.h 112rc4_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
125rc4_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/rc4.h 113rc4_skey.o: ../../include/openssl/rc4.h ../../include/openssl/safestack.h
126rc4_skey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 114rc4_skey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
127rc4_skey.o: ../../include/openssl/symhacks.h ../cryptlib.h rc4_locl.h 115rc4_skey.o: ../cryptlib.h rc4_locl.h rc4_skey.c
128rc4_skey.o: rc4_skey.c
diff --git a/src/lib/libcrypto/rc4/asm/rc4-ia64.S b/src/lib/libcrypto/rc4/asm/rc4-ia64.S
index a322d0c718..8210c47d04 100644
--- a/src/lib/libcrypto/rc4/asm/rc4-ia64.S
+++ b/src/lib/libcrypto/rc4/asm/rc4-ia64.S
@@ -75,14 +75,13 @@ yy=r31;
75.skip 16 75.skip 16
76RC4: 76RC4:
77 .prologue 77 .prologue
78 .fframe 0
79 .save ar.pfs,r2 78 .save ar.pfs,r2
80 .save ar.lc,r3
81 .save pr,prsave
82{ .mii; alloc r2=ar.pfs,4,12,0,16 79{ .mii; alloc r2=ar.pfs,4,12,0,16
80 .save pr,prsave
83 mov prsave=pr 81 mov prsave=pr
84 ADDP key=0,in0 };; 82 ADDP key=0,in0 };;
85{ .mib; cmp.eq p6,p0=0,in1 // len==0? 83{ .mib; cmp.eq p6,p0=0,in1 // len==0?
84 .save ar.lc,r3
86 mov r3=ar.lc 85 mov r3=ar.lc
87(p6) br.ret.spnt.many b0 };; // emergency exit 86(p6) br.ret.spnt.many b0 };; // emergency exit
88 87
diff --git a/src/lib/libcrypto/rc4/rc4.c b/src/lib/libcrypto/rc4/rc4.c
index b39c070292..c900b26055 100644
--- a/src/lib/libcrypto/rc4/rc4.c
+++ b/src/lib/libcrypto/rc4/rc4.c
@@ -60,6 +60,7 @@
60#include <stdlib.h> 60#include <stdlib.h>
61#include <string.h> 61#include <string.h>
62#include <openssl/rc4.h> 62#include <openssl/rc4.h>
63#include <openssl/evp.h>
63 64
64char *usage[]={ 65char *usage[]={
65"usage: rc4 args\n", 66"usage: rc4 args\n",
@@ -162,7 +163,7 @@ bad:
162 keystr=buf; 163 keystr=buf;
163 } 164 }
164 165
165 EVP_Digest((unsigned char *)keystr,(unsigned long)strlen(keystr),md,NULL,EVP_md5()); 166 EVP_Digest((unsigned char *)keystr,strlen(keystr),md,NULL,EVP_md5(),NULL);
166 OPENSSL_cleanse(keystr,strlen(keystr)); 167 OPENSSL_cleanse(keystr,strlen(keystr));
167 RC4_set_key(&key,MD5_DIGEST_LENGTH,md); 168 RC4_set_key(&key,MD5_DIGEST_LENGTH,md);
168 169
diff --git a/src/lib/libcrypto/rc4/rc4speed.c b/src/lib/libcrypto/rc4/rc4speed.c
index ced98c52df..0ebd38123d 100644
--- a/src/lib/libcrypto/rc4/rc4speed.c
+++ b/src/lib/libcrypto/rc4/rc4speed.c
@@ -69,7 +69,10 @@
69#include OPENSSL_UNISTD_IO 69#include OPENSSL_UNISTD_IO
70OPENSSL_DECLARE_EXIT 70OPENSSL_DECLARE_EXIT
71 71
72#ifndef OPENSSL_SYS_NETWARE
72#include <signal.h> 73#include <signal.h>
74#endif
75
73#ifndef _IRIX 76#ifndef _IRIX
74#include <time.h> 77#include <time.h>
75#endif 78#endif
diff --git a/src/lib/libcrypto/rc4/rc4test.c b/src/lib/libcrypto/rc4/rc4test.c
index b9d8f20975..54b597fa26 100644
--- a/src/lib/libcrypto/rc4/rc4test.c
+++ b/src/lib/libcrypto/rc4/rc4test.c
@@ -70,6 +70,7 @@ int main(int argc, char *argv[])
70} 70}
71#else 71#else
72#include <openssl/rc4.h> 72#include <openssl/rc4.h>
73#include <openssl/sha.h>
73 74
74static unsigned char keys[7][30]={ 75static unsigned char keys[7][30]={
75 {8,0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef}, 76 {8,0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef},
@@ -113,13 +114,11 @@ static unsigned char output[7][30]={
113 114
114int main(int argc, char *argv[]) 115int main(int argc, char *argv[])
115 { 116 {
116 int i,err=0; 117 int err=0;
117 int j; 118 unsigned int i, j;
118 unsigned char *p; 119 unsigned char *p;
119 RC4_KEY key; 120 RC4_KEY key;
120 unsigned char buf[512],obuf[512]; 121 unsigned char obuf[512];
121
122 for (i=0; i<512; i++) buf[i]=0x01;
123 122
124 for (i=0; i<6; i++) 123 for (i=0; i<6; i++)
125 { 124 {
@@ -130,12 +129,12 @@ int main(int argc, char *argv[])
130 { 129 {
131 printf("error calculating RC4\n"); 130 printf("error calculating RC4\n");
132 printf("output:"); 131 printf("output:");
133 for (j=0; j<data_len[i]+1; j++) 132 for (j=0; j<data_len[i]+1U; j++)
134 printf(" %02x",obuf[j]); 133 printf(" %02x",obuf[j]);
135 printf("\n"); 134 printf("\n");
136 printf("expect:"); 135 printf("expect:");
137 p= &(output[i][0]); 136 p= &(output[i][0]);
138 for (j=0; j<data_len[i]+1; j++) 137 for (j=0; j<data_len[i]+1U; j++)
139 printf(" %02x",*(p++)); 138 printf(" %02x",*(p++));
140 printf("\n"); 139 printf("\n");
141 err++; 140 err++;
@@ -181,12 +180,12 @@ int main(int argc, char *argv[])
181 { 180 {
182 printf("error in RC4 multi-call processing\n"); 181 printf("error in RC4 multi-call processing\n");
183 printf("output:"); 182 printf("output:");
184 for (j=0; j<data_len[3]+1; j++) 183 for (j=0; j<data_len[3]+1U; j++)
185 printf(" %02x",obuf[j]); 184 printf(" %02x",obuf[j]);
186 printf("\n"); 185 printf("\n");
187 printf("expect:"); 186 printf("expect:");
188 p= &(output[3][0]); 187 p= &(output[3][0]);
189 for (j=0; j<data_len[3]+1; j++) 188 for (j=0; j<data_len[3]+1U; j++)
190 printf(" %02x",*(p++)); 189 printf(" %02x",*(p++));
191 err++; 190 err++;
192 } 191 }
@@ -197,6 +196,40 @@ int main(int argc, char *argv[])
197 } 196 }
198 } 197 }
199 printf("done\n"); 198 printf("done\n");
199 printf("bulk test ");
200 { unsigned char buf[513];
201 SHA_CTX c;
202 unsigned char md[SHA_DIGEST_LENGTH];
203 static unsigned char expected[]={
204 0xa4,0x7b,0xcc,0x00,0x3d,0xd0,0xbd,0xe1,0xac,0x5f,
205 0x12,0x1e,0x45,0xbc,0xfb,0x1a,0xa1,0xf2,0x7f,0xc5 };
206
207 RC4_set_key(&key,keys[0][0],&(keys[3][1]));
208 memset(buf,'\0',sizeof(buf));
209 SHA1_Init(&c);
210 for (i=0;i<2571;i++) {
211 RC4(&key,sizeof(buf),buf,buf);
212 SHA1_Update(&c,buf,sizeof(buf));
213 }
214 SHA1_Final(md,&c);
215
216 if (memcmp(md,expected,sizeof(md))) {
217 printf("error in RC4 bulk test\n");
218 printf("output:");
219 for (j=0; j<sizeof(md); j++)
220 printf(" %02x",md[j]);
221 printf("\n");
222 printf("expect:");
223 for (j=0; j<sizeof(md); j++)
224 printf(" %02x",expected[j]);
225 printf("\n");
226 err++;
227 }
228 else printf("ok\n");
229 }
230#ifdef OPENSSL_SYS_NETWARE
231 if (err) printf("ERROR: %d\n", err);
232#endif
200 EXIT(err); 233 EXIT(err);
201 return(0); 234 return(0);
202 } 235 }
diff --git a/src/lib/libcrypto/rc5/Makefile b/src/lib/libcrypto/rc5/Makefile
index 16e6a60017..efb0f36b59 100644
--- a/src/lib/libcrypto/rc5/Makefile
+++ b/src/lib/libcrypto/rc5/Makefile
@@ -8,11 +8,6 @@ CC= cc
8CPP= $(CC) -E 8CPP= $(CC) -E
9INCLUDES= 9INCLUDES=
10CFLAG=-g 10CFLAG=-g
11INSTALL_PREFIX=
12OPENSSLDIR= /usr/local/ssl
13INSTALLTOP=/usr/local/ssl
14MAKEDEPPROG= makedepend
15MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
16MAKEFILE= Makefile 11MAKEFILE= Makefile
17AR= ar r 12AR= ar r
18 13
@@ -22,6 +17,7 @@ RC5_ENC= rc5_enc.o
22 17
23CFLAGS= $(INCLUDES) $(CFLAG) 18CFLAGS= $(INCLUDES) $(CFLAG)
24ASFLAGS= $(INCLUDES) $(ASFLAG) 19ASFLAGS= $(INCLUDES) $(ASFLAG)
20AFLAGS= $(ASFLAGS)
25 21
26GENERAL=Makefile 22GENERAL=Makefile
27TEST=rc5test.c 23TEST=rc5test.c
@@ -48,20 +44,15 @@ lib: $(LIBOBJ)
48 $(RANLIB) $(LIB) || echo Never mind. 44 $(RANLIB) $(LIB) || echo Never mind.
49 @touch lib 45 @touch lib
50 46
51# elf 47# ELF
52asm/r586-elf.s: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl 48r586-elf.s: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
53 (cd asm; $(PERL) rc5-586.pl elf $(CFLAGS) > r586-elf.s) 49 (cd asm; $(PERL) rc5-586.pl elf $(CFLAGS) > ../$@)
54 50# COFF
51r586-cof.s: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
52 (cd asm; $(PERL) rc5-586.pl coff $(CFLAGS) > ../$@)
55# a.out 53# a.out
56asm/r586-out.o: asm/r586unix.cpp 54r586-out.s: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
57 $(CPP) -DOUT asm/r586unix.cpp | as -o asm/r586-out.o 55 (cd asm; $(PERL) rc5-586.pl a.out $(CFLAGS) > ../$@)
58
59# bsdi
60asm/r586bsdi.o: asm/r586unix.cpp
61 $(CPP) -DBSDI asm/r586unix.cpp | sed 's/ :/:/' | as -o asm/r586bsdi.o
62
63asm/r586unix.cpp: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
64 (cd asm; $(PERL) rc5-586.pl cpp >r586unix.cpp)
65 56
66files: 57files:
67 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO 58 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
@@ -72,6 +63,7 @@ links:
72 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 63 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
73 64
74install: 65install:
66 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
75 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 67 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
76 do \ 68 do \
77 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 69 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -87,6 +79,7 @@ lint:
87 lint -DLINT $(INCLUDES) $(SRC)>fluff 79 lint -DLINT $(INCLUDES) $(SRC)>fluff
88 80
89depend: 81depend:
82 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
90 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 83 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
91 84
92dclean: 85dclean:
@@ -94,17 +87,17 @@ dclean:
94 mv -f Makefile.new $(MAKEFILE) 87 mv -f Makefile.new $(MAKEFILE)
95 88
96clean: 89clean:
97 rm -f asm/r586unix.cpp asm/*-elf.* *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff 90 rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
98 91
99# DO NOT DELETE THIS LINE -- make depend depends on it. 92# DO NOT DELETE THIS LINE -- make depend depends on it.
100 93
101rc5_ecb.o: ../../include/openssl/opensslv.h ../../include/openssl/rc5.h 94rc5_ecb.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
102rc5_ecb.o: rc5_ecb.c rc5_locl.h 95rc5_ecb.o: ../../include/openssl/rc5.h rc5_ecb.c rc5_locl.h
103rc5_enc.o: ../../include/openssl/rc5.h rc5_enc.c rc5_locl.h 96rc5_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc5.h
104rc5_skey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 97rc5_enc.o: rc5_enc.c rc5_locl.h
105rc5_skey.o: ../../include/openssl/fips.h ../../include/openssl/opensslconf.h 98rc5_skey.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc5.h
106rc5_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/rc5.h 99rc5_skey.o: rc5_locl.h rc5_skey.c
107rc5_skey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 100rc5cfb64.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc5.h
108rc5_skey.o: ../../include/openssl/symhacks.h rc5_locl.h rc5_skey.c 101rc5cfb64.o: rc5_locl.h rc5cfb64.c
109rc5cfb64.o: ../../include/openssl/rc5.h rc5_locl.h rc5cfb64.c 102rc5ofb64.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc5.h
110rc5ofb64.o: ../../include/openssl/rc5.h rc5_locl.h rc5ofb64.c 103rc5ofb64.o: rc5_locl.h rc5ofb64.c
diff --git a/src/lib/libcrypto/rc5/rc5.h b/src/lib/libcrypto/rc5/rc5.h
index aa3f26920b..4b3c153b50 100644
--- a/src/lib/libcrypto/rc5/rc5.h
+++ b/src/lib/libcrypto/rc5/rc5.h
@@ -59,6 +59,8 @@
59#ifndef HEADER_RC5_H 59#ifndef HEADER_RC5_H
60#define HEADER_RC5_H 60#define HEADER_RC5_H
61 61
62#include <openssl/opensslconf.h> /* OPENSSL_NO_RC5 */
63
62#ifdef __cplusplus 64#ifdef __cplusplus
63extern "C" { 65extern "C" {
64#endif 66#endif
@@ -92,10 +94,7 @@ typedef struct rc5_key_st
92 RC5_32_INT data[2*(RC5_16_ROUNDS+1)]; 94 RC5_32_INT data[2*(RC5_16_ROUNDS+1)];
93 } RC5_32_KEY; 95 } RC5_32_KEY;
94 96
95#ifdef OPENSSL_FIPS 97
96void private_RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data,
97 int rounds);
98#endif
99void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data, 98void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data,
100 int rounds); 99 int rounds);
101void RC5_32_ecb_encrypt(const unsigned char *in,unsigned char *out,RC5_32_KEY *key, 100void RC5_32_ecb_encrypt(const unsigned char *in,unsigned char *out,RC5_32_KEY *key,
diff --git a/src/lib/libcrypto/rc5/rc5_locl.h b/src/lib/libcrypto/rc5/rc5_locl.h
index f4ebc23004..282dd38822 100644
--- a/src/lib/libcrypto/rc5/rc5_locl.h
+++ b/src/lib/libcrypto/rc5/rc5_locl.h
@@ -146,7 +146,7 @@
146 *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ 146 *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
147 *((c)++)=(unsigned char)(((l) )&0xff)) 147 *((c)++)=(unsigned char)(((l) )&0xff))
148 148
149#if defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER) 149#if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)) || defined(__ICC)
150#define ROTATE_l32(a,n) _lrotl(a,n) 150#define ROTATE_l32(a,n) _lrotl(a,n)
151#define ROTATE_r32(a,n) _lrotr(a,n) 151#define ROTATE_r32(a,n) _lrotr(a,n)
152#elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC) 152#elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC)
diff --git a/src/lib/libcrypto/ripemd/Makefile b/src/lib/libcrypto/ripemd/Makefile
index 20c8b4d8db..d55875c20c 100644
--- a/src/lib/libcrypto/ripemd/Makefile
+++ b/src/lib/libcrypto/ripemd/Makefile
@@ -8,11 +8,6 @@ CC= cc
8CPP= $(CC) -E 8CPP= $(CC) -E
9INCLUDES= 9INCLUDES=
10CFLAG=-g 10CFLAG=-g
11INSTALL_PREFIX=
12OPENSSLDIR= /usr/local/ssl
13INSTALLTOP=/usr/local/ssl
14MAKEDEPPROG= makedepend
15MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
16MAKEFILE= Makefile 11MAKEFILE= Makefile
17AR= ar r 12AR= ar r
18 13
@@ -20,6 +15,7 @@ RIP_ASM_OBJ=
20 15
21CFLAGS= $(INCLUDES) $(CFLAG) 16CFLAGS= $(INCLUDES) $(CFLAG)
22ASFLAGS= $(INCLUDES) $(ASFLAG) 17ASFLAGS= $(INCLUDES) $(ASFLAG)
18AFLAGS= $(ASFLAGS)
23 19
24GENERAL=Makefile 20GENERAL=Makefile
25TEST=rmdtest.c 21TEST=rmdtest.c
@@ -46,20 +42,15 @@ lib: $(LIBOBJ)
46 $(RANLIB) $(LIB) || echo Never mind. 42 $(RANLIB) $(LIB) || echo Never mind.
47 @touch lib 43 @touch lib
48 44
49# elf 45# ELF
50asm/rm86-elf.s: asm/rmd-586.pl ../perlasm/x86asm.pl 46rm86-elf.s: asm/rmd-586.pl ../perlasm/x86asm.pl
51 (cd asm; $(PERL) rmd-586.pl elf $(CFLAGS) > rm86-elf.s) 47 (cd asm; $(PERL) rmd-586.pl elf $(CFLAGS) > ../$@)
52 48# COFF
49rm86-cof.s: asm/rmd-586.pl ../perlasm/x86asm.pl
50 (cd asm; $(PERL) rmd-586.pl coff $(CFLAGS) > ../$@)
53# a.out 51# a.out
54asm/rm86-out.o: asm/rm86unix.cpp 52rm86-out.s: asm/rmd-586.pl ../perlasm/x86asm.pl
55 $(CPP) -DOUT asm/rm86unix.cpp | as -o asm/rm86-out.o 53 (cd asm; $(PERL) rmd-586.pl a.out $(CFLAGS) > ../$@)
56
57# bsdi
58asm/rm86bsdi.o: asm/rm86unix.cpp
59 $(CPP) -DBSDI asm/rm86unix.cpp | sed 's/ :/:/' | as -o asm/rm86bsdi.o
60
61asm/rm86unix.cpp: asm/rmd-586.pl ../perlasm/x86asm.pl
62 (cd asm; $(PERL) rmd-586.pl cpp >rm86unix.cpp)
63 54
64files: 55files:
65 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO 56 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
@@ -70,6 +61,7 @@ links:
70 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 61 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
71 62
72install: 63install:
64 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
73 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 65 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
74 do \ 66 do \
75 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 67 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -85,6 +77,7 @@ lint:
85 lint -DLINT $(INCLUDES) $(SRC)>fluff 77 lint -DLINT $(INCLUDES) $(SRC)>fluff
86 78
87depend: 79depend:
80 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
88 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 81 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
89 82
90dclean: 83dclean:
@@ -92,20 +85,15 @@ dclean:
92 mv -f Makefile.new $(MAKEFILE) 85 mv -f Makefile.new $(MAKEFILE)
93 86
94clean: 87clean:
95 rm -f asm/rm86unix.cpp asm/*-elf.* *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff 88 rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
96 89
97# DO NOT DELETE THIS LINE -- make depend depends on it. 90# DO NOT DELETE THIS LINE -- make depend depends on it.
98 91
99rmd_dgst.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h 92rmd_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
100rmd_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
101rmd_dgst.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
102rmd_dgst.o: ../../include/openssl/opensslconf.h
103rmd_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ripemd.h 93rmd_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ripemd.h
104rmd_dgst.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 94rmd_dgst.o: ../md32_common.h rmd_dgst.c rmd_locl.h rmdconst.h
105rmd_dgst.o: ../../include/openssl/symhacks.h ../md32_common.h rmd_dgst.c
106rmd_dgst.o: rmd_locl.h rmdconst.h
107rmd_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 95rmd_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
108rmd_one.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 96rmd_one.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
109rmd_one.o: ../../include/openssl/ripemd.h ../../include/openssl/safestack.h 97rmd_one.o: ../../include/openssl/ossl_typ.h ../../include/openssl/ripemd.h
110rmd_one.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 98rmd_one.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
111rmd_one.o: rmd_one.c 99rmd_one.o: ../../include/openssl/symhacks.h rmd_one.c
diff --git a/src/lib/libcrypto/ripemd/rmdtest.c b/src/lib/libcrypto/ripemd/rmdtest.c
index d4c709e646..fb34e0e836 100644
--- a/src/lib/libcrypto/ripemd/rmdtest.c
+++ b/src/lib/libcrypto/ripemd/rmdtest.c
@@ -103,19 +103,19 @@ static char *pt(unsigned char *md);
103int main(int argc, char *argv[]) 103int main(int argc, char *argv[])
104 { 104 {
105 int i,err=0; 105 int i,err=0;
106 unsigned char **P,**R; 106 char **P,**R;
107 char *p; 107 char *p;
108 unsigned char md[RIPEMD160_DIGEST_LENGTH]; 108 unsigned char md[RIPEMD160_DIGEST_LENGTH];
109 109
110 P=(unsigned char **)test; 110 P=test;
111 R=(unsigned char **)ret; 111 R=ret;
112 i=1; 112 i=1;
113 while (*P != NULL) 113 while (*P != NULL)
114 { 114 {
115#ifdef CHARSET_EBCDIC 115#ifdef CHARSET_EBCDIC
116 ebcdic2ascii((char *)*P, (char *)*P, strlen((char *)*P)); 116 ebcdic2ascii((char *)*P, (char *)*P, strlen((char *)*P));
117#endif 117#endif
118 EVP_Digest(&(P[0][0]),(unsigned long)strlen((char *)*P),md,NULL,EVP_ripemd160(), NULL); 118 EVP_Digest(&(P[0][0]),strlen((char *)*P),md,NULL,EVP_ripemd160(), NULL);
119 p=pt(md); 119 p=pt(md);
120 if (strcmp(p,(char *)*R) != 0) 120 if (strcmp(p,(char *)*R) != 0)
121 { 121 {
diff --git a/src/lib/libcrypto/rsa/Makefile b/src/lib/libcrypto/rsa/Makefile
index 8851825250..13900812ac 100644
--- a/src/lib/libcrypto/rsa/Makefile
+++ b/src/lib/libcrypto/rsa/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include 8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -24,10 +19,10 @@ APPS=
24LIB=$(TOP)/libcrypto.a 19LIB=$(TOP)/libcrypto.a
25LIBSRC= rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c rsa_err.c \ 20LIBSRC= rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c rsa_err.c \
26 rsa_pk1.c rsa_ssl.c rsa_none.c rsa_oaep.c rsa_chk.c rsa_null.c \ 21 rsa_pk1.c rsa_ssl.c rsa_none.c rsa_oaep.c rsa_chk.c rsa_null.c \
27 rsa_pss.c rsa_x931.c rsa_asn1.c 22 rsa_pss.c rsa_x931.c rsa_asn1.c rsa_depr.c
28LIBOBJ= rsa_eay.o rsa_gen.o rsa_lib.o rsa_sign.o rsa_saos.o rsa_err.o \ 23LIBOBJ= rsa_eay.o rsa_gen.o rsa_lib.o rsa_sign.o rsa_saos.o rsa_err.o \
29 rsa_pk1.o rsa_ssl.o rsa_none.o rsa_oaep.o rsa_chk.o rsa_null.o \ 24 rsa_pk1.o rsa_ssl.o rsa_none.o rsa_oaep.o rsa_chk.o rsa_null.o \
30 rsa_pss.o rsa_x931.o rsa_asn1.o 25 rsa_pss.o rsa_x931.o rsa_asn1.o rsa_depr.o
31 26
32SRC= $(LIBSRC) 27SRC= $(LIBSRC)
33 28
@@ -55,6 +50,7 @@ links:
55 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 50 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
56 51
57install: 52install:
53 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
58 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 54 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
59 do \ 55 do \
60 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 56 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -70,6 +66,7 @@ lint:
70 lint -DLINT $(INCLUDES) $(SRC)>fluff 66 lint -DLINT $(INCLUDES) $(SRC)>fluff
71 67
72depend: 68depend:
69 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
73 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 70 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
74 71
75dclean: 72dclean:
@@ -99,6 +96,15 @@ rsa_chk.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
99rsa_chk.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 96rsa_chk.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
100rsa_chk.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 97rsa_chk.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
101rsa_chk.o: rsa_chk.c 98rsa_chk.o: rsa_chk.c
99rsa_depr.o: ../../e_os.h ../../include/openssl/asn1.h
100rsa_depr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
101rsa_depr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
102rsa_depr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
103rsa_depr.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
104rsa_depr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
105rsa_depr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
106rsa_depr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
107rsa_depr.o: ../cryptlib.h rsa_depr.c
102rsa_eay.o: ../../e_os.h ../../include/openssl/asn1.h 108rsa_eay.o: ../../e_os.h ../../include/openssl/asn1.h
103rsa_eay.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 109rsa_eay.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
104rsa_eay.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 110rsa_eay.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -109,13 +115,12 @@ rsa_eay.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
109rsa_eay.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 115rsa_eay.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
110rsa_eay.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_eay.c 116rsa_eay.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_eay.c
111rsa_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 117rsa_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
112rsa_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h 118rsa_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
113rsa_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 119rsa_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
114rsa_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 120rsa_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
115rsa_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 121rsa_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rsa.h
116rsa_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 122rsa_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
117rsa_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 123rsa_err.o: ../../include/openssl/symhacks.h rsa_err.c
118rsa_err.o: rsa_err.c
119rsa_gen.o: ../../e_os.h ../../include/openssl/asn1.h 124rsa_gen.o: ../../e_os.h ../../include/openssl/asn1.h
120rsa_gen.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 125rsa_gen.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
121rsa_gen.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 126rsa_gen.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -128,14 +133,13 @@ rsa_gen.o: ../cryptlib.h rsa_gen.c
128rsa_lib.o: ../../e_os.h ../../include/openssl/asn1.h 133rsa_lib.o: ../../e_os.h ../../include/openssl/asn1.h
129rsa_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 134rsa_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
130rsa_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 135rsa_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
131rsa_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
132rsa_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h 136rsa_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
133rsa_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h 137rsa_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
134rsa_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 138rsa_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
135rsa_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h 139rsa_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
136rsa_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 140rsa_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
137rsa_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 141rsa_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
138rsa_lib.o: ../../include/openssl/ui.h ../cryptlib.h rsa_lib.c 142rsa_lib.o: ../cryptlib.h rsa_lib.c
139rsa_none.o: ../../e_os.h ../../include/openssl/asn1.h 143rsa_none.o: ../../e_os.h ../../include/openssl/asn1.h
140rsa_none.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 144rsa_none.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
141rsa_none.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 145rsa_none.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -154,26 +158,17 @@ rsa_null.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
154rsa_null.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h 158rsa_null.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
155rsa_null.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 159rsa_null.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
156rsa_null.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_null.c 160rsa_null.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_null.c
157rsa_oaep.o: ../../e_os.h ../../include/openssl/aes.h 161rsa_oaep.o: ../../e_os.h ../../include/openssl/asn1.h
158rsa_oaep.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 162rsa_oaep.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
159rsa_oaep.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 163rsa_oaep.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
160rsa_oaep.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 164rsa_oaep.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
161rsa_oaep.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 165rsa_oaep.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
162rsa_oaep.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
163rsa_oaep.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
164rsa_oaep.o: ../../include/openssl/err.h ../../include/openssl/evp.h
165rsa_oaep.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
166rsa_oaep.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
167rsa_oaep.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
168rsa_oaep.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 166rsa_oaep.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
169rsa_oaep.o: ../../include/openssl/opensslconf.h 167rsa_oaep.o: ../../include/openssl/opensslconf.h
170rsa_oaep.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 168rsa_oaep.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
171rsa_oaep.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h 169rsa_oaep.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
172rsa_oaep.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
173rsa_oaep.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
174rsa_oaep.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 170rsa_oaep.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
175rsa_oaep.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 171rsa_oaep.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
176rsa_oaep.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
177rsa_oaep.o: ../cryptlib.h rsa_oaep.c 172rsa_oaep.o: ../cryptlib.h rsa_oaep.c
178rsa_pk1.o: ../../e_os.h ../../include/openssl/asn1.h 173rsa_pk1.o: ../../e_os.h ../../include/openssl/asn1.h
179rsa_pk1.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 174rsa_pk1.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -184,68 +179,43 @@ rsa_pk1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
184rsa_pk1.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h 179rsa_pk1.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
185rsa_pk1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 180rsa_pk1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
186rsa_pk1.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_pk1.c 181rsa_pk1.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_pk1.c
187rsa_pss.o: ../../e_os.h ../../include/openssl/aes.h 182rsa_pss.o: ../../e_os.h ../../include/openssl/asn1.h
188rsa_pss.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 183rsa_pss.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
189rsa_pss.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 184rsa_pss.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
190rsa_pss.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 185rsa_pss.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
191rsa_pss.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 186rsa_pss.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
192rsa_pss.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
193rsa_pss.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
194rsa_pss.o: ../../include/openssl/err.h ../../include/openssl/evp.h
195rsa_pss.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
196rsa_pss.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
197rsa_pss.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
198rsa_pss.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 187rsa_pss.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
199rsa_pss.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 188rsa_pss.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
200rsa_pss.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h 189rsa_pss.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
201rsa_pss.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
202rsa_pss.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
203rsa_pss.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 190rsa_pss.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
204rsa_pss.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 191rsa_pss.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
205rsa_pss.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 192rsa_pss.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_pss.c
206rsa_pss.o: ../../include/openssl/ui_compat.h ../cryptlib.h rsa_pss.c 193rsa_saos.o: ../../e_os.h ../../include/openssl/asn1.h
207rsa_saos.o: ../../e_os.h ../../include/openssl/aes.h 194rsa_saos.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
208rsa_saos.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 195rsa_saos.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
209rsa_saos.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 196rsa_saos.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
210rsa_saos.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 197rsa_saos.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
211rsa_saos.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
212rsa_saos.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
213rsa_saos.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
214rsa_saos.o: ../../include/openssl/err.h ../../include/openssl/evp.h 198rsa_saos.o: ../../include/openssl/err.h ../../include/openssl/evp.h
215rsa_saos.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 199rsa_saos.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
216rsa_saos.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 200rsa_saos.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
217rsa_saos.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
218rsa_saos.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
219rsa_saos.o: ../../include/openssl/opensslconf.h
220rsa_saos.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 201rsa_saos.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
221rsa_saos.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 202rsa_saos.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
222rsa_saos.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
223rsa_saos.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
224rsa_saos.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 203rsa_saos.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
225rsa_saos.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 204rsa_saos.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
226rsa_saos.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
227rsa_saos.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 205rsa_saos.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
228rsa_saos.o: ../cryptlib.h rsa_saos.c 206rsa_saos.o: ../cryptlib.h rsa_saos.c
229rsa_sign.o: ../../e_os.h ../../include/openssl/aes.h 207rsa_sign.o: ../../e_os.h ../../include/openssl/asn1.h
230rsa_sign.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 208rsa_sign.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
231rsa_sign.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 209rsa_sign.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
232rsa_sign.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 210rsa_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
233rsa_sign.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 211rsa_sign.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
234rsa_sign.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
235rsa_sign.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
236rsa_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h 212rsa_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h
237rsa_sign.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 213rsa_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
238rsa_sign.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 214rsa_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
239rsa_sign.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
240rsa_sign.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
241rsa_sign.o: ../../include/openssl/opensslconf.h
242rsa_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 215rsa_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
243rsa_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 216rsa_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
244rsa_sign.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
245rsa_sign.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
246rsa_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 217rsa_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
247rsa_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 218rsa_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
248rsa_sign.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
249rsa_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 219rsa_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
250rsa_sign.o: ../cryptlib.h rsa_sign.c 220rsa_sign.o: ../cryptlib.h rsa_sign.c
251rsa_ssl.o: ../../e_os.h ../../include/openssl/asn1.h 221rsa_ssl.o: ../../e_os.h ../../include/openssl/asn1.h
diff --git a/src/lib/libcrypto/rsa/rsa_null.c b/src/lib/libcrypto/rsa/rsa_null.c
index 64057fbdcf..491572c82b 100644
--- a/src/lib/libcrypto/rsa/rsa_null.c
+++ b/src/lib/libcrypto/rsa/rsa_null.c
@@ -94,6 +94,9 @@ static RSA_METHOD rsa_null_meth={
94 RSA_null_finish, 94 RSA_null_finish,
95 0, 95 0,
96 NULL, 96 NULL,
97 NULL,
98 NULL,
99 NULL
97 }; 100 };
98 101
99const RSA_METHOD *RSA_null_method(void) 102const RSA_METHOD *RSA_null_method(void)
@@ -104,35 +107,35 @@ const RSA_METHOD *RSA_null_method(void)
104static int RSA_null_public_encrypt(int flen, const unsigned char *from, 107static int RSA_null_public_encrypt(int flen, const unsigned char *from,
105 unsigned char *to, RSA *rsa, int padding) 108 unsigned char *to, RSA *rsa, int padding)
106 { 109 {
107 RSAerr(RSA_F_RSA_NULL, RSA_R_RSA_OPERATIONS_NOT_SUPPORTED); 110 RSAerr(RSA_F_RSA_NULL_PUBLIC_ENCRYPT, RSA_R_RSA_OPERATIONS_NOT_SUPPORTED);
108 return -1; 111 return -1;
109 } 112 }
110 113
111static int RSA_null_private_encrypt(int flen, const unsigned char *from, 114static int RSA_null_private_encrypt(int flen, const unsigned char *from,
112 unsigned char *to, RSA *rsa, int padding) 115 unsigned char *to, RSA *rsa, int padding)
113 { 116 {
114 RSAerr(RSA_F_RSA_NULL, RSA_R_RSA_OPERATIONS_NOT_SUPPORTED); 117 RSAerr(RSA_F_RSA_NULL_PRIVATE_ENCRYPT, RSA_R_RSA_OPERATIONS_NOT_SUPPORTED);
115 return -1; 118 return -1;
116 } 119 }
117 120
118static int RSA_null_private_decrypt(int flen, const unsigned char *from, 121static int RSA_null_private_decrypt(int flen, const unsigned char *from,
119 unsigned char *to, RSA *rsa, int padding) 122 unsigned char *to, RSA *rsa, int padding)
120 { 123 {
121 RSAerr(RSA_F_RSA_NULL, RSA_R_RSA_OPERATIONS_NOT_SUPPORTED); 124 RSAerr(RSA_F_RSA_NULL_PRIVATE_DECRYPT, RSA_R_RSA_OPERATIONS_NOT_SUPPORTED);
122 return -1; 125 return -1;
123 } 126 }
124 127
125static int RSA_null_public_decrypt(int flen, const unsigned char *from, 128static int RSA_null_public_decrypt(int flen, const unsigned char *from,
126 unsigned char *to, RSA *rsa, int padding) 129 unsigned char *to, RSA *rsa, int padding)
127 { 130 {
128 RSAerr(RSA_F_RSA_NULL, RSA_R_RSA_OPERATIONS_NOT_SUPPORTED); 131 RSAerr(RSA_F_RSA_NULL_PUBLIC_DECRYPT, RSA_R_RSA_OPERATIONS_NOT_SUPPORTED);
129 return -1; 132 return -1;
130 } 133 }
131 134
132#if 0 /* not currently used */ 135#if 0 /* not currently used */
133static int RSA_null_mod_exp(BIGNUM *r0, BIGNUM *I, RSA *rsa) 136static int RSA_null_mod_exp(BIGNUM *r0, BIGNUM *I, RSA *rsa)
134 { 137 {
135 RSAerr(RSA_F_RSA_NULL, RSA_R_RSA_OPERATIONS_NOT_SUPPORTED); 138 ...err(RSA_F_RSA_NULL_MOD_EXP, RSA_R_RSA_OPERATIONS_NOT_SUPPORTED);
136 return -1; 139 return -1;
137 } 140 }
138#endif 141#endif
@@ -146,5 +149,3 @@ static int RSA_null_finish(RSA *rsa)
146 { 149 {
147 return(1); 150 return(1);
148 } 151 }
149
150
diff --git a/src/lib/libcrypto/rsa/rsa_test.c b/src/lib/libcrypto/rsa/rsa_test.c
index 218bb2a39b..4080de8bcf 100644
--- a/src/lib/libcrypto/rsa/rsa_test.c
+++ b/src/lib/libcrypto/rsa/rsa_test.c
@@ -8,6 +8,7 @@
8#include <openssl/crypto.h> 8#include <openssl/crypto.h>
9#include <openssl/err.h> 9#include <openssl/err.h>
10#include <openssl/rand.h> 10#include <openssl/rand.h>
11#include <openssl/bn.h>
11#ifdef OPENSSL_NO_RSA 12#ifdef OPENSSL_NO_RSA
12int main(int argc, char *argv[]) 13int main(int argc, char *argv[])
13{ 14{
@@ -218,6 +219,7 @@ int main(int argc, char *argv[])
218 int plen; 219 int plen;
219 int clen = 0; 220 int clen = 0;
220 int num; 221 int num;
222 int n;
221 223
222 CRYPTO_malloc_debug_init(); 224 CRYPTO_malloc_debug_init();
223 CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL); 225 CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL);
@@ -241,7 +243,7 @@ int main(int argc, char *argv[])
241 clen = key3(key, ctext_ex); 243 clen = key3(key, ctext_ex);
242 break; 244 break;
243 } 245 }
244 if (v/3 > 1) key->flags |= RSA_FLAG_NO_EXP_CONSTTIME; 246 if (v/3 >= 1) key->flags |= RSA_FLAG_NO_CONSTTIME;
245 247
246 num = RSA_public_encrypt(plen, ptext_ex, ctext, key, 248 num = RSA_public_encrypt(plen, ptext_ex, ctext, key,
247 RSA_PKCS1_PADDING); 249 RSA_PKCS1_PADDING);
@@ -277,7 +279,7 @@ int main(int argc, char *argv[])
277 err=1; 279 err=1;
278 goto next; 280 goto next;
279 } 281 }
280 282
281 num = RSA_private_decrypt(num, ctext, ptext, key, 283 num = RSA_private_decrypt(num, ctext, ptext, key,
282 RSA_PKCS1_OAEP_PADDING); 284 RSA_PKCS1_OAEP_PADDING);
283 if (num != plen || memcmp(ptext, ptext_ex, num) != 0) 285 if (num != plen || memcmp(ptext, ptext_ex, num) != 0)
@@ -286,10 +288,7 @@ int main(int argc, char *argv[])
286 err=1; 288 err=1;
287 } 289 }
288 else if (memcmp(ctext, ctext_ex, num) == 0) 290 else if (memcmp(ctext, ctext_ex, num) == 0)
289 {
290 printf("OAEP test vector %d passed!\n", v); 291 printf("OAEP test vector %d passed!\n", v);
291 goto next;
292 }
293 292
294 /* Different ciphertexts (rsa_oaep.c without -DPKCS_TESTVECT). 293 /* Different ciphertexts (rsa_oaep.c without -DPKCS_TESTVECT).
295 Try decrypting ctext_ex */ 294 Try decrypting ctext_ex */
@@ -304,6 +303,26 @@ int main(int argc, char *argv[])
304 } 303 }
305 else 304 else
306 printf("OAEP encryption/decryption ok\n"); 305 printf("OAEP encryption/decryption ok\n");
306
307 /* Try decrypting corrupted ciphertexts */
308 for(n = 0 ; n < clen ; ++n)
309 {
310 int b;
311 unsigned char saved = ctext[n];
312 for(b = 0 ; b < 256 ; ++b)
313 {
314 if(b == saved)
315 continue;
316 ctext[n] = b;
317 num = RSA_private_decrypt(num, ctext, ptext, key,
318 RSA_PKCS1_OAEP_PADDING);
319 if(num > 0)
320 {
321 printf("Corrupt data decrypted!\n");
322 err = 1;
323 }
324 }
325 }
307 next: 326 next:
308 RSA_free(key); 327 RSA_free(key);
309 } 328 }
@@ -313,6 +332,9 @@ int main(int argc, char *argv[])
313 332
314 CRYPTO_mem_leaks_fp(stderr); 333 CRYPTO_mem_leaks_fp(stderr);
315 334
335#ifdef OPENSSL_SYS_NETWARE
336 if (err) printf("ERROR: %d\n", err);
337#endif
316 return err; 338 return err;
317 } 339 }
318#endif 340#endif
diff --git a/src/lib/libcrypto/sha/Makefile b/src/lib/libcrypto/sha/Makefile
index 46103bbc83..ac64fb61d3 100644
--- a/src/lib/libcrypto/sha/Makefile
+++ b/src/lib/libcrypto/sha/Makefile
@@ -8,11 +8,6 @@ CC= cc
8CPP= $(CC) -E 8CPP= $(CC) -E
9INCLUDES= 9INCLUDES=
10CFLAG=-g 10CFLAG=-g
11INSTALL_PREFIX=
12OPENSSLDIR= /usr/local/ssl
13INSTALLTOP=/usr/local/ssl
14MAKEDEPPROG= makedepend
15MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
16MAKEFILE= Makefile 11MAKEFILE= Makefile
17AR= ar r 12AR= ar r
18 13
@@ -20,14 +15,15 @@ SHA1_ASM_OBJ=
20 15
21CFLAGS= $(INCLUDES) $(CFLAG) 16CFLAGS= $(INCLUDES) $(CFLAG)
22ASFLAGS= $(INCLUDES) $(ASFLAG) 17ASFLAGS= $(INCLUDES) $(ASFLAG)
18AFLAGS= $(ASFLAGS)
23 19
24GENERAL=Makefile 20GENERAL=Makefile
25TEST=shatest.c sha1test.c 21TEST=shatest.c sha1test.c sha256t.c sha512t.c
26APPS= 22APPS=
27 23
28LIB=$(TOP)/libcrypto.a 24LIB=$(TOP)/libcrypto.a
29LIBSRC=sha_dgst.c sha1dgst.c sha_one.c sha1_one.c 25LIBSRC=sha_dgst.c sha1dgst.c sha_one.c sha1_one.c sha256.c sha512.c
30LIBOBJ=sha_dgst.o sha1dgst.o sha_one.o sha1_one.o $(SHA1_ASM_OBJ) 26LIBOBJ=sha_dgst.o sha1dgst.o sha_one.o sha1_one.o sha256.o sha512.o $(SHA1_ASM_OBJ)
31 27
32SRC= $(LIBSRC) 28SRC= $(LIBSRC)
33 29
@@ -46,23 +42,33 @@ lib: $(LIBOBJ)
46 $(RANLIB) $(LIB) || echo Never mind. 42 $(RANLIB) $(LIB) || echo Never mind.
47 @touch lib 43 @touch lib
48 44
49# elf 45# ELF
50asm/sx86-elf.s: asm/sha1-586.pl ../perlasm/x86asm.pl 46sx86-elf.s: asm/sha1-586.pl ../perlasm/x86asm.pl
51 (cd asm; $(PERL) sha1-586.pl elf $(CFLAGS) $(PROCESSOR) > sx86-elf.s) 47 (cd asm; $(PERL) sha1-586.pl elf $(CFLAGS) $(PROCESSOR) > ../$@)
52 48s512sse2-elf.s: asm/sha512-sse2.pl ../perlasm/x86asm.pl
49 (cd asm; $(PERL) sha512-sse2.pl elf $(CFLAGS) $(PROCESSOR) > ../$@)
50# COFF
51sx86-cof.s: asm/sha1-586.pl ../perlasm/x86asm.pl
52 (cd asm; $(PERL) sha1-586.pl coff $(CFLAGS) $(PROCESSOR) > ../$@)
53s512sse2-cof.s: asm/sha512-sse2.pl ../perlasm/x86asm.pl
54 (cd asm; $(PERL) sha512-sse2.pl coff $(CFLAGS) $(PROCESSOR) > ../$@)
53# a.out 55# a.out
54asm/sx86-out.o: asm/sx86unix.cpp 56sx86-out.s: asm/sha1-586.pl ../perlasm/x86asm.pl
55 $(CPP) -DOUT asm/sx86unix.cpp | as -o asm/sx86-out.o 57 (cd asm; $(PERL) sha1-586.pl a.out $(CFLAGS) $(PROCESSOR) > ../$@)
56 58s512sse2-out.s: asm/sha512-sse2.pl ../perlasm/x86asm.pl
57# bsdi 59 (cd asm; $(PERL) sha512-sse2.pl a.out $(CFLAGS) $(PROCESSOR) > ../$@)
58asm/sx86bsdi.o: asm/sx86unix.cpp
59 $(CPP) -DBSDI asm/sx86unix.cpp | sed 's/ :/:/' | as -o asm/sx86bsdi.o
60 60
61asm/sx86unix.cpp: asm/sha1-586.pl ../perlasm/x86asm.pl 61sha1-ia64.s: asm/sha1-ia64.pl
62 (cd asm; $(PERL) sha1-586.pl cpp $(PROCESSOR) >sx86unix.cpp)
63
64asm/sha1-ia64.s: asm/sha1-ia64.pl
65 (cd asm; $(PERL) sha1-ia64.pl $(CFLAGS) ) > $@ 62 (cd asm; $(PERL) sha1-ia64.pl $(CFLAGS) ) > $@
63sha256-ia64.s: asm/sha512-ia64.pl
64 (cd asm; $(PERL) sha512-ia64.pl ../$@ $(CFLAGS))
65sha512-ia64.s: asm/sha512-ia64.pl
66 (cd asm; $(PERL) sha512-ia64.pl ../$@ $(CFLAGS))
67
68# Solaris make has to be explicitly told
69sha1-x86_64.s: asm/sha1-x86_64.pl; $(PERL) asm/sha1-x86_64.pl $@
70sha256-x86_64.s:asm/sha512-x86_64.pl; $(PERL) asm/sha512-x86_64.pl $@
71sha512-x86_64.s:asm/sha512-x86_64.pl; $(PERL) asm/sha512-x86_64.pl $@
66 72
67files: 73files:
68 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO 74 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
@@ -73,6 +79,7 @@ links:
73 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 79 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
74 80
75install: 81install:
82 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
76 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 83 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
77 do \ 84 do \
78 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 85 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -88,6 +95,7 @@ lint:
88 lint -DLINT $(INCLUDES) $(SRC)>fluff 95 lint -DLINT $(INCLUDES) $(SRC)>fluff
89 96
90depend: 97depend:
98 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
91 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 99 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
92 100
93dclean: 101dclean:
@@ -95,33 +103,37 @@ dclean:
95 mv -f Makefile.new $(MAKEFILE) 103 mv -f Makefile.new $(MAKEFILE)
96 104
97clean: 105clean:
98 rm -f asm/sx86unix.cpp asm/*-elf.* *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff asm/*.o 106 rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
99 107
100# DO NOT DELETE THIS LINE -- make depend depends on it. 108# DO NOT DELETE THIS LINE -- make depend depends on it.
101 109
102sha1_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 110sha1_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
103sha1_one.o: ../../include/openssl/opensslconf.h 111sha1_one.o: ../../include/openssl/opensslconf.h
104sha1_one.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 112sha1_one.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
105sha1_one.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 113sha1_one.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
106sha1_one.o: ../../include/openssl/symhacks.h sha1_one.c 114sha1_one.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
107sha1dgst.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h 115sha1_one.o: sha1_one.c
108sha1dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 116sha1dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
109sha1dgst.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h 117sha1dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/sha.h
110sha1dgst.o: ../../include/openssl/opensslconf.h 118sha1dgst.o: ../md32_common.h sha1dgst.c sha_locl.h
111sha1dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 119sha256.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
112sha1dgst.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 120sha256.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
113sha1dgst.o: ../../include/openssl/symhacks.h ../md32_common.h sha1dgst.c 121sha256.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
114sha1dgst.o: sha_locl.h 122sha256.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
115sha_dgst.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h 123sha256.o: ../../include/openssl/symhacks.h ../md32_common.h sha256.c
116sha_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 124sha512.o: ../../e_os.h ../../include/openssl/bio.h
117sha_dgst.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h 125sha512.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
118sha_dgst.o: ../../include/openssl/opensslconf.h 126sha512.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
119sha_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 127sha512.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
120sha_dgst.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 128sha512.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
121sha_dgst.o: ../../include/openssl/symhacks.h ../md32_common.h sha_dgst.c 129sha512.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
122sha_dgst.o: sha_locl.h 130sha512.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
131sha512.o: ../cryptlib.h sha512.c
132sha_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
133sha_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/sha.h
134sha_dgst.o: ../md32_common.h sha_dgst.c sha_locl.h
123sha_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 135sha_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
124sha_one.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 136sha_one.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
125sha_one.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 137sha_one.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
126sha_one.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 138sha_one.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
127sha_one.o: sha_one.c 139sha_one.o: ../../include/openssl/symhacks.h sha_one.c
diff --git a/src/lib/libcrypto/sha/asm/sha512-sse2.pl b/src/lib/libcrypto/sha/asm/sha512-sse2.pl
new file mode 100644
index 0000000000..10902bf673
--- /dev/null
+++ b/src/lib/libcrypto/sha/asm/sha512-sse2.pl
@@ -0,0 +1,404 @@
1#!/usr/bin/env perl
2#
3# ====================================================================
4# Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
5# project. Rights for redistribution and usage in source and binary
6# forms are granted according to the OpenSSL license.
7# ====================================================================
8#
9# SHA512_Transform_SSE2.
10#
11# As the name suggests, this is an IA-32 SSE2 implementation of
12# SHA512_Transform. Motivating factor for the undertaken effort was that
13# SHA512 was observed to *consistently* perform *significantly* poorer
14# than SHA256 [2x and slower is common] on 32-bit platforms. On 64-bit
15# platforms on the other hand SHA512 tend to outperform SHA256 [~50%
16# seem to be common improvement factor]. All this is perfectly natural,
17# as SHA512 is a 64-bit algorithm. But isn't IA-32 SSE2 essentially
18# a 64-bit instruction set? Is it rich enough to implement SHA512?
19# If answer was "no," then you wouldn't have been reading this...
20#
21# Throughput performance in MBps (larger is better):
22#
23# 2.4GHz P4 1.4GHz AMD32 1.4GHz AMD64(*)
24# SHA256/gcc(*) 54 43 59
25# SHA512/gcc 17 23 92
26# SHA512/sse2 61(**) 57(**)
27# SHA512/icc 26 28
28# SHA256/icc(*) 65 54
29#
30# (*) AMD64 and SHA256 numbers are presented mostly for amusement or
31# reference purposes.
32# (**) I.e. it gives ~2-3x speed-up if compared with compiler generated
33# code. One can argue that hand-coded *non*-SSE2 implementation
34# would perform better than compiler generated one as well, and
35# that comparison is therefore not exactly fair. Well, as SHA512
36# puts enormous pressure on IA-32 GP register bank, I reckon that
37# hand-coded version wouldn't perform significantly better than
38# one compiled with icc, ~20% perhaps... So that this code would
39# still outperform it with distinguishing marginal. But feel free
40# to prove me wrong:-)
41# <appro@fy.chalmers.se>
42push(@INC,"perlasm","../../perlasm");
43require "x86asm.pl";
44
45&asm_init($ARGV[0],"sha512-sse2.pl",$ARGV[$#ARGV] eq "386");
46
47$K512="esi"; # K512[80] table, found at the end...
48#$W512="esp"; # $W512 is not just W512[16]: it comprises *two* copies
49 # of W512[16] and a copy of A-H variables...
50$W512_SZ=8*(16+16+8); # see above...
51#$Kidx="ebx"; # index in K512 table, advances from 0 to 80...
52$Widx="edx"; # index in W512, wraps around at 16...
53$data="edi"; # 16 qwords of input data...
54$A="mm0"; # B-D and
55$E="mm1"; # F-H are allocated dynamically...
56$Aoff=256+0; # A-H offsets relative to $W512...
57$Boff=256+8;
58$Coff=256+16;
59$Doff=256+24;
60$Eoff=256+32;
61$Foff=256+40;
62$Goff=256+48;
63$Hoff=256+56;
64
65sub SHA2_ROUND()
66{ local ($kidx,$widx)=@_;
67
68 # One can argue that one could reorder instructions for better
69 # performance. Well, I tried and it doesn't seem to make any
70 # noticeable difference. Modern out-of-order execution cores
71 # reorder instructions to their liking in either case and they
72 # apparently do decent job. So we can keep the code more
73 # readable/regular/comprehensible:-)
74
75 # I adhere to 64-bit %mmX registers in order to avoid/not care
76 # about #GP exceptions on misaligned 128-bit access, most
77 # notably in paddq with memory operand. Not to mention that
78 # SSE2 intructions operating on %mmX can be scheduled every
79 # cycle [and not every second one if operating on %xmmN].
80
81 &movq ("mm4",&QWP($Foff,$W512)); # load f
82 &movq ("mm5",&QWP($Goff,$W512)); # load g
83 &movq ("mm6",&QWP($Hoff,$W512)); # load h
84
85 &movq ("mm2",$E); # %mm2 is sliding right
86 &movq ("mm3",$E); # %mm3 is sliding left
87 &psrlq ("mm2",14);
88 &psllq ("mm3",23);
89 &movq ("mm7","mm2"); # %mm7 is T1
90 &pxor ("mm7","mm3");
91 &psrlq ("mm2",4);
92 &psllq ("mm3",23);
93 &pxor ("mm7","mm2");
94 &pxor ("mm7","mm3");
95 &psrlq ("mm2",23);
96 &psllq ("mm3",4);
97 &pxor ("mm7","mm2");
98 &pxor ("mm7","mm3"); # T1=Sigma1_512(e)
99
100 &movq (&QWP($Foff,$W512),$E); # f = e
101 &movq (&QWP($Goff,$W512),"mm4"); # g = f
102 &movq (&QWP($Hoff,$W512),"mm5"); # h = g
103
104 &pxor ("mm4","mm5"); # f^=g
105 &pand ("mm4",$E); # f&=e
106 &pxor ("mm4","mm5"); # f^=g
107 &paddq ("mm7","mm4"); # T1+=Ch(e,f,g)
108
109 &movq ("mm2",&QWP($Boff,$W512)); # load b
110 &movq ("mm3",&QWP($Coff,$W512)); # load c
111 &movq ($E,&QWP($Doff,$W512)); # e = d
112
113 &paddq ("mm7","mm6"); # T1+=h
114 &paddq ("mm7",&QWP(0,$K512,$kidx,8)); # T1+=K512[i]
115 &paddq ("mm7",&QWP(0,$W512,$widx,8)); # T1+=W512[i]
116 &paddq ($E,"mm7"); # e += T1
117
118 &movq ("mm4",$A); # %mm4 is sliding right
119 &movq ("mm5",$A); # %mm5 is sliding left
120 &psrlq ("mm4",28);
121 &psllq ("mm5",25);
122 &movq ("mm6","mm4"); # %mm6 is T2
123 &pxor ("mm6","mm5");
124 &psrlq ("mm4",6);
125 &psllq ("mm5",5);
126 &pxor ("mm6","mm4");
127 &pxor ("mm6","mm5");
128 &psrlq ("mm4",5);
129 &psllq ("mm5",6);
130 &pxor ("mm6","mm4");
131 &pxor ("mm6","mm5"); # T2=Sigma0_512(a)
132
133 &movq (&QWP($Boff,$W512),$A); # b = a
134 &movq (&QWP($Coff,$W512),"mm2"); # c = b
135 &movq (&QWP($Doff,$W512),"mm3"); # d = c
136
137 &movq ("mm4",$A); # %mm4=a
138 &por ($A,"mm3"); # a=a|c
139 &pand ("mm4","mm3"); # %mm4=a&c
140 &pand ($A,"mm2"); # a=(a|c)&b
141 &por ("mm4",$A); # %mm4=(a&c)|((a|c)&b)
142 &paddq ("mm6","mm4"); # T2+=Maj(a,b,c)
143
144 &movq ($A,"mm7"); # a=T1
145 &paddq ($A,"mm6"); # a+=T2
146}
147
148$func="sha512_block_sse2";
149
150&function_begin_B($func);
151 if (0) {# Caller is expected to check if it's appropriate to
152 # call this routine. Below 3 lines are retained for
153 # debugging purposes...
154 &picmeup("eax","OPENSSL_ia32cap");
155 &bt (&DWP(0,"eax"),26);
156 &jnc ("SHA512_Transform");
157 }
158
159 &push ("ebp");
160 &mov ("ebp","esp");
161 &push ("ebx");
162 &push ("esi");
163 &push ("edi");
164
165 &mov ($Widx,&DWP(8,"ebp")); # A-H state, 1st arg
166 &mov ($data,&DWP(12,"ebp")); # input data, 2nd arg
167 &call (&label("pic_point")); # make it PIC!
168&set_label("pic_point");
169 &blindpop($K512);
170 &lea ($K512,&DWP(&label("K512")."-".&label("pic_point"),$K512));
171
172 $W512 = "esp"; # start using %esp as W512
173 &sub ($W512,$W512_SZ);
174 &and ($W512,-16); # ensure 128-bit alignment
175
176 # make private copy of A-H
177 # v assume the worst and stick to unaligned load
178 &movdqu ("xmm0",&QWP(0,$Widx));
179 &movdqu ("xmm1",&QWP(16,$Widx));
180 &movdqu ("xmm2",&QWP(32,$Widx));
181 &movdqu ("xmm3",&QWP(48,$Widx));
182
183&align(8);
184&set_label("_chunk_loop");
185
186 &movdqa (&QWP($Aoff,$W512),"xmm0"); # a,b
187 &movdqa (&QWP($Coff,$W512),"xmm1"); # c,d
188 &movdqa (&QWP($Eoff,$W512),"xmm2"); # e,f
189 &movdqa (&QWP($Goff,$W512),"xmm3"); # g,h
190
191 &xor ($Widx,$Widx);
192
193 &movdq2q($A,"xmm0"); # load a
194 &movdq2q($E,"xmm2"); # load e
195
196 # Why aren't loops unrolled? It makes sense to unroll if
197 # execution time for loop body is comparable with branch
198 # penalties and/or if whole data-set resides in register bank.
199 # Neither is case here... Well, it would be possible to
200 # eliminate few store operations, but it would hardly affect
201 # so to say stop-watch performance, as there is a lot of
202 # available memory slots to fill. It will only relieve some
203 # pressure off memory bus...
204
205 # flip input stream byte order...
206 &mov ("eax",&DWP(0,$data,$Widx,8));
207 &mov ("ebx",&DWP(4,$data,$Widx,8));
208 &bswap ("eax");
209 &bswap ("ebx");
210 &mov (&DWP(0,$W512,$Widx,8),"ebx"); # W512[i]
211 &mov (&DWP(4,$W512,$Widx,8),"eax");
212 &mov (&DWP(128+0,$W512,$Widx,8),"ebx"); # copy of W512[i]
213 &mov (&DWP(128+4,$W512,$Widx,8),"eax");
214
215&align(8);
216&set_label("_1st_loop"); # 0-15
217 # flip input stream byte order...
218 &mov ("eax",&DWP(0+8,$data,$Widx,8));
219 &mov ("ebx",&DWP(4+8,$data,$Widx,8));
220 &bswap ("eax");
221 &bswap ("ebx");
222 &mov (&DWP(0+8,$W512,$Widx,8),"ebx"); # W512[i]
223 &mov (&DWP(4+8,$W512,$Widx,8),"eax");
224 &mov (&DWP(128+0+8,$W512,$Widx,8),"ebx"); # copy of W512[i]
225 &mov (&DWP(128+4+8,$W512,$Widx,8),"eax");
226&set_label("_1st_looplet");
227 &SHA2_ROUND($Widx,$Widx); &inc($Widx);
228
229&cmp ($Widx,15)
230&jl (&label("_1st_loop"));
231&je (&label("_1st_looplet")); # playing similar trick on 2nd loop
232 # does not improve performance...
233
234 $Kidx = "ebx"; # start using %ebx as Kidx
235 &mov ($Kidx,$Widx);
236
237&align(8);
238&set_label("_2nd_loop"); # 16-79
239 &and($Widx,0xf);
240
241 # 128-bit fragment! I update W512[i] and W512[i+1] in
242 # parallel:-) Note that I refer to W512[(i&0xf)+N] and not to
243 # W512[(i+N)&0xf]! This is exactly what I maintain the second
244 # copy of W512[16] for...
245 &movdqu ("xmm0",&QWP(8*1,$W512,$Widx,8)); # s0=W512[i+1]
246 &movdqa ("xmm2","xmm0"); # %xmm2 is sliding right
247 &movdqa ("xmm3","xmm0"); # %xmm3 is sliding left
248 &psrlq ("xmm2",1);
249 &psllq ("xmm3",56);
250 &movdqa ("xmm0","xmm2");
251 &pxor ("xmm0","xmm3");
252 &psrlq ("xmm2",6);
253 &psllq ("xmm3",7);
254 &pxor ("xmm0","xmm2");
255 &pxor ("xmm0","xmm3");
256 &psrlq ("xmm2",1);
257 &pxor ("xmm0","xmm2"); # s0 = sigma0_512(s0);
258
259 &movdqa ("xmm1",&QWP(8*14,$W512,$Widx,8)); # s1=W512[i+14]
260 &movdqa ("xmm4","xmm1"); # %xmm4 is sliding right
261 &movdqa ("xmm5","xmm1"); # %xmm5 is sliding left
262 &psrlq ("xmm4",6);
263 &psllq ("xmm5",3);
264 &movdqa ("xmm1","xmm4");
265 &pxor ("xmm1","xmm5");
266 &psrlq ("xmm4",13);
267 &psllq ("xmm5",42);
268 &pxor ("xmm1","xmm4");
269 &pxor ("xmm1","xmm5");
270 &psrlq ("xmm4",42);
271 &pxor ("xmm1","xmm4"); # s1 = sigma1_512(s1);
272
273 # + have to explictly load W512[i+9] as it's not 128-bit
274 # v aligned and paddq would throw an exception...
275 &movdqu ("xmm6",&QWP(8*9,$W512,$Widx,8));
276 &paddq ("xmm0","xmm1"); # s0 += s1
277 &paddq ("xmm0","xmm6"); # s0 += W512[i+9]
278 &paddq ("xmm0",&QWP(0,$W512,$Widx,8)); # s0 += W512[i]
279
280 &movdqa (&QWP(0,$W512,$Widx,8),"xmm0"); # W512[i] = s0
281 &movdqa (&QWP(16*8,$W512,$Widx,8),"xmm0"); # copy of W512[i]
282
283 # as the above fragment was 128-bit, we "owe" 2 rounds...
284 &SHA2_ROUND($Kidx,$Widx); &inc($Kidx); &inc($Widx);
285 &SHA2_ROUND($Kidx,$Widx); &inc($Kidx); &inc($Widx);
286
287&cmp ($Kidx,80);
288&jl (&label("_2nd_loop"));
289
290 # update A-H state
291 &mov ($Widx,&DWP(8,"ebp")); # A-H state, 1st arg
292 &movq (&QWP($Aoff,$W512),$A); # write out a
293 &movq (&QWP($Eoff,$W512),$E); # write out e
294 &movdqu ("xmm0",&QWP(0,$Widx));
295 &movdqu ("xmm1",&QWP(16,$Widx));
296 &movdqu ("xmm2",&QWP(32,$Widx));
297 &movdqu ("xmm3",&QWP(48,$Widx));
298 &paddq ("xmm0",&QWP($Aoff,$W512)); # 128-bit additions...
299 &paddq ("xmm1",&QWP($Coff,$W512));
300 &paddq ("xmm2",&QWP($Eoff,$W512));
301 &paddq ("xmm3",&QWP($Goff,$W512));
302 &movdqu (&QWP(0,$Widx),"xmm0");
303 &movdqu (&QWP(16,$Widx),"xmm1");
304 &movdqu (&QWP(32,$Widx),"xmm2");
305 &movdqu (&QWP(48,$Widx),"xmm3");
306
307&add ($data,16*8); # advance input data pointer
308&dec (&DWP(16,"ebp")); # decrement 3rd arg
309&jnz (&label("_chunk_loop"));
310
311 # epilogue
312 &emms (); # required for at least ELF and Win32 ABIs
313 &mov ("edi",&DWP(-12,"ebp"));
314 &mov ("esi",&DWP(-8,"ebp"));
315 &mov ("ebx",&DWP(-4,"ebp"));
316 &leave ();
317&ret ();
318
319&align(64);
320&set_label("K512"); # Yes! I keep it in the code segment!
321 &data_word(0xd728ae22,0x428a2f98); # u64
322 &data_word(0x23ef65cd,0x71374491); # u64
323 &data_word(0xec4d3b2f,0xb5c0fbcf); # u64
324 &data_word(0x8189dbbc,0xe9b5dba5); # u64
325 &data_word(0xf348b538,0x3956c25b); # u64
326 &data_word(0xb605d019,0x59f111f1); # u64
327 &data_word(0xaf194f9b,0x923f82a4); # u64
328 &data_word(0xda6d8118,0xab1c5ed5); # u64
329 &data_word(0xa3030242,0xd807aa98); # u64
330 &data_word(0x45706fbe,0x12835b01); # u64
331 &data_word(0x4ee4b28c,0x243185be); # u64
332 &data_word(0xd5ffb4e2,0x550c7dc3); # u64
333 &data_word(0xf27b896f,0x72be5d74); # u64
334 &data_word(0x3b1696b1,0x80deb1fe); # u64
335 &data_word(0x25c71235,0x9bdc06a7); # u64
336 &data_word(0xcf692694,0xc19bf174); # u64
337 &data_word(0x9ef14ad2,0xe49b69c1); # u64
338 &data_word(0x384f25e3,0xefbe4786); # u64
339 &data_word(0x8b8cd5b5,0x0fc19dc6); # u64
340 &data_word(0x77ac9c65,0x240ca1cc); # u64
341 &data_word(0x592b0275,0x2de92c6f); # u64
342 &data_word(0x6ea6e483,0x4a7484aa); # u64
343 &data_word(0xbd41fbd4,0x5cb0a9dc); # u64
344 &data_word(0x831153b5,0x76f988da); # u64
345 &data_word(0xee66dfab,0x983e5152); # u64
346 &data_word(0x2db43210,0xa831c66d); # u64
347 &data_word(0x98fb213f,0xb00327c8); # u64
348 &data_word(0xbeef0ee4,0xbf597fc7); # u64
349 &data_word(0x3da88fc2,0xc6e00bf3); # u64
350 &data_word(0x930aa725,0xd5a79147); # u64
351 &data_word(0xe003826f,0x06ca6351); # u64
352 &data_word(0x0a0e6e70,0x14292967); # u64
353 &data_word(0x46d22ffc,0x27b70a85); # u64
354 &data_word(0x5c26c926,0x2e1b2138); # u64
355 &data_word(0x5ac42aed,0x4d2c6dfc); # u64
356 &data_word(0x9d95b3df,0x53380d13); # u64
357 &data_word(0x8baf63de,0x650a7354); # u64
358 &data_word(0x3c77b2a8,0x766a0abb); # u64
359 &data_word(0x47edaee6,0x81c2c92e); # u64
360 &data_word(0x1482353b,0x92722c85); # u64
361 &data_word(0x4cf10364,0xa2bfe8a1); # u64
362 &data_word(0xbc423001,0xa81a664b); # u64
363 &data_word(0xd0f89791,0xc24b8b70); # u64
364 &data_word(0x0654be30,0xc76c51a3); # u64
365 &data_word(0xd6ef5218,0xd192e819); # u64
366 &data_word(0x5565a910,0xd6990624); # u64
367 &data_word(0x5771202a,0xf40e3585); # u64
368 &data_word(0x32bbd1b8,0x106aa070); # u64
369 &data_word(0xb8d2d0c8,0x19a4c116); # u64
370 &data_word(0x5141ab53,0x1e376c08); # u64
371 &data_word(0xdf8eeb99,0x2748774c); # u64
372 &data_word(0xe19b48a8,0x34b0bcb5); # u64
373 &data_word(0xc5c95a63,0x391c0cb3); # u64
374 &data_word(0xe3418acb,0x4ed8aa4a); # u64
375 &data_word(0x7763e373,0x5b9cca4f); # u64
376 &data_word(0xd6b2b8a3,0x682e6ff3); # u64
377 &data_word(0x5defb2fc,0x748f82ee); # u64
378 &data_word(0x43172f60,0x78a5636f); # u64
379 &data_word(0xa1f0ab72,0x84c87814); # u64
380 &data_word(0x1a6439ec,0x8cc70208); # u64
381 &data_word(0x23631e28,0x90befffa); # u64
382 &data_word(0xde82bde9,0xa4506ceb); # u64
383 &data_word(0xb2c67915,0xbef9a3f7); # u64
384 &data_word(0xe372532b,0xc67178f2); # u64
385 &data_word(0xea26619c,0xca273ece); # u64
386 &data_word(0x21c0c207,0xd186b8c7); # u64
387 &data_word(0xcde0eb1e,0xeada7dd6); # u64
388 &data_word(0xee6ed178,0xf57d4f7f); # u64
389 &data_word(0x72176fba,0x06f067aa); # u64
390 &data_word(0xa2c898a6,0x0a637dc5); # u64
391 &data_word(0xbef90dae,0x113f9804); # u64
392 &data_word(0x131c471b,0x1b710b35); # u64
393 &data_word(0x23047d84,0x28db77f5); # u64
394 &data_word(0x40c72493,0x32caab7b); # u64
395 &data_word(0x15c9bebc,0x3c9ebe0a); # u64
396 &data_word(0x9c100d4c,0x431d67c4); # u64
397 &data_word(0xcb3e42b6,0x4cc5d4be); # u64
398 &data_word(0xfc657e2a,0x597f299c); # u64
399 &data_word(0x3ad6faec,0x5fcb6fab); # u64
400 &data_word(0x4a475817,0x6c44198c); # u64
401
402&function_end_B($func);
403
404&asm_finish();
diff --git a/src/lib/libcrypto/sha/sha1test.c b/src/lib/libcrypto/sha/sha1test.c
index 4f2e4ada2d..6feb3964c7 100644
--- a/src/lib/libcrypto/sha/sha1test.c
+++ b/src/lib/libcrypto/sha/sha1test.c
@@ -106,7 +106,7 @@ static char *pt(unsigned char *md);
106int main(int argc, char *argv[]) 106int main(int argc, char *argv[])
107 { 107 {
108 int i,err=0; 108 int i,err=0;
109 unsigned char **P,**R; 109 char **P,**R;
110 static unsigned char buf[1000]; 110 static unsigned char buf[1000];
111 char *p,*r; 111 char *p,*r;
112 EVP_MD_CTX c; 112 EVP_MD_CTX c;
@@ -118,12 +118,12 @@ int main(int argc, char *argv[])
118#endif 118#endif
119 119
120 EVP_MD_CTX_init(&c); 120 EVP_MD_CTX_init(&c);
121 P=(unsigned char **)test; 121 P=test;
122 R=(unsigned char **)ret; 122 R=ret;
123 i=1; 123 i=1;
124 while (*P != NULL) 124 while (*P != NULL)
125 { 125 {
126 EVP_Digest(*P,(unsigned long)strlen((char *)*P),md,NULL,EVP_sha1(), NULL); 126 EVP_Digest(*P,strlen((char *)*P),md,NULL,EVP_sha1(), NULL);
127 p=pt(md); 127 p=pt(md);
128 if (strcmp(p,(char *)*R) != 0) 128 if (strcmp(p,(char *)*R) != 0)
129 { 129 {
@@ -157,6 +157,10 @@ int main(int argc, char *argv[])
157 } 157 }
158 else 158 else
159 printf("test 3 ok\n"); 159 printf("test 3 ok\n");
160
161#ifdef OPENSSL_SYS_NETWARE
162 if (err) printf("ERROR: %d\n", err);
163#endif
160 EXIT(err); 164 EXIT(err);
161 EVP_MD_CTX_cleanup(&c); 165 EVP_MD_CTX_cleanup(&c);
162 return(0); 166 return(0);
diff --git a/src/lib/libcrypto/sha/sha_dgst.c b/src/lib/libcrypto/sha/sha_dgst.c
index 5a4b3ab204..70eb56032c 100644
--- a/src/lib/libcrypto/sha/sha_dgst.c
+++ b/src/lib/libcrypto/sha/sha_dgst.c
@@ -56,6 +56,7 @@
56 * [including the GNU Public Licence.] 56 * [including the GNU Public Licence.]
57 */ 57 */
58 58
59#include <openssl/opensslconf.h>
59#if !defined(OPENSSL_NO_SHA0) && !defined(OPENSSL_NO_SHA) 60#if !defined(OPENSSL_NO_SHA0) && !defined(OPENSSL_NO_SHA)
60 61
61#undef SHA_1 62#undef SHA_1
@@ -63,7 +64,7 @@
63 64
64#include <openssl/opensslv.h> 65#include <openssl/opensslv.h>
65 66
66const char *SHA_version="SHA" OPENSSL_VERSION_PTEXT; 67const char SHA_version[]="SHA" OPENSSL_VERSION_PTEXT;
67 68
68/* The implementation is in ../md32_common.h */ 69/* The implementation is in ../md32_common.h */
69 70
diff --git a/src/lib/libcrypto/sha/sha_one.c b/src/lib/libcrypto/sha/sha_one.c
index d4f4d344df..3bae623ce8 100644
--- a/src/lib/libcrypto/sha/sha_one.c
+++ b/src/lib/libcrypto/sha/sha_one.c
@@ -62,7 +62,7 @@
62#include <openssl/crypto.h> 62#include <openssl/crypto.h>
63 63
64#ifndef OPENSSL_NO_SHA0 64#ifndef OPENSSL_NO_SHA0
65unsigned char *SHA(const unsigned char *d, unsigned long n, unsigned char *md) 65unsigned char *SHA(const unsigned char *d, size_t n, unsigned char *md)
66 { 66 {
67 SHA_CTX c; 67 SHA_CTX c;
68 static unsigned char m[SHA_DIGEST_LENGTH]; 68 static unsigned char m[SHA_DIGEST_LENGTH];
diff --git a/src/lib/libcrypto/sha/shatest.c b/src/lib/libcrypto/sha/shatest.c
index ff702aa53e..ed0fe06a7b 100644
--- a/src/lib/libcrypto/sha/shatest.c
+++ b/src/lib/libcrypto/sha/shatest.c
@@ -106,7 +106,7 @@ static char *pt(unsigned char *md);
106int main(int argc, char *argv[]) 106int main(int argc, char *argv[])
107 { 107 {
108 int i,err=0; 108 int i,err=0;
109 unsigned char **P,**R; 109 char **P,**R;
110 static unsigned char buf[1000]; 110 static unsigned char buf[1000];
111 char *p,*r; 111 char *p,*r;
112 EVP_MD_CTX c; 112 EVP_MD_CTX c;
@@ -118,12 +118,12 @@ int main(int argc, char *argv[])
118#endif 118#endif
119 119
120 EVP_MD_CTX_init(&c); 120 EVP_MD_CTX_init(&c);
121 P=(unsigned char **)test; 121 P=test;
122 R=(unsigned char **)ret; 122 R=ret;
123 i=1; 123 i=1;
124 while (*P != NULL) 124 while (*P != NULL)
125 { 125 {
126 EVP_Digest(*P,(unsigned long)strlen((char *)*P),md,NULL,EVP_sha(), NULL); 126 EVP_Digest(*P,strlen((char *)*P),md,NULL,EVP_sha(), NULL);
127 p=pt(md); 127 p=pt(md);
128 if (strcmp(p,(char *)*R) != 0) 128 if (strcmp(p,(char *)*R) != 0)
129 { 129 {
@@ -157,6 +157,10 @@ int main(int argc, char *argv[])
157 } 157 }
158 else 158 else
159 printf("test 3 ok\n"); 159 printf("test 3 ok\n");
160
161#ifdef OPENSSL_SYS_NETWARE
162 if (err) printf("ERROR: %d\n", err);
163#endif
160 EVP_MD_CTX_cleanup(&c); 164 EVP_MD_CTX_cleanup(&c);
161 EXIT(err); 165 EXIT(err);
162 return(0); 166 return(0);
diff --git a/src/lib/libcrypto/stack/Makefile b/src/lib/libcrypto/stack/Makefile
index 711b16832a..5327692ac8 100644
--- a/src/lib/libcrypto/stack/Makefile
+++ b/src/lib/libcrypto/stack/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= 8INCLUDES=
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -51,6 +46,7 @@ links:
51 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 46 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
52 47
53install: 48install:
49 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
54 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 50 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
55 do \ 51 do \
56 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 52 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -66,6 +62,7 @@ lint:
66 lint -DLINT $(INCLUDES) $(SRC)>fluff 62 lint -DLINT $(INCLUDES) $(SRC)>fluff
67 63
68depend: 64depend:
65 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
69 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 66 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
70 67
71dclean: 68dclean:
@@ -77,10 +74,11 @@ clean:
77 74
78# DO NOT DELETE THIS LINE -- make depend depends on it. 75# DO NOT DELETE THIS LINE -- make depend depends on it.
79 76
80stack.o: ../../e_os.h ../../include/openssl/bio.h 77stack.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
81stack.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 78stack.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
82stack.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 79stack.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
83stack.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 80stack.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
84stack.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 81stack.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
85stack.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 82stack.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
86stack.o: ../cryptlib.h stack.c 83stack.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
84stack.o: ../../include/openssl/symhacks.h ../cryptlib.h stack.c
diff --git a/src/lib/libcrypto/symhacks.h b/src/lib/libcrypto/symhacks.h
index 774162fec9..64528ad5c2 100644
--- a/src/lib/libcrypto/symhacks.h
+++ b/src/lib/libcrypto/symhacks.h
@@ -127,6 +127,12 @@
127/* Hack some long X509 names */ 127/* Hack some long X509 names */
128#undef X509_REVOKED_get_ext_by_critical 128#undef X509_REVOKED_get_ext_by_critical
129#define X509_REVOKED_get_ext_by_critical X509_REVOKED_get_ext_by_critic 129#define X509_REVOKED_get_ext_by_critical X509_REVOKED_get_ext_by_critic
130#undef X509_policy_tree_get0_user_policies
131#define X509_policy_tree_get0_user_policies X509_pcy_tree_get0_usr_policies
132#undef X509_policy_node_get0_qualifiers
133#define X509_policy_node_get0_qualifiers X509_pcy_node_get0_qualifiers
134#undef X509_STORE_CTX_get_explicit_policy
135#define X509_STORE_CTX_get_explicit_policy X509_STORE_CTX_get_expl_policy
130 136
131/* Hack some long CRYPTO names */ 137/* Hack some long CRYPTO names */
132#undef CRYPTO_set_dynlock_destroy_callback 138#undef CRYPTO_set_dynlock_destroy_callback
@@ -153,16 +159,16 @@
153#define SSL_get_ex_data_X509_STORE_CTX_idx SSL_get_ex_d_X509_STORE_CTX_idx 159#define SSL_get_ex_data_X509_STORE_CTX_idx SSL_get_ex_d_X509_STORE_CTX_idx
154#undef SSL_add_file_cert_subjects_to_stack 160#undef SSL_add_file_cert_subjects_to_stack
155#define SSL_add_file_cert_subjects_to_stack SSL_add_file_cert_subjs_to_stk 161#define SSL_add_file_cert_subjects_to_stack SSL_add_file_cert_subjs_to_stk
156#if 0 /* This function is not defined i VMS. */
157#undef SSL_add_dir_cert_subjects_to_stack 162#undef SSL_add_dir_cert_subjects_to_stack
158#define SSL_add_dir_cert_subjects_to_stack SSL_add_dir_cert_subjs_to_stk 163#define SSL_add_dir_cert_subjects_to_stack SSL_add_dir_cert_subjs_to_stk
159#endif
160#undef SSL_CTX_use_certificate_chain_file 164#undef SSL_CTX_use_certificate_chain_file
161#define SSL_CTX_use_certificate_chain_file SSL_CTX_use_cert_chain_file 165#define SSL_CTX_use_certificate_chain_file SSL_CTX_use_cert_chain_file
162#undef SSL_CTX_set_cert_verify_callback 166#undef SSL_CTX_set_cert_verify_callback
163#define SSL_CTX_set_cert_verify_callback SSL_CTX_set_cert_verify_cb 167#define SSL_CTX_set_cert_verify_callback SSL_CTX_set_cert_verify_cb
164#undef SSL_CTX_set_default_passwd_cb_userdata 168#undef SSL_CTX_set_default_passwd_cb_userdata
165#define SSL_CTX_set_default_passwd_cb_userdata SSL_CTX_set_def_passwd_cb_ud 169#define SSL_CTX_set_default_passwd_cb_userdata SSL_CTX_set_def_passwd_cb_ud
170#undef SSL_COMP_get_compression_methods
171#define SSL_COMP_get_compression_methods SSL_COMP_get_compress_methods
166 172
167/* Hack some long ENGINE names */ 173/* Hack some long ENGINE names */
168#undef ENGINE_get_default_BN_mod_exp_crt 174#undef ENGINE_get_default_BN_mod_exp_crt
@@ -195,6 +201,12 @@
195#define OPENSSL_add_all_algorithms_conf OPENSSL_add_all_algo_conf 201#define OPENSSL_add_all_algorithms_conf OPENSSL_add_all_algo_conf
196 202
197/* Hack some long EC names */ 203/* Hack some long EC names */
204#undef EC_GROUP_set_point_conversion_form
205#define EC_GROUP_set_point_conversion_form EC_GROUP_set_point_conv_form
206#undef EC_GROUP_get_point_conversion_form
207#define EC_GROUP_get_point_conversion_form EC_GROUP_get_point_conv_form
208#undef EC_GROUP_clear_free_all_extra_data
209#define EC_GROUP_clear_free_all_extra_data EC_GROUP_clr_free_all_xtra_data
198#undef EC_POINT_set_Jprojective_coordinates_GFp 210#undef EC_POINT_set_Jprojective_coordinates_GFp
199#define EC_POINT_set_Jprojective_coordinates_GFp \ 211#define EC_POINT_set_Jprojective_coordinates_GFp \
200 EC_POINT_set_Jproj_coords_GFp 212 EC_POINT_set_Jproj_coords_GFp
@@ -207,6 +219,32 @@
207#define EC_POINT_get_affine_coordinates_GFp EC_POINT_get_affine_coords_GFp 219#define EC_POINT_get_affine_coordinates_GFp EC_POINT_get_affine_coords_GFp
208#undef EC_POINT_set_compressed_coordinates_GFp 220#undef EC_POINT_set_compressed_coordinates_GFp
209#define EC_POINT_set_compressed_coordinates_GFp EC_POINT_set_compr_coords_GFp 221#define EC_POINT_set_compressed_coordinates_GFp EC_POINT_set_compr_coords_GFp
222#undef EC_POINT_set_affine_coordinates_GF2m
223#define EC_POINT_set_affine_coordinates_GF2m EC_POINT_set_affine_coords_GF2m
224#undef EC_POINT_get_affine_coordinates_GF2m
225#define EC_POINT_get_affine_coordinates_GF2m EC_POINT_get_affine_coords_GF2m
226#undef EC_POINT_set_compressed_coordinates_GF2m
227#define EC_POINT_set_compressed_coordinates_GF2m \
228 EC_POINT_set_compr_coords_GF2m
229#undef ec_GF2m_simple_group_clear_finish
230#define ec_GF2m_simple_group_clear_finish ec_GF2m_simple_grp_clr_finish
231#undef ec_GF2m_simple_group_check_discriminant
232#define ec_GF2m_simple_group_check_discriminant ec_GF2m_simple_grp_chk_discrim
233#undef ec_GF2m_simple_point_clear_finish
234#define ec_GF2m_simple_point_clear_finish ec_GF2m_simple_pt_clr_finish
235#undef ec_GF2m_simple_point_set_to_infinity
236#define ec_GF2m_simple_point_set_to_infinity ec_GF2m_simple_pt_set_to_inf
237#undef ec_GF2m_simple_points_make_affine
238#define ec_GF2m_simple_points_make_affine ec_GF2m_simple_pts_make_affine
239#undef ec_GF2m_simple_point_set_affine_coordinates
240#define ec_GF2m_simple_point_set_affine_coordinates \
241 ec_GF2m_smp_pt_set_af_coords
242#undef ec_GF2m_simple_point_get_affine_coordinates
243#define ec_GF2m_simple_point_get_affine_coordinates \
244 ec_GF2m_smp_pt_get_af_coords
245#undef ec_GF2m_simple_set_compressed_coordinates
246#define ec_GF2m_simple_set_compressed_coordinates \
247 ec_GF2m_smp_set_compr_coords
210#undef ec_GFp_simple_group_set_curve_GFp 248#undef ec_GFp_simple_group_set_curve_GFp
211#define ec_GFp_simple_group_set_curve_GFp ec_GFp_simple_grp_set_curve_GFp 249#define ec_GFp_simple_group_set_curve_GFp ec_GFp_simple_grp_set_curve_GFp
212#undef ec_GFp_simple_group_get_curve_GFp 250#undef ec_GFp_simple_group_get_curve_GFp
@@ -242,6 +280,81 @@
242#undef ec_GFp_simple_set_compressed_coordinates_GFp 280#undef ec_GFp_simple_set_compressed_coordinates_GFp
243#define ec_GFp_simple_set_compressed_coordinates_GFp \ 281#define ec_GFp_simple_set_compressed_coordinates_GFp \
244 ec_GFp_smp_set_compr_coords_GFp 282 ec_GFp_smp_set_compr_coords_GFp
283#undef ec_GFp_simple_point_set_affine_coordinates
284#define ec_GFp_simple_point_set_affine_coordinates \
285 ec_GFp_smp_pt_set_af_coords
286#undef ec_GFp_simple_point_get_affine_coordinates
287#define ec_GFp_simple_point_get_affine_coordinates \
288 ec_GFp_smp_pt_get_af_coords
289#undef ec_GFp_simple_set_compressed_coordinates
290#define ec_GFp_simple_set_compressed_coordinates \
291 ec_GFp_smp_set_compr_coords
292#undef ec_GFp_simple_group_check_discriminant
293#define ec_GFp_simple_group_check_discriminant ec_GFp_simple_grp_chk_discrim
294
295/* Hack som long STORE names */
296#undef STORE_method_set_initialise_function
297#define STORE_method_set_initialise_function STORE_meth_set_initialise_fn
298#undef STORE_method_set_cleanup_function
299#define STORE_method_set_cleanup_function STORE_meth_set_cleanup_fn
300#undef STORE_method_set_generate_function
301#define STORE_method_set_generate_function STORE_meth_set_generate_fn
302#undef STORE_method_set_modify_function
303#define STORE_method_set_modify_function STORE_meth_set_modify_fn
304#undef STORE_method_set_revoke_function
305#define STORE_method_set_revoke_function STORE_meth_set_revoke_fn
306#undef STORE_method_set_delete_function
307#define STORE_method_set_delete_function STORE_meth_set_delete_fn
308#undef STORE_method_set_list_start_function
309#define STORE_method_set_list_start_function STORE_meth_set_list_start_fn
310#undef STORE_method_set_list_next_function
311#define STORE_method_set_list_next_function STORE_meth_set_list_next_fn
312#undef STORE_method_set_list_end_function
313#define STORE_method_set_list_end_function STORE_meth_set_list_end_fn
314#undef STORE_method_set_update_store_function
315#define STORE_method_set_update_store_function STORE_meth_set_update_store_fn
316#undef STORE_method_set_lock_store_function
317#define STORE_method_set_lock_store_function STORE_meth_set_lock_store_fn
318#undef STORE_method_set_unlock_store_function
319#define STORE_method_set_unlock_store_function STORE_meth_set_unlock_store_fn
320#undef STORE_method_get_initialise_function
321#define STORE_method_get_initialise_function STORE_meth_get_initialise_fn
322#undef STORE_method_get_cleanup_function
323#define STORE_method_get_cleanup_function STORE_meth_get_cleanup_fn
324#undef STORE_method_get_generate_function
325#define STORE_method_get_generate_function STORE_meth_get_generate_fn
326#undef STORE_method_get_modify_function
327#define STORE_method_get_modify_function STORE_meth_get_modify_fn
328#undef STORE_method_get_revoke_function
329#define STORE_method_get_revoke_function STORE_meth_get_revoke_fn
330#undef STORE_method_get_delete_function
331#define STORE_method_get_delete_function STORE_meth_get_delete_fn
332#undef STORE_method_get_list_start_function
333#define STORE_method_get_list_start_function STORE_meth_get_list_start_fn
334#undef STORE_method_get_list_next_function
335#define STORE_method_get_list_next_function STORE_meth_get_list_next_fn
336#undef STORE_method_get_list_end_function
337#define STORE_method_get_list_end_function STORE_meth_get_list_end_fn
338#undef STORE_method_get_update_store_function
339#define STORE_method_get_update_store_function STORE_meth_get_update_store_fn
340#undef STORE_method_get_lock_store_function
341#define STORE_method_get_lock_store_function STORE_meth_get_lock_store_fn
342#undef STORE_method_get_unlock_store_function
343#define STORE_method_get_unlock_store_function STORE_meth_get_unlock_store_fn
344
345/* Hack some long CMS names */
346#undef CMS_RecipientInfo_ktri_get0_algs
347#define CMS_RecipientInfo_ktri_get0_algs CMS_RecipInfo_ktri_get0_algs
348#undef CMS_RecipientInfo_ktri_get0_signer_id
349#define CMS_RecipientInfo_ktri_get0_signer_id CMS_RecipInfo_ktri_get0_sigr_id
350#undef CMS_OtherRevocationInfoFormat_it
351#define CMS_OtherRevocationInfoFormat_it CMS_OtherRevocInfoFormat_it
352#undef CMS_KeyAgreeRecipientIdentifier_it
353#define CMS_KeyAgreeRecipientIdentifier_it CMS_KeyAgreeRecipIdentifier_it
354#undef CMS_OriginatorIdentifierOrKey_it
355#define CMS_OriginatorIdentifierOrKey_it CMS_OriginatorIdOrKey_it
356#undef cms_SignerIdentifier_get0_signer_id
357#define cms_SignerIdentifier_get0_signer_id cms_SignerId_get0_signer_id
245 358
246#endif /* defined OPENSSL_SYS_VMS */ 359#endif /* defined OPENSSL_SYS_VMS */
247 360
@@ -253,6 +366,15 @@
253#undef OCSP_crlID_new 366#undef OCSP_crlID_new
254#define OCSP_crlID_new OCSP_crlID2_new 367#define OCSP_crlID_new OCSP_crlID2_new
255 368
369#undef d2i_ECPARAMETERS
370#define d2i_ECPARAMETERS d2i_UC_ECPARAMETERS
371#undef i2d_ECPARAMETERS
372#define i2d_ECPARAMETERS i2d_UC_ECPARAMETERS
373#undef d2i_ECPKPARAMETERS
374#define d2i_ECPKPARAMETERS d2i_UC_ECPKPARAMETERS
375#undef i2d_ECPKPARAMETERS
376#define i2d_ECPKPARAMETERS i2d_UC_ECPKPARAMETERS
377
256/* These functions do not seem to exist! However, I'm paranoid... 378/* These functions do not seem to exist! However, I'm paranoid...
257 Original command in x509v3.h: 379 Original command in x509v3.h:
258 These functions are being redefined in another directory, 380 These functions are being redefined in another directory,
@@ -273,3 +395,6 @@
273 395
274 396
275#endif /* ! defined HEADER_VMS_IDHACKS_H */ 397#endif /* ! defined HEADER_VMS_IDHACKS_H */
398/* This one clashes with CMS_data_create */
399#undef cms_Data_create
400#define cms_Data_create priv_cms_Data_create
diff --git a/src/lib/libcrypto/threads/mttest.c b/src/lib/libcrypto/threads/mttest.c
index 7588966cb2..f6f3df4b6a 100644
--- a/src/lib/libcrypto/threads/mttest.c
+++ b/src/lib/libcrypto/threads/mttest.c
@@ -77,6 +77,12 @@
77#ifdef PTHREADS 77#ifdef PTHREADS
78#include <pthread.h> 78#include <pthread.h>
79#endif 79#endif
80#ifdef OPENSSL_SYS_NETWARE
81#if !defined __int64
82# define __int64 long long
83#endif
84#include <nwmpk.h>
85#endif
80#include <openssl/lhash.h> 86#include <openssl/lhash.h>
81#include <openssl/crypto.h> 87#include <openssl/crypto.h>
82#include <openssl/buffer.h> 88#include <openssl/buffer.h>
@@ -86,8 +92,18 @@
86#include <openssl/err.h> 92#include <openssl/err.h>
87#include <openssl/rand.h> 93#include <openssl/rand.h>
88 94
95#ifdef OPENSSL_NO_FP_API
96#define APPS_WIN16
97#include "../buffer/bss_file.c"
98#endif
99
100#ifdef OPENSSL_SYS_NETWARE
101#define TEST_SERVER_CERT "/openssl/apps/server.pem"
102#define TEST_CLIENT_CERT "/openssl/apps/client.pem"
103#else
89#define TEST_SERVER_CERT "../../apps/server.pem" 104#define TEST_SERVER_CERT "../../apps/server.pem"
90#define TEST_CLIENT_CERT "../../apps/client.pem" 105#define TEST_CLIENT_CERT "../../apps/client.pem"
106#endif
91 107
92#define MAX_THREAD_NUMBER 100 108#define MAX_THREAD_NUMBER 100
93 109
@@ -100,10 +116,18 @@ void irix_locking_callback(int mode,int type,char *file,int line);
100void solaris_locking_callback(int mode,int type,char *file,int line); 116void solaris_locking_callback(int mode,int type,char *file,int line);
101void win32_locking_callback(int mode,int type,char *file,int line); 117void win32_locking_callback(int mode,int type,char *file,int line);
102void pthreads_locking_callback(int mode,int type,char *file,int line); 118void pthreads_locking_callback(int mode,int type,char *file,int line);
119void netware_locking_callback(int mode,int type,char *file,int line);
103 120
104unsigned long irix_thread_id(void ); 121unsigned long irix_thread_id(void );
105unsigned long solaris_thread_id(void ); 122unsigned long solaris_thread_id(void );
106unsigned long pthreads_thread_id(void ); 123unsigned long pthreads_thread_id(void );
124unsigned long netware_thread_id(void );
125
126#if defined(OPENSSL_SYS_NETWARE)
127static MPKMutex *lock_cs;
128static MPKSema ThreadSem;
129static long *lock_count;
130#endif
107 131
108BIO *bio_err=NULL; 132BIO *bio_err=NULL;
109BIO *bio_stdout=NULL; 133BIO *bio_stdout=NULL;
@@ -384,6 +408,9 @@ int ndoit(SSL_CTX *ssl_ctx[2])
384 SSL_free((SSL *)ctx[2]); 408 SSL_free((SSL *)ctx[2]);
385 SSL_free((SSL *)ctx[3]); 409 SSL_free((SSL *)ctx[3]);
386 } 410 }
411# ifdef OPENSSL_SYS_NETWARE
412 MPKSemaphoreSignal(ThreadSem);
413# endif
387 return(0); 414 return(0);
388 } 415 }
389 416
@@ -627,6 +654,9 @@ int doit(char *ctx[4])
627 } 654 }
628 655
629 if ((done & S_DONE) && (done & C_DONE)) break; 656 if ((done & S_DONE) && (done & C_DONE)) break;
657# if defined(OPENSSL_SYS_NETWARE)
658 ThreadSwitchWithDelay();
659# endif
630 } 660 }
631 661
632 SSL_set_shutdown(c_ssl,SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN); 662 SSL_set_shutdown(c_ssl,SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN);
@@ -1094,3 +1124,88 @@ unsigned long pthreads_thread_id(void)
1094 1124
1095 1125
1096 1126
1127#ifdef OPENSSL_SYS_NETWARE
1128
1129void thread_setup(void)
1130{
1131 int i;
1132
1133 lock_cs=OPENSSL_malloc(CRYPTO_num_locks() * sizeof(MPKMutex));
1134 lock_count=OPENSSL_malloc(CRYPTO_num_locks() * sizeof(long));
1135 for (i=0; i<CRYPTO_num_locks(); i++)
1136 {
1137 lock_count[i]=0;
1138 lock_cs[i]=MPKMutexAlloc("OpenSSL mutex");
1139 }
1140
1141 ThreadSem = MPKSemaphoreAlloc("OpenSSL mttest semaphore", 0 );
1142
1143 CRYPTO_set_id_callback((unsigned long (*)())netware_thread_id);
1144 CRYPTO_set_locking_callback((void (*)())netware_locking_callback);
1145}
1146
1147void thread_cleanup(void)
1148{
1149 int i;
1150
1151 CRYPTO_set_locking_callback(NULL);
1152
1153 fprintf(stdout,"thread_cleanup\n");
1154
1155 for (i=0; i<CRYPTO_num_locks(); i++)
1156 {
1157 MPKMutexFree(lock_cs[i]);
1158 fprintf(stdout,"%8ld:%s\n",lock_count[i],CRYPTO_get_lock_name(i));
1159 }
1160 OPENSSL_free(lock_cs);
1161 OPENSSL_free(lock_count);
1162
1163 MPKSemaphoreFree(ThreadSem);
1164
1165 fprintf(stdout,"done cleanup\n");
1166}
1167
1168void netware_locking_callback(int mode, int type, char *file, int line)
1169{
1170 if (mode & CRYPTO_LOCK)
1171 {
1172 MPKMutexLock(lock_cs[type]);
1173 lock_count[type]++;
1174 }
1175 else
1176 MPKMutexUnlock(lock_cs[type]);
1177}
1178
1179void do_threads(SSL_CTX *s_ctx, SSL_CTX *c_ctx)
1180{
1181 SSL_CTX *ssl_ctx[2];
1182 int i;
1183 ssl_ctx[0]=s_ctx;
1184 ssl_ctx[1]=c_ctx;
1185
1186 for (i=0; i<thread_number; i++)
1187 {
1188 BeginThread( (void(*)(void*))ndoit, NULL, THREAD_STACK_SIZE,
1189 (void*)ssl_ctx);
1190 ThreadSwitchWithDelay();
1191 }
1192
1193 printf("reaping\n");
1194
1195 /* loop until all threads have signaled the semaphore */
1196 for (i=0; i<thread_number; i++)
1197 {
1198 MPKSemaphoreWait(ThreadSem);
1199 }
1200 printf("netware threads done (%d,%d)\n",
1201 s_ctx->references,c_ctx->references);
1202}
1203
1204unsigned long netware_thread_id(void)
1205{
1206 unsigned long ret;
1207
1208 ret=(unsigned long)GetThreadID();
1209 return(ret);
1210}
1211#endif /* NETWARE */
diff --git a/src/lib/libcrypto/threads/th-lock.c b/src/lib/libcrypto/threads/th-lock.c
index a6a79b9f45..14aae5f912 100644
--- a/src/lib/libcrypto/threads/th-lock.c
+++ b/src/lib/libcrypto/threads/th-lock.c
@@ -80,7 +80,7 @@
80#include <openssl/lhash.h> 80#include <openssl/lhash.h>
81#include <openssl/crypto.h> 81#include <openssl/crypto.h>
82#include <openssl/buffer.h> 82#include <openssl/buffer.h>
83#include <openssl/e_os.h> 83#include "../../e_os.h"
84#include <openssl/x509.h> 84#include <openssl/x509.h>
85#include <openssl/ssl.h> 85#include <openssl/ssl.h>
86#include <openssl/err.h> 86#include <openssl/err.h>
diff --git a/src/lib/libcrypto/tmdiff.c b/src/lib/libcrypto/tmdiff.c
index 307523ebba..1c6e052ac9 100644
--- a/src/lib/libcrypto/tmdiff.c
+++ b/src/lib/libcrypto/tmdiff.c
@@ -72,7 +72,11 @@
72# define TIMES 72# define TIMES
73#endif 73#endif
74 74
75#ifndef _IRIX 75#ifdef OPENSSL_SYS_NETWARE
76#undef TIMES
77#endif
78
79#if !defined(_IRIX) || defined (OPENSSL_SYS_NETWARE)
76# include <time.h> 80# include <time.h>
77#endif 81#endif
78#ifdef TIMES 82#ifdef TIMES
@@ -94,7 +98,7 @@
94#include <sys/param.h> 98#include <sys/param.h>
95#endif 99#endif
96 100
97#if !defined(TIMES) && !defined(OPENSSL_SYS_VXWORKS) 101#if !defined(TIMES) && !defined(OPENSSL_SYS_VXWORKS) && !defined(OPENSSL_SYS_NETWARE)
98#include <sys/timeb.h> 102#include <sys/timeb.h>
99#endif 103#endif
100 104
@@ -106,7 +110,8 @@
106#ifndef HZ 110#ifndef HZ
107# if defined(_SC_CLK_TCK) \ 111# if defined(_SC_CLK_TCK) \
108 && (!defined(OPENSSL_SYS_VMS) || __CTRL_VER >= 70000000) 112 && (!defined(OPENSSL_SYS_VMS) || __CTRL_VER >= 70000000)
109# define HZ ((double)sysconf(_SC_CLK_TCK)) 113/* # define HZ ((double)sysconf(_SC_CLK_TCK)) */
114# define HZ sysconf(_SC_CLK_TCK)
110# else 115# else
111# ifndef CLK_TCK 116# ifndef CLK_TCK
112# ifndef _BSD_CLK_TCK_ /* FreeBSD hack */ 117# ifndef _BSD_CLK_TCK_ /* FreeBSD hack */
@@ -120,7 +125,7 @@
120# endif 125# endif
121#endif 126#endif
122 127
123typedef struct ms_tm 128struct ms_tm
124 { 129 {
125#ifdef TIMES 130#ifdef TIMES
126 struct tms ms_tms; 131 struct tms ms_tms;
@@ -128,6 +133,8 @@ typedef struct ms_tm
128# ifdef OPENSSL_SYS_WIN32 133# ifdef OPENSSL_SYS_WIN32
129 HANDLE thread_id; 134 HANDLE thread_id;
130 FILETIME ms_win32; 135 FILETIME ms_win32;
136# elif defined (OPENSSL_SYS_NETWARE)
137 clock_t ms_clock;
131# else 138# else
132# ifdef OPENSSL_SYS_VXWORKS 139# ifdef OPENSSL_SYS_VXWORKS
133 unsigned long ticks; 140 unsigned long ticks;
@@ -136,9 +143,9 @@ typedef struct ms_tm
136# endif 143# endif
137# endif 144# endif
138#endif 145#endif
139 } MS_TM; 146 };
140 147
141char *ms_time_new(void) 148MS_TM *ms_time_new(void)
142 { 149 {
143 MS_TM *ret; 150 MS_TM *ret;
144 151
@@ -149,18 +156,17 @@ char *ms_time_new(void)
149#ifdef OPENSSL_SYS_WIN32 156#ifdef OPENSSL_SYS_WIN32
150 ret->thread_id=GetCurrentThread(); 157 ret->thread_id=GetCurrentThread();
151#endif 158#endif
152 return((char *)ret); 159 return ret;
153 } 160 }
154 161
155void ms_time_free(char *a) 162void ms_time_free(MS_TM *a)
156 { 163 {
157 if (a != NULL) 164 if (a != NULL)
158 OPENSSL_free(a); 165 OPENSSL_free(a);
159 } 166 }
160 167
161void ms_time_get(char *a) 168void ms_time_get(MS_TM *tm)
162 { 169 {
163 MS_TM *tm=(MS_TM *)a;
164#ifdef OPENSSL_SYS_WIN32 170#ifdef OPENSSL_SYS_WIN32
165 FILETIME tmpa,tmpb,tmpc; 171 FILETIME tmpa,tmpb,tmpc;
166#endif 172#endif
@@ -170,6 +176,8 @@ void ms_time_get(char *a)
170#else 176#else
171# ifdef OPENSSL_SYS_WIN32 177# ifdef OPENSSL_SYS_WIN32
172 GetThreadTimes(tm->thread_id,&tmpa,&tmpb,&tmpc,&(tm->ms_win32)); 178 GetThreadTimes(tm->thread_id,&tmpa,&tmpb,&tmpc,&(tm->ms_win32));
179# elif defined (OPENSSL_SYS_NETWARE)
180 tm->ms_clock = clock();
173# else 181# else
174# ifdef OPENSSL_SYS_VXWORKS 182# ifdef OPENSSL_SYS_VXWORKS
175 tm->ticks = tickGet(); 183 tm->ticks = tickGet();
@@ -180,14 +188,13 @@ void ms_time_get(char *a)
180#endif 188#endif
181 } 189 }
182 190
183double ms_time_diff(char *ap, char *bp) 191double ms_time_diff(MS_TM *a, MS_TM *b)
184 { 192 {
185 MS_TM *a=(MS_TM *)ap;
186 MS_TM *b=(MS_TM *)bp;
187 double ret; 193 double ret;
188 194
189#ifdef TIMES 195#ifdef TIMES
190 ret=(b->ms_tms.tms_utime-a->ms_tms.tms_utime)/HZ; 196 ret = HZ;
197 ret = (b->ms_tms.tms_utime-a->ms_tms.tms_utime) / ret;
191#else 198#else
192# ifdef OPENSSL_SYS_WIN32 199# ifdef OPENSSL_SYS_WIN32
193 { 200 {
@@ -204,6 +211,8 @@ double ms_time_diff(char *ap, char *bp)
204 lb+=b->ms_win32.dwLowDateTime; 211 lb+=b->ms_win32.dwLowDateTime;
205 ret=((double)(lb-la))/1e7; 212 ret=((double)(lb-la))/1e7;
206 } 213 }
214# elif defined (OPENSSL_SYS_NETWARE)
215 ret= (double)(b->ms_clock - a->ms_clock);
207# else 216# else
208# ifdef OPENSSL_SYS_VXWORKS 217# ifdef OPENSSL_SYS_VXWORKS
209 ret = (double)(b->ticks - a->ticks) / (double)sysClkRateGet(); 218 ret = (double)(b->ticks - a->ticks) / (double)sysClkRateGet();
@@ -217,18 +226,20 @@ double ms_time_diff(char *ap, char *bp)
217 return((ret < 0.0000001)?0.0000001:ret); 226 return((ret < 0.0000001)?0.0000001:ret);
218 } 227 }
219 228
220int ms_time_cmp(char *ap, char *bp) 229int ms_time_cmp(const MS_TM *a, const MS_TM *b)
221 { 230 {
222 MS_TM *a=(MS_TM *)ap,*b=(MS_TM *)bp;
223 double d; 231 double d;
224 int ret; 232 int ret;
225 233
226#ifdef TIMES 234#ifdef TIMES
227 d=(b->ms_tms.tms_utime-a->ms_tms.tms_utime)/HZ; 235 d = HZ;
236 d = (b->ms_tms.tms_utime-a->ms_tms.tms_utime) / d;
228#else 237#else
229# ifdef OPENSSL_SYS_WIN32 238# ifdef OPENSSL_SYS_WIN32
230 d =(b->ms_win32.dwHighDateTime&0x000fffff)*10+b->ms_win32.dwLowDateTime/1e7; 239 d =(b->ms_win32.dwHighDateTime&0x000fffff)*10+b->ms_win32.dwLowDateTime/1e7;
231 d-=(a->ms_win32.dwHighDateTime&0x000fffff)*10+a->ms_win32.dwLowDateTime/1e7; 240 d-=(a->ms_win32.dwHighDateTime&0x000fffff)*10+a->ms_win32.dwLowDateTime/1e7;
241# elif defined (OPENSSL_SYS_NETWARE)
242 d= (double)(b->ms_clock - a->ms_clock);
232# else 243# else
233# ifdef OPENSSL_SYS_VXWORKS 244# ifdef OPENSSL_SYS_VXWORKS
234 d = (b->ticks - a->ticks); 245 d = (b->ticks - a->ticks);
diff --git a/src/lib/libcrypto/tmdiff.h b/src/lib/libcrypto/tmdiff.h
index 41a8a1e0e0..af5c41c649 100644
--- a/src/lib/libcrypto/tmdiff.h
+++ b/src/lib/libcrypto/tmdiff.h
@@ -59,6 +59,16 @@
59/* Header for dynamic hash table routines 59/* Header for dynamic hash table routines
60 * Author - Eric Young 60 * Author - Eric Young
61 */ 61 */
62/* ... erm yeah, "dynamic hash tables" you say?
63 *
64 * And what would dynamic hash tables have to do with any of this code *now*?
65 * AFAICS, this code is only referenced by crypto/bn/exp.c which is an unused
66 * file that I doubt compiles any more. speed.c is the only thing that could
67 * use this (and it has nothing to do with hash tables), yet it instead has its
68 * own duplication of all this stuff and looks, if anything, more complete. See
69 * the corresponding note in apps/speed.c.
70 * The Bemused - Geoff
71 */
62 72
63#ifndef HEADER_TMDIFF_H 73#ifndef HEADER_TMDIFF_H
64#define HEADER_TMDIFF_H 74#define HEADER_TMDIFF_H
@@ -67,11 +77,13 @@
67extern "C" { 77extern "C" {
68#endif 78#endif
69 79
70char *ms_time_new(void ); 80typedef struct ms_tm MS_TM;
71void ms_time_free(char *a); 81
72void ms_time_get(char *a); 82MS_TM *ms_time_new(void );
73double ms_time_diff(char *start,char *end); 83void ms_time_free(MS_TM *a);
74int ms_time_cmp(char *ap,char *bp); 84void ms_time_get(MS_TM *a);
85double ms_time_diff(MS_TM *start, MS_TM *end);
86int ms_time_cmp(const MS_TM *ap, const MS_TM *bp);
75 87
76#ifdef __cplusplus 88#ifdef __cplusplus
77} 89}
diff --git a/src/lib/libcrypto/txt_db/Makefile b/src/lib/libcrypto/txt_db/Makefile
index 3cb550a795..e6f30331d8 100644
--- a/src/lib/libcrypto/txt_db/Makefile
+++ b/src/lib/libcrypto/txt_db/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= 8INCLUDES=
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -51,6 +46,7 @@ links:
51 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 46 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
52 47
53install: 48install:
49 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
54 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 50 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
55 do \ 51 do \
56 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 52 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -66,6 +62,7 @@ lint:
66 lint -DLINT $(INCLUDES) $(SRC)>fluff 62 lint -DLINT $(INCLUDES) $(SRC)>fluff
67 63
68depend: 64depend:
65 @[ -n "$(MAKEDEPEND)" ] # should be set by top Makefile...
69 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 66 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
70 67
71dclean: 68dclean:
@@ -81,6 +78,7 @@ txt_db.o: ../../e_os.h ../../include/openssl/bio.h
81txt_db.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 78txt_db.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
82txt_db.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 79txt_db.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
83txt_db.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 80txt_db.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
84txt_db.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 81txt_db.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
85txt_db.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 82txt_db.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
86txt_db.o: ../../include/openssl/txt_db.h ../cryptlib.h txt_db.c 83txt_db.o: ../../include/openssl/symhacks.h ../../include/openssl/txt_db.h
84txt_db.o: ../cryptlib.h txt_db.c
diff --git a/src/lib/libcrypto/ui/Makefile b/src/lib/libcrypto/ui/Makefile
index fcb2a66a39..a685659fb4 100644
--- a/src/lib/libcrypto/ui/Makefile
+++ b/src/lib/libcrypto/ui/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include 8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -55,6 +50,7 @@ links:
55 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 50 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
56 51
57install: 52install:
53 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
58 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 54 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
59 do \ 55 do \
60 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 56 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -70,6 +66,7 @@ lint:
70 lint -DLINT $(INCLUDES) $(SRC)>fluff 66 lint -DLINT $(INCLUDES) $(SRC)>fluff
71 67
72depend: 68depend:
69 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
73 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 70 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
74 71
75dclean: 72dclean:
@@ -81,35 +78,34 @@ clean:
81 78
82# DO NOT DELETE THIS LINE -- make depend depends on it. 79# DO NOT DELETE THIS LINE -- make depend depends on it.
83 80
84ui_compat.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 81ui_compat.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
85ui_compat.o: ../../include/openssl/opensslconf.h 82ui_compat.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
86ui_compat.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 83ui_compat.o: ../../include/openssl/stack.h ../../include/openssl/ui.h
87ui_compat.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 84ui_compat.o: ../../include/openssl/ui_compat.h ui_compat.c
88ui_compat.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
89ui_compat.o: ui_compat.c
90ui_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h 85ui_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
91ui_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 86ui_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
92ui_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 87ui_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
93ui_err.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 88ui_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
94ui_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 89ui_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
95ui_err.o: ../../include/openssl/ui.h ui_err.c 90ui_err.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h ui_err.c
96ui_lib.o: ../../e_os.h ../../include/openssl/bio.h 91ui_lib.o: ../../e_os.h ../../include/openssl/bio.h
97ui_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 92ui_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
98ui_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 93ui_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
99ui_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 94ui_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
100ui_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h 95ui_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
101ui_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 96ui_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
102ui_lib.o: ../../include/openssl/ui.h ../cryptlib.h ui_lib.c ui_locl.h 97ui_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
98ui_lib.o: ../cryptlib.h ui_lib.c ui_locl.h
103ui_openssl.o: ../../e_os.h ../../include/openssl/bio.h 99ui_openssl.o: ../../e_os.h ../../include/openssl/bio.h
104ui_openssl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 100ui_openssl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
105ui_openssl.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 101ui_openssl.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
106ui_openssl.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 102ui_openssl.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
107ui_openssl.o: ../../include/openssl/opensslv.h 103ui_openssl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
108ui_openssl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 104ui_openssl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
109ui_openssl.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 105ui_openssl.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
110ui_openssl.o: ../cryptlib.h ui_locl.h ui_openssl.c 106ui_openssl.o: ../cryptlib.h ui_locl.h ui_openssl.c
111ui_util.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h 107ui_util.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
112ui_util.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 108ui_util.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
113ui_util.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 109ui_util.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
114ui_util.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 110ui_util.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
115ui_util.o: ui_util.c 111ui_util.o: ../../include/openssl/ui.h ui_locl.h ui_util.c
diff --git a/src/lib/libcrypto/uid.c b/src/lib/libcrypto/uid.c
index 73205a4baa..b1fd52bada 100644
--- a/src/lib/libcrypto/uid.c
+++ b/src/lib/libcrypto/uid.c
@@ -65,7 +65,7 @@ int OPENSSL_issetugid(void)
65 return issetugid(); 65 return issetugid();
66 } 66 }
67 67
68#elif defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VXWORKS) 68#elif defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE)
69 69
70int OPENSSL_issetugid(void) 70int OPENSSL_issetugid(void)
71 { 71 {
diff --git a/src/lib/libcrypto/util/ck_errf.pl b/src/lib/libcrypto/util/ck_errf.pl
index 7a24d6c5a2..344b422c34 100644
--- a/src/lib/libcrypto/util/ck_errf.pl
+++ b/src/lib/libcrypto/util/ck_errf.pl
@@ -13,16 +13,21 @@ foreach $file (@ARGV)
13 $func=""; 13 $func="";
14 while (<IN>) 14 while (<IN>)
15 { 15 {
16 if (/^[a-zA-Z].+[\s*]([A-Za-z_0-9]+)\(.*\)/) 16 if (!/;$/ && /^([a-zA-Z].*[\s*])?([A-Za-z_0-9]+)\(.*[),]/)
17 { 17 {
18 $func=$1; 18 /^([^()]*(\([^()]*\)[^()]*)*)\(/;
19 $1 =~ /([A-Za-z_0-9]*)$/;
20 $func = $1;
19 $func =~ tr/A-Z/a-z/; 21 $func =~ tr/A-Z/a-z/;
20 } 22 }
21 if (/([A-Z0-9]+)err\(([^,]+)/) 23 if (/([A-Z0-9]+)err\(([^,]+)/)
22 { 24 {
23 next if ($func eq "");
24 $errlib=$1; 25 $errlib=$1;
25 $n=$2; 26 $n=$2;
27
28 if ($func eq "")
29 { print "$file:$.:???:$n\n"; next; }
30
26 if ($n !~ /([^_]+)_F_(.+)$/) 31 if ($n !~ /([^_]+)_F_(.+)$/)
27 { 32 {
28 # print "check -$file:$.:$func:$n\n"; 33 # print "check -$file:$.:$func:$n\n";
@@ -32,7 +37,7 @@ foreach $file (@ARGV)
32 $n=$2; 37 $n=$2;
33 38
34 if ($lib ne $errlib) 39 if ($lib ne $errlib)
35 { print "$file:$.:$func:$n\n"; next; } 40 { print "$file:$.:$func:$n [${errlib}err]\n"; next; }
36 41
37 $n =~ tr/A-Z/a-z/; 42 $n =~ tr/A-Z/a-z/;
38 if (($n ne $func) && ($errlib ne "SYS")) 43 if (($n ne $func) && ($errlib ne "SYS"))
diff --git a/src/lib/libcrypto/util/clean-depend.pl b/src/lib/libcrypto/util/clean-depend.pl
index 6c485d1e2f..2b2bdb4048 100644
--- a/src/lib/libcrypto/util/clean-depend.pl
+++ b/src/lib/libcrypto/util/clean-depend.pl
@@ -37,8 +37,11 @@ foreach $file (sort keys %files) {
37 $file=~s/^\.\///; 37 $file=~s/^\.\///;
38 push @{$files{$file}},$origfile; 38 push @{$files{$file}},$origfile;
39 my $prevdep=""; 39 my $prevdep="";
40 foreach $dep (sort @{$files{$file}}) { 40
41 $dep=~s/^\.\///; 41 # Remove leading ./ before sorting
42 my @deps = map { $_ =~ s/^\.\///; $_ } @{$files{$file}};
43
44 foreach $dep (sort @deps) {
42 next if $prevdep eq $dep; # to exterminate duplicates... 45 next if $prevdep eq $dep; # to exterminate duplicates...
43 $prevdep = $dep; 46 $prevdep = $dep;
44 $len=0 if $len+length($dep)+1 >= 80; 47 $len=0 if $len+length($dep)+1 >= 80;
diff --git a/src/lib/libcrypto/util/cygwin.sh b/src/lib/libcrypto/util/cygwin.sh
index 7f791d47f4..89d1dda95b 100644
--- a/src/lib/libcrypto/util/cygwin.sh
+++ b/src/lib/libcrypto/util/cygwin.sh
@@ -47,6 +47,14 @@ function doc_install()
47 create_cygwin_readme 47 create_cygwin_readme
48} 48}
49 49
50function certs_install()
51{
52 CERTS_DIR=${INSTALL_PREFIX}/usr/ssl/certs
53
54 mkdir -p ${CERTS_DIR}
55 cp -rp certs/* ${CERTS_DIR}
56}
57
50function create_cygwin_readme() 58function create_cygwin_readme()
51{ 59{
52 README_DIR=${INSTALL_PREFIX}/usr/share/doc/Cygwin 60 README_DIR=${INSTALL_PREFIX}/usr/share/doc/Cygwin
@@ -104,19 +112,25 @@ base_install
104 112
105doc_install 113doc_install
106 114
115certs_install
116
107create_cygwin_readme 117create_cygwin_readme
108 118
109create_profile_files 119create_profile_files
110 120
111cd ${INSTALL_PREFIX} 121cd ${INSTALL_PREFIX}
112strip usr/bin/*.exe usr/bin/*.dll 122chmod u+w usr/lib/engines/*.so
123strip usr/bin/*.exe usr/bin/*.dll usr/lib/engines/*.so
124chmod u-w usr/lib/engines/*.so
113 125
114# Runtime package 126# Runtime package
115find etc usr/bin usr/share/doc usr/ssl/certs usr/ssl/man/man[157] \ 127find etc usr/bin usr/lib/engines usr/share/doc usr/ssl/certs \
116 usr/ssl/misc usr/ssl/openssl.cnf usr/ssl/private -empty -o \! -type d | 128 usr/ssl/man/man[157] usr/ssl/misc usr/ssl/openssl.cnf usr/ssl/private \
129 -empty -o \! -type d |
117tar cjfT openssl-${VERSION}-${SUBVERSION}.tar.bz2 - 130tar cjfT openssl-${VERSION}-${SUBVERSION}.tar.bz2 -
118# Development package 131# Development package
119find usr/include usr/lib usr/ssl/man/man3 -empty -o \! -type d | 132find usr/include usr/lib/*.a usr/lib/pkgconfig usr/ssl/man/man3 \
133 -empty -o \! -type d |
120tar cjfT openssl-devel-${VERSION}-${SUBVERSION}.tar.bz2 - 134tar cjfT openssl-devel-${VERSION}-${SUBVERSION}.tar.bz2 -
121 135
122ls -l openssl-${VERSION}-${SUBVERSION}.tar.bz2 136ls -l openssl-${VERSION}-${SUBVERSION}.tar.bz2
diff --git a/src/lib/libcrypto/util/domd b/src/lib/libcrypto/util/domd
index 5610521f0b..691be7a440 100644
--- a/src/lib/libcrypto/util/domd
+++ b/src/lib/libcrypto/util/domd
@@ -26,7 +26,7 @@ if [ "$MAKEDEPEND" = "gcc" ]; then
26 ${PERL} $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new 26 ${PERL} $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new
27 rm -f Makefile.tmp 27 rm -f Makefile.tmp
28else 28else
29 ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND -f Makefile $@ 29 ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND $@
30 ${PERL} $TOP/util/clean-depend.pl < Makefile > Makefile.new 30 ${PERL} $TOP/util/clean-depend.pl < Makefile > Makefile.new
31fi 31fi
32mv Makefile.new Makefile 32mv Makefile.new Makefile
diff --git a/src/lib/libcrypto/util/libeay.num b/src/lib/libcrypto/util/libeay.num
index 4222bef6d6..2989500c4b 100644
--- a/src/lib/libcrypto/util/libeay.num
+++ b/src/lib/libcrypto/util/libeay.num
@@ -123,10 +123,10 @@ BN_dup 128 EXIST::FUNCTION:
123BN_free 129 EXIST::FUNCTION: 123BN_free 129 EXIST::FUNCTION:
124BN_from_montgomery 130 EXIST::FUNCTION: 124BN_from_montgomery 130 EXIST::FUNCTION:
125BN_gcd 131 EXIST::FUNCTION: 125BN_gcd 131 EXIST::FUNCTION:
126BN_generate_prime 132 EXIST::FUNCTION: 126BN_generate_prime 132 EXIST::FUNCTION:DEPRECATED
127BN_get_word 133 EXIST::FUNCTION: 127BN_get_word 133 EXIST::FUNCTION:
128BN_is_bit_set 134 EXIST::FUNCTION: 128BN_is_bit_set 134 EXIST::FUNCTION:
129BN_is_prime 135 EXIST::FUNCTION: 129BN_is_prime 135 EXIST::FUNCTION:DEPRECATED
130BN_lshift 136 EXIST::FUNCTION: 130BN_lshift 136 EXIST::FUNCTION:
131BN_lshift1 137 EXIST::FUNCTION: 131BN_lshift1 137 EXIST::FUNCTION:
132BN_mask_bits 138 EXIST::FUNCTION: 132BN_mask_bits 138 EXIST::FUNCTION:
@@ -193,14 +193,14 @@ DH_check 200 EXIST::FUNCTION:DH
193DH_compute_key 201 EXIST::FUNCTION:DH 193DH_compute_key 201 EXIST::FUNCTION:DH
194DH_free 202 EXIST::FUNCTION:DH 194DH_free 202 EXIST::FUNCTION:DH
195DH_generate_key 203 EXIST::FUNCTION:DH 195DH_generate_key 203 EXIST::FUNCTION:DH
196DH_generate_parameters 204 EXIST::FUNCTION:DH 196DH_generate_parameters 204 EXIST::FUNCTION:DEPRECATED,DH
197DH_new 205 EXIST::FUNCTION:DH 197DH_new 205 EXIST::FUNCTION:DH
198DH_size 206 EXIST::FUNCTION:DH 198DH_size 206 EXIST::FUNCTION:DH
199DHparams_print 207 EXIST::FUNCTION:BIO,DH 199DHparams_print 207 EXIST::FUNCTION:BIO,DH
200DHparams_print_fp 208 EXIST::FUNCTION:DH,FP_API 200DHparams_print_fp 208 EXIST::FUNCTION:DH,FP_API
201DSA_free 209 EXIST::FUNCTION:DSA 201DSA_free 209 EXIST::FUNCTION:DSA
202DSA_generate_key 210 EXIST::FUNCTION:DSA 202DSA_generate_key 210 EXIST::FUNCTION:DSA
203DSA_generate_parameters 211 EXIST::FUNCTION:DSA 203DSA_generate_parameters 211 EXIST::FUNCTION:DEPRECATED,DSA
204DSA_is_prime 212 NOEXIST::FUNCTION: 204DSA_is_prime 212 NOEXIST::FUNCTION:
205DSA_new 213 EXIST::FUNCTION:DSA 205DSA_new 213 EXIST::FUNCTION:DSA
206DSA_print 214 EXIST::FUNCTION:BIO,DSA 206DSA_print 214 EXIST::FUNCTION:BIO,DSA
@@ -474,7 +474,7 @@ RSAPrivateKey_dup 481 EXIST::FUNCTION:RSA
474RSAPublicKey_dup 482 EXIST::FUNCTION:RSA 474RSAPublicKey_dup 482 EXIST::FUNCTION:RSA
475RSA_PKCS1_SSLeay 483 EXIST::FUNCTION:RSA 475RSA_PKCS1_SSLeay 483 EXIST::FUNCTION:RSA
476RSA_free 484 EXIST::FUNCTION:RSA 476RSA_free 484 EXIST::FUNCTION:RSA
477RSA_generate_key 485 EXIST::FUNCTION:RSA 477RSA_generate_key 485 EXIST::FUNCTION:DEPRECATED,RSA
478RSA_new 486 EXIST::FUNCTION:RSA 478RSA_new 486 EXIST::FUNCTION:RSA
479RSA_new_method 487 EXIST::FUNCTION:RSA 479RSA_new_method 487 EXIST::FUNCTION:RSA
480RSA_print 488 EXIST::FUNCTION:BIO,RSA 480RSA_print 488 EXIST::FUNCTION:BIO,RSA
@@ -802,7 +802,7 @@ DES_set_odd_parity 809 EXIST::FUNCTION:DES
802DES_string_to_2keys 810 EXIST::FUNCTION:DES 802DES_string_to_2keys 810 EXIST::FUNCTION:DES
803DES_string_to_key 811 EXIST::FUNCTION:DES 803DES_string_to_key 811 EXIST::FUNCTION:DES
804DES_xcbc_encrypt 812 EXIST::FUNCTION:DES 804DES_xcbc_encrypt 812 EXIST::FUNCTION:DES
805DES_xwhite_in2out 813 EXIST::FUNCTION:DES 805DES_xwhite_in2out 813 NOEXIST::FUNCTION:
806fcrypt_body 814 NOEXIST::FUNCTION: 806fcrypt_body 814 NOEXIST::FUNCTION:
807i2a_ASN1_INTEGER 815 EXIST::FUNCTION:BIO 807i2a_ASN1_INTEGER 815 EXIST::FUNCTION:BIO
808i2a_ASN1_OBJECT 816 EXIST::FUNCTION:BIO 808i2a_ASN1_OBJECT 816 EXIST::FUNCTION:BIO
@@ -1104,7 +1104,7 @@ BN_RECP_CTX_set 1131 EXIST::FUNCTION:
1104BN_mod_mul_reciprocal 1132 EXIST::FUNCTION: 1104BN_mod_mul_reciprocal 1132 EXIST::FUNCTION:
1105BN_mod_exp_recp 1133 EXIST::FUNCTION: 1105BN_mod_exp_recp 1133 EXIST::FUNCTION:
1106BN_div_recp 1134 EXIST::FUNCTION: 1106BN_div_recp 1134 EXIST::FUNCTION:
1107BN_CTX_init 1135 EXIST::FUNCTION: 1107BN_CTX_init 1135 EXIST::FUNCTION:DEPRECATED
1108BN_MONT_CTX_init 1136 EXIST::FUNCTION: 1108BN_MONT_CTX_init 1136 EXIST::FUNCTION:
1109RAND_get_rand_method 1137 EXIST::FUNCTION: 1109RAND_get_rand_method 1137 EXIST::FUNCTION:
1110PKCS7_add_attribute 1138 EXIST::FUNCTION: 1110PKCS7_add_attribute 1138 EXIST::FUNCTION:
@@ -1221,8 +1221,8 @@ BIO_f_reliable 1244 EXIST::FUNCTION:BIO
1221PKCS7_dataFinal 1245 EXIST::FUNCTION: 1221PKCS7_dataFinal 1245 EXIST::FUNCTION:
1222PKCS7_dataDecode 1246 EXIST::FUNCTION: 1222PKCS7_dataDecode 1246 EXIST::FUNCTION:
1223X509V3_EXT_CRL_add_conf 1247 EXIST::FUNCTION: 1223X509V3_EXT_CRL_add_conf 1247 EXIST::FUNCTION:
1224BN_set_params 1248 EXIST::FUNCTION: 1224BN_set_params 1248 EXIST::FUNCTION:DEPRECATED
1225BN_get_params 1249 EXIST::FUNCTION: 1225BN_get_params 1249 EXIST::FUNCTION:DEPRECATED
1226BIO_get_ex_num 1250 NOEXIST::FUNCTION: 1226BIO_get_ex_num 1250 NOEXIST::FUNCTION:
1227BIO_set_ex_free_func 1251 NOEXIST::FUNCTION: 1227BIO_set_ex_free_func 1251 NOEXIST::FUNCTION:
1228EVP_ripemd160 1252 EXIST::FUNCTION:RIPEMD 1228EVP_ripemd160 1252 EXIST::FUNCTION:RIPEMD
@@ -1744,7 +1744,7 @@ X509_REQ_add1_attr_by_txt 2217 EXIST::FUNCTION:
1744X509_ATTRIBUTE_create_by_txt 2218 EXIST::FUNCTION: 1744X509_ATTRIBUTE_create_by_txt 2218 EXIST::FUNCTION:
1745X509at_add1_attr_by_txt 2219 EXIST::FUNCTION: 1745X509at_add1_attr_by_txt 2219 EXIST::FUNCTION:
1746BN_pseudo_rand 2239 EXIST::FUNCTION: 1746BN_pseudo_rand 2239 EXIST::FUNCTION:
1747BN_is_prime_fasttest 2240 EXIST::FUNCTION: 1747BN_is_prime_fasttest 2240 EXIST::FUNCTION:DEPRECATED
1748BN_CTX_end 2241 EXIST::FUNCTION: 1748BN_CTX_end 2241 EXIST::FUNCTION:
1749BN_CTX_start 2242 EXIST::FUNCTION: 1749BN_CTX_start 2242 EXIST::FUNCTION:
1750BN_CTX_get 2243 EXIST::FUNCTION: 1750BN_CTX_get 2243 EXIST::FUNCTION:
@@ -2071,7 +2071,7 @@ PKCS7_ATTR_SIGN_it 2632 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
2071UI_add_error_string 2633 EXIST::FUNCTION: 2071UI_add_error_string 2633 EXIST::FUNCTION:
2072KRB5_CHECKSUM_free 2634 EXIST::FUNCTION: 2072KRB5_CHECKSUM_free 2634 EXIST::FUNCTION:
2073OCSP_REQUEST_get_ext 2635 EXIST::FUNCTION: 2073OCSP_REQUEST_get_ext 2635 EXIST::FUNCTION:
2074ENGINE_load_ubsec 2636 EXIST::FUNCTION:ENGINE 2074ENGINE_load_ubsec 2636 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
2075ENGINE_register_all_digests 2637 EXIST::FUNCTION:ENGINE 2075ENGINE_register_all_digests 2637 EXIST::FUNCTION:ENGINE
2076PKEY_USAGE_PERIOD_it 2638 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: 2076PKEY_USAGE_PERIOD_it 2638 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
2077PKEY_USAGE_PERIOD_it 2638 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: 2077PKEY_USAGE_PERIOD_it 2638 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -2089,7 +2089,7 @@ OCSP_BASICRESP_get_ext_by_crit 2646 EXIST:VMS:FUNCTION:
2089OCSP_cert_status_str 2647 EXIST::FUNCTION: 2089OCSP_cert_status_str 2647 EXIST::FUNCTION:
2090d2i_OCSP_REQUEST 2648 EXIST::FUNCTION: 2090d2i_OCSP_REQUEST 2648 EXIST::FUNCTION:
2091UI_dup_info_string 2649 EXIST::FUNCTION: 2091UI_dup_info_string 2649 EXIST::FUNCTION:
2092_ossl_old_des_xwhite_in2out 2650 EXIST::FUNCTION:DES 2092_ossl_old_des_xwhite_in2out 2650 NOEXIST::FUNCTION:
2093PKCS12_it 2651 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: 2093PKCS12_it 2651 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
2094PKCS12_it 2651 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: 2094PKCS12_it 2651 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
2095OCSP_SINGLERESP_get_ext_by_critical 2652 EXIST:!VMS:FUNCTION: 2095OCSP_SINGLERESP_get_ext_by_critical 2652 EXIST:!VMS:FUNCTION:
@@ -2419,7 +2419,7 @@ UI_get_string_type 2916 EXIST::FUNCTION:
2419ENGINE_unregister_DH 2917 EXIST::FUNCTION:ENGINE 2419ENGINE_unregister_DH 2917 EXIST::FUNCTION:ENGINE
2420ENGINE_register_all_DSA 2918 EXIST::FUNCTION:ENGINE 2420ENGINE_register_all_DSA 2918 EXIST::FUNCTION:ENGINE
2421OCSP_ONEREQ_get_ext_by_critical 2919 EXIST::FUNCTION: 2421OCSP_ONEREQ_get_ext_by_critical 2919 EXIST::FUNCTION:
2422bn_dup_expand 2920 EXIST::FUNCTION: 2422bn_dup_expand 2920 EXIST::FUNCTION:DEPRECATED
2423OCSP_cert_id_new 2921 EXIST::FUNCTION: 2423OCSP_cert_id_new 2921 EXIST::FUNCTION:
2424BASIC_CONSTRAINTS_it 2922 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: 2424BASIC_CONSTRAINTS_it 2922 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
2425BASIC_CONSTRAINTS_it 2922 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: 2425BASIC_CONSTRAINTS_it 2922 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -2545,7 +2545,7 @@ OCSP_RESPONSE_new 3023 EXIST::FUNCTION:
2545AES_set_encrypt_key 3024 EXIST::FUNCTION:AES 2545AES_set_encrypt_key 3024 EXIST::FUNCTION:AES
2546OCSP_resp_count 3025 EXIST::FUNCTION: 2546OCSP_resp_count 3025 EXIST::FUNCTION:
2547KRB5_CHECKSUM_new 3026 EXIST::FUNCTION: 2547KRB5_CHECKSUM_new 3026 EXIST::FUNCTION:
2548ENGINE_load_cswift 3027 EXIST::FUNCTION:ENGINE 2548ENGINE_load_cswift 3027 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
2549OCSP_onereq_get0_id 3028 EXIST::FUNCTION: 2549OCSP_onereq_get0_id 3028 EXIST::FUNCTION:
2550ENGINE_set_default_ciphers 3029 EXIST::FUNCTION:ENGINE 2550ENGINE_set_default_ciphers 3029 EXIST::FUNCTION:ENGINE
2551NOTICEREF_it 3030 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: 2551NOTICEREF_it 3030 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2576,7 +2576,7 @@ ASN1_primitive_free 3051 EXIST::FUNCTION:
2576i2d_EXTENDED_KEY_USAGE 3052 EXIST::FUNCTION: 2576i2d_EXTENDED_KEY_USAGE 3052 EXIST::FUNCTION:
2577i2d_OCSP_SIGNATURE 3053 EXIST::FUNCTION: 2577i2d_OCSP_SIGNATURE 3053 EXIST::FUNCTION:
2578asn1_enc_save 3054 EXIST::FUNCTION: 2578asn1_enc_save 3054 EXIST::FUNCTION:
2579ENGINE_load_nuron 3055 EXIST::FUNCTION:ENGINE 2579ENGINE_load_nuron 3055 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
2580_ossl_old_des_pcbc_encrypt 3056 EXIST::FUNCTION:DES 2580_ossl_old_des_pcbc_encrypt 3056 EXIST::FUNCTION:DES
2581PKCS12_MAC_DATA_it 3057 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: 2581PKCS12_MAC_DATA_it 3057 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
2582PKCS12_MAC_DATA_it 3057 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: 2582PKCS12_MAC_DATA_it 3057 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -2600,7 +2600,7 @@ asn1_get_choice_selector 3071 EXIST::FUNCTION:
2600i2d_KRB5_CHECKSUM 3072 EXIST::FUNCTION: 2600i2d_KRB5_CHECKSUM 3072 EXIST::FUNCTION:
2601ENGINE_set_table_flags 3073 EXIST::FUNCTION:ENGINE 2601ENGINE_set_table_flags 3073 EXIST::FUNCTION:ENGINE
2602AES_options 3074 EXIST::FUNCTION:AES 2602AES_options 3074 EXIST::FUNCTION:AES
2603ENGINE_load_chil 3075 EXIST::FUNCTION:ENGINE 2603ENGINE_load_chil 3075 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
2604OCSP_id_cmp 3076 EXIST::FUNCTION: 2604OCSP_id_cmp 3076 EXIST::FUNCTION:
2605OCSP_BASICRESP_new 3077 EXIST::FUNCTION: 2605OCSP_BASICRESP_new 3077 EXIST::FUNCTION:
2606OCSP_REQUEST_get_ext_by_NID 3078 EXIST::FUNCTION: 2606OCSP_REQUEST_get_ext_by_NID 3078 EXIST::FUNCTION:
@@ -2667,7 +2667,7 @@ OCSP_CRLID_it 3127 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
2667OCSP_CRLID_it 3127 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: 2667OCSP_CRLID_it 3127 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
2668i2d_KRB5_AUTHENTBODY 3128 EXIST::FUNCTION: 2668i2d_KRB5_AUTHENTBODY 3128 EXIST::FUNCTION:
2669OCSP_REQUEST_get_ext_count 3129 EXIST::FUNCTION: 2669OCSP_REQUEST_get_ext_count 3129 EXIST::FUNCTION:
2670ENGINE_load_atalla 3130 EXIST::FUNCTION:ENGINE 2670ENGINE_load_atalla 3130 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
2671X509_NAME_it 3131 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: 2671X509_NAME_it 3131 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
2672X509_NAME_it 3131 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: 2672X509_NAME_it 3131 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
2673USERNOTICE_it 3132 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: 2673USERNOTICE_it 3132 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2762,8 +2762,8 @@ DES_read_2passwords 3206 EXIST::FUNCTION:DES
2762DES_read_password 3207 EXIST::FUNCTION:DES 2762DES_read_password 3207 EXIST::FUNCTION:DES
2763UI_UTIL_read_pw 3208 EXIST::FUNCTION: 2763UI_UTIL_read_pw 3208 EXIST::FUNCTION:
2764UI_UTIL_read_pw_string 3209 EXIST::FUNCTION: 2764UI_UTIL_read_pw_string 3209 EXIST::FUNCTION:
2765ENGINE_load_aep 3210 EXIST::FUNCTION:ENGINE 2765ENGINE_load_aep 3210 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
2766ENGINE_load_sureware 3211 EXIST::FUNCTION:ENGINE 2766ENGINE_load_sureware 3211 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
2767OPENSSL_add_all_algorithms_noconf 3212 EXIST:!VMS:FUNCTION: 2767OPENSSL_add_all_algorithms_noconf 3212 EXIST:!VMS:FUNCTION:
2768OPENSSL_add_all_algo_noconf 3212 EXIST:VMS:FUNCTION: 2768OPENSSL_add_all_algo_noconf 3212 EXIST:VMS:FUNCTION:
2769OPENSSL_add_all_algorithms_conf 3213 EXIST:!VMS:FUNCTION: 2769OPENSSL_add_all_algorithms_conf 3213 EXIST:!VMS:FUNCTION:
@@ -2772,7 +2772,7 @@ OPENSSL_load_builtin_modules 3214 EXIST::FUNCTION:
2772AES_ofb128_encrypt 3215 EXIST::FUNCTION:AES 2772AES_ofb128_encrypt 3215 EXIST::FUNCTION:AES
2773AES_ctr128_encrypt 3216 EXIST::FUNCTION:AES 2773AES_ctr128_encrypt 3216 EXIST::FUNCTION:AES
2774AES_cfb128_encrypt 3217 EXIST::FUNCTION:AES 2774AES_cfb128_encrypt 3217 EXIST::FUNCTION:AES
2775ENGINE_load_4758cca 3218 EXIST::FUNCTION:ENGINE 2775ENGINE_load_4758cca 3218 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
2776_ossl_096_des_random_seed 3219 EXIST::FUNCTION:DES 2776_ossl_096_des_random_seed 3219 EXIST::FUNCTION:DES
2777EVP_aes_256_ofb 3220 EXIST::FUNCTION:AES 2777EVP_aes_256_ofb 3220 EXIST::FUNCTION:AES
2778EVP_aes_192_ofb 3221 EXIST::FUNCTION:AES 2778EVP_aes_192_ofb 3221 EXIST::FUNCTION:AES
@@ -2804,57 +2804,57 @@ OPENSSL_cleanse 3245 EXIST::FUNCTION:
2804ENGINE_setup_bsd_cryptodev 3246 EXIST:__FreeBSD__:FUNCTION:ENGINE 2804ENGINE_setup_bsd_cryptodev 3246 EXIST:__FreeBSD__:FUNCTION:ENGINE
2805ERR_release_err_state_table 3247 EXIST::FUNCTION:LHASH 2805ERR_release_err_state_table 3247 EXIST::FUNCTION:LHASH
2806EVP_aes_128_cfb8 3248 EXIST::FUNCTION:AES 2806EVP_aes_128_cfb8 3248 EXIST::FUNCTION:AES
2807FIPS_corrupt_rsa 3249 EXIST:OPENSSL_FIPS:FUNCTION: 2807FIPS_corrupt_rsa 3249 NOEXIST::FUNCTION:
2808FIPS_selftest_des 3250 EXIST:OPENSSL_FIPS:FUNCTION: 2808FIPS_selftest_des 3250 NOEXIST::FUNCTION:
2809EVP_aes_128_cfb1 3251 EXIST::FUNCTION:AES 2809EVP_aes_128_cfb1 3251 EXIST::FUNCTION:AES
2810EVP_aes_192_cfb8 3252 EXIST::FUNCTION:AES 2810EVP_aes_192_cfb8 3252 EXIST::FUNCTION:AES
2811FIPS_mode_set 3253 EXIST:OPENSSL_FIPS:FUNCTION: 2811FIPS_mode_set 3253 NOEXIST::FUNCTION:
2812FIPS_selftest_dsa 3254 EXIST:OPENSSL_FIPS:FUNCTION: 2812FIPS_selftest_dsa 3254 NOEXIST::FUNCTION:
2813EVP_aes_256_cfb8 3255 EXIST::FUNCTION:AES 2813EVP_aes_256_cfb8 3255 EXIST::FUNCTION:AES
2814FIPS_allow_md5 3256 NOEXIST::FUNCTION: 2814FIPS_allow_md5 3256 NOEXIST::FUNCTION:
2815DES_ede3_cfb_encrypt 3257 EXIST::FUNCTION:DES 2815DES_ede3_cfb_encrypt 3257 EXIST::FUNCTION:DES
2816EVP_des_ede3_cfb8 3258 EXIST::FUNCTION:DES 2816EVP_des_ede3_cfb8 3258 EXIST::FUNCTION:DES
2817FIPS_rand_seeded 3259 EXIST:OPENSSL_FIPS:FUNCTION: 2817FIPS_rand_seeded 3259 NOEXIST::FUNCTION:
2818AES_cfbr_encrypt_block 3260 EXIST::FUNCTION:AES 2818AES_cfbr_encrypt_block 3260 EXIST::FUNCTION:AES
2819AES_cfb8_encrypt 3261 EXIST::FUNCTION:AES 2819AES_cfb8_encrypt 3261 EXIST::FUNCTION:AES
2820FIPS_rand_seed 3262 EXIST:OPENSSL_FIPS:FUNCTION: 2820FIPS_rand_seed 3262 NOEXIST::FUNCTION:
2821FIPS_corrupt_des 3263 EXIST:OPENSSL_FIPS:FUNCTION: 2821FIPS_corrupt_des 3263 NOEXIST::FUNCTION:
2822EVP_aes_192_cfb1 3264 EXIST::FUNCTION:AES 2822EVP_aes_192_cfb1 3264 EXIST::FUNCTION:AES
2823FIPS_selftest_aes 3265 EXIST:OPENSSL_FIPS:FUNCTION: 2823FIPS_selftest_aes 3265 NOEXIST::FUNCTION:
2824FIPS_set_prng_key 3266 EXIST:OPENSSL_FIPS:FUNCTION: 2824FIPS_set_prng_key 3266 NOEXIST::FUNCTION:
2825EVP_des_cfb8 3267 EXIST::FUNCTION:DES 2825EVP_des_cfb8 3267 EXIST::FUNCTION:DES
2826FIPS_corrupt_dsa 3268 EXIST:OPENSSL_FIPS:FUNCTION: 2826FIPS_corrupt_dsa 3268 NOEXIST::FUNCTION:
2827FIPS_test_mode 3269 EXIST:OPENSSL_FIPS:FUNCTION: 2827FIPS_test_mode 3269 NOEXIST::FUNCTION:
2828FIPS_rand_method 3270 EXIST:OPENSSL_FIPS:FUNCTION: 2828FIPS_rand_method 3270 NOEXIST::FUNCTION:
2829EVP_aes_256_cfb1 3271 EXIST::FUNCTION:AES 2829EVP_aes_256_cfb1 3271 EXIST::FUNCTION:AES
2830ERR_load_FIPS_strings 3272 EXIST:OPENSSL_FIPS:FUNCTION: 2830ERR_load_FIPS_strings 3272 NOEXIST::FUNCTION:
2831FIPS_corrupt_aes 3273 EXIST:OPENSSL_FIPS:FUNCTION: 2831FIPS_corrupt_aes 3273 NOEXIST::FUNCTION:
2832FIPS_selftest_sha1 3274 EXIST:OPENSSL_FIPS:FUNCTION: 2832FIPS_selftest_sha1 3274 NOEXIST::FUNCTION:
2833FIPS_selftest_rsa 3275 EXIST:OPENSSL_FIPS:FUNCTION: 2833FIPS_selftest_rsa 3275 NOEXIST::FUNCTION:
2834FIPS_corrupt_sha1 3276 EXIST:OPENSSL_FIPS:FUNCTION: 2834FIPS_corrupt_sha1 3276 NOEXIST::FUNCTION:
2835EVP_des_cfb1 3277 EXIST::FUNCTION:DES 2835EVP_des_cfb1 3277 EXIST::FUNCTION:DES
2836FIPS_dsa_check 3278 EXIST:OPENSSL_FIPS:FUNCTION: 2836FIPS_dsa_check 3278 NOEXIST::FUNCTION:
2837AES_cfb1_encrypt 3279 EXIST::FUNCTION:AES 2837AES_cfb1_encrypt 3279 EXIST::FUNCTION:AES
2838EVP_des_ede3_cfb1 3280 EXIST::FUNCTION:DES 2838EVP_des_ede3_cfb1 3280 EXIST::FUNCTION:DES
2839FIPS_rand_check 3281 EXIST:OPENSSL_FIPS:FUNCTION: 2839FIPS_rand_check 3281 NOEXIST::FUNCTION:
2840FIPS_md5_allowed 3282 NOEXIST::FUNCTION: 2840FIPS_md5_allowed 3282 NOEXIST::FUNCTION:
2841FIPS_mode 3283 EXIST:OPENSSL_FIPS:FUNCTION: 2841FIPS_mode 3283 NOEXIST::FUNCTION:
2842FIPS_selftest_failed 3284 EXIST:OPENSSL_FIPS:FUNCTION: 2842FIPS_selftest_failed 3284 NOEXIST::FUNCTION:
2843sk_is_sorted 3285 EXIST::FUNCTION: 2843sk_is_sorted 3285 EXIST::FUNCTION:
2844X509_check_ca 3286 EXIST::FUNCTION: 2844X509_check_ca 3286 EXIST::FUNCTION:
2845private_idea_set_encrypt_key 3287 EXIST:OPENSSL_FIPS:FUNCTION:IDEA 2845private_idea_set_encrypt_key 3287 NOEXIST::FUNCTION:
2846HMAC_CTX_set_flags 3288 EXIST::FUNCTION:HMAC 2846HMAC_CTX_set_flags 3288 NOEXIST::FUNCTION:
2847private_SHA_Init 3289 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA0 2847private_SHA_Init 3289 NOEXIST::FUNCTION:
2848private_CAST_set_key 3290 EXIST:OPENSSL_FIPS:FUNCTION:CAST 2848private_CAST_set_key 3290 NOEXIST::FUNCTION:
2849private_RIPEMD160_Init 3291 EXIST:OPENSSL_FIPS:FUNCTION:RIPEMD 2849private_RIPEMD160_Init 3291 NOEXIST::FUNCTION:
2850private_RC5_32_set_key 3292 EXIST:OPENSSL_FIPS:FUNCTION:RC5 2850private_RC5_32_set_key 3292 NOEXIST::FUNCTION:
2851private_MD5_Init 3293 EXIST:OPENSSL_FIPS:FUNCTION:MD5 2851private_MD5_Init 3293 NOEXIST::FUNCTION:
2852private_RC4_set_key 3294 EXIST:OPENSSL_FIPS:FUNCTION:RC4 2852private_RC4_set_key 3294 NOEXIST::FUNCTION:
2853private_MDC2_Init 3295 EXIST:OPENSSL_FIPS:FUNCTION:MDC2 2853private_MDC2_Init 3295 NOEXIST::FUNCTION:
2854private_RC2_set_key 3296 EXIST:OPENSSL_FIPS:FUNCTION:RC2 2854private_RC2_set_key 3296 NOEXIST::FUNCTION:
2855private_MD4_Init 3297 EXIST:OPENSSL_FIPS:FUNCTION:MD4 2855private_MD4_Init 3297 NOEXIST::FUNCTION:
2856private_BF_set_key 3298 EXIST:OPENSSL_FIPS:FUNCTION:BF 2856private_BF_set_key 3298 NOEXIST::FUNCTION:
2857private_MD2_Init 3299 EXIST:OPENSSL_FIPS:FUNCTION:MD2 2857private_MD2_Init 3299 NOEXIST::FUNCTION:
2858d2i_PROXY_CERT_INFO_EXTENSION 3300 EXIST::FUNCTION: 2858d2i_PROXY_CERT_INFO_EXTENSION 3300 EXIST::FUNCTION:
2859PROXY_POLICY_it 3301 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: 2859PROXY_POLICY_it 3301 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
2860PROXY_POLICY_it 3301 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: 2860PROXY_POLICY_it 3301 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -2868,13 +2868,13 @@ PROXY_CERT_INFO_EXTENSION_it 3307 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
2868PROXY_POLICY_free 3308 EXIST::FUNCTION: 2868PROXY_POLICY_free 3308 EXIST::FUNCTION:
2869PROXY_POLICY_new 3309 EXIST::FUNCTION: 2869PROXY_POLICY_new 3309 EXIST::FUNCTION:
2870BN_MONT_CTX_set_locked 3310 EXIST::FUNCTION: 2870BN_MONT_CTX_set_locked 3310 EXIST::FUNCTION:
2871FIPS_selftest_rng 3311 EXIST:OPENSSL_FIPS:FUNCTION: 2871FIPS_selftest_rng 3311 NOEXIST::FUNCTION:
2872EVP_sha384 3312 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA512 2872EVP_sha384 3312 EXIST::FUNCTION:SHA,SHA512
2873EVP_sha512 3313 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA512 2873EVP_sha512 3313 EXIST::FUNCTION:SHA,SHA512
2874EVP_sha224 3314 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA256 2874EVP_sha224 3314 EXIST::FUNCTION:SHA,SHA256
2875EVP_sha256 3315 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA256 2875EVP_sha256 3315 EXIST::FUNCTION:SHA,SHA256
2876FIPS_selftest_hmac 3316 EXIST:OPENSSL_FIPS:FUNCTION: 2876FIPS_selftest_hmac 3316 NOEXIST::FUNCTION:
2877FIPS_corrupt_rng 3317 EXIST:OPENSSL_FIPS:FUNCTION: 2877FIPS_corrupt_rng 3317 NOEXIST::FUNCTION:
2878BN_mod_exp_mont_consttime 3318 EXIST::FUNCTION: 2878BN_mod_exp_mont_consttime 3318 EXIST::FUNCTION:
2879RSA_X931_hash_id 3319 EXIST::FUNCTION:RSA 2879RSA_X931_hash_id 3319 EXIST::FUNCTION:RSA
2880RSA_padding_check_X931 3320 EXIST::FUNCTION:RSA 2880RSA_padding_check_X931 3320 EXIST::FUNCTION:RSA
@@ -2882,26 +2882,773 @@ RSA_verify_PKCS1_PSS 3321 EXIST::FUNCTION:RSA
2882RSA_padding_add_X931 3322 EXIST::FUNCTION:RSA 2882RSA_padding_add_X931 3322 EXIST::FUNCTION:RSA
2883RSA_padding_add_PKCS1_PSS 3323 EXIST::FUNCTION:RSA 2883RSA_padding_add_PKCS1_PSS 3323 EXIST::FUNCTION:RSA
2884PKCS1_MGF1 3324 EXIST::FUNCTION:RSA 2884PKCS1_MGF1 3324 EXIST::FUNCTION:RSA
2885BN_X931_generate_Xpq 3325 EXIST:OPENSSL_FIPS:FUNCTION: 2885BN_X931_generate_Xpq 3325 NOEXIST::FUNCTION:
2886RSA_X931_generate_key 3326 EXIST:OPENSSL_FIPS:FUNCTION:RSA 2886RSA_X931_generate_key 3326 NOEXIST::FUNCTION:
2887BN_X931_derive_prime 3327 EXIST:OPENSSL_FIPS:FUNCTION: 2887BN_X931_derive_prime 3327 NOEXIST::FUNCTION:
2888BN_X931_generate_prime 3328 EXIST:OPENSSL_FIPS:FUNCTION: 2888BN_X931_generate_prime 3328 NOEXIST::FUNCTION:
2889RSA_X931_derive 3329 EXIST:OPENSSL_FIPS:FUNCTION:RSA 2889RSA_X931_derive 3329 NOEXIST::FUNCTION:
2890SHA512_Update 3356 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA512 2890BIO_new_dgram 3330 EXIST::FUNCTION:
2891SHA256_Init 3479 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA256 2891BN_get0_nist_prime_384 3331 EXIST::FUNCTION:
2892SHA224 3510 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA256 2892ERR_set_mark 3332 EXIST::FUNCTION:
2893SHA384_Update 3551 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA512 2893X509_STORE_CTX_set0_crls 3333 EXIST::FUNCTION:
2894SHA224_Final 3560 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA256 2894ENGINE_set_STORE 3334 EXIST::FUNCTION:ENGINE
2895SHA224_Update 3562 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA256 2895ENGINE_register_ECDSA 3335 EXIST::FUNCTION:ENGINE
2896SHA512_Final 3581 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA512 2896STORE_method_set_list_start_function 3336 EXIST:!VMS:FUNCTION:
2897SHA224_Init 3631 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA256 2897STORE_meth_set_list_start_fn 3336 EXIST:VMS:FUNCTION:
2898SHA512_Init 3633 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA512 2898BN_BLINDING_invert_ex 3337 EXIST::FUNCTION:
2899SHA256 3654 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA256 2899NAME_CONSTRAINTS_free 3338 EXIST::FUNCTION:
2900SHA256_Transform 3664 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA256 2900STORE_ATTR_INFO_set_number 3339 EXIST::FUNCTION:
2901SHA512 3669 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA512 2901BN_BLINDING_get_thread_id 3340 EXIST::FUNCTION:
2902SHA512_Transform 3675 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA512 2902X509_STORE_CTX_set0_param 3341 EXIST::FUNCTION:
2903SHA256_Final 3712 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA256 2903POLICY_MAPPING_it 3342 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
2904SHA384_Init 3737 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA512 2904POLICY_MAPPING_it 3342 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
2905SHA384_Final 3740 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA512 2905STORE_parse_attrs_start 3343 EXIST::FUNCTION:
2906SHA384 3745 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA512 2906POLICY_CONSTRAINTS_free 3344 EXIST::FUNCTION:
2907SHA256_Update 3765 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA256 2907EVP_PKEY_add1_attr_by_NID 3345 EXIST::FUNCTION:
2908BN_nist_mod_192 3346 EXIST::FUNCTION:
2909EC_GROUP_get_trinomial_basis 3347 EXIST::FUNCTION:EC
2910STORE_set_method 3348 EXIST::FUNCTION:
2911GENERAL_SUBTREE_free 3349 EXIST::FUNCTION:
2912NAME_CONSTRAINTS_it 3350 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
2913NAME_CONSTRAINTS_it 3350 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
2914ECDH_get_default_method 3351 EXIST::FUNCTION:ECDH
2915PKCS12_add_safe 3352 EXIST::FUNCTION:
2916EC_KEY_new_by_curve_name 3353 EXIST::FUNCTION:EC
2917STORE_method_get_update_store_function 3354 EXIST:!VMS:FUNCTION:
2918STORE_meth_get_update_store_fn 3354 EXIST:VMS:FUNCTION:
2919ENGINE_register_ECDH 3355 EXIST::FUNCTION:ENGINE
2920SHA512_Update 3356 EXIST::FUNCTION:SHA,SHA512
2921i2d_ECPrivateKey 3357 EXIST::FUNCTION:EC
2922BN_get0_nist_prime_192 3358 EXIST::FUNCTION:
2923STORE_modify_certificate 3359 EXIST::FUNCTION:
2924EC_POINT_set_affine_coordinates_GF2m 3360 EXIST:!VMS:FUNCTION:EC
2925EC_POINT_set_affine_coords_GF2m 3360 EXIST:VMS:FUNCTION:EC
2926BN_GF2m_mod_exp_arr 3361 EXIST::FUNCTION:
2927STORE_ATTR_INFO_modify_number 3362 EXIST::FUNCTION:
2928X509_keyid_get0 3363 EXIST::FUNCTION:
2929ENGINE_load_gmp 3364 EXIST::FUNCTION:ENGINE,GMP,STATIC_ENGINE
2930pitem_new 3365 EXIST::FUNCTION:
2931BN_GF2m_mod_mul_arr 3366 EXIST::FUNCTION:
2932STORE_list_public_key_endp 3367 EXIST::FUNCTION:
2933o2i_ECPublicKey 3368 EXIST::FUNCTION:EC
2934EC_KEY_copy 3369 EXIST::FUNCTION:EC
2935BIO_dump_fp 3370 EXIST::FUNCTION:FP_API
2936X509_policy_node_get0_parent 3371 EXIST::FUNCTION:
2937EC_GROUP_check_discriminant 3372 EXIST::FUNCTION:EC
2938i2o_ECPublicKey 3373 EXIST::FUNCTION:EC
2939EC_KEY_precompute_mult 3374 EXIST::FUNCTION:EC
2940a2i_IPADDRESS 3375 EXIST::FUNCTION:
2941STORE_method_set_initialise_function 3376 EXIST:!VMS:FUNCTION:
2942STORE_meth_set_initialise_fn 3376 EXIST:VMS:FUNCTION:
2943X509_STORE_CTX_set_depth 3377 EXIST::FUNCTION:
2944X509_VERIFY_PARAM_inherit 3378 EXIST::FUNCTION:
2945EC_POINT_point2bn 3379 EXIST::FUNCTION:EC
2946STORE_ATTR_INFO_set_dn 3380 EXIST::FUNCTION:
2947X509_policy_tree_get0_policies 3381 EXIST::FUNCTION:
2948EC_GROUP_new_curve_GF2m 3382 EXIST::FUNCTION:EC
2949STORE_destroy_method 3383 EXIST::FUNCTION:
2950ENGINE_unregister_STORE 3384 EXIST::FUNCTION:ENGINE
2951EVP_PKEY_get1_EC_KEY 3385 EXIST::FUNCTION:EC
2952STORE_ATTR_INFO_get0_number 3386 EXIST::FUNCTION:
2953ENGINE_get_default_ECDH 3387 EXIST::FUNCTION:ENGINE
2954EC_KEY_get_conv_form 3388 EXIST::FUNCTION:EC
2955ASN1_OCTET_STRING_NDEF_it 3389 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
2956ASN1_OCTET_STRING_NDEF_it 3389 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
2957STORE_delete_public_key 3390 EXIST::FUNCTION:
2958STORE_get_public_key 3391 EXIST::FUNCTION:
2959STORE_modify_arbitrary 3392 EXIST::FUNCTION:
2960ENGINE_get_static_state 3393 EXIST::FUNCTION:ENGINE
2961pqueue_iterator 3394 EXIST::FUNCTION:
2962ECDSA_SIG_new 3395 EXIST::FUNCTION:ECDSA
2963OPENSSL_DIR_end 3396 EXIST::FUNCTION:
2964BN_GF2m_mod_sqr 3397 EXIST::FUNCTION:
2965EC_POINT_bn2point 3398 EXIST::FUNCTION:EC
2966X509_VERIFY_PARAM_set_depth 3399 EXIST::FUNCTION:
2967EC_KEY_set_asn1_flag 3400 EXIST::FUNCTION:EC
2968STORE_get_method 3401 EXIST::FUNCTION:
2969EC_KEY_get_key_method_data 3402 EXIST::FUNCTION:EC
2970ECDSA_sign_ex 3403 EXIST::FUNCTION:ECDSA
2971STORE_parse_attrs_end 3404 EXIST::FUNCTION:
2972EC_GROUP_get_point_conversion_form 3405 EXIST:!VMS:FUNCTION:EC
2973EC_GROUP_get_point_conv_form 3405 EXIST:VMS:FUNCTION:EC
2974STORE_method_set_store_function 3406 EXIST::FUNCTION:
2975STORE_ATTR_INFO_in 3407 EXIST::FUNCTION:
2976PEM_read_bio_ECPKParameters 3408 EXIST::FUNCTION:EC
2977EC_GROUP_get_pentanomial_basis 3409 EXIST::FUNCTION:EC
2978EVP_PKEY_add1_attr_by_txt 3410 EXIST::FUNCTION:
2979BN_BLINDING_set_flags 3411 EXIST::FUNCTION:
2980X509_VERIFY_PARAM_set1_policies 3412 EXIST::FUNCTION:
2981X509_VERIFY_PARAM_set1_name 3413 EXIST::FUNCTION:
2982X509_VERIFY_PARAM_set_purpose 3414 EXIST::FUNCTION:
2983STORE_get_number 3415 EXIST::FUNCTION:
2984ECDSA_sign_setup 3416 EXIST::FUNCTION:ECDSA
2985BN_GF2m_mod_solve_quad_arr 3417 EXIST::FUNCTION:
2986EC_KEY_up_ref 3418 EXIST::FUNCTION:EC
2987POLICY_MAPPING_free 3419 EXIST::FUNCTION:
2988BN_GF2m_mod_div 3420 EXIST::FUNCTION:
2989X509_VERIFY_PARAM_set_flags 3421 EXIST::FUNCTION:
2990EC_KEY_free 3422 EXIST::FUNCTION:EC
2991STORE_method_set_list_next_function 3423 EXIST:!VMS:FUNCTION:
2992STORE_meth_set_list_next_fn 3423 EXIST:VMS:FUNCTION:
2993PEM_write_bio_ECPrivateKey 3424 EXIST::FUNCTION:EC
2994d2i_EC_PUBKEY 3425 EXIST::FUNCTION:EC
2995STORE_method_get_generate_function 3426 EXIST:!VMS:FUNCTION:
2996STORE_meth_get_generate_fn 3426 EXIST:VMS:FUNCTION:
2997STORE_method_set_list_end_function 3427 EXIST:!VMS:FUNCTION:
2998STORE_meth_set_list_end_fn 3427 EXIST:VMS:FUNCTION:
2999pqueue_print 3428 EXIST::FUNCTION:
3000EC_GROUP_have_precompute_mult 3429 EXIST::FUNCTION:EC
3001EC_KEY_print_fp 3430 EXIST::FUNCTION:EC,FP_API
3002BN_GF2m_mod_arr 3431 EXIST::FUNCTION:
3003PEM_write_bio_X509_CERT_PAIR 3432 EXIST::FUNCTION:
3004EVP_PKEY_cmp 3433 EXIST::FUNCTION:
3005X509_policy_level_node_count 3434 EXIST::FUNCTION:
3006STORE_new_engine 3435 EXIST::FUNCTION:
3007STORE_list_public_key_start 3436 EXIST::FUNCTION:
3008X509_VERIFY_PARAM_new 3437 EXIST::FUNCTION:
3009ECDH_get_ex_data 3438 EXIST::FUNCTION:ECDH
3010EVP_PKEY_get_attr 3439 EXIST::FUNCTION:
3011ECDSA_do_sign 3440 EXIST::FUNCTION:ECDSA
3012ENGINE_unregister_ECDH 3441 EXIST::FUNCTION:ENGINE
3013ECDH_OpenSSL 3442 EXIST::FUNCTION:ECDH
3014EC_KEY_set_conv_form 3443 EXIST::FUNCTION:EC
3015EC_POINT_dup 3444 EXIST::FUNCTION:EC
3016GENERAL_SUBTREE_new 3445 EXIST::FUNCTION:
3017STORE_list_crl_endp 3446 EXIST::FUNCTION:
3018EC_get_builtin_curves 3447 EXIST::FUNCTION:EC
3019X509_policy_node_get0_qualifiers 3448 EXIST:!VMS:FUNCTION:
3020X509_pcy_node_get0_qualifiers 3448 EXIST:VMS:FUNCTION:
3021STORE_list_crl_end 3449 EXIST::FUNCTION:
3022EVP_PKEY_set1_EC_KEY 3450 EXIST::FUNCTION:EC
3023BN_GF2m_mod_sqrt_arr 3451 EXIST::FUNCTION:
3024i2d_ECPrivateKey_bio 3452 EXIST::FUNCTION:BIO,EC
3025ECPKParameters_print_fp 3453 EXIST::FUNCTION:EC,FP_API
3026pqueue_find 3454 EXIST::FUNCTION:
3027ECDSA_SIG_free 3455 EXIST::FUNCTION:ECDSA
3028PEM_write_bio_ECPKParameters 3456 EXIST::FUNCTION:EC
3029STORE_method_set_ctrl_function 3457 EXIST::FUNCTION:
3030STORE_list_public_key_end 3458 EXIST::FUNCTION:
3031EC_KEY_set_private_key 3459 EXIST::FUNCTION:EC
3032pqueue_peek 3460 EXIST::FUNCTION:
3033STORE_get_arbitrary 3461 EXIST::FUNCTION:
3034STORE_store_crl 3462 EXIST::FUNCTION:
3035X509_policy_node_get0_policy 3463 EXIST::FUNCTION:
3036PKCS12_add_safes 3464 EXIST::FUNCTION:
3037BN_BLINDING_convert_ex 3465 EXIST::FUNCTION:
3038X509_policy_tree_free 3466 EXIST::FUNCTION:
3039OPENSSL_ia32cap_loc 3467 EXIST::FUNCTION:
3040BN_GF2m_poly2arr 3468 EXIST::FUNCTION:
3041STORE_ctrl 3469 EXIST::FUNCTION:
3042STORE_ATTR_INFO_compare 3470 EXIST::FUNCTION:
3043BN_get0_nist_prime_224 3471 EXIST::FUNCTION:
3044i2d_ECParameters 3472 EXIST::FUNCTION:EC
3045i2d_ECPKParameters 3473 EXIST::FUNCTION:EC
3046BN_GENCB_call 3474 EXIST::FUNCTION:
3047d2i_ECPKParameters 3475 EXIST::FUNCTION:EC
3048STORE_method_set_generate_function 3476 EXIST:!VMS:FUNCTION:
3049STORE_meth_set_generate_fn 3476 EXIST:VMS:FUNCTION:
3050ENGINE_set_ECDH 3477 EXIST::FUNCTION:ENGINE
3051NAME_CONSTRAINTS_new 3478 EXIST::FUNCTION:
3052SHA256_Init 3479 EXIST::FUNCTION:SHA,SHA256
3053EC_KEY_get0_public_key 3480 EXIST::FUNCTION:EC
3054PEM_write_bio_EC_PUBKEY 3481 EXIST::FUNCTION:EC
3055STORE_ATTR_INFO_set_cstr 3482 EXIST::FUNCTION:
3056STORE_list_crl_next 3483 EXIST::FUNCTION:
3057STORE_ATTR_INFO_in_range 3484 EXIST::FUNCTION:
3058ECParameters_print 3485 EXIST::FUNCTION:BIO,EC
3059STORE_method_set_delete_function 3486 EXIST:!VMS:FUNCTION:
3060STORE_meth_set_delete_fn 3486 EXIST:VMS:FUNCTION:
3061STORE_list_certificate_next 3487 EXIST::FUNCTION:
3062ASN1_generate_nconf 3488 EXIST::FUNCTION:
3063BUF_memdup 3489 EXIST::FUNCTION:
3064BN_GF2m_mod_mul 3490 EXIST::FUNCTION:
3065STORE_method_get_list_next_function 3491 EXIST:!VMS:FUNCTION:
3066STORE_meth_get_list_next_fn 3491 EXIST:VMS:FUNCTION:
3067STORE_ATTR_INFO_get0_dn 3492 EXIST::FUNCTION:
3068STORE_list_private_key_next 3493 EXIST::FUNCTION:
3069EC_GROUP_set_seed 3494 EXIST::FUNCTION:EC
3070X509_VERIFY_PARAM_set_trust 3495 EXIST::FUNCTION:
3071STORE_ATTR_INFO_free 3496 EXIST::FUNCTION:
3072STORE_get_private_key 3497 EXIST::FUNCTION:
3073EVP_PKEY_get_attr_count 3498 EXIST::FUNCTION:
3074STORE_ATTR_INFO_new 3499 EXIST::FUNCTION:
3075EC_GROUP_get_curve_GF2m 3500 EXIST::FUNCTION:EC
3076STORE_method_set_revoke_function 3501 EXIST:!VMS:FUNCTION:
3077STORE_meth_set_revoke_fn 3501 EXIST:VMS:FUNCTION:
3078STORE_store_number 3502 EXIST::FUNCTION:
3079BN_is_prime_ex 3503 EXIST::FUNCTION:
3080STORE_revoke_public_key 3504 EXIST::FUNCTION:
3081X509_STORE_CTX_get0_param 3505 EXIST::FUNCTION:
3082STORE_delete_arbitrary 3506 EXIST::FUNCTION:
3083PEM_read_X509_CERT_PAIR 3507 EXIST:!WIN16:FUNCTION:
3084X509_STORE_set_depth 3508 EXIST::FUNCTION:
3085ECDSA_get_ex_data 3509 EXIST::FUNCTION:ECDSA
3086SHA224 3510 EXIST::FUNCTION:SHA,SHA256
3087BIO_dump_indent_fp 3511 EXIST::FUNCTION:FP_API
3088EC_KEY_set_group 3512 EXIST::FUNCTION:EC
3089BUF_strndup 3513 EXIST::FUNCTION:
3090STORE_list_certificate_start 3514 EXIST::FUNCTION:
3091BN_GF2m_mod 3515 EXIST::FUNCTION:
3092X509_REQ_check_private_key 3516 EXIST::FUNCTION:
3093EC_GROUP_get_seed_len 3517 EXIST::FUNCTION:EC
3094ERR_load_STORE_strings 3518 EXIST::FUNCTION:
3095PEM_read_bio_EC_PUBKEY 3519 EXIST::FUNCTION:EC
3096STORE_list_private_key_end 3520 EXIST::FUNCTION:
3097i2d_EC_PUBKEY 3521 EXIST::FUNCTION:EC
3098ECDSA_get_default_method 3522 EXIST::FUNCTION:ECDSA
3099ASN1_put_eoc 3523 EXIST::FUNCTION:
3100X509_STORE_CTX_get_explicit_policy 3524 EXIST:!VMS:FUNCTION:
3101X509_STORE_CTX_get_expl_policy 3524 EXIST:VMS:FUNCTION:
3102X509_VERIFY_PARAM_table_cleanup 3525 EXIST::FUNCTION:
3103STORE_modify_private_key 3526 EXIST::FUNCTION:
3104X509_VERIFY_PARAM_free 3527 EXIST::FUNCTION:
3105EC_METHOD_get_field_type 3528 EXIST::FUNCTION:EC
3106EC_GFp_nist_method 3529 EXIST::FUNCTION:EC
3107STORE_method_set_modify_function 3530 EXIST:!VMS:FUNCTION:
3108STORE_meth_set_modify_fn 3530 EXIST:VMS:FUNCTION:
3109STORE_parse_attrs_next 3531 EXIST::FUNCTION:
3110ENGINE_load_padlock 3532 EXIST::FUNCTION:ENGINE
3111EC_GROUP_set_curve_name 3533 EXIST::FUNCTION:EC
3112X509_CERT_PAIR_it 3534 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
3113X509_CERT_PAIR_it 3534 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
3114STORE_method_get_revoke_function 3535 EXIST:!VMS:FUNCTION:
3115STORE_meth_get_revoke_fn 3535 EXIST:VMS:FUNCTION:
3116STORE_method_set_get_function 3536 EXIST::FUNCTION:
3117STORE_modify_number 3537 EXIST::FUNCTION:
3118STORE_method_get_store_function 3538 EXIST::FUNCTION:
3119STORE_store_private_key 3539 EXIST::FUNCTION:
3120BN_GF2m_mod_sqr_arr 3540 EXIST::FUNCTION:
3121RSA_setup_blinding 3541 EXIST::FUNCTION:RSA
3122BIO_s_datagram 3542 EXIST::FUNCTION:DGRAM
3123STORE_Memory 3543 EXIST::FUNCTION:
3124sk_find_ex 3544 EXIST::FUNCTION:
3125EC_GROUP_set_curve_GF2m 3545 EXIST::FUNCTION:EC
3126ENGINE_set_default_ECDSA 3546 EXIST::FUNCTION:ENGINE
3127POLICY_CONSTRAINTS_new 3547 EXIST::FUNCTION:
3128BN_GF2m_mod_sqrt 3548 EXIST::FUNCTION:
3129ECDH_set_default_method 3549 EXIST::FUNCTION:ECDH
3130EC_KEY_generate_key 3550 EXIST::FUNCTION:EC
3131SHA384_Update 3551 EXIST::FUNCTION:SHA,SHA512
3132BN_GF2m_arr2poly 3552 EXIST::FUNCTION:
3133STORE_method_get_get_function 3553 EXIST::FUNCTION:
3134STORE_method_set_cleanup_function 3554 EXIST:!VMS:FUNCTION:
3135STORE_meth_set_cleanup_fn 3554 EXIST:VMS:FUNCTION:
3136EC_GROUP_check 3555 EXIST::FUNCTION:EC
3137d2i_ECPrivateKey_bio 3556 EXIST::FUNCTION:BIO,EC
3138EC_KEY_insert_key_method_data 3557 EXIST::FUNCTION:EC
3139STORE_method_get_lock_store_function 3558 EXIST:!VMS:FUNCTION:
3140STORE_meth_get_lock_store_fn 3558 EXIST:VMS:FUNCTION:
3141X509_VERIFY_PARAM_get_depth 3559 EXIST::FUNCTION:
3142SHA224_Final 3560 EXIST::FUNCTION:SHA,SHA256
3143STORE_method_set_update_store_function 3561 EXIST:!VMS:FUNCTION:
3144STORE_meth_set_update_store_fn 3561 EXIST:VMS:FUNCTION:
3145SHA224_Update 3562 EXIST::FUNCTION:SHA,SHA256
3146d2i_ECPrivateKey 3563 EXIST::FUNCTION:EC
3147ASN1_item_ndef_i2d 3564 EXIST::FUNCTION:
3148STORE_delete_private_key 3565 EXIST::FUNCTION:
3149ERR_pop_to_mark 3566 EXIST::FUNCTION:
3150ENGINE_register_all_STORE 3567 EXIST::FUNCTION:ENGINE
3151X509_policy_level_get0_node 3568 EXIST::FUNCTION:
3152i2d_PKCS7_NDEF 3569 EXIST::FUNCTION:
3153EC_GROUP_get_degree 3570 EXIST::FUNCTION:EC
3154ASN1_generate_v3 3571 EXIST::FUNCTION:
3155STORE_ATTR_INFO_modify_cstr 3572 EXIST::FUNCTION:
3156X509_policy_tree_level_count 3573 EXIST::FUNCTION:
3157BN_GF2m_add 3574 EXIST::FUNCTION:
3158EC_KEY_get0_group 3575 EXIST::FUNCTION:EC
3159STORE_generate_crl 3576 EXIST::FUNCTION:
3160STORE_store_public_key 3577 EXIST::FUNCTION:
3161X509_CERT_PAIR_free 3578 EXIST::FUNCTION:
3162STORE_revoke_private_key 3579 EXIST::FUNCTION:
3163BN_nist_mod_224 3580 EXIST::FUNCTION:
3164SHA512_Final 3581 EXIST::FUNCTION:SHA,SHA512
3165STORE_ATTR_INFO_modify_dn 3582 EXIST::FUNCTION:
3166STORE_method_get_initialise_function 3583 EXIST:!VMS:FUNCTION:
3167STORE_meth_get_initialise_fn 3583 EXIST:VMS:FUNCTION:
3168STORE_delete_number 3584 EXIST::FUNCTION:
3169i2d_EC_PUBKEY_bio 3585 EXIST::FUNCTION:BIO,EC
3170BIO_dgram_non_fatal_error 3586 EXIST::FUNCTION:
3171EC_GROUP_get_asn1_flag 3587 EXIST::FUNCTION:EC
3172STORE_ATTR_INFO_in_ex 3588 EXIST::FUNCTION:
3173STORE_list_crl_start 3589 EXIST::FUNCTION:
3174ECDH_get_ex_new_index 3590 EXIST::FUNCTION:ECDH
3175STORE_method_get_modify_function 3591 EXIST:!VMS:FUNCTION:
3176STORE_meth_get_modify_fn 3591 EXIST:VMS:FUNCTION:
3177v2i_ASN1_BIT_STRING 3592 EXIST::FUNCTION:
3178STORE_store_certificate 3593 EXIST::FUNCTION:
3179OBJ_bsearch_ex 3594 EXIST::FUNCTION:
3180X509_STORE_CTX_set_default 3595 EXIST::FUNCTION:
3181STORE_ATTR_INFO_set_sha1str 3596 EXIST::FUNCTION:
3182BN_GF2m_mod_inv 3597 EXIST::FUNCTION:
3183BN_GF2m_mod_exp 3598 EXIST::FUNCTION:
3184STORE_modify_public_key 3599 EXIST::FUNCTION:
3185STORE_method_get_list_start_function 3600 EXIST:!VMS:FUNCTION:
3186STORE_meth_get_list_start_fn 3600 EXIST:VMS:FUNCTION:
3187EC_GROUP_get0_seed 3601 EXIST::FUNCTION:EC
3188STORE_store_arbitrary 3602 EXIST::FUNCTION:
3189STORE_method_set_unlock_store_function 3603 EXIST:!VMS:FUNCTION:
3190STORE_meth_set_unlock_store_fn 3603 EXIST:VMS:FUNCTION:
3191BN_GF2m_mod_div_arr 3604 EXIST::FUNCTION:
3192ENGINE_set_ECDSA 3605 EXIST::FUNCTION:ENGINE
3193STORE_create_method 3606 EXIST::FUNCTION:
3194ECPKParameters_print 3607 EXIST::FUNCTION:BIO,EC
3195EC_KEY_get0_private_key 3608 EXIST::FUNCTION:EC
3196PEM_write_EC_PUBKEY 3609 EXIST:!WIN16:FUNCTION:EC
3197X509_VERIFY_PARAM_set1 3610 EXIST::FUNCTION:
3198ECDH_set_method 3611 EXIST::FUNCTION:ECDH
3199v2i_GENERAL_NAME_ex 3612 EXIST::FUNCTION:
3200ECDH_set_ex_data 3613 EXIST::FUNCTION:ECDH
3201STORE_generate_key 3614 EXIST::FUNCTION:
3202BN_nist_mod_521 3615 EXIST::FUNCTION:
3203X509_policy_tree_get0_level 3616 EXIST::FUNCTION:
3204EC_GROUP_set_point_conversion_form 3617 EXIST:!VMS:FUNCTION:EC
3205EC_GROUP_set_point_conv_form 3617 EXIST:VMS:FUNCTION:EC
3206PEM_read_EC_PUBKEY 3618 EXIST:!WIN16:FUNCTION:EC
3207i2d_ECDSA_SIG 3619 EXIST::FUNCTION:ECDSA
3208ECDSA_OpenSSL 3620 EXIST::FUNCTION:ECDSA
3209STORE_delete_crl 3621 EXIST::FUNCTION:
3210EC_KEY_get_enc_flags 3622 EXIST::FUNCTION:EC
3211ASN1_const_check_infinite_end 3623 EXIST::FUNCTION:
3212EVP_PKEY_delete_attr 3624 EXIST::FUNCTION:
3213ECDSA_set_default_method 3625 EXIST::FUNCTION:ECDSA
3214EC_POINT_set_compressed_coordinates_GF2m 3626 EXIST:!VMS:FUNCTION:EC
3215EC_POINT_set_compr_coords_GF2m 3626 EXIST:VMS:FUNCTION:EC
3216EC_GROUP_cmp 3627 EXIST::FUNCTION:EC
3217STORE_revoke_certificate 3628 EXIST::FUNCTION:
3218BN_get0_nist_prime_256 3629 EXIST::FUNCTION:
3219STORE_method_get_delete_function 3630 EXIST:!VMS:FUNCTION:
3220STORE_meth_get_delete_fn 3630 EXIST:VMS:FUNCTION:
3221SHA224_Init 3631 EXIST::FUNCTION:SHA,SHA256
3222PEM_read_ECPrivateKey 3632 EXIST:!WIN16:FUNCTION:EC
3223SHA512_Init 3633 EXIST::FUNCTION:SHA,SHA512
3224STORE_parse_attrs_endp 3634 EXIST::FUNCTION:
3225BN_set_negative 3635 EXIST::FUNCTION:
3226ERR_load_ECDSA_strings 3636 EXIST::FUNCTION:ECDSA
3227EC_GROUP_get_basis_type 3637 EXIST::FUNCTION:EC
3228STORE_list_public_key_next 3638 EXIST::FUNCTION:
3229i2v_ASN1_BIT_STRING 3639 EXIST::FUNCTION:
3230STORE_OBJECT_free 3640 EXIST::FUNCTION:
3231BN_nist_mod_384 3641 EXIST::FUNCTION:
3232i2d_X509_CERT_PAIR 3642 EXIST::FUNCTION:
3233PEM_write_ECPKParameters 3643 EXIST:!WIN16:FUNCTION:EC
3234ECDH_compute_key 3644 EXIST::FUNCTION:ECDH
3235STORE_ATTR_INFO_get0_sha1str 3645 EXIST::FUNCTION:
3236ENGINE_register_all_ECDH 3646 EXIST::FUNCTION:ENGINE
3237pqueue_pop 3647 EXIST::FUNCTION:
3238STORE_ATTR_INFO_get0_cstr 3648 EXIST::FUNCTION:
3239POLICY_CONSTRAINTS_it 3649 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
3240POLICY_CONSTRAINTS_it 3649 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
3241STORE_get_ex_new_index 3650 EXIST::FUNCTION:
3242EVP_PKEY_get_attr_by_OBJ 3651 EXIST::FUNCTION:
3243X509_VERIFY_PARAM_add0_policy 3652 EXIST::FUNCTION:
3244BN_GF2m_mod_solve_quad 3653 EXIST::FUNCTION:
3245SHA256 3654 EXIST::FUNCTION:SHA,SHA256
3246i2d_ECPrivateKey_fp 3655 EXIST::FUNCTION:EC,FP_API
3247X509_policy_tree_get0_user_policies 3656 EXIST:!VMS:FUNCTION:
3248X509_pcy_tree_get0_usr_policies 3656 EXIST:VMS:FUNCTION:
3249OPENSSL_DIR_read 3657 EXIST::FUNCTION:
3250ENGINE_register_all_ECDSA 3658 EXIST::FUNCTION:ENGINE
3251X509_VERIFY_PARAM_lookup 3659 EXIST::FUNCTION:
3252EC_POINT_get_affine_coordinates_GF2m 3660 EXIST:!VMS:FUNCTION:EC
3253EC_POINT_get_affine_coords_GF2m 3660 EXIST:VMS:FUNCTION:EC
3254EC_GROUP_dup 3661 EXIST::FUNCTION:EC
3255ENGINE_get_default_ECDSA 3662 EXIST::FUNCTION:ENGINE
3256EC_KEY_new 3663 EXIST::FUNCTION:EC
3257SHA256_Transform 3664 EXIST::FUNCTION:SHA,SHA256
3258EC_KEY_set_enc_flags 3665 EXIST::FUNCTION:EC
3259ECDSA_verify 3666 EXIST::FUNCTION:ECDSA
3260EC_POINT_point2hex 3667 EXIST::FUNCTION:EC
3261ENGINE_get_STORE 3668 EXIST::FUNCTION:ENGINE
3262SHA512 3669 EXIST::FUNCTION:SHA,SHA512
3263STORE_get_certificate 3670 EXIST::FUNCTION:
3264ECDSA_do_sign_ex 3671 EXIST::FUNCTION:ECDSA
3265ECDSA_do_verify 3672 EXIST::FUNCTION:ECDSA
3266d2i_ECPrivateKey_fp 3673 EXIST::FUNCTION:EC,FP_API
3267STORE_delete_certificate 3674 EXIST::FUNCTION:
3268SHA512_Transform 3675 EXIST::FUNCTION:SHA,SHA512
3269X509_STORE_set1_param 3676 EXIST::FUNCTION:
3270STORE_method_get_ctrl_function 3677 EXIST::FUNCTION:
3271STORE_free 3678 EXIST::FUNCTION:
3272PEM_write_ECPrivateKey 3679 EXIST:!WIN16:FUNCTION:EC
3273STORE_method_get_unlock_store_function 3680 EXIST:!VMS:FUNCTION:
3274STORE_meth_get_unlock_store_fn 3680 EXIST:VMS:FUNCTION:
3275STORE_get_ex_data 3681 EXIST::FUNCTION:
3276EC_KEY_set_public_key 3682 EXIST::FUNCTION:EC
3277PEM_read_ECPKParameters 3683 EXIST:!WIN16:FUNCTION:EC
3278X509_CERT_PAIR_new 3684 EXIST::FUNCTION:
3279ENGINE_register_STORE 3685 EXIST::FUNCTION:ENGINE
3280RSA_generate_key_ex 3686 EXIST::FUNCTION:RSA
3281DSA_generate_parameters_ex 3687 EXIST::FUNCTION:DSA
3282ECParameters_print_fp 3688 EXIST::FUNCTION:EC,FP_API
3283X509V3_NAME_from_section 3689 EXIST::FUNCTION:
3284EVP_PKEY_add1_attr 3690 EXIST::FUNCTION:
3285STORE_modify_crl 3691 EXIST::FUNCTION:
3286STORE_list_private_key_start 3692 EXIST::FUNCTION:
3287POLICY_MAPPINGS_it 3693 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
3288POLICY_MAPPINGS_it 3693 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
3289GENERAL_SUBTREE_it 3694 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
3290GENERAL_SUBTREE_it 3694 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
3291EC_GROUP_get_curve_name 3695 EXIST::FUNCTION:EC
3292PEM_write_X509_CERT_PAIR 3696 EXIST:!WIN16:FUNCTION:
3293BIO_dump_indent_cb 3697 EXIST::FUNCTION:
3294d2i_X509_CERT_PAIR 3698 EXIST::FUNCTION:
3295STORE_list_private_key_endp 3699 EXIST::FUNCTION:
3296asn1_const_Finish 3700 EXIST::FUNCTION:
3297i2d_EC_PUBKEY_fp 3701 EXIST::FUNCTION:EC,FP_API
3298BN_nist_mod_256 3702 EXIST::FUNCTION:
3299X509_VERIFY_PARAM_add0_table 3703 EXIST::FUNCTION:
3300pqueue_free 3704 EXIST::FUNCTION:
3301BN_BLINDING_create_param 3705 EXIST::FUNCTION:
3302ECDSA_size 3706 EXIST::FUNCTION:ECDSA
3303d2i_EC_PUBKEY_bio 3707 EXIST::FUNCTION:BIO,EC
3304BN_get0_nist_prime_521 3708 EXIST::FUNCTION:
3305STORE_ATTR_INFO_modify_sha1str 3709 EXIST::FUNCTION:
3306BN_generate_prime_ex 3710 EXIST::FUNCTION:
3307EC_GROUP_new_by_curve_name 3711 EXIST::FUNCTION:EC
3308SHA256_Final 3712 EXIST::FUNCTION:SHA,SHA256
3309DH_generate_parameters_ex 3713 EXIST::FUNCTION:DH
3310PEM_read_bio_ECPrivateKey 3714 EXIST::FUNCTION:EC
3311STORE_method_get_cleanup_function 3715 EXIST:!VMS:FUNCTION:
3312STORE_meth_get_cleanup_fn 3715 EXIST:VMS:FUNCTION:
3313ENGINE_get_ECDH 3716 EXIST::FUNCTION:ENGINE
3314d2i_ECDSA_SIG 3717 EXIST::FUNCTION:ECDSA
3315BN_is_prime_fasttest_ex 3718 EXIST::FUNCTION:
3316ECDSA_sign 3719 EXIST::FUNCTION:ECDSA
3317X509_policy_check 3720 EXIST::FUNCTION:
3318EVP_PKEY_get_attr_by_NID 3721 EXIST::FUNCTION:
3319STORE_set_ex_data 3722 EXIST::FUNCTION:
3320ENGINE_get_ECDSA 3723 EXIST::FUNCTION:ENGINE
3321EVP_ecdsa 3724 EXIST::FUNCTION:SHA
3322BN_BLINDING_get_flags 3725 EXIST::FUNCTION:
3323PKCS12_add_cert 3726 EXIST::FUNCTION:
3324STORE_OBJECT_new 3727 EXIST::FUNCTION:
3325ERR_load_ECDH_strings 3728 EXIST::FUNCTION:ECDH
3326EC_KEY_dup 3729 EXIST::FUNCTION:EC
3327EVP_CIPHER_CTX_rand_key 3730 EXIST::FUNCTION:
3328ECDSA_set_method 3731 EXIST::FUNCTION:ECDSA
3329a2i_IPADDRESS_NC 3732 EXIST::FUNCTION:
3330d2i_ECParameters 3733 EXIST::FUNCTION:EC
3331STORE_list_certificate_end 3734 EXIST::FUNCTION:
3332STORE_get_crl 3735 EXIST::FUNCTION:
3333X509_POLICY_NODE_print 3736 EXIST::FUNCTION:
3334SHA384_Init 3737 EXIST::FUNCTION:SHA,SHA512
3335EC_GF2m_simple_method 3738 EXIST::FUNCTION:EC
3336ECDSA_set_ex_data 3739 EXIST::FUNCTION:ECDSA
3337SHA384_Final 3740 EXIST::FUNCTION:SHA,SHA512
3338PKCS7_set_digest 3741 EXIST::FUNCTION:
3339EC_KEY_print 3742 EXIST::FUNCTION:BIO,EC
3340STORE_method_set_lock_store_function 3743 EXIST:!VMS:FUNCTION:
3341STORE_meth_set_lock_store_fn 3743 EXIST:VMS:FUNCTION:
3342ECDSA_get_ex_new_index 3744 EXIST::FUNCTION:ECDSA
3343SHA384 3745 EXIST::FUNCTION:SHA,SHA512
3344POLICY_MAPPING_new 3746 EXIST::FUNCTION:
3345STORE_list_certificate_endp 3747 EXIST::FUNCTION:
3346X509_STORE_CTX_get0_policy_tree 3748 EXIST::FUNCTION:
3347EC_GROUP_set_asn1_flag 3749 EXIST::FUNCTION:EC
3348EC_KEY_check_key 3750 EXIST::FUNCTION:EC
3349d2i_EC_PUBKEY_fp 3751 EXIST::FUNCTION:EC,FP_API
3350PKCS7_set0_type_other 3752 EXIST::FUNCTION:
3351PEM_read_bio_X509_CERT_PAIR 3753 EXIST::FUNCTION:
3352pqueue_next 3754 EXIST::FUNCTION:
3353STORE_method_get_list_end_function 3755 EXIST:!VMS:FUNCTION:
3354STORE_meth_get_list_end_fn 3755 EXIST:VMS:FUNCTION:
3355EVP_PKEY_add1_attr_by_OBJ 3756 EXIST::FUNCTION:
3356X509_VERIFY_PARAM_set_time 3757 EXIST::FUNCTION:
3357pqueue_new 3758 EXIST::FUNCTION:
3358ENGINE_set_default_ECDH 3759 EXIST::FUNCTION:ENGINE
3359STORE_new_method 3760 EXIST::FUNCTION:
3360PKCS12_add_key 3761 EXIST::FUNCTION:
3361DSO_merge 3762 EXIST::FUNCTION:
3362EC_POINT_hex2point 3763 EXIST::FUNCTION:EC
3363BIO_dump_cb 3764 EXIST::FUNCTION:
3364SHA256_Update 3765 EXIST::FUNCTION:SHA,SHA256
3365pqueue_insert 3766 EXIST::FUNCTION:
3366pitem_free 3767 EXIST::FUNCTION:
3367BN_GF2m_mod_inv_arr 3768 EXIST::FUNCTION:
3368ENGINE_unregister_ECDSA 3769 EXIST::FUNCTION:ENGINE
3369BN_BLINDING_set_thread_id 3770 EXIST::FUNCTION:
3370get_rfc3526_prime_8192 3771 EXIST::FUNCTION:
3371X509_VERIFY_PARAM_clear_flags 3772 EXIST::FUNCTION:
3372get_rfc2409_prime_1024 3773 EXIST::FUNCTION:
3373DH_check_pub_key 3774 EXIST::FUNCTION:DH
3374get_rfc3526_prime_2048 3775 EXIST::FUNCTION:
3375get_rfc3526_prime_6144 3776 EXIST::FUNCTION:
3376get_rfc3526_prime_1536 3777 EXIST::FUNCTION:
3377get_rfc3526_prime_3072 3778 EXIST::FUNCTION:
3378get_rfc3526_prime_4096 3779 EXIST::FUNCTION:
3379get_rfc2409_prime_768 3780 EXIST::FUNCTION:
3380X509_VERIFY_PARAM_get_flags 3781 EXIST::FUNCTION:
3381EVP_CIPHER_CTX_new 3782 EXIST::FUNCTION:
3382EVP_CIPHER_CTX_free 3783 EXIST::FUNCTION:
3383Camellia_cbc_encrypt 3784 EXIST::FUNCTION:CAMELLIA
3384Camellia_cfb128_encrypt 3785 EXIST::FUNCTION:CAMELLIA
3385Camellia_cfb1_encrypt 3786 EXIST::FUNCTION:CAMELLIA
3386Camellia_cfb8_encrypt 3787 EXIST::FUNCTION:CAMELLIA
3387Camellia_ctr128_encrypt 3788 EXIST::FUNCTION:CAMELLIA
3388Camellia_cfbr_encrypt_block 3789 EXIST::FUNCTION:CAMELLIA
3389Camellia_decrypt 3790 EXIST::FUNCTION:CAMELLIA
3390Camellia_ecb_encrypt 3791 EXIST::FUNCTION:CAMELLIA
3391Camellia_encrypt 3792 EXIST::FUNCTION:CAMELLIA
3392Camellia_ofb128_encrypt 3793 EXIST::FUNCTION:CAMELLIA
3393Camellia_set_key 3794 EXIST::FUNCTION:CAMELLIA
3394EVP_camellia_128_cbc 3795 EXIST::FUNCTION:CAMELLIA
3395EVP_camellia_128_cfb128 3796 EXIST::FUNCTION:CAMELLIA
3396EVP_camellia_128_cfb1 3797 EXIST::FUNCTION:CAMELLIA
3397EVP_camellia_128_cfb8 3798 EXIST::FUNCTION:CAMELLIA
3398EVP_camellia_128_ecb 3799 EXIST::FUNCTION:CAMELLIA
3399EVP_camellia_128_ofb 3800 EXIST::FUNCTION:CAMELLIA
3400EVP_camellia_192_cbc 3801 EXIST::FUNCTION:CAMELLIA
3401EVP_camellia_192_cfb128 3802 EXIST::FUNCTION:CAMELLIA
3402EVP_camellia_192_cfb1 3803 EXIST::FUNCTION:CAMELLIA
3403EVP_camellia_192_cfb8 3804 EXIST::FUNCTION:CAMELLIA
3404EVP_camellia_192_ecb 3805 EXIST::FUNCTION:CAMELLIA
3405EVP_camellia_192_ofb 3806 EXIST::FUNCTION:CAMELLIA
3406EVP_camellia_256_cbc 3807 EXIST::FUNCTION:CAMELLIA
3407EVP_camellia_256_cfb128 3808 EXIST::FUNCTION:CAMELLIA
3408EVP_camellia_256_cfb1 3809 EXIST::FUNCTION:CAMELLIA
3409EVP_camellia_256_cfb8 3810 EXIST::FUNCTION:CAMELLIA
3410EVP_camellia_256_ecb 3811 EXIST::FUNCTION:CAMELLIA
3411EVP_camellia_256_ofb 3812 EXIST::FUNCTION:CAMELLIA
3412a2i_ipadd 3813 EXIST::FUNCTION:
3413ASIdentifiers_free 3814 EXIST::FUNCTION:RFC3779
3414i2d_ASIdOrRange 3815 EXIST::FUNCTION:RFC3779
3415EVP_CIPHER_block_size 3816 EXIST::FUNCTION:
3416v3_asid_is_canonical 3817 EXIST::FUNCTION:RFC3779
3417IPAddressChoice_free 3818 EXIST::FUNCTION:RFC3779
3418EVP_CIPHER_CTX_set_app_data 3819 EXIST::FUNCTION:
3419BIO_set_callback_arg 3820 EXIST::FUNCTION:
3420v3_addr_add_prefix 3821 EXIST::FUNCTION:RFC3779
3421IPAddressOrRange_it 3822 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779
3422IPAddressOrRange_it 3822 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779
3423BIO_set_flags 3823 EXIST::FUNCTION:
3424ASIdentifiers_it 3824 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779
3425ASIdentifiers_it 3824 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779
3426v3_addr_get_range 3825 EXIST::FUNCTION:RFC3779
3427BIO_method_type 3826 EXIST::FUNCTION:
3428v3_addr_inherits 3827 EXIST::FUNCTION:RFC3779
3429IPAddressChoice_it 3828 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779
3430IPAddressChoice_it 3828 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779
3431AES_ige_encrypt 3829 EXIST::FUNCTION:AES
3432v3_addr_add_range 3830 EXIST::FUNCTION:RFC3779
3433EVP_CIPHER_CTX_nid 3831 EXIST::FUNCTION:
3434d2i_ASRange 3832 EXIST::FUNCTION:RFC3779
3435v3_addr_add_inherit 3833 EXIST::FUNCTION:RFC3779
3436v3_asid_add_id_or_range 3834 EXIST::FUNCTION:RFC3779
3437v3_addr_validate_resource_set 3835 EXIST::FUNCTION:RFC3779
3438EVP_CIPHER_iv_length 3836 EXIST::FUNCTION:
3439EVP_MD_type 3837 EXIST::FUNCTION:
3440v3_asid_canonize 3838 EXIST::FUNCTION:RFC3779
3441IPAddressRange_free 3839 EXIST::FUNCTION:RFC3779
3442v3_asid_add_inherit 3840 EXIST::FUNCTION:RFC3779
3443EVP_CIPHER_CTX_key_length 3841 EXIST::FUNCTION:
3444IPAddressRange_new 3842 EXIST::FUNCTION:RFC3779
3445ASIdOrRange_new 3843 EXIST::FUNCTION:RFC3779
3446EVP_MD_size 3844 EXIST::FUNCTION:
3447EVP_MD_CTX_test_flags 3845 EXIST::FUNCTION:
3448BIO_clear_flags 3846 EXIST::FUNCTION:
3449i2d_ASRange 3847 EXIST::FUNCTION:RFC3779
3450IPAddressRange_it 3848 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779
3451IPAddressRange_it 3848 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779
3452IPAddressChoice_new 3849 EXIST::FUNCTION:RFC3779
3453ASIdentifierChoice_new 3850 EXIST::FUNCTION:RFC3779
3454ASRange_free 3851 EXIST::FUNCTION:RFC3779
3455EVP_MD_pkey_type 3852 EXIST::FUNCTION:
3456EVP_MD_CTX_clear_flags 3853 EXIST::FUNCTION:
3457IPAddressFamily_free 3854 EXIST::FUNCTION:RFC3779
3458i2d_IPAddressFamily 3855 EXIST::FUNCTION:RFC3779
3459IPAddressOrRange_new 3856 EXIST::FUNCTION:RFC3779
3460EVP_CIPHER_flags 3857 EXIST::FUNCTION:
3461v3_asid_validate_resource_set 3858 EXIST::FUNCTION:RFC3779
3462d2i_IPAddressRange 3859 EXIST::FUNCTION:RFC3779
3463AES_bi_ige_encrypt 3860 EXIST::FUNCTION:AES
3464BIO_get_callback 3861 EXIST::FUNCTION:
3465IPAddressOrRange_free 3862 EXIST::FUNCTION:RFC3779
3466v3_addr_subset 3863 EXIST::FUNCTION:RFC3779
3467d2i_IPAddressFamily 3864 EXIST::FUNCTION:RFC3779
3468v3_asid_subset 3865 EXIST::FUNCTION:RFC3779
3469BIO_test_flags 3866 EXIST::FUNCTION:
3470i2d_ASIdentifierChoice 3867 EXIST::FUNCTION:RFC3779
3471ASRange_it 3868 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779
3472ASRange_it 3868 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779
3473d2i_ASIdentifiers 3869 EXIST::FUNCTION:RFC3779
3474ASRange_new 3870 EXIST::FUNCTION:RFC3779
3475d2i_IPAddressChoice 3871 EXIST::FUNCTION:RFC3779
3476v3_addr_get_afi 3872 EXIST::FUNCTION:RFC3779
3477EVP_CIPHER_key_length 3873 EXIST::FUNCTION:
3478EVP_Cipher 3874 EXIST::FUNCTION:
3479i2d_IPAddressOrRange 3875 EXIST::FUNCTION:RFC3779
3480ASIdOrRange_it 3876 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779
3481ASIdOrRange_it 3876 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779
3482EVP_CIPHER_nid 3877 EXIST::FUNCTION:
3483i2d_IPAddressChoice 3878 EXIST::FUNCTION:RFC3779
3484EVP_CIPHER_CTX_block_size 3879 EXIST::FUNCTION:
3485ASIdentifiers_new 3880 EXIST::FUNCTION:RFC3779
3486v3_addr_validate_path 3881 EXIST::FUNCTION:RFC3779
3487IPAddressFamily_new 3882 EXIST::FUNCTION:RFC3779
3488EVP_MD_CTX_set_flags 3883 EXIST::FUNCTION:
3489v3_addr_is_canonical 3884 EXIST::FUNCTION:RFC3779
3490i2d_IPAddressRange 3885 EXIST::FUNCTION:RFC3779
3491IPAddressFamily_it 3886 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779
3492IPAddressFamily_it 3886 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779
3493v3_asid_inherits 3887 EXIST::FUNCTION:RFC3779
3494EVP_CIPHER_CTX_cipher 3888 EXIST::FUNCTION:
3495EVP_CIPHER_CTX_get_app_data 3889 EXIST::FUNCTION:
3496EVP_MD_block_size 3890 EXIST::FUNCTION:
3497EVP_CIPHER_CTX_flags 3891 EXIST::FUNCTION:
3498v3_asid_validate_path 3892 EXIST::FUNCTION:RFC3779
3499d2i_IPAddressOrRange 3893 EXIST::FUNCTION:RFC3779
3500v3_addr_canonize 3894 EXIST::FUNCTION:RFC3779
3501ASIdentifierChoice_it 3895 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779
3502ASIdentifierChoice_it 3895 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779
3503EVP_MD_CTX_md 3896 EXIST::FUNCTION:
3504d2i_ASIdentifierChoice 3897 EXIST::FUNCTION:RFC3779
3505BIO_method_name 3898 EXIST::FUNCTION:
3506EVP_CIPHER_CTX_iv_length 3899 EXIST::FUNCTION:
3507ASIdOrRange_free 3900 EXIST::FUNCTION:RFC3779
3508ASIdentifierChoice_free 3901 EXIST::FUNCTION:RFC3779
3509BIO_get_callback_arg 3902 EXIST::FUNCTION:
3510BIO_set_callback 3903 EXIST::FUNCTION:
3511d2i_ASIdOrRange 3904 EXIST::FUNCTION:RFC3779
3512i2d_ASIdentifiers 3905 EXIST::FUNCTION:RFC3779
3513SEED_decrypt 3908 EXIST::FUNCTION:SEED
3514SEED_encrypt 3909 EXIST::FUNCTION:SEED
3515SEED_cbc_encrypt 3910 EXIST::FUNCTION:SEED
3516EVP_seed_ofb 3911 EXIST::FUNCTION:SEED
3517SEED_cfb128_encrypt 3912 EXIST::FUNCTION:SEED
3518SEED_ofb128_encrypt 3913 EXIST::FUNCTION:SEED
3519EVP_seed_cbc 3914 EXIST::FUNCTION:SEED
3520SEED_ecb_encrypt 3915 EXIST::FUNCTION:SEED
3521EVP_seed_ecb 3916 EXIST::FUNCTION:SEED
3522SEED_set_key 3917 EXIST::FUNCTION:SEED
3523EVP_seed_cfb128 3918 EXIST::FUNCTION:SEED
3524X509_EXTENSIONS_it 3919 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
3525X509_EXTENSIONS_it 3919 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
3526X509_get1_ocsp 3920 EXIST::FUNCTION:
3527OCSP_REQ_CTX_free 3921 EXIST::FUNCTION:
3528i2d_X509_EXTENSIONS 3922 EXIST::FUNCTION:
3529OCSP_sendreq_nbio 3923 EXIST::FUNCTION:
3530OCSP_sendreq_new 3924 EXIST::FUNCTION:
3531d2i_X509_EXTENSIONS 3925 EXIST::FUNCTION:
3532X509_ALGORS_it 3926 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
3533X509_ALGORS_it 3926 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
3534X509_ALGOR_get0 3927 EXIST::FUNCTION:
3535X509_ALGOR_set0 3928 EXIST::FUNCTION:
3536AES_unwrap_key 3929 EXIST::FUNCTION:AES
3537AES_wrap_key 3930 EXIST::FUNCTION:AES
3538X509at_get0_data_by_OBJ 3931 EXIST::FUNCTION:
3539ASN1_TYPE_set1 3932 EXIST::FUNCTION:
3540ASN1_STRING_set0 3933 EXIST::FUNCTION:
3541i2d_X509_ALGORS 3934 EXIST::FUNCTION:
3542BIO_f_zlib 3935 EXIST:ZLIB:FUNCTION:
3543COMP_zlib_cleanup 3936 EXIST::FUNCTION:
3544d2i_X509_ALGORS 3937 EXIST::FUNCTION:
3545CMS_ReceiptRequest_free 3938 EXIST::FUNCTION:CMS
3546PEM_write_CMS 3939 EXIST:!WIN16:FUNCTION:CMS
3547CMS_add0_CertificateChoices 3940 EXIST::FUNCTION:CMS
3548CMS_unsigned_add1_attr_by_OBJ 3941 EXIST::FUNCTION:CMS
3549ERR_load_CMS_strings 3942 EXIST::FUNCTION:CMS
3550CMS_sign_receipt 3943 EXIST::FUNCTION:CMS
3551i2d_CMS_ContentInfo 3944 EXIST::FUNCTION:CMS
3552CMS_signed_delete_attr 3945 EXIST::FUNCTION:CMS
3553d2i_CMS_bio 3946 EXIST::FUNCTION:CMS
3554CMS_unsigned_get_attr_by_NID 3947 EXIST::FUNCTION:CMS
3555CMS_verify 3948 EXIST::FUNCTION:CMS
3556SMIME_read_CMS 3949 EXIST::FUNCTION:CMS
3557CMS_decrypt_set1_key 3950 EXIST::FUNCTION:CMS
3558CMS_SignerInfo_get0_algs 3951 EXIST::FUNCTION:CMS
3559CMS_add1_cert 3952 EXIST::FUNCTION:CMS
3560CMS_set_detached 3953 EXIST::FUNCTION:CMS
3561CMS_encrypt 3954 EXIST::FUNCTION:CMS
3562CMS_EnvelopedData_create 3955 EXIST::FUNCTION:CMS
3563CMS_uncompress 3956 EXIST::FUNCTION:CMS
3564CMS_add0_crl 3957 EXIST::FUNCTION:CMS
3565CMS_SignerInfo_verify_content 3958 EXIST::FUNCTION:CMS
3566CMS_unsigned_get0_data_by_OBJ 3959 EXIST::FUNCTION:CMS
3567PEM_write_bio_CMS 3960 EXIST::FUNCTION:CMS
3568CMS_unsigned_get_attr 3961 EXIST::FUNCTION:CMS
3569CMS_RecipientInfo_ktri_cert_cmp 3962 EXIST::FUNCTION:CMS
3570CMS_RecipientInfo_ktri_get0_algs 3963 EXIST:!VMS:FUNCTION:CMS
3571CMS_RecipInfo_ktri_get0_algs 3963 EXIST:VMS:FUNCTION:CMS
3572CMS_ContentInfo_free 3964 EXIST::FUNCTION:CMS
3573CMS_final 3965 EXIST::FUNCTION:CMS
3574CMS_add_simple_smimecap 3966 EXIST::FUNCTION:CMS
3575CMS_SignerInfo_verify 3967 EXIST::FUNCTION:CMS
3576CMS_data 3968 EXIST::FUNCTION:CMS
3577CMS_ContentInfo_it 3969 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMS
3578CMS_ContentInfo_it 3969 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CMS
3579d2i_CMS_ReceiptRequest 3970 EXIST::FUNCTION:CMS
3580CMS_compress 3971 EXIST::FUNCTION:CMS
3581CMS_digest_create 3972 EXIST::FUNCTION:CMS
3582CMS_SignerInfo_cert_cmp 3973 EXIST::FUNCTION:CMS
3583CMS_SignerInfo_sign 3974 EXIST::FUNCTION:CMS
3584CMS_data_create 3975 EXIST::FUNCTION:CMS
3585i2d_CMS_bio 3976 EXIST::FUNCTION:CMS
3586CMS_EncryptedData_set1_key 3977 EXIST::FUNCTION:CMS
3587CMS_decrypt 3978 EXIST::FUNCTION:CMS
3588int_smime_write_ASN1 3979 EXIST::FUNCTION:
3589CMS_unsigned_delete_attr 3980 EXIST::FUNCTION:CMS
3590CMS_unsigned_get_attr_count 3981 EXIST::FUNCTION:CMS
3591CMS_add_smimecap 3982 EXIST::FUNCTION:CMS
3592PEM_read_CMS 3983 EXIST:!WIN16:FUNCTION:CMS
3593CMS_signed_get_attr_by_OBJ 3984 EXIST::FUNCTION:CMS
3594d2i_CMS_ContentInfo 3985 EXIST::FUNCTION:CMS
3595CMS_add_standard_smimecap 3986 EXIST::FUNCTION:CMS
3596CMS_ContentInfo_new 3987 EXIST::FUNCTION:CMS
3597CMS_RecipientInfo_type 3988 EXIST::FUNCTION:CMS
3598CMS_get0_type 3989 EXIST::FUNCTION:CMS
3599CMS_is_detached 3990 EXIST::FUNCTION:CMS
3600CMS_sign 3991 EXIST::FUNCTION:CMS
3601CMS_signed_add1_attr 3992 EXIST::FUNCTION:CMS
3602CMS_unsigned_get_attr_by_OBJ 3993 EXIST::FUNCTION:CMS
3603SMIME_write_CMS 3994 EXIST::FUNCTION:CMS
3604CMS_EncryptedData_decrypt 3995 EXIST::FUNCTION:CMS
3605CMS_get0_RecipientInfos 3996 EXIST::FUNCTION:CMS
3606CMS_add0_RevocationInfoChoice 3997 EXIST::FUNCTION:CMS
3607CMS_decrypt_set1_pkey 3998 EXIST::FUNCTION:CMS
3608CMS_SignerInfo_set1_signer_cert 3999 EXIST::FUNCTION:CMS
3609CMS_get0_signers 4000 EXIST::FUNCTION:CMS
3610CMS_ReceiptRequest_get0_values 4001 EXIST::FUNCTION:CMS
3611CMS_signed_get0_data_by_OBJ 4002 EXIST::FUNCTION:CMS
3612CMS_get0_SignerInfos 4003 EXIST::FUNCTION:CMS
3613CMS_add0_cert 4004 EXIST::FUNCTION:CMS
3614CMS_EncryptedData_encrypt 4005 EXIST::FUNCTION:CMS
3615CMS_digest_verify 4006 EXIST::FUNCTION:CMS
3616CMS_set1_signers_certs 4007 EXIST::FUNCTION:CMS
3617CMS_signed_get_attr 4008 EXIST::FUNCTION:CMS
3618CMS_RecipientInfo_set0_key 4009 EXIST::FUNCTION:CMS
3619CMS_SignedData_init 4010 EXIST::FUNCTION:CMS
3620CMS_RecipientInfo_kekri_get0_id 4011 EXIST::FUNCTION:CMS
3621CMS_verify_receipt 4012 EXIST::FUNCTION:CMS
3622CMS_ReceiptRequest_it 4013 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMS
3623CMS_ReceiptRequest_it 4013 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CMS
3624PEM_read_bio_CMS 4014 EXIST::FUNCTION:CMS
3625CMS_get1_crls 4015 EXIST::FUNCTION:CMS
3626CMS_add0_recipient_key 4016 EXIST::FUNCTION:CMS
3627SMIME_read_ASN1 4017 EXIST::FUNCTION:
3628CMS_ReceiptRequest_new 4018 EXIST::FUNCTION:CMS
3629CMS_get0_content 4019 EXIST::FUNCTION:CMS
3630CMS_get1_ReceiptRequest 4020 EXIST::FUNCTION:CMS
3631CMS_signed_add1_attr_by_OBJ 4021 EXIST::FUNCTION:CMS
3632CMS_RecipientInfo_kekri_id_cmp 4022 EXIST::FUNCTION:CMS
3633CMS_add1_ReceiptRequest 4023 EXIST::FUNCTION:CMS
3634CMS_SignerInfo_get0_signer_id 4024 EXIST::FUNCTION:CMS
3635CMS_unsigned_add1_attr_by_NID 4025 EXIST::FUNCTION:CMS
3636CMS_unsigned_add1_attr 4026 EXIST::FUNCTION:CMS
3637CMS_signed_get_attr_by_NID 4027 EXIST::FUNCTION:CMS
3638CMS_get1_certs 4028 EXIST::FUNCTION:CMS
3639CMS_signed_add1_attr_by_NID 4029 EXIST::FUNCTION:CMS
3640CMS_unsigned_add1_attr_by_txt 4030 EXIST::FUNCTION:CMS
3641CMS_dataFinal 4031 EXIST::FUNCTION:CMS
3642CMS_RecipientInfo_ktri_get0_signer_id 4032 EXIST:!VMS:FUNCTION:CMS
3643CMS_RecipInfo_ktri_get0_sigr_id 4032 EXIST:VMS:FUNCTION:CMS
3644i2d_CMS_ReceiptRequest 4033 EXIST::FUNCTION:CMS
3645CMS_add1_recipient_cert 4034 EXIST::FUNCTION:CMS
3646CMS_dataInit 4035 EXIST::FUNCTION:CMS
3647CMS_signed_add1_attr_by_txt 4036 EXIST::FUNCTION:CMS
3648CMS_RecipientInfo_decrypt 4037 EXIST::FUNCTION:CMS
3649CMS_signed_get_attr_count 4038 EXIST::FUNCTION:CMS
3650CMS_get0_eContentType 4039 EXIST::FUNCTION:CMS
3651CMS_set1_eContentType 4040 EXIST::FUNCTION:CMS
3652CMS_ReceiptRequest_create0 4041 EXIST::FUNCTION:CMS
3653CMS_add1_signer 4042 EXIST::FUNCTION:CMS
3654CMS_RecipientInfo_set0_pkey 4043 EXIST::FUNCTION:CMS
diff --git a/src/lib/libcrypto/util/mk1mf.pl b/src/lib/libcrypto/util/mk1mf.pl
index 05a6086164..1ac5fd3a50 100644
--- a/src/lib/libcrypto/util/mk1mf.pl
+++ b/src/lib/libcrypto/util/mk1mf.pl
@@ -10,19 +10,11 @@ $OPTIONS="";
10$ssl_version=""; 10$ssl_version="";
11$banner="\t\@echo Building OpenSSL"; 11$banner="\t\@echo Building OpenSSL";
12 12
13my $no_static_engine = 0;
14my $engines = "";
13local $zlib_opt = 0; # 0 = no zlib, 1 = static, 2 = dynamic 15local $zlib_opt = 0; # 0 = no zlib, 1 = static, 2 = dynamic
14local $zlib_lib = ""; 16local $zlib_lib = "";
15 17
16my $fips_canister_path = "";
17my $fips_premain_dso_exe_path = "";
18my $fips_premain_c_path = "";
19my $fips_sha1_exe_path = "";
20
21my $fipslibdir = "";
22my $baseaddr = "";
23
24my $ex_l_libs = "";
25
26 18
27open(IN,"<Makefile") || die "unable to open Makefile!\n"; 19open(IN,"<Makefile") || die "unable to open Makefile!\n";
28while(<IN>) { 20while(<IN>) {
@@ -38,22 +30,21 @@ $infile="MINFO";
38 30
39%ops=( 31%ops=(
40 "VC-WIN32", "Microsoft Visual C++ [4-6] - Windows NT or 9X", 32 "VC-WIN32", "Microsoft Visual C++ [4-6] - Windows NT or 9X",
41 "VC-WIN32-GMAKE", "Microsoft Visual C++ [4-6] - Windows NT or 9X, GNU make", 33 "VC-WIN64I", "Microsoft C/C++ - Win64/IA-64",
34 "VC-WIN64A", "Microsoft C/C++ - Win64/x64",
42 "VC-CE", "Microsoft eMbedded Visual C++ 3.0 - Windows CE ONLY", 35 "VC-CE", "Microsoft eMbedded Visual C++ 3.0 - Windows CE ONLY",
43 "VC-NT", "Microsoft Visual C++ [4-6] - Windows NT ONLY", 36 "VC-NT", "Microsoft Visual C++ [4-6] - Windows NT ONLY",
44 "VC-W31-16", "Microsoft Visual C++ 1.52 - Windows 3.1 - 286",
45 "VC-WIN16", "Alias for VC-W31-32",
46 "VC-W31-32", "Microsoft Visual C++ 1.52 - Windows 3.1 - 386+",
47 "VC-MSDOS","Microsoft Visual C++ 1.52 - MSDOS",
48 "Mingw32", "GNU C++ - Windows NT or 9x", 37 "Mingw32", "GNU C++ - Windows NT or 9x",
49 "Mingw32-files", "Create files with DOS copy ...", 38 "Mingw32-files", "Create files with DOS copy ...",
50 "BC-NT", "Borland C++ 4.5 - Windows NT", 39 "BC-NT", "Borland C++ 4.5 - Windows NT",
51 "BC-W31", "Borland C++ 4.5 - Windows 3.1 - PROBABLY NOT WORKING",
52 "BC-MSDOS","Borland C++ 4.5 - MSDOS",
53 "linux-elf","Linux elf", 40 "linux-elf","Linux elf",
54 "ultrix-mips","DEC mips ultrix", 41 "ultrix-mips","DEC mips ultrix",
55 "FreeBSD","FreeBSD distribution", 42 "FreeBSD","FreeBSD distribution",
56 "OS2-EMX", "EMX GCC OS/2", 43 "OS2-EMX", "EMX GCC OS/2",
44 "netware-clib", "CodeWarrior for NetWare - CLib - with WinSock Sockets",
45 "netware-clib-bsdsock", "CodeWarrior for NetWare - CLib - with BSD Sockets",
46 "netware-libc", "CodeWarrior for NetWare - LibC - with WinSock Sockets",
47 "netware-libc-bsdsock", "CodeWarrior for NetWare - LibC - with BSD Sockets",
57 "default","cc under unix", 48 "default","cc under unix",
58 ); 49 );
59 50
@@ -73,16 +64,20 @@ and [options] can be one of
73 no-md2 no-md4 no-md5 no-sha no-mdc2 - Skip this digest 64 no-md2 no-md4 no-md5 no-sha no-mdc2 - Skip this digest
74 no-ripemd 65 no-ripemd
75 no-rc2 no-rc4 no-rc5 no-idea no-des - Skip this symetric cipher 66 no-rc2 no-rc4 no-rc5 no-idea no-des - Skip this symetric cipher
76 no-bf no-cast no-aes 67 no-bf no-cast no-aes no-camellia no-seed
77 no-rsa no-dsa no-dh - Skip this public key cipher 68 no-rsa no-dsa no-dh - Skip this public key cipher
78 no-ssl2 no-ssl3 - Skip this version of SSL 69 no-ssl2 no-ssl3 - Skip this version of SSL
79 just-ssl - remove all non-ssl keys/digest 70 just-ssl - remove all non-ssl keys/digest
80 no-asm - No x86 asm 71 no-asm - No x86 asm
81 no-krb5 - No KRB5 72 no-krb5 - No KRB5
82 no-ec - No EC 73 no-ec - No EC
74 no-ecdsa - No ECDSA
75 no-ecdh - No ECDH
83 no-engine - No engine 76 no-engine - No engine
84 no-hw - No hw 77 no-hw - No hw
85 nasm - Use NASM for x86 asm 78 nasm - Use NASM for x86 asm
79 nw-nasm - Use NASM x86 asm for NetWare
80 nw-mwasm - Use Metrowerks x86 asm for NetWare
86 gaswin - Use GNU as with Mingw32 81 gaswin - Use GNU as with Mingw32
87 no-socks - No socket code 82 no-socks - No socket code
88 no-err - No error strings 83 no-err - No error strings
@@ -107,6 +102,8 @@ foreach (grep(!/^$/, split(/ /, $OPTIONS)))
107 print STDERR "unknown option - $_\n" if !&read_options; 102 print STDERR "unknown option - $_\n" if !&read_options;
108 } 103 }
109 104
105$no_static_engine = 0 if (!$shlib);
106
110$no_mdc2=1 if ($no_des); 107$no_mdc2=1 if ($no_des);
111 108
112$no_ssl3=1 if ($no_md5 || $no_sha); 109$no_ssl3=1 if ($no_md5 || $no_sha);
@@ -119,13 +116,10 @@ $out_def="out";
119$inc_def="outinc"; 116$inc_def="outinc";
120$tmp_def="tmp"; 117$tmp_def="tmp";
121 118
122$mkdir="-mkdir"; 119$perl="perl" unless defined $perl;
123$mkcanister="ld -r -o"; 120$mkdir="-mkdir" unless defined $mkdir;
124
125$ex_build_targets = "";
126 121
127($ssl,$crypto)=("ssl","crypto"); 122($ssl,$crypto)=("ssl","crypto");
128$cryptocompat = "";
129$ranlib="echo ranlib"; 123$ranlib="echo ranlib";
130 124
131$cc=(defined($VARS{'CC'}))?$VARS{'CC'}:'cc'; 125$cc=(defined($VARS{'CC'}))?$VARS{'CC'}:'cc';
@@ -134,40 +128,16 @@ $bin_dir=(defined($VARS{'BIN'}))?$VARS{'BIN'}:'';
134 128
135# $bin_dir.=$o causes a core dump on my sparc :-( 129# $bin_dir.=$o causes a core dump on my sparc :-(
136 130
131
137$NT=0; 132$NT=0;
138 133
139push(@INC,"util/pl","pl"); 134push(@INC,"util/pl","pl");
140if ($platform eq "VC-MSDOS") 135if (($platform =~ /VC-(.+)/))
141 {
142 $asmbits=16;
143 $msdos=1;
144 require 'VC-16.pl';
145 }
146elsif ($platform eq "VC-W31-16")
147 { 136 {
148 $asmbits=16; 137 $FLAVOR=$1;
149 $msdos=1; $win16=1; 138 $NT = 1 if $1 eq "NT";
150 require 'VC-16.pl';
151 }
152elsif (($platform eq "VC-W31-32") || ($platform eq "VC-WIN16"))
153 {
154 $asmbits=32;
155 $msdos=1; $win16=1;
156 require 'VC-16.pl';
157 }
158elsif (($platform eq "VC-WIN32") || ($platform eq "VC-NT"))
159 {
160 $NT = 1 if $platform eq "VC-NT";
161 require 'VC-32.pl'; 139 require 'VC-32.pl';
162 } 140 }
163elsif ($platform eq "VC-WIN32-GMAKE")
164 {
165 require 'VC-32-GMAKE.pl';
166 }
167elsif ($platform eq "VC-CE")
168 {
169 require 'VC-CE.pl';
170 }
171elsif ($platform eq "Mingw32") 141elsif ($platform eq "Mingw32")
172 { 142 {
173 require 'Mingw32.pl'; 143 require 'Mingw32.pl';
@@ -181,23 +151,6 @@ elsif ($platform eq "BC-NT")
181 $bc=1; 151 $bc=1;
182 require 'BC-32.pl'; 152 require 'BC-32.pl';
183 } 153 }
184elsif ($platform eq "BC-W31")
185 {
186 $bc=1;
187 $msdos=1; $w16=1;
188 require 'BC-16.pl';
189 }
190elsif ($platform eq "BC-Q16")
191 {
192 $msdos=1; $w16=1; $shlib=0; $qw=1;
193 require 'BC-16.pl';
194 }
195elsif ($platform eq "BC-MSDOS")
196 {
197 $asmbits=16;
198 $msdos=1;
199 require 'BC-16.pl';
200 }
201elsif ($platform eq "FreeBSD") 154elsif ($platform eq "FreeBSD")
202 { 155 {
203 require 'unix.pl'; 156 require 'unix.pl';
@@ -220,6 +173,13 @@ elsif ($platform eq "OS2-EMX")
220 $wc=1; 173 $wc=1;
221 require 'OS2-EMX.pl'; 174 require 'OS2-EMX.pl';
222 } 175 }
176elsif (($platform eq "netware-clib") || ($platform eq "netware-libc") ||
177 ($platform eq "netware-clib-bsdsock") || ($platform eq "netware-libc-bsdsock"))
178 {
179 $LIBC=1 if $platform eq "netware-libc" || $platform eq "netware-libc-bsdsock";
180 $BSDSOCK=1 if ($platform eq "netware-libc-bsdsock") || ($platform eq "netware-clib-bsdsock");
181 require 'netware.pl';
182 }
223else 183else
224 { 184 {
225 require "unix.pl"; 185 require "unix.pl";
@@ -238,6 +198,8 @@ $cflags= "$xcflags$cflags" if $xcflags ne "";
238 198
239$cflags.=" -DOPENSSL_NO_IDEA" if $no_idea; 199$cflags.=" -DOPENSSL_NO_IDEA" if $no_idea;
240$cflags.=" -DOPENSSL_NO_AES" if $no_aes; 200$cflags.=" -DOPENSSL_NO_AES" if $no_aes;
201$cflags.=" -DOPENSSL_NO_CAMELLIA" if $no_camellia;
202$cflags.=" -DOPENSSL_NO_SEED" if $no_seed;
241$cflags.=" -DOPENSSL_NO_RC2" if $no_rc2; 203$cflags.=" -DOPENSSL_NO_RC2" if $no_rc2;
242$cflags.=" -DOPENSSL_NO_RC4" if $no_rc4; 204$cflags.=" -DOPENSSL_NO_RC4" if $no_rc4;
243$cflags.=" -DOPENSSL_NO_RC5" if $no_rc5; 205$cflags.=" -DOPENSSL_NO_RC5" if $no_rc5;
@@ -248,7 +210,7 @@ $cflags.=" -DOPENSSL_NO_SHA" if $no_sha;
248$cflags.=" -DOPENSSL_NO_SHA1" if $no_sha1; 210$cflags.=" -DOPENSSL_NO_SHA1" if $no_sha1;
249$cflags.=" -DOPENSSL_NO_RIPEMD" if $no_ripemd; 211$cflags.=" -DOPENSSL_NO_RIPEMD" if $no_ripemd;
250$cflags.=" -DOPENSSL_NO_MDC2" if $no_mdc2; 212$cflags.=" -DOPENSSL_NO_MDC2" if $no_mdc2;
251$cflags.=" -DOPENSSL_NO_BF" if $no_bf; 213$cflags.=" -DOPENSSL_NO_BF" if $no_bf;
252$cflags.=" -DOPENSSL_NO_CAST" if $no_cast; 214$cflags.=" -DOPENSSL_NO_CAST" if $no_cast;
253$cflags.=" -DOPENSSL_NO_DES" if $no_des; 215$cflags.=" -DOPENSSL_NO_DES" if $no_des;
254$cflags.=" -DOPENSSL_NO_RSA" if $no_rsa; 216$cflags.=" -DOPENSSL_NO_RSA" if $no_rsa;
@@ -257,17 +219,30 @@ $cflags.=" -DOPENSSL_NO_DH" if $no_dh;
257$cflags.=" -DOPENSSL_NO_SOCK" if $no_sock; 219$cflags.=" -DOPENSSL_NO_SOCK" if $no_sock;
258$cflags.=" -DOPENSSL_NO_SSL2" if $no_ssl2; 220$cflags.=" -DOPENSSL_NO_SSL2" if $no_ssl2;
259$cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3; 221$cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3;
222$cflags.=" -DOPENSSL_NO_TLSEXT" if $no_tlsext;
223$cflags.=" -DOPENSSL_NO_CMS" if $no_cms;
260$cflags.=" -DOPENSSL_NO_ERR" if $no_err; 224$cflags.=" -DOPENSSL_NO_ERR" if $no_err;
261$cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5; 225$cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5;
262$cflags.=" -DOPENSSL_NO_EC" if $no_ec; 226$cflags.=" -DOPENSSL_NO_EC" if $no_ec;
227$cflags.=" -DOPENSSL_NO_ECDSA" if $no_ecdsa;
228$cflags.=" -DOPENSSL_NO_ECDH" if $no_ecdh;
263$cflags.=" -DOPENSSL_NO_ENGINE" if $no_engine; 229$cflags.=" -DOPENSSL_NO_ENGINE" if $no_engine;
264$cflags.=" -DOPENSSL_NO_HW" if $no_hw; 230$cflags.=" -DOPENSSL_NO_HW" if $no_hw;
265$cflags.=" -DOPENSSL_FIPS" if $fips;
266#$cflags.=" -DRSAref" if $rsaref ne "";
267 231
268$cflags.= " -DZLIB" if $zlib_opt; 232$cflags.= " -DZLIB" if $zlib_opt;
269$cflags.= " -DZLIB_SHARED" if $zlib_opt == 2; 233$cflags.= " -DZLIB_SHARED" if $zlib_opt == 2;
270 234
235if ($no_static_engine)
236 {
237 $cflags .= " -DOPENSSL_NO_STATIC_ENGINE";
238 }
239else
240 {
241 $cflags .= " -DOPENSSL_NO_DYNAMIC_ENGINE";
242 }
243
244#$cflags.=" -DRSAref" if $rsaref ne "";
245
271## if ($unix) 246## if ($unix)
272## { $cflags="$c_flags" if ($c_flags ne ""); } 247## { $cflags="$c_flags" if ($c_flags ne ""); }
273##else 248##else
@@ -305,21 +280,11 @@ for (;;)
305 { 280 {
306 if ($lib ne "") 281 if ($lib ne "")
307 { 282 {
308 if ($fips && $dir =~ /^fips/) 283 $uc=$lib;
309 { 284 $uc =~ s/^lib(.*)\.a/$1/;
310 $uc = "FIPS"; 285 $uc =~ tr/a-z/A-Z/;
311 } 286 $lib_nam{$uc}=$uc;
312 else 287 $lib_obj{$uc}.=$libobj." ";
313 {
314 $uc=$lib;
315 $uc =~ s/^lib(.*)\.a/$1/;
316 $uc =~ tr/a-z/A-Z/;
317 }
318 if (($uc ne "FIPS") || $fips_canister_build)
319 {
320 $lib_nam{$uc}=$uc;
321 $lib_obj{$uc}.=$libobj." ";
322 }
323 } 288 }
324 last if ($val eq "FINISHED"); 289 last if ($val eq "FINISHED");
325 $lib=""; 290 $lib="";
@@ -340,10 +305,10 @@ for (;;)
340 { $ex_libs .= " $val" if $val ne "";} 305 { $ex_libs .= " $val" if $val ne "";}
341 306
342 if ($key eq "TEST") 307 if ($key eq "TEST")
343 { $test.=&var_add($dir,$val); } 308 { $test.=&var_add($dir,$val, 0); }
344 309
345 if (($key eq "PROGS") || ($key eq "E_OBJ")) 310 if (($key eq "PROGS") || ($key eq "E_OBJ"))
346 { $e_exe.=&var_add($dir,$val); } 311 { $e_exe.=&var_add($dir,$val, 0); }
347 312
348 if ($key eq "LIB") 313 if ($key eq "LIB")
349 { 314 {
@@ -352,74 +317,45 @@ for (;;)
352 } 317 }
353 318
354 if ($key eq "EXHEADER") 319 if ($key eq "EXHEADER")
355 { $exheader.=&var_add($dir,$val); } 320 { $exheader.=&var_add($dir,$val, 1); }
356 321
357 if ($key eq "HEADER") 322 if ($key eq "HEADER")
358 { $header.=&var_add($dir,$val); } 323 { $header.=&var_add($dir,$val, 1); }
359
360 if ($key eq "LIBOBJ")
361 { $libobj=&var_add($dir,$val); }
362 324
363 if ($key eq "FIPSLIBDIR") 325 if ($key eq "LIBOBJ" && ($dir ne "engines" || !$no_static_engine))
364 { $fipslibdir=$val;} 326 { $libobj=&var_add($dir,$val, 0); }
365 327 if ($key eq "LIBNAMES" && $dir eq "engines" && $no_static_engine)
366 if ($key eq "BASEADDR") 328 { $engines.=$val }
367 { $baseaddr=$val;}
368 329
369 if (!($_=<IN>)) 330 if (!($_=<IN>))
370 { $_="RELATIVE_DIRECTORY=FINISHED\n"; } 331 { $_="RELATIVE_DIRECTORY=FINISHED\n"; }
371 } 332 }
372close(IN); 333close(IN);
373 334
374if ($fips_canister_path eq "") 335if ($shlib)
375 {
376 $fips_canister_path = "\$(FIPSLIB_D)${o}fipscanister.o";
377 }
378
379if ($fips_premain_c_path eq "")
380 { 336 {
381 $fips_premain_c_path = "\$(FIPSLIB_D)${o}fips_premain.c"; 337 $extra_install= <<"EOF";
382 } 338 \$(CP) \"\$(O_SSL)\" \"\$(INSTALLTOP)${o}bin\"
383 339 \$(CP) \"\$(O_CRYPTO)\" \"\$(INSTALLTOP)${o}bin\"
384if ($fips) 340 \$(CP) \"\$(L_SSL)\" \"\$(INSTALLTOP)${o}lib\"
385 { 341 \$(CP) \"\$(L_CRYPTO)\" \"\$(INSTALLTOP)${o}lib\"
386 if ($fips_sha1_exe_path eq "") 342EOF
343 if ($no_static_engine)
387 { 344 {
388 $fips_sha1_exe_path = 345 $extra_install .= <<"EOF"
389 "\$(BIN_D)${o}fips_standalone_sha1$exep"; 346 \$(MKDIR) \"\$(INSTALLTOP)${o}lib${o}engines\"
347 \$(CP) \"\$(E_SHLIB)\" \"\$(INSTALLTOP)${o}lib${o}engines\"
348EOF
390 } 349 }
391 } 350 }
392 else 351else
393 {
394 $fips_sha1_exe_path = "";
395 }
396
397if ($fips_premain_dso_exe_path eq "")
398 {
399 $fips_premain_dso_exe_path = "\$(BIN_D)${o}fips_premain_dso$exep";
400 }
401
402# $ex_build_targets .= "\$(BIN_D)${o}\$(E_PREMAIN_DSO)$exep" if ($fips);
403
404if ($fips)
405 { 352 {
406 if (!$shlib) 353 $extra_install= <<"EOF";
407 { 354 \$(CP) \"\$(O_SSL)\" \"\$(INSTALLTOP)${o}lib\"
408 $ex_build_targets .= " \$(LIB_D)$o$crypto_compat \$(PREMAIN_DSO_EXE)"; 355 \$(CP) \"\$(O_CRYPTO)\" \"\$(INSTALLTOP)${o}lib\"
409 $ex_l_libs .= " \$(O_FIPSCANISTER)"; 356EOF
410 } 357 $ex_libs .= " $zlib_lib" if $zlib_opt == 1;
411 if ($fipslibdir eq "")
412 {
413 open (IN, "util/fipslib_path.txt") || fipslib_error();
414 $fipslibdir = <IN>;
415 chomp $fipslibdir;
416 close IN;
417 }
418 fips_check_files($fipslibdir,
419 "fipscanister.o", "fipscanister.o.sha1",
420 "fips_premain.c", "fips_premain.c.sha1");
421 } 358 }
422
423 359
424$defs= <<"EOF"; 360$defs= <<"EOF";
425# This makefile has been automatically generated from the OpenSSL distribution. 361# This makefile has been automatically generated from the OpenSSL distribution.
@@ -439,15 +375,6 @@ EOF
439 375
440$defs .= $preamble if defined $preamble; 376$defs .= $preamble if defined $preamble;
441 377
442if ($platform eq "VC-CE")
443 {
444 $defs.= <<"EOF";
445!INCLUDE <\$(WCECOMPAT)/wcedefs.mak>
446
447EOF
448 $ex_libs .= " $zlib_lib" if $zlib_opt == 1;
449 }
450
451$defs.= <<"EOF"; 378$defs.= <<"EOF";
452INSTALLTOP=$INSTALLTOP 379INSTALLTOP=$INSTALLTOP
453 380
@@ -468,10 +395,11 @@ EX_LIBS=$ex_libs
468SRC_D=$src_dir 395SRC_D=$src_dir
469 396
470LINK=$link 397LINK=$link
471PERL=perl
472FIPSLINK=\$(PERL) util${o}fipslink.pl
473LFLAGS=$lflags 398LFLAGS=$lflags
399RSC=$rsc
474 400
401AES_ASM_OBJ=$aes_asm_obj
402AES_ASM_SRC=$aes_asm_src
475BN_ASM_OBJ=$bn_asm_obj 403BN_ASM_OBJ=$bn_asm_obj
476BN_ASM_SRC=$bn_asm_src 404BN_ASM_SRC=$bn_asm_src
477BNCO_ASM_OBJ=$bnco_asm_obj 405BNCO_ASM_OBJ=$bnco_asm_obj
@@ -492,6 +420,8 @@ SHA1_ASM_OBJ=$sha1_asm_obj
492SHA1_ASM_SRC=$sha1_asm_src 420SHA1_ASM_SRC=$sha1_asm_src
493RMD160_ASM_OBJ=$rmd160_asm_obj 421RMD160_ASM_OBJ=$rmd160_asm_obj
494RMD160_ASM_SRC=$rmd160_asm_src 422RMD160_ASM_SRC=$rmd160_asm_src
423CPUID_ASM_OBJ=$cpuid_asm_obj
424CPUID_ASM_SRC=$cpuid_asm_src
495 425
496# The output directory for everything intersting 426# The output directory for everything intersting
497OUT_D=$out_dir 427OUT_D=$out_dir
@@ -501,9 +431,7 @@ TMP_D=$tmp_dir
501INC_D=$inc_dir 431INC_D=$inc_dir
502INCO_D=$inc_dir${o}openssl 432INCO_D=$inc_dir${o}openssl
503 433
504# Directory containing FIPS module 434PERL=$perl
505
506
507CP=$cp 435CP=$cp
508RM=$rm 436RM=$rm
509RANLIB=$ranlib 437RANLIB=$ranlib
@@ -511,18 +439,6 @@ MKDIR=$mkdir
511MKLIB=$bin_dir$mklib 439MKLIB=$bin_dir$mklib
512MLFLAGS=$mlflags 440MLFLAGS=$mlflags
513ASM=$bin_dir$asm 441ASM=$bin_dir$asm
514MKCANISTER=$mkcanister
515
516# FIPS validated module and support file locations
517
518E_PREMAIN_DSO=fips_premain_dso
519
520FIPSLIB_D=$fipslibdir
521BASEADDR=$baseaddr
522FIPS_PREMAIN_SRC=$fips_premain_c_path
523O_FIPSCANISTER=$fips_canister_path
524FIPS_SHA1_EXE=$fips_sha1_exe_path
525PREMAIN_DSO_EXE=$fips_premain_dso_exe_path
526 442
527###################################################### 443######################################################
528# You should not need to touch anything below this point 444# You should not need to touch anything below this point
@@ -535,12 +451,14 @@ CRYPTO=$crypto
535# BIN_D - Binary output directory 451# BIN_D - Binary output directory
536# TEST_D - Binary test file output directory 452# TEST_D - Binary test file output directory
537# LIB_D - library output directory 453# LIB_D - library output directory
454# ENG_D - dynamic engine output directory
538# Note: if you change these point to different directories then uncomment out 455# Note: if you change these point to different directories then uncomment out
539# the lines around the 'NB' comment below. 456# the lines around the 'NB' comment below.
540# 457#
541BIN_D=\$(OUT_D) 458BIN_D=\$(OUT_D)
542TEST_D=\$(OUT_D) 459TEST_D=\$(OUT_D)
543LIB_D=\$(OUT_D) 460LIB_D=\$(OUT_D)
461ENG_D=\$(OUT_D)
544 462
545# INCL_D - local library directory 463# INCL_D - local library directory
546# OBJ_D - temp object file directory 464# OBJ_D - temp object file directory
@@ -554,7 +472,7 @@ SO_CRYPTO= $plib\$(CRYPTO)$so_shlibp
554L_SSL= \$(LIB_D)$o$plib\$(SSL)$libp 472L_SSL= \$(LIB_D)$o$plib\$(SSL)$libp
555L_CRYPTO= \$(LIB_D)$o$plib\$(CRYPTO)$libp 473L_CRYPTO= \$(LIB_D)$o$plib\$(CRYPTO)$libp
556 474
557L_LIBS= \$(L_SSL) \$(L_CRYPTO) $ex_l_libs 475L_LIBS= \$(L_SSL) \$(L_CRYPTO)
558 476
559###################################################### 477######################################################
560# Don't touch anything below this point 478# Don't touch anything below this point
@@ -564,19 +482,19 @@ INC=-I\$(INC_D) -I\$(INCL_D)
564APP_CFLAGS=\$(INC) \$(CFLAG) \$(APP_CFLAG) 482APP_CFLAGS=\$(INC) \$(CFLAG) \$(APP_CFLAG)
565LIB_CFLAGS=\$(INC) \$(CFLAG) \$(LIB_CFLAG) 483LIB_CFLAGS=\$(INC) \$(CFLAG) \$(LIB_CFLAG)
566SHLIB_CFLAGS=\$(INC) \$(CFLAG) \$(LIB_CFLAG) \$(SHLIB_CFLAG) 484SHLIB_CFLAGS=\$(INC) \$(CFLAG) \$(LIB_CFLAG) \$(SHLIB_CFLAG)
567LIBS_DEP=\$(O_CRYPTO) \$(O_SSL) $ex_libs_dep 485LIBS_DEP=\$(O_CRYPTO) \$(O_SSL)
568 486
569############################################# 487#############################################
570EOF 488EOF
571 489
572$rules=<<"EOF"; 490$rules=<<"EOF";
573all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) \$(INCO_D) headers \$(FIPS_SHA1_EXE) lib exe $ex_build_targets 491all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) \$(INCO_D) headers lib exe
574 492
575banner: 493banner:
576$banner 494$banner
577 495
578\$(TMP_D): 496\$(TMP_D):
579 \$(MKDIR) \$(TMP_D) 497 \$(MKDIR) \"\$(TMP_D)\"
580# NB: uncomment out these lines if BIN_D, TEST_D and LIB_D are different 498# NB: uncomment out these lines if BIN_D, TEST_D and LIB_D are different
581#\$(BIN_D): 499#\$(BIN_D):
582# \$(MKDIR) \$(BIN_D) 500# \$(MKDIR) \$(BIN_D)
@@ -585,31 +503,36 @@ $banner
585# \$(MKDIR) \$(TEST_D) 503# \$(MKDIR) \$(TEST_D)
586 504
587\$(LIB_D): 505\$(LIB_D):
588 \$(MKDIR) \$(LIB_D) 506 \$(MKDIR) \"\$(LIB_D)\"
589 507
590\$(INCO_D): \$(INC_D) 508\$(INCO_D): \$(INC_D)
591 \$(MKDIR) \$(INCO_D) 509 \$(MKDIR) \"\$(INCO_D)\"
592 510
593\$(INC_D): 511\$(INC_D):
594 \$(MKDIR) \$(INC_D) 512 \$(MKDIR) \"\$(INC_D)\"
595 513
596headers: \$(HEADER) \$(EXHEADER) 514headers: \$(HEADER) \$(EXHEADER)
597 @ 515 @
598 516
599lib: \$(LIBS_DEP) 517lib: \$(LIBS_DEP) \$(E_SHLIB)
600 518
601exe: \$(T_EXE) \$(BIN_D)$o\$(E_EXE)$exep 519exe: \$(T_EXE) \$(BIN_D)$o\$(E_EXE)$exep
602 520
603install: 521install: all
604 \$(MKDIR) \$(INSTALLTOP) 522 \$(MKDIR) \"\$(INSTALLTOP)\"
605 \$(MKDIR) \$(INSTALLTOP)${o}bin 523 \$(MKDIR) \"\$(INSTALLTOP)${o}bin\"
606 \$(MKDIR) \$(INSTALLTOP)${o}include 524 \$(MKDIR) \"\$(INSTALLTOP)${o}include\"
607 \$(MKDIR) \$(INSTALLTOP)${o}include${o}openssl 525 \$(MKDIR) \"\$(INSTALLTOP)${o}include${o}openssl\"
608 \$(MKDIR) \$(INSTALLTOP)${o}lib 526 \$(MKDIR) \"\$(INSTALLTOP)${o}lib\"
609 \$(CP) \$(INCO_D)${o}*.\[ch\] \$(INSTALLTOP)${o}include${o}openssl 527 \$(CP) \"\$(INCO_D)${o}*.\[ch\]\" \"\$(INSTALLTOP)${o}include${o}openssl\"
610 \$(CP) \$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin 528 \$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep\" \"\$(INSTALLTOP)${o}bin\"
611 \$(CP) \$(O_SSL) \$(INSTALLTOP)${o}lib 529 \$(CP) \"apps${o}openssl.cnf\" \"\$(INSTALLTOP)\"
612 \$(CP) \$(O_CRYPTO) \$(INSTALLTOP)${o}lib 530$extra_install
531
532
533test: \$(T_EXE)
534 cd \$(BIN_D)
535 ..${o}ms${o}test
613 536
614clean: 537clean:
615 \$(RM) \$(TMP_D)$o*.* 538 \$(RM) \$(TMP_D)$o*.*
@@ -668,11 +591,11 @@ foreach (split(/\s+/,$exheader)){ $h{$_}=1; }
668foreach (split(/\s+/,$header)) { $h.=$_." " unless $h{$_}; } 591foreach (split(/\s+/,$header)) { $h.=$_." " unless $h{$_}; }
669chop($h); $header=$h; 592chop($h); $header=$h;
670 593
671$defs.=&do_defs("HEADER",$header,"\$(INCL_D)",".h"); 594$defs.=&do_defs("HEADER",$header,"\$(INCL_D)","");
672$rules.=&do_copy_rule("\$(INCL_D)",$header,".h"); 595$rules.=&do_copy_rule("\$(INCL_D)",$header,"");
673 596
674$defs.=&do_defs("EXHEADER",$exheader,"\$(INCO_D)",".h"); 597$defs.=&do_defs("EXHEADER",$exheader,"\$(INCO_D)","");
675$rules.=&do_copy_rule("\$(INCO_D)",$exheader,".h"); 598$rules.=&do_copy_rule("\$(INCO_D)",$exheader,"");
676 599
677$defs.=&do_defs("T_OBJ",$test,"\$(OBJ_D)",$obj); 600$defs.=&do_defs("T_OBJ",$test,"\$(OBJ_D)",$obj);
678$rules.=&do_compile_rule("\$(OBJ_D)",$test,"\$(APP_CFLAGS)"); 601$rules.=&do_compile_rule("\$(OBJ_D)",$test,"\$(APP_CFLAGS)");
@@ -680,29 +603,6 @@ $rules.=&do_compile_rule("\$(OBJ_D)",$test,"\$(APP_CFLAGS)");
680$defs.=&do_defs("E_OBJ",$e_exe,"\$(OBJ_D)",$obj); 603$defs.=&do_defs("E_OBJ",$e_exe,"\$(OBJ_D)",$obj);
681$rules.=&do_compile_rule("\$(OBJ_D)",$e_exe,'-DMONOLITH $(APP_CFLAGS)'); 604$rules.=&do_compile_rule("\$(OBJ_D)",$e_exe,'-DMONOLITH $(APP_CFLAGS)');
682 605
683# Special case rules for fips_start and fips_end fips_premain_dso
684
685if ($fips)
686 {
687 if ($fips_canister_build)
688 {
689 $rules.=&cc_compile_target("\$(OBJ_D)${o}fips_start$obj",
690 "fips-1.0${o}fips_canister.c",
691 "-DFIPS_START \$(SHLIB_CFLAGS)");
692 $rules.=&cc_compile_target("\$(OBJ_D)${o}fips_end$obj",
693 "fips-1.0${o}fips_canister.c", "\$(SHLIB_CFLAGS)");
694 }
695 $rules.=&cc_compile_target("\$(OBJ_D)${o}fips_standalone_sha1$obj",
696 "fips-1.0${o}sha${o}fips_standalone_sha1.c",
697 "\$(SHLIB_CFLAGS)");
698 $rules.=&cc_compile_target("\$(OBJ_D)${o}fips_sha1dgst$obj",
699 "fips-1.0${o}sha${o}fips_sha1dgst.c",
700 "\$(SHLIB_CFLAGS)") unless $fips_canister_build;
701 $rules.=&cc_compile_target("\$(OBJ_D)${o}\$(E_PREMAIN_DSO)$obj",
702 "fips-1.0${o}fips_premain.c",
703 "-DFINGERPRINT_PREMAIN_DSO_LOAD \$(SHLIB_CFLAGS)");
704 }
705
706foreach (values %lib_nam) 606foreach (values %lib_nam)
707 { 607 {
708 $lib_obj=$lib_obj{$_}; 608 $lib_obj=$lib_obj{$_};
@@ -713,7 +613,12 @@ foreach (values %lib_nam)
713 $rules.="\$(O_SSL):\n\n"; 613 $rules.="\$(O_SSL):\n\n";
714 next; 614 next;
715 } 615 }
716 616 if (($aes_asm_obj ne "") && ($_ eq "CRYPTO"))
617 {
618 $lib_obj =~ s/\s(\S*\/aes_core\S*)/ \$(AES_ASM_OBJ)/;
619 $lib_obj =~ s/\s\S*\/aes_cbc\S*//;
620 $rules.=&do_asm_rule($aes_asm_obj,$aes_asm_src);
621 }
717 if (($bn_asm_obj ne "") && ($_ eq "CRYPTO")) 622 if (($bn_asm_obj ne "") && ($_ eq "CRYPTO"))
718 { 623 {
719 $lib_obj =~ s/\s\S*\/bn_asm\S*/ \$(BN_ASM_OBJ)/; 624 $lib_obj =~ s/\s\S*\/bn_asm\S*/ \$(BN_ASM_OBJ)/;
@@ -765,11 +670,28 @@ foreach (values %lib_nam)
765 $lib_obj =~ s/\s(\S*\/rmd_dgst\S*)/ $1 \$(RMD160_ASM_OBJ)/; 670 $lib_obj =~ s/\s(\S*\/rmd_dgst\S*)/ $1 \$(RMD160_ASM_OBJ)/;
766 $rules.=&do_asm_rule($rmd160_asm_obj,$rmd160_asm_src); 671 $rules.=&do_asm_rule($rmd160_asm_obj,$rmd160_asm_src);
767 } 672 }
673 if (($cpuid_asm_obj ne "") && ($_ eq "CRYPTO"))
674 {
675 $lib_obj =~ s/\s(\S*\/cversion\S*)/ $1 \$(CPUID_ASM_OBJ)/;
676 $rules.=&do_asm_rule($cpuid_asm_obj,$cpuid_asm_src);
677 }
768 $defs.=&do_defs(${_}."OBJ",$lib_obj,"\$(OBJ_D)",$obj); 678 $defs.=&do_defs(${_}."OBJ",$lib_obj,"\$(OBJ_D)",$obj);
769 $lib=($slib)?" \$(SHLIB_CFLAGS)".$shlib_ex_cflags{$_}:" \$(LIB_CFLAGS)"; 679 $lib=($slib)?" \$(SHLIB_CFLAGS)".$shlib_ex_cflags{$_}:" \$(LIB_CFLAGS)";
770 $rules.=&do_compile_rule("\$(OBJ_D)",$lib_obj{$_},$lib); 680 $rules.=&do_compile_rule("\$(OBJ_D)",$lib_obj{$_},$lib);
771 } 681 }
772 682
683# hack to add version info on MSVC
684if (($platform eq "VC-WIN32") || ($platform eq "VC-NT")) {
685 $rules.= <<"EOF";
686\$(OBJ_D)\\\$(CRYPTO).res: ms\\version32.rc
687 \$(RSC) /fo"\$(OBJ_D)\\\$(CRYPTO).res" /d CRYPTO ms\\version32.rc
688
689\$(OBJ_D)\\\$(SSL).res: ms\\version32.rc
690 \$(RSC) /fo"\$(OBJ_D)\\\$(SSL).res" /d SSL ms\\version32.rc
691
692EOF
693}
694
773$defs.=&do_defs("T_EXE",$test,"\$(TEST_D)",$exep); 695$defs.=&do_defs("T_EXE",$test,"\$(TEST_D)",$exep);
774foreach (split(/\s+/,$test)) 696foreach (split(/\s+/,$test))
775 { 697 {
@@ -778,42 +700,20 @@ foreach (split(/\s+/,$test))
778 $rules.=&do_link_rule("\$(TEST_D)$o$t$exep",$tt,"\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)"); 700 $rules.=&do_link_rule("\$(TEST_D)$o$t$exep",$tt,"\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)");
779 } 701 }
780 702
781$rules.= &do_lib_rule("\$(SSLOBJ)","\$(O_SSL)",$ssl,$shlib,"\$(SO_SSL)"); 703$defs.=&do_defs("E_SHLIB",$engines,"\$(ENG_D)",$shlibp);
782
783 704
784if ($fips) 705foreach (split(/\s+/,$engines))
785 {
786 if ($shlib)
787 {
788 $rules.= &do_lib_rule("\$(CRYPTOOBJ) \$(O_FIPSCANISTER)",
789 "\$(O_CRYPTO)",
790 "$crypto",
791 $shlib, "\$(SO_CRYPTO)", "\$(BASEADDR)");
792 }
793 else
794 {
795 $rules.= &do_lib_rule("\$(CRYPTOOBJ)",
796 "\$(O_CRYPTO)",$crypto,$shlib,"\$(SO_CRYPTO)", "");
797 $rules.= &do_lib_rule("\$(CRYPTOOBJ) \$(O_FIPSCANISTER)",
798 "\$(LIB_D)$o$crypto_compat",$crypto,$shlib,"\$(SO_CRYPTO)", "");
799 }
800 }
801 else
802 { 706 {
803 $rules.= &do_lib_rule("\$(CRYPTOOBJ)","\$(O_CRYPTO)",$crypto,$shlib, 707 $rules.=&do_compile_rule("\$(OBJ_D)","engines${o}e_$_",$lib);
804 "\$(SO_CRYPTO)"); 708 $rules.= &do_lib_rule("\$(OBJ_D)${o}e_${_}.obj","\$(ENG_D)$o$_$shlibp","",$shlib,"");
805 } 709 }
806 710
807 711
808if ($fips)
809 {
810 $rules.= &do_rlink_rule("\$(O_FIPSCANISTER)", "\$(OBJ_D)${o}fips_start$obj \$(FIPSOBJ) \$(OBJ_D)${o}fips_end$obj", "\$(FIPSLIB_D)${o}fips_standalone_sha1$exep", "") if $fips_canister_build;
811 $rules.=&do_link_rule("\$(PREMAIN_DSO_EXE)","\$(OBJ_D)${o}\$(E_PREMAIN_DSO)$obj \$(CRYPTOOBJ) \$(O_FIPSCANISTER)","","\$(EX_LIBS)", 1);
812
813 $rules.=&do_link_rule("\$(FIPS_SHA1_EXE)","\$(OBJ_D)${o}fips_standalone_sha1$obj \$(OBJ_D)${o}fips_sha1dgst$obj","","", 1);
814 }
815 712
816 $rules.=&do_link_rule("\$(BIN_D)$o\$(E_EXE)$exep","\$(E_OBJ)","\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)",0); 713$rules.= &do_lib_rule("\$(SSLOBJ)","\$(O_SSL)",$ssl,$shlib,"\$(SO_SSL)");
714$rules.= &do_lib_rule("\$(CRYPTOOBJ)","\$(O_CRYPTO)",$crypto,$shlib,"\$(SO_CRYPTO)");
715
716$rules.=&do_link_rule("\$(BIN_D)$o\$(E_EXE)$exep","\$(E_OBJ)","\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)");
817 717
818print $defs; 718print $defs;
819 719
@@ -833,13 +733,15 @@ print $rules;
833# directories 733# directories
834sub var_add 734sub var_add
835 { 735 {
836 local($dir,$val)=@_; 736 local($dir,$val,$keepext)=@_;
837 local(@a,$_,$ret); 737 local(@a,$_,$ret);
838 738
839 return("") if $no_engine && $dir =~ /\/engine/; 739 return("") if $no_engine && $dir =~ /\/engine/;
840 return("") if $no_hw && $dir =~ /\/hw/; 740 return("") if $no_hw && $dir =~ /\/hw/;
841 return("") if $no_idea && $dir =~ /\/idea/; 741 return("") if $no_idea && $dir =~ /\/idea/;
842 return("") if $no_aes && $dir =~ /\/aes/; 742 return("") if $no_aes && $dir =~ /\/aes/;
743 return("") if $no_camellia && $dir =~ /\/camellia/;
744 return("") if $no_seed && $dir =~ /\/seed/;
843 return("") if $no_rc2 && $dir =~ /\/rc2/; 745 return("") if $no_rc2 && $dir =~ /\/rc2/;
844 return("") if $no_rc4 && $dir =~ /\/rc4/; 746 return("") if $no_rc4 && $dir =~ /\/rc4/;
845 return("") if $no_rc5 && $dir =~ /\/rc5/; 747 return("") if $no_rc5 && $dir =~ /\/rc5/;
@@ -848,6 +750,7 @@ sub var_add
848 return("") if $no_dsa && $dir =~ /\/dsa/; 750 return("") if $no_dsa && $dir =~ /\/dsa/;
849 return("") if $no_dh && $dir =~ /\/dh/; 751 return("") if $no_dh && $dir =~ /\/dh/;
850 return("") if $no_ec && $dir =~ /\/ec/; 752 return("") if $no_ec && $dir =~ /\/ec/;
753 return("") if $no_cms && $dir =~ /\/cms/;
851 if ($no_des && $dir =~ /\/des/) 754 if ($no_des && $dir =~ /\/des/)
852 { 755 {
853 if ($val =~ /read_pwd/) 756 if ($val =~ /read_pwd/)
@@ -862,7 +765,7 @@ sub var_add
862 765
863 $val =~ s/^\s*(.*)\s*$/$1/; 766 $val =~ s/^\s*(.*)\s*$/$1/;
864 @a=split(/\s+/,$val); 767 @a=split(/\s+/,$val);
865 grep(s/\.[och]$//,@a); 768 grep(s/\.[och]$//,@a) unless $keepext;
866 769
867 @a=grep(!/^e_.*_3d$/,@a) if $no_des; 770 @a=grep(!/^e_.*_3d$/,@a) if $no_des;
868 @a=grep(!/^e_.*_d$/,@a) if $no_des; 771 @a=grep(!/^e_.*_d$/,@a) if $no_des;
@@ -873,6 +776,8 @@ sub var_add
873 @a=grep(!/^e_.*_bf$/,@a) if $no_bf; 776 @a=grep(!/^e_.*_bf$/,@a) if $no_bf;
874 @a=grep(!/^e_.*_c$/,@a) if $no_cast; 777 @a=grep(!/^e_.*_c$/,@a) if $no_cast;
875 @a=grep(!/^e_rc4$/,@a) if $no_rc4; 778 @a=grep(!/^e_rc4$/,@a) if $no_rc4;
779 @a=grep(!/^e_camellia$/,@a) if $no_camellia;
780 @a=grep(!/^e_seed$/,@a) if $no_seed;
876 781
877 @a=grep(!/(^s2_)|(^s23_)/,@a) if $no_ssl2; 782 @a=grep(!/(^s2_)|(^s23_)/,@a) if $no_ssl2;
878 @a=grep(!/(^s3_)|(^s23_)/,@a) if $no_ssl3; 783 @a=grep(!/(^s3_)|(^s23_)/,@a) if $no_ssl3;
@@ -956,13 +861,23 @@ sub do_defs
956 elsif ($_ =~ /RC5_ENC/) { $t="$_ "; } 861 elsif ($_ =~ /RC5_ENC/) { $t="$_ "; }
957 elsif ($_ =~ /MD5_ASM/) { $t="$_ "; } 862 elsif ($_ =~ /MD5_ASM/) { $t="$_ "; }
958 elsif ($_ =~ /SHA1_ASM/){ $t="$_ "; } 863 elsif ($_ =~ /SHA1_ASM/){ $t="$_ "; }
864 elsif ($_ =~ /AES_ASM/){ $t="$_ "; }
959 elsif ($_ =~ /RMD160_ASM/){ $t="$_ "; } 865 elsif ($_ =~ /RMD160_ASM/){ $t="$_ "; }
866 elsif ($_ =~ /CPUID_ASM/){ $t="$_ "; }
960 else { $t="$location${o}$_$pf "; } 867 else { $t="$location${o}$_$pf "; }
961 868
962 $Vars{$var}.="$t "; 869 $Vars{$var}.="$t ";
963 $ret.=$t; 870 $ret.=$t;
964 } 871 }
965 chop($ret); 872 # hack to add version info on MSVC
873 if ($shlib && (($platform eq "VC-WIN32") || ($platform eq "VC-NT")))
874 {
875 if ($var eq "CRYPTOOBJ")
876 { $ret.="\$(OBJ_D)\\\$(CRYPTO).res "; }
877 elsif ($var eq "SSLOBJ")
878 { $ret.="\$(OBJ_D)\\\$(SSL).res "; }
879 }
880 chomp($ret);
966 $ret.="\n\n"; 881 $ret.="\n\n";
967 return($ret); 882 return($ret);
968 } 883 }
@@ -1057,61 +972,118 @@ sub do_copy_rule
1057 if ($n =~ /bss_file/) 972 if ($n =~ /bss_file/)
1058 { $pp=".c"; } 973 { $pp=".c"; }
1059 else { $pp=$p; } 974 else { $pp=$p; }
1060 $ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp\n\t\$(CP) \$(SRC_D)$o$_$pp $to${o}$n$pp\n\n"; 975 $ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp\n\t\$(CP) \"\$(SRC_D)$o$_$pp\" \"$to${o}$n$pp\"\n\n";
1061 } 976 }
1062 return($ret); 977 return($ret);
1063 } 978 }
1064 979
1065sub read_options 980sub read_options
1066 { 981 {
1067 if (/^no-rc2$/) { $no_rc2=1; } 982 # Many options are handled in a similar way. In particular
1068 elsif (/^no-rc4$/) { $no_rc4=1; } 983 # no-xxx sets zero or more scalars to 1.
1069 elsif (/^no-rc5$/) { $no_rc5=1; } 984 # Process these using a hash containing the option name and
1070 elsif (/^no-idea$/) { $no_idea=1; } 985 # reference to the scalars to set.
1071 elsif (/^no-aes$/) { $no_aes=1; } 986
1072 elsif (/^no-des$/) { $no_des=1; } 987 my %valid_options = (
1073 elsif (/^no-bf$/) { $no_bf=1; } 988 "no-rc2" => \$no_rc2,
1074 elsif (/^no-cast$/) { $no_cast=1; } 989 "no-rc4" => \$no_rc4,
1075 elsif (/^no-md2$/) { $no_md2=1; } 990 "no-rc5" => \$no_rc5,
1076 elsif (/^no-md4$/) { $no_md4=1; } 991 "no-idea" => \$no_idea,
1077 elsif (/^no-md5$/) { $no_md5=1; } 992 "no-aes" => \$no_aes,
1078 elsif (/^no-sha$/) { $no_sha=1; } 993 "no-camellia" => \$no_camellia,
1079 elsif (/^no-sha1$/) { $no_sha1=1; } 994 "no-seed" => \$no_seed,
1080 elsif (/^no-ripemd$/) { $no_ripemd=1; } 995 "no-des" => \$no_des,
1081 elsif (/^no-mdc2$/) { $no_mdc2=1; } 996 "no-bf" => \$no_bf,
1082 elsif (/^no-patents$/) { $no_rc2=$no_rc4=$no_rc5=$no_idea=$no_rsa=1; } 997 "no-cast" => \$no_cast,
1083 elsif (/^no-rsa$/) { $no_rsa=1; } 998 "no-md2" => \$no_md2,
1084 elsif (/^no-dsa$/) { $no_dsa=1; } 999 "no-md4" => \$no_md4,
1085 elsif (/^no-dh$/) { $no_dh=1; } 1000 "no-md5" => \$no_md5,
1086 elsif (/^no-hmac$/) { $no_hmac=1; } 1001 "no-sha" => \$no_sha,
1087 elsif (/^no-aes$/) { $no_aes=1; } 1002 "no-sha1" => \$no_sha1,
1088 elsif (/^no-asm$/) { $no_asm=1; } 1003 "no-ripemd" => \$no_ripemd,
1089 elsif (/^nasm$/) { $nasm=1; } 1004 "no-mdc2" => \$no_mdc2,
1090 elsif (/^gaswin$/) { $gaswin=1; } 1005 "no-patents" =>
1091 elsif (/^no-ssl2$/) { $no_ssl2=1; } 1006 [\$no_rc2, \$no_rc4, \$no_rc5, \$no_idea, \$no_rsa],
1092 elsif (/^no-ssl3$/) { $no_ssl3=1; } 1007 "no-rsa" => \$no_rsa,
1093 elsif (/^no-err$/) { $no_err=1; } 1008 "no-dsa" => \$no_dsa,
1094 elsif (/^no-sock$/) { $no_sock=1; } 1009 "no-dh" => \$no_dh,
1095 elsif (/^no-krb5$/) { $no_krb5=1; } 1010 "no-hmac" => \$no_hmac,
1096 elsif (/^no-ec$/) { $no_ec=1; } 1011 "no-asm" => \$no_asm,
1097 elsif (/^no-engine$/) { $no_engine=1; } 1012 "nasm" => \$nasm,
1098 elsif (/^no-hw$/) { $no_hw=1; } 1013 "nw-nasm" => \$nw_nasm,
1099 1014 "nw-mwasm" => \$nw_mwasm,
1100 elsif (/^just-ssl$/) { $no_rc2=$no_idea=$no_des=$no_bf=$no_cast=1; 1015 "gaswin" => \$gaswin,
1101 $no_md2=$no_sha=$no_mdc2=$no_dsa=$no_dh=1; 1016 "no-ssl2" => \$no_ssl2,
1102 $no_ssl2=$no_err=$no_ripemd=$no_rc5=1; 1017 "no-ssl3" => \$no_ssl3,
1103 $no_aes=1; } 1018 "no-tlsext" => \$no_tlsext,
1104 1019 "no-cms" => \$no_cms,
1105 elsif (/^rsaref$/) { } 1020 "no-err" => \$no_err,
1106 elsif (/^fips$/) { $fips=1; } 1021 "no-sock" => \$no_sock,
1107 elsif (/^gcc$/) { $gcc=1; } 1022 "no-krb5" => \$no_krb5,
1108 elsif (/^debug$/) { $debug=1; } 1023 "no-ec" => \$no_ec,
1109 elsif (/^profile$/) { $profile=1; } 1024 "no-ecdsa" => \$no_ecdsa,
1110 elsif (/^shlib$/) { $shlib=1; } 1025 "no-ecdh" => \$no_ecdh,
1111 elsif (/^dll$/) { $shlib=1; } 1026 "no-engine" => \$no_engine,
1112 elsif (/^shared$/) { } # We just need to ignore it for now... 1027 "no-hw" => \$no_hw,
1113 elsif (/^zlib$/) { $zlib_opt = 1 if $zlib_opt == 0 } 1028 "just-ssl" =>
1114 elsif (/^zlib-dynamic$/){ $zlib_opt = 2; } 1029 [\$no_rc2, \$no_idea, \$no_des, \$no_bf, \$no_cast,
1030 \$no_md2, \$no_sha, \$no_mdc2, \$no_dsa, \$no_dh,
1031 \$no_ssl2, \$no_err, \$no_ripemd, \$no_rc5,
1032 \$no_aes, \$no_camellia, \$no_seed],
1033 "rsaref" => 0,
1034 "gcc" => \$gcc,
1035 "debug" => \$debug,
1036 "profile" => \$profile,
1037 "shlib" => \$shlib,
1038 "dll" => \$shlib,
1039 "shared" => 0,
1040 "no-gmp" => 0,
1041 "no-rfc3779" => 0,
1042 "no-montasm" => 0,
1043 "no-shared" => 0,
1044 "no-zlib" => 0,
1045 "no-zlib-dynamic" => 0,
1046 );
1047
1048 if (exists $valid_options{$_})
1049 {
1050 my $r = $valid_options{$_};
1051 if ( ref $r eq "SCALAR")
1052 { $$r = 1;}
1053 elsif ( ref $r eq "ARRAY")
1054 {
1055 my $r2;
1056 foreach $r2 (@$r)
1057 {
1058 $$r2 = 1;
1059 }
1060 }
1061 }
1062 elsif (/^no-comp$/) { $xcflags = "-DOPENSSL_NO_COMP $xcflags"; }
1063 elsif (/^enable-zlib$/) { $zlib_opt = 1 if $zlib_opt == 0 }
1064 elsif (/^enable-zlib-dynamic$/)
1065 {
1066 $zlib_opt = 2;
1067 }
1068 elsif (/^no-static-engine/)
1069 {
1070 $no_static_engine = 1;
1071 }
1072 elsif (/^enable-static-engine/)
1073 {
1074 $no_static_engine = 0;
1075 }
1076 # There are also enable-xxx options which correspond to
1077 # the no-xxx. Since the scalars are enabled by default
1078 # these can be ignored.
1079 elsif (/^enable-/)
1080 {
1081 my $t = $_;
1082 $t =~ s/^enable/no/;
1083 if (exists $valid_options{$t})
1084 {return 1;}
1085 return 0;
1086 }
1115 elsif (/^--with-krb5-flavor=(.*)$/) 1087 elsif (/^--with-krb5-flavor=(.*)$/)
1116 { 1088 {
1117 my $krb5_flavor = $1; 1089 my $krb5_flavor = $1;
@@ -1135,31 +1107,3 @@ sub read_options
1135 else { return(0); } 1107 else { return(0); }
1136 return(1); 1108 return(1);
1137 } 1109 }
1138
1139sub fipslib_error
1140 {
1141 print STDERR "***FIPS module directory sanity check failed***\n";
1142 print STDERR "FIPS module build failed, or was deleted\n";
1143 print STDERR "Please rebuild FIPS module.\n";
1144 exit 1;
1145 }
1146
1147sub fips_check_files
1148 {
1149 my $dir = shift @_;
1150 my $ret = 1;
1151 if (!-d $dir)
1152 {
1153 print STDERR "FIPS module directory $dir does not exist\n";
1154 fipslib_error();
1155 }
1156 foreach (@_)
1157 {
1158 if (!-f "$dir${o}$_")
1159 {
1160 print STDERR "FIPS module file $_ does not exist!\n";
1161 $ret = 0;
1162 }
1163 }
1164 fipslib_error() if ($ret == 0);
1165 }
diff --git a/src/lib/libcrypto/util/mkdef.pl b/src/lib/libcrypto/util/mkdef.pl
index 6c1e53bb14..ef1cc6e513 100644
--- a/src/lib/libcrypto/util/mkdef.pl
+++ b/src/lib/libcrypto/util/mkdef.pl
@@ -79,19 +79,29 @@ my $OS2=0;
79my $safe_stack_def = 0; 79my $safe_stack_def = 0;
80 80
81my @known_platforms = ( "__FreeBSD__", "PERL5", "NeXT", 81my @known_platforms = ( "__FreeBSD__", "PERL5", "NeXT",
82 "EXPORT_VAR_AS_FUNCTION", "OPENSSL_FIPS" ); 82 "EXPORT_VAR_AS_FUNCTION", "ZLIB" );
83my @known_ossl_platforms = ( "VMS", "WIN16", "WIN32", "WINNT", "OS2" ); 83my @known_ossl_platforms = ( "VMS", "WIN16", "WIN32", "WINNT", "OS2" );
84my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", 84my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
85 "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1", 85 "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1",
86 "SHA256", "SHA512", "RIPEMD", 86 "SHA256", "SHA512", "RIPEMD",
87 "MDC2", "RSA", "DSA", "DH", "EC", "HMAC", "AES", 87 "MDC2", "RSA", "DSA", "DH", "EC", "ECDH", "ECDSA", "HMAC", "AES", "CAMELLIA", "SEED",
88 # Envelope "algorithms" 88 # Envelope "algorithms"
89 "EVP", "X509", "ASN1_TYPEDEFS", 89 "EVP", "X509", "ASN1_TYPEDEFS",
90 # Helper "algorithms" 90 # Helper "algorithms"
91 "BIO", "COMP", "BUFFER", "LHASH", "STACK", "ERR", 91 "BIO", "COMP", "BUFFER", "LHASH", "STACK", "ERR",
92 "LOCKING", 92 "LOCKING",
93 # External "algorithms" 93 # External "algorithms"
94 "FP_API", "STDIO", "SOCK", "KRB5", "ENGINE", "HW" ); 94 "FP_API", "STDIO", "SOCK", "KRB5", "DGRAM",
95 # Engines
96 "STATIC_ENGINE", "ENGINE", "HW", "GMP",
97 # RFC3779 support
98 "RFC3779",
99 # TLS extension support
100 "TLSEXT",
101 # CMS
102 "CMS",
103 # Deprecated functions
104 "DEPRECATED" );
95 105
96my $options=""; 106my $options="";
97open(IN,"<Makefile") || die "unable to open Makefile!\n"; 107open(IN,"<Makefile") || die "unable to open Makefile!\n";
@@ -107,9 +117,11 @@ my $no_rc2; my $no_rc4; my $no_rc5; my $no_idea; my $no_des; my $no_bf;
107my $no_cast; 117my $no_cast;
108my $no_md2; my $no_md4; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2; 118my $no_md2; my $no_md4; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2;
109my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5; 119my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5;
110my $no_ec; my $no_engine; my $no_hw; 120my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw; my $no_camellia;
111my $no_fp_api; 121my $no_seed;
112my $fips; 122my $no_fp_api; my $no_static_engine; my $no_gmp; my $no_deprecated;
123my $no_rfc3779; my $no_tlsext; my $no_cms;
124
113 125
114foreach (@ARGV, split(/ /, $options)) 126foreach (@ARGV, split(/ /, $options))
115 { 127 {
@@ -130,7 +142,11 @@ foreach (@ARGV, split(/ /, $options))
130 } 142 }
131 $VMS=1 if $_ eq "VMS"; 143 $VMS=1 if $_ eq "VMS";
132 $OS2=1 if $_ eq "OS2"; 144 $OS2=1 if $_ eq "OS2";
133 $fips=1 if $_ eq "fips"; 145 if ($_ eq "zlib" || $_ eq "zlib-dynamic"
146 || $_ eq "enable-zlib-dynamic") {
147 $zlib = 1;
148 }
149
134 150
135 $do_ssl=1 if $_ eq "ssleay"; 151 $do_ssl=1 if $_ eq "ssleay";
136 if ($_ eq "ssl") { 152 if ($_ eq "ssl") {
@@ -142,6 +158,8 @@ foreach (@ARGV, split(/ /, $options))
142 $do_crypto=1; 158 $do_crypto=1;
143 $libname=$_; 159 $libname=$_;
144 } 160 }
161 $no_static_engine=1 if $_ eq "no-static-engine";
162 $no_static_engine=0 if $_ eq "enable-static-engine";
145 $do_update=1 if $_ eq "update"; 163 $do_update=1 if $_ eq "update";
146 $do_rewrite=1 if $_ eq "rewrite"; 164 $do_rewrite=1 if $_ eq "rewrite";
147 $do_ctest=1 if $_ eq "ctest"; 165 $do_ctest=1 if $_ eq "ctest";
@@ -166,8 +184,12 @@ foreach (@ARGV, split(/ /, $options))
166 elsif (/^no-dsa$/) { $no_dsa=1; } 184 elsif (/^no-dsa$/) { $no_dsa=1; }
167 elsif (/^no-dh$/) { $no_dh=1; } 185 elsif (/^no-dh$/) { $no_dh=1; }
168 elsif (/^no-ec$/) { $no_ec=1; } 186 elsif (/^no-ec$/) { $no_ec=1; }
187 elsif (/^no-ecdsa$/) { $no_ecdsa=1; }
188 elsif (/^no-ecdh$/) { $no_ecdh=1; }
169 elsif (/^no-hmac$/) { $no_hmac=1; } 189 elsif (/^no-hmac$/) { $no_hmac=1; }
170 elsif (/^no-aes$/) { $no_aes=1; } 190 elsif (/^no-aes$/) { $no_aes=1; }
191 elsif (/^no-camellia$/) { $no_camellia=1; }
192 elsif (/^no-seed$/) { $no_seed=1; }
171 elsif (/^no-evp$/) { $no_evp=1; } 193 elsif (/^no-evp$/) { $no_evp=1; }
172 elsif (/^no-lhash$/) { $no_lhash=1; } 194 elsif (/^no-lhash$/) { $no_lhash=1; }
173 elsif (/^no-stack$/) { $no_stack=1; } 195 elsif (/^no-stack$/) { $no_stack=1; }
@@ -180,6 +202,10 @@ foreach (@ARGV, split(/ /, $options))
180 elsif (/^no-krb5$/) { $no_krb5=1; } 202 elsif (/^no-krb5$/) { $no_krb5=1; }
181 elsif (/^no-engine$/) { $no_engine=1; } 203 elsif (/^no-engine$/) { $no_engine=1; }
182 elsif (/^no-hw$/) { $no_hw=1; } 204 elsif (/^no-hw$/) { $no_hw=1; }
205 elsif (/^no-gmp$/) { $no_gmp=1; }
206 elsif (/^no-rfc3779$/) { $no_rfc3779=1; }
207 elsif (/^no-tlsext$/) { $no_tlsext=1; }
208 elsif (/^no-cms$/) { $no_cms=1; }
183 } 209 }
184 210
185 211
@@ -215,8 +241,10 @@ $max_crypto = $max_num;
215 241
216my $ssl="ssl/ssl.h"; 242my $ssl="ssl/ssl.h";
217$ssl.=" ssl/kssl.h"; 243$ssl.=" ssl/kssl.h";
244$ssl.=" ssl/tls1.h";
218 245
219my $crypto ="crypto/crypto.h"; 246my $crypto ="crypto/crypto.h";
247$crypto.=" crypto/o_dir.h";
220$crypto.=" crypto/des/des.h crypto/des/des_old.h" ; # unless $no_des; 248$crypto.=" crypto/des/des.h crypto/des/des_old.h" ; # unless $no_des;
221$crypto.=" crypto/idea/idea.h" ; # unless $no_idea; 249$crypto.=" crypto/idea/idea.h" ; # unless $no_idea;
222$crypto.=" crypto/rc4/rc4.h" ; # unless $no_rc4; 250$crypto.=" crypto/rc4/rc4.h" ; # unless $no_rc4;
@@ -231,12 +259,16 @@ $crypto.=" crypto/mdc2/mdc2.h" ; # unless $no_mdc2;
231$crypto.=" crypto/sha/sha.h" ; # unless $no_sha; 259$crypto.=" crypto/sha/sha.h" ; # unless $no_sha;
232$crypto.=" crypto/ripemd/ripemd.h" ; # unless $no_ripemd; 260$crypto.=" crypto/ripemd/ripemd.h" ; # unless $no_ripemd;
233$crypto.=" crypto/aes/aes.h" ; # unless $no_aes; 261$crypto.=" crypto/aes/aes.h" ; # unless $no_aes;
262$crypto.=" crypto/camellia/camellia.h" ; # unless $no_camellia;
263$crypto.=" crypto/seed/seed.h"; # unless $no_seed;
234 264
235$crypto.=" crypto/bn/bn.h"; 265$crypto.=" crypto/bn/bn.h";
236$crypto.=" crypto/rsa/rsa.h" ; # unless $no_rsa; 266$crypto.=" crypto/rsa/rsa.h" ; # unless $no_rsa;
237$crypto.=" crypto/dsa/dsa.h" ; # unless $no_dsa; 267$crypto.=" crypto/dsa/dsa.h" ; # unless $no_dsa;
238$crypto.=" crypto/dh/dh.h" ; # unless $no_dh; 268$crypto.=" crypto/dh/dh.h" ; # unless $no_dh;
239$crypto.=" crypto/ec/ec.h" ; # unless $no_ec; 269$crypto.=" crypto/ec/ec.h" ; # unless $no_ec;
270$crypto.=" crypto/ecdsa/ecdsa.h" ; # unless $no_ecdsa;
271$crypto.=" crypto/ecdh/ecdh.h" ; # unless $no_ecdh;
240$crypto.=" crypto/hmac/hmac.h" ; # unless $no_hmac; 272$crypto.=" crypto/hmac/hmac.h" ; # unless $no_hmac;
241 273
242$crypto.=" crypto/engine/engine.h"; # unless $no_engine; 274$crypto.=" crypto/engine/engine.h"; # unless $no_engine;
@@ -267,7 +299,9 @@ $crypto.=" crypto/ocsp/ocsp.h";
267$crypto.=" crypto/ui/ui.h crypto/ui/ui_compat.h"; 299$crypto.=" crypto/ui/ui.h crypto/ui/ui_compat.h";
268$crypto.=" crypto/krb5/krb5_asn.h"; 300$crypto.=" crypto/krb5/krb5_asn.h";
269$crypto.=" crypto/tmdiff.h"; 301$crypto.=" crypto/tmdiff.h";
270$crypto.=" fips-1.0/fips.h fips-1.0/rand/fips_rand.h fips-1.0/sha/fips_sha.h"; 302$crypto.=" crypto/store/store.h";
303$crypto.=" crypto/pqueue/pqueue.h";
304$crypto.=" crypto/cms/cms.h";
271 305
272my $symhacks="crypto/symhacks.h"; 306my $symhacks="crypto/symhacks.h";
273 307
@@ -423,7 +457,11 @@ sub do_defs
423 457
424 print STDERR "DEBUG: parsing ----------\n" if $debug; 458 print STDERR "DEBUG: parsing ----------\n" if $debug;
425 while(<IN>) { 459 while(<IN>) {
426 last if (/\/\* Error codes for the \w+ functions\. \*\//); 460 if (/\/\* Error codes for the \w+ functions\. \*\//)
461 {
462 undef @tag;
463 last;
464 }
427 if ($line ne '') { 465 if ($line ne '') {
428 $_ = $line . $_; 466 $_ = $line . $_;
429 $line = ''; 467 $line = '';
@@ -436,17 +474,22 @@ sub do_defs
436 next; 474 next;
437 } 475 }
438 476
439 $cpp = 1 if /^\#.*ifdef.*cplusplus/; 477 if(/\/\*/) {
478 if (not /\*\//) { # multiline comment...
479 $line = $_; # ... just accumulate
480 next;
481 } else {
482 s/\/\*.*?\*\///gs;# wipe it
483 }
484 }
485
440 if ($cpp) { 486 if ($cpp) {
441 $cpp = 0 if /^\#.*endif/; 487 $cpp++ if /^#\s*if/;
488 $cpp-- if /^#\s*endif/;
442 next; 489 next;
443 } 490 }
491 $cpp = 1 if /^#.*ifdef.*cplusplus/;
444 492
445 s/\/\*.*?\*\///gs; # ignore comments
446 if (/\/\*/) { # if we have part
447 $line = $_; # of a comment,
448 next; # continue reading
449 }
450 s/{[^{}]*}//gs; # ignore {} blocks 493 s/{[^{}]*}//gs; # ignore {} blocks
451 print STDERR "DEBUG: \$def=\"$def\"\n" if $debug && $def ne ""; 494 print STDERR "DEBUG: \$def=\"$def\"\n" if $debug && $def ne "";
452 print STDERR "DEBUG: \$_=\"$_\"\n" if $debug; 495 print STDERR "DEBUG: \$_=\"$_\"\n" if $debug;
@@ -505,7 +548,7 @@ sub do_defs
505 } 548 }
506 } elsif (/^\#\s*endif/) { 549 } elsif (/^\#\s*endif/) {
507 my $tag_i = $#tag; 550 my $tag_i = $#tag;
508 while($tag[$tag_i] ne "-") { 551 while($tag_i > 0 && $tag[$tag_i] ne "-") {
509 my $t=$tag[$tag_i]; 552 my $t=$tag[$tag_i];
510 print STDERR "DEBUG: \$t=\"$t\"\n" if $debug; 553 print STDERR "DEBUG: \$t=\"$t\"\n" if $debug;
511 if ($tag{$t}==2) { 554 if ($tag{$t}==2) {
@@ -672,6 +715,10 @@ sub do_defs
672 "EXPORT_VAR_AS_FUNCTION", 715 "EXPORT_VAR_AS_FUNCTION",
673 "FUNCTION"); 716 "FUNCTION");
674 next; 717 next;
718 } elsif (/^\s*DECLARE_ASN1_ALLOC_FUNCTIONS\s*\(\s*(\w*)\s*\)/) {
719 $def .= "int $1_free(void);";
720 $def .= "int $1_new(void);";
721 next;
675 } elsif (/^\s*DECLARE_ASN1_FUNCTIONS_name\s*\(\s*(\w*)\s*,\s*(\w*)\s*\)/) { 722 } elsif (/^\s*DECLARE_ASN1_FUNCTIONS_name\s*\(\s*(\w*)\s*,\s*(\w*)\s*\)/) {
676 $def .= "int d2i_$2(void);"; 723 $def .= "int d2i_$2(void);";
677 $def .= "int i2d_$2(void);"; 724 $def .= "int i2d_$2(void);";
@@ -716,12 +763,21 @@ sub do_defs
716 "EXPORT_VAR_AS_FUNCTION", 763 "EXPORT_VAR_AS_FUNCTION",
717 "FUNCTION"); 764 "FUNCTION");
718 next; 765 next;
766 } elsif (/^\s*DECLARE_ASN1_NDEF_FUNCTION\s*\(\s*(\w*)\s*\)/) {
767 $def .= "int i2d_$1_NDEF(void);";
719 } elsif (/^\s*DECLARE_ASN1_SET_OF\s*\(\s*(\w*)\s*\)/) { 768 } elsif (/^\s*DECLARE_ASN1_SET_OF\s*\(\s*(\w*)\s*\)/) {
720 next; 769 next;
770 } elsif (/^\s*DECLARE_ASN1_PRINT_FUNCTION\s*\(\s*(\w*)\s*\)/) {
771 $def .= "int $1_print_ctx(void);";
772 next;
773 } elsif (/^\s*DECLARE_ASN1_PRINT_FUNCTION_name\s*\(\s*(\w*)\s*,\s*(\w*)\s*\)/) {
774 $def .= "int $2_print_ctx(void);";
775 next;
721 } elsif (/^\s*DECLARE_PKCS12_STACK_OF\s*\(\s*(\w*)\s*\)/) { 776 } elsif (/^\s*DECLARE_PKCS12_STACK_OF\s*\(\s*(\w*)\s*\)/) {
722 next; 777 next;
723 } elsif (/^DECLARE_PEM_rw\s*\(\s*(\w*)\s*,/ || 778 } elsif (/^DECLARE_PEM_rw\s*\(\s*(\w*)\s*,/ ||
724 /^DECLARE_PEM_rw_cb\s*\(\s*(\w*)\s*,/ ) { 779 /^DECLARE_PEM_rw_cb\s*\(\s*(\w*)\s*,/ ||
780 /^DECLARE_PEM_rw_const\s*\(\s*(\w*)\s*,/ ) {
725 # Things not in Win16 781 # Things not in Win16
726 $def .= 782 $def .=
727 "#INFO:" 783 "#INFO:"
@@ -797,7 +853,7 @@ sub do_defs
797 } 853 }
798 close(IN); 854 close(IN);
799 855
800 my $algs = ''; 856 my $algs;
801 my $plays; 857 my $plays;
802 858
803 print STDERR "DEBUG: postprocessing ----------\n" if $debug; 859 print STDERR "DEBUG: postprocessing ----------\n" if $debug;
@@ -809,6 +865,17 @@ sub do_defs
809 next if(/typedef\W/); 865 next if(/typedef\W/);
810 next if(/\#define/); 866 next if(/\#define/);
811 867
868 # Reduce argument lists to empty ()
869 # fold round brackets recursively: (t(*v)(t),t) -> (t{}{},t) -> {}
870 while(/\(.*\)/s) {
871 s/\([^\(\)]+\)/\{\}/gs;
872 s/\(\s*\*\s*(\w+)\s*\{\}\s*\)/$1/gs; #(*f{}) -> f
873 }
874 # pretend as we didn't use curly braces: {} -> ()
875 s/\{\}/\(\)/gs;
876
877 s/STACK_OF\(\)/void/gs;
878
812 print STDERR "DEBUG: \$_ = \"$_\"\n" if $debug; 879 print STDERR "DEBUG: \$_ = \"$_\"\n" if $debug;
813 if (/^\#INFO:([^:]*):(.*)$/) { 880 if (/^\#INFO:([^:]*):(.*)$/) {
814 $plats = $1; 881 $plats = $1;
@@ -819,21 +886,10 @@ sub do_defs
819 $s = $1; 886 $s = $1;
820 $k = "VARIABLE"; 887 $k = "VARIABLE";
821 print STDERR "DEBUG: found external variable $s\n" if $debug; 888 print STDERR "DEBUG: found external variable $s\n" if $debug;
822 } elsif (/\(\*(\w*(\{[0-9]+\})?)\([^\)]+/) { 889 } elsif (/TYPEDEF_\w+_OF/s) {
823 $s = $1;
824 print STDERR "DEBUG: found ANSI C function $s\n" if $debug;
825 } elsif (/\w+\W+(\w+)\W*\(\s*\)(\s*__attribute__\(.*\)\s*)?$/s) {
826 # K&R C
827 print STDERR "DEBUG: found K&R C function $s\n" if $debug;
828 next; 890 next;
829 } elsif (/\w+\W+\w+(\{[0-9]+\})?\W*\(.*\)(\s*__attribute__\(.*\)\s*)?$/s) { 891 } elsif (/(\w+)\s*\(\).*/s) { # first token prior [first] () is
830 while (not /\(\)(\s*__attribute__\(.*\)\s*)?$/s) { 892 $s = $1; # a function name!
831 s/[^\(\)]*\)(\s*__attribute__\(.*\)\s*)?$/\)/s;
832 s/\([^\(\)]*\)\)(\s*__attribute__\(.*\)\s*)?$/\)/s;
833 }
834 s/\(void\)//;
835 /(\w+(\{[0-9]+\})?)\W*\(\)/s;
836 $s = $1;
837 print STDERR "DEBUG: found function $s\n" if $debug; 893 print STDERR "DEBUG: found function $s\n" if $debug;
838 } elsif (/\(/ and not (/=/)) { 894 } elsif (/\(/ and not (/=/)) {
839 print STDERR "File $file: cannot parse: $_;\n"; 895 print STDERR "File $file: cannot parse: $_;\n";
@@ -864,13 +920,9 @@ sub do_defs
864 $a .= ",RSA" if($s =~ /PEM_Seal(Final|Init|Update)/); 920 $a .= ",RSA" if($s =~ /PEM_Seal(Final|Init|Update)/);
865 $a .= ",RSA" if($s =~ /RSAPrivateKey/); 921 $a .= ",RSA" if($s =~ /RSAPrivateKey/);
866 $a .= ",RSA" if($s =~ /SSLv23?_((client|server)_)?method/); 922 $a .= ",RSA" if($s =~ /SSLv23?_((client|server)_)?method/);
867 # SHA2 algorithms only defined in FIPS mode for
868 # OpenSSL 0.9.7
869 $p .= "OPENSSL_FIPS" if($s =~ /SHA[235]/);
870 923
871 $platform{$s} = 924 $platform{$s} =
872 &reduce_platforms((defined($platform{$s})?$platform{$s}.',':"").$p); 925 &reduce_platforms((defined($platform{$s})?$platform{$s}.',':"").$p);
873 $algorithm{$s} = '' if !defined $algorithm{$s};
874 $algorithm{$s} .= ','.$a; 926 $algorithm{$s} .= ','.$a;
875 927
876 if (defined($variant{$s})) { 928 if (defined($variant{$s})) {
@@ -1035,9 +1087,7 @@ sub is_valid
1035 if ($keyword eq "EXPORT_VAR_AS_FUNCTION" && ($VMSVAX || $W32 || $W16)) { 1087 if ($keyword eq "EXPORT_VAR_AS_FUNCTION" && ($VMSVAX || $W32 || $W16)) {
1036 return 1; 1088 return 1;
1037 } 1089 }
1038 if ($keyword eq "OPENSSL_FIPS" && $fips) { 1090 if ($keyword eq "ZLIB" && $zlib) { return 1; }
1039 return 1;
1040 }
1041 return 0; 1091 return 0;
1042 } else { 1092 } else {
1043 # algorithms 1093 # algorithms
@@ -1058,8 +1108,12 @@ sub is_valid
1058 if ($keyword eq "DSA" && $no_dsa) { return 0; } 1108 if ($keyword eq "DSA" && $no_dsa) { return 0; }
1059 if ($keyword eq "DH" && $no_dh) { return 0; } 1109 if ($keyword eq "DH" && $no_dh) { return 0; }
1060 if ($keyword eq "EC" && $no_ec) { return 0; } 1110 if ($keyword eq "EC" && $no_ec) { return 0; }
1111 if ($keyword eq "ECDSA" && $no_ecdsa) { return 0; }
1112 if ($keyword eq "ECDH" && $no_ecdh) { return 0; }
1061 if ($keyword eq "HMAC" && $no_hmac) { return 0; } 1113 if ($keyword eq "HMAC" && $no_hmac) { return 0; }
1062 if ($keyword eq "AES" && $no_aes) { return 0; } 1114 if ($keyword eq "AES" && $no_aes) { return 0; }
1115 if ($keyword eq "CAMELLIA" && $no_camellia) { return 0; }
1116 if ($keyword eq "SEED" && $no_seed) { return 0; }
1063 if ($keyword eq "EVP" && $no_evp) { return 0; } 1117 if ($keyword eq "EVP" && $no_evp) { return 0; }
1064 if ($keyword eq "LHASH" && $no_lhash) { return 0; } 1118 if ($keyword eq "LHASH" && $no_lhash) { return 0; }
1065 if ($keyword eq "STACK" && $no_stack) { return 0; } 1119 if ($keyword eq "STACK" && $no_stack) { return 0; }
@@ -1072,6 +1126,12 @@ sub is_valid
1072 if ($keyword eq "ENGINE" && $no_engine) { return 0; } 1126 if ($keyword eq "ENGINE" && $no_engine) { return 0; }
1073 if ($keyword eq "HW" && $no_hw) { return 0; } 1127 if ($keyword eq "HW" && $no_hw) { return 0; }
1074 if ($keyword eq "FP_API" && $no_fp_api) { return 0; } 1128 if ($keyword eq "FP_API" && $no_fp_api) { return 0; }
1129 if ($keyword eq "STATIC_ENGINE" && $no_static_engine) { return 0; }
1130 if ($keyword eq "GMP" && $no_gmp) { return 0; }
1131 if ($keyword eq "RFC3779" && $no_rfc3779) { return 0; }
1132 if ($keyword eq "TLSEXT" && $no_tlsext) { return 0; }
1133 if ($keyword eq "CMS" && $no_cms) { return 0; }
1134 if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; }
1075 1135
1076 # Nothing recognise as true 1136 # Nothing recognise as true
1077 return 1; 1137 return 1;
@@ -1174,8 +1234,6 @@ EOO
1174 1234
1175LIBRARY $libname $liboptions 1235LIBRARY $libname $liboptions
1176 1236
1177DESCRIPTION '$description'
1178
1179EOF 1237EOF
1180 1238
1181 if ($W16) { 1239 if ($W16) {
diff --git a/src/lib/libcrypto/util/mkdir-p.pl b/src/lib/libcrypto/util/mkdir-p.pl
index 6c69c2daa4..e73d02b073 100644
--- a/src/lib/libcrypto/util/mkdir-p.pl
+++ b/src/lib/libcrypto/util/mkdir-p.pl
@@ -8,6 +8,7 @@
8my $arg; 8my $arg;
9 9
10foreach $arg (@ARGV) { 10foreach $arg (@ARGV) {
11 $arg =~ tr|\\|/|;
11 &do_mkdir_p($arg); 12 &do_mkdir_p($arg);
12} 13}
13 14
diff --git a/src/lib/libcrypto/util/mkfiles.pl b/src/lib/libcrypto/util/mkfiles.pl
index bc78510f56..1282392fea 100644
--- a/src/lib/libcrypto/util/mkfiles.pl
+++ b/src/lib/libcrypto/util/mkfiles.pl
@@ -24,12 +24,16 @@ my @dirs = (
24"crypto/bf", 24"crypto/bf",
25"crypto/cast", 25"crypto/cast",
26"crypto/aes", 26"crypto/aes",
27"crypto/camellia",
28"crypto/seed",
27"crypto/bn", 29"crypto/bn",
28"crypto/rsa", 30"crypto/rsa",
29"crypto/dsa", 31"crypto/dsa",
30"crypto/dso", 32"crypto/dso",
31"crypto/dh", 33"crypto/dh",
32"crypto/ec", 34"crypto/ec",
35"crypto/ecdh",
36"crypto/ecdsa",
33"crypto/buffer", 37"crypto/buffer",
34"crypto/bio", 38"crypto/bio",
35"crypto/stack", 39"crypto/stack",
@@ -51,17 +55,12 @@ my @dirs = (
51"crypto/ocsp", 55"crypto/ocsp",
52"crypto/ui", 56"crypto/ui",
53"crypto/krb5", 57"crypto/krb5",
54"fips-1.0", 58"crypto/store",
55"fips-1.0/aes", 59"crypto/pqueue",
56"fips-1.0/des", 60"crypto/cms",
57"fips-1.0/dsa",
58"fips-1.0/dh",
59"fips-1.0/hmac",
60"fips-1.0/rand",
61"fips-1.0/rsa",
62"fips-1.0/sha",
63"ssl", 61"ssl",
64"apps", 62"apps",
63"engines",
65"test", 64"test",
66"tools" 65"tools"
67); 66);
diff --git a/src/lib/libcrypto/util/mklink.pl b/src/lib/libcrypto/util/mklink.pl
index 182732d959..d9bc98aab8 100644
--- a/src/lib/libcrypto/util/mklink.pl
+++ b/src/lib/libcrypto/util/mklink.pl
@@ -14,7 +14,6 @@
14# not contain symbolic links and that the parent of / is never referenced. 14# not contain symbolic links and that the parent of / is never referenced.
15# Apart from this, this script should be able to handle even the most 15# Apart from this, this script should be able to handle even the most
16# pathological cases. 16# pathological cases.
17#
18 17
19use Cwd; 18use Cwd;
20 19
diff --git a/src/lib/libcrypto/util/opensslwrap.sh b/src/lib/libcrypto/util/opensslwrap.sh
index 91d29e2b87..b27cbb897f 100755
--- a/src/lib/libcrypto/util/opensslwrap.sh
+++ b/src/lib/libcrypto/util/opensslwrap.sh
@@ -3,6 +3,10 @@
3HERE="`echo $0 | sed -e 's|[^/]*$||'`" 3HERE="`echo $0 | sed -e 's|[^/]*$||'`"
4OPENSSL="${HERE}../apps/openssl" 4OPENSSL="${HERE}../apps/openssl"
5 5
6if [ -d "${HERE}../engines" -a "x$OPENSSL_ENGINES" = "x" ]; then
7 OPENSSL_ENGINES="${HERE}../engines"; export OPENSSL_ENGINES
8fi
9
6if [ -x "${OPENSSL}.exe" ]; then 10if [ -x "${OPENSSL}.exe" ]; then
7 # The original reason for this script existence is to work around 11 # The original reason for this script existence is to work around
8 # certain caveats in run-time linker behaviour. On Windows platforms 12 # certain caveats in run-time linker behaviour. On Windows platforms
diff --git a/src/lib/libcrypto/util/pl/BC-32.pl b/src/lib/libcrypto/util/pl/BC-32.pl
index 28869c868d..99b8c058d2 100644
--- a/src/lib/libcrypto/util/pl/BC-32.pl
+++ b/src/lib/libcrypto/util/pl/BC-32.pl
@@ -62,7 +62,7 @@ $des_enc_src='';
62$bf_enc_obj=''; 62$bf_enc_obj='';
63$bf_enc_src=''; 63$bf_enc_src='';
64 64
65if (!$no_asm && !$fips) 65if (!$no_asm)
66 { 66 {
67 $bn_mulw_obj='crypto\bn\asm\bn_win32.obj'; 67 $bn_mulw_obj='crypto\bn\asm\bn_win32.obj';
68 $bn_mulw_src='crypto\bn\asm\bn_win32.asm'; 68 $bn_mulw_src='crypto\bn\asm\bn_win32.asm';
@@ -126,18 +126,13 @@ ___
126 126
127sub do_link_rule 127sub do_link_rule
128 { 128 {
129 local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_; 129 local($target,$files,$dep_libs,$libs)=@_;
130 local($ret,$_); 130 local($ret,$_);
131 131
132 $file =~ s/\//$o/g if $o ne '/'; 132 $file =~ s/\//$o/g if $o ne '/';
133 $n=&bname($targer); 133 $n=&bname($targer);
134 $ret.="$target: $files $dep_libs\n"; 134 $ret.="$target: $files $dep_libs\n";
135 $ret.="\t\$(LINK) \$(LFLAGS) $files \$(APP_EX_OBJ), $target,, $libs\n"; 135 $ret.="\t\$(LINK) \$(LFLAGS) $files \$(APP_EX_OBJ), $target,, $libs\n\n";
136 if (defined $sha1file)
137 {
138 $ret.="\t$openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
139 }
140 $ret.="\n";
141 return($ret); 136 return($ret);
142 } 137 }
143 138
diff --git a/src/lib/libcrypto/util/pl/Mingw32.pl b/src/lib/libcrypto/util/pl/Mingw32.pl
index b9bb24d21d..8f0483fb93 100644
--- a/src/lib/libcrypto/util/pl/Mingw32.pl
+++ b/src/lib/libcrypto/util/pl/Mingw32.pl
@@ -19,9 +19,9 @@ $cc='gcc';
19if ($debug) 19if ($debug)
20 { $cflags="-DL_ENDIAN -DDSO_WIN32 -g2 -ggdb"; } 20 { $cflags="-DL_ENDIAN -DDSO_WIN32 -g2 -ggdb"; }
21else 21else
22 { $cflags="-DL_ENDIAN -DDSO_WIN32 -fomit-frame-pointer -O3 -mcpu=i486 -Wall"; } 22 { $cflags="-DL_ENDIAN -DDSO_WIN32 -fomit-frame-pointer -O3 -march=i486 -Wall"; }
23 23
24if ($gaswin and !$no_asm and !$fips) 24if ($gaswin and !$no_asm)
25 { 25 {
26 $bn_asm_obj='$(OBJ_D)\bn-win32.o'; 26 $bn_asm_obj='$(OBJ_D)\bn-win32.o';
27 $bn_asm_src='crypto/bn/asm/bn-win32.s'; 27 $bn_asm_src='crypto/bn/asm/bn-win32.s';
@@ -43,7 +43,9 @@ if ($gaswin and !$no_asm and !$fips)
43 $rmd160_asm_src='crypto/ripemd/asm/rm-win32.s'; 43 $rmd160_asm_src='crypto/ripemd/asm/rm-win32.s';
44 $sha1_asm_obj='$(OBJ_D)\s1-win32.o'; 44 $sha1_asm_obj='$(OBJ_D)\s1-win32.o';
45 $sha1_asm_src='crypto/sha/asm/s1-win32.s'; 45 $sha1_asm_src='crypto/sha/asm/s1-win32.s';
46 $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM"; 46 $cpuid_asm_obj='$(OBJ_D)\cpu-win32.o';
47 $cpuid_asm_src='crypto/cpu-win32.s';
48 $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM -DOPENSSL_BN_ASM_PART_WORDS";
47 } 49 }
48 50
49 51
@@ -92,18 +94,13 @@ sub do_lib_rule
92 94
93sub do_link_rule 95sub do_link_rule
94 { 96 {
95 local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_; 97 local($target,$files,$dep_libs,$libs)=@_;
96 local($ret,$_); 98 local($ret,$_);
97 99
98 $file =~ s/\//$o/g if $o ne '/'; 100 $file =~ s/\//$o/g if $o ne '/';
99 $n=&bname($target); 101 $n=&bname($target);
100 $ret.="$target: $files $dep_libs\n"; 102 $ret.="$target: $files $dep_libs\n";
101 $ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n"; 103 $ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n\n";
102 if (defined $sha1file)
103 {
104 $ret.="\t$openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
105 }
106 $ret.="\n";
107 return($ret); 104 return($ret);
108 } 105 }
1091; 1061;
diff --git a/src/lib/libcrypto/util/pl/OS2-EMX.pl b/src/lib/libcrypto/util/pl/OS2-EMX.pl
index 8dbeaa7a08..28cd116907 100644
--- a/src/lib/libcrypto/util/pl/OS2-EMX.pl
+++ b/src/lib/libcrypto/util/pl/OS2-EMX.pl
@@ -48,7 +48,7 @@ $des_enc_src="";
48$bf_enc_obj=""; 48$bf_enc_obj="";
49$bf_enc_src=""; 49$bf_enc_src="";
50 50
51if (!$no_asm && !$fips) 51if (!$no_asm)
52 { 52 {
53 $bn_asm_obj="crypto/bn/asm/bn-os2$obj crypto/bn/asm/co-os2$obj"; 53 $bn_asm_obj="crypto/bn/asm/bn-os2$obj crypto/bn/asm/co-os2$obj";
54 $bn_asm_src="crypto/bn/asm/bn-os2.asm crypto/bn/asm/co-os2.asm"; 54 $bn_asm_src="crypto/bn/asm/bn-os2.asm crypto/bn/asm/co-os2.asm";
@@ -107,18 +107,13 @@ sub do_lib_rule
107 107
108sub do_link_rule 108sub do_link_rule
109 { 109 {
110 local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_; 110 local($target,$files,$dep_libs,$libs)=@_;
111 local($ret,$_); 111 local($ret,$_);
112 112
113 $file =~ s/\//$o/g if $o ne '/'; 113 $file =~ s/\//$o/g if $o ne '/';
114 $n=&bname($target); 114 $n=&bname($target);
115 $ret.="$target: $files $dep_libs\n"; 115 $ret.="$target: $files $dep_libs\n";
116 $ret.="\t\$(LINK) ${efile}$target \$(CFLAG) \$(LFLAGS) $files $libs\n"; 116 $ret.="\t\$(LINK) ${efile}$target \$(CFLAG) \$(LFLAGS) $files $libs\n\n";
117 if (defined $sha1file)
118 {
119 $ret.="\t$openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
120 }
121 $ret.="\n";
122 return($ret); 117 return($ret);
123 } 118 }
124 119
diff --git a/src/lib/libcrypto/util/pl/VC-32.pl b/src/lib/libcrypto/util/pl/VC-32.pl
index 4e97dfa9af..9cb2ab7e99 100644
--- a/src/lib/libcrypto/util/pl/VC-32.pl
+++ b/src/lib/libcrypto/util/pl/VC-32.pl
@@ -1,56 +1,154 @@
1#!/usr/local/bin/perl 1#!/usr/local/bin/perl
2# VCw32lib.pl - the file for Visual C++ 4.[01] for windows NT, static libraries 2# VC-32.pl - unified script for Microsoft Visual C++, covering Win32,
3# Win64 and WinCE [follow $FLAVOR variable to trace the differences].
3# 4#
4 5
5$ssl= "ssleay32"; 6$ssl= "ssleay32";
6 7$crypto="libeay32";
7if ($fips && !$shlib)
8 {
9 $crypto="libeayfips32";
10 $crypto_compat = "libeaycompat32.lib";
11 }
12else
13 {
14 $crypto="libeay32";
15 }
16 8
17$o='\\'; 9$o='\\';
18$cp='copy nul+'; # Timestamps get stuffed otherwise 10$cp='$(PERL) util/copy.pl';
11$mkdir='$(PERL) util/mkdir-p.pl';
19$rm='del'; 12$rm='del';
20 13
21$zlib_lib="zlib1.lib"; 14$zlib_lib="zlib1.lib";
22 15
23# C compiler stuff 16# C compiler stuff
24$cc='cl'; 17$cc='cl';
25$cflags=' /MD /W3 /WX /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32'; 18if ($FLAVOR =~ /WIN64/)
26$cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8 19 {
27$cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8 20 # Note that we currently don't have /WX on Win64! There is a lot of
28$lflags="/nologo /subsystem:console /machine:I386 /opt:ref"; 21 # warnings, but only of two types:
22 #
23 # C4344: conversion from '__int64' to 'int/long', possible loss of data
24 # C4267: conversion from 'size_t' to 'int/long', possible loss of data
25 #
26 # Amount of latter type is minimized by aliasing strlen to function of
27 # own desing and limiting its return value to 2GB-1 (see e_os.h). As
28 # per 0.9.8 release remaining warnings were explicitly examined and
29 # considered safe to ignore.
30 #
31 $base_cflags=' /W3 /Gs0 /GF /Gy /nologo -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DOPENSSL_SYSNAME_WIN32 -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE';
32 $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
33 $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
34 my $f = $shlib?' /MD':' /MT';
35 $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
36 $opt_cflags=$f.' /Ox';
37 $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
38 $lflags="/nologo /subsystem:console /opt:ref";
39 }
40elsif ($FLAVOR =~ /CE/)
41 {
42 # sanity check
43 die '%OSVERSION% is not defined' if (!defined($ENV{'OSVERSION'}));
44 die '%PLATFORM% is not defined' if (!defined($ENV{'PLATFORM'}));
45 die '%TARGETCPU% is not defined' if (!defined($ENV{'TARGETCPU'}));
46
47 #
48 # Idea behind this is to mimic flags set by eVC++ IDE...
49 #
50 $wcevers = $ENV{'OSVERSION'}; # WCENNN
51 die '%OSVERSION% value is insane' if ($wcevers !~ /^WCE([1-9])([0-9]{2})$/);
52 $wcecdefs = "-D_WIN32_WCE=$1$2 -DUNDER_CE=$1$2"; # -D_WIN32_WCE=NNN
53 $wcelflag = "/subsystem:windowsce,$1.$2"; # ...,N.NN
54
55 $wceplatf = $ENV{'PLATFORM'};
56 $wceplatf =~ tr/a-z0-9 /A-Z0-9_/d;
57 $wcecdefs .= " -DWCE_PLATFORM_$wceplatf";
58
59 $wcetgt = $ENV{'TARGETCPU'}; # just shorter name...
60 SWITCH: for($wcetgt) {
61 /^X86/ && do { $wcecdefs.=" -Dx86 -D_X86_ -D_i386_ -Di_386_";
62 $wcelflag.=" /machine:IX86"; last; };
63 /^ARMV4[IT]/ && do { $wcecdefs.=" -DARM -D_ARM_ -D$wcetgt";
64 $wcecdefs.=" -DTHUMB -D_THUMB_" if($wcetgt=~/T$/);
65 $wcecdefs.=" -QRarch4T -QRinterwork-return";
66 $wcelflag.=" /machine:THUMB"; last; };
67 /^ARM/ && do { $wcecdefs.=" -DARM -D_ARM_ -D$wcetgt";
68 $wcelflag.=" /machine:ARM"; last; };
69 /^MIPSIV/ && do { $wcecdefs.=" -DMIPS -D_MIPS_ -DR4000 -D$wcetgt";
70 $wcecdefs.=" -D_MIPS64 -QMmips4 -QMn32";
71 $wcelflag.=" /machine:MIPSFPU"; last; };
72 /^MIPS16/ && do { $wcecdefs.=" -DMIPS -D_MIPS_ -DR4000 -D$wcetgt";
73 $wcecdefs.=" -DMIPSII -QMmips16";
74 $wcelflag.=" /machine:MIPS16"; last; };
75 /^MIPSII/ && do { $wcecdefs.=" -DMIPS -D_MIPS_ -DR4000 -D$wcetgt";
76 $wcecdefs.=" -QMmips2";
77 $wcelflag.=" /machine:MIPS"; last; };
78 /^R4[0-9]{3}/ && do { $wcecdefs.=" -DMIPS -D_MIPS_ -DR4000";
79 $wcelflag.=" /machine:MIPS"; last; };
80 /^SH[0-9]/ && do { $wcecdefs.=" -D$wcetgt -D_$wcetgt_ -DSHx";
81 $wcecdefs.=" -Qsh4" if ($wcetgt =~ /^SH4/);
82 $wcelflag.=" /machine:$wcetgt"; last; };
83 { $wcecdefs.=" -D$wcetgt -D_$wcetgt_";
84 $wcelflag.=" /machine:$wcetgt"; last; };
85 }
86
87 $cc='$(CC)';
88 $base_cflags=' /W3 /WX /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT';
89 $base_cflags.=" $wcecdefs";
90 $opt_cflags=' /MC /O1i'; # optimize for space, but with intrinsics...
91 $dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG';
92 $lflags="/nologo /opt:ref $wcelflag";
93 }
94else # Win32
95 {
96 $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
97 $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
98 $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
99 my $f = $shlib?' /MD':' /MT';
100 $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
101 $opt_cflags=$f.' /Ox /O2 /Ob2';
102 $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
103 $lflags="/nologo /subsystem:console /opt:ref";
104 }
29$mlflags=''; 105$mlflags='';
30 106
31$out_def="out32"; 107$out_def="out32"; $out_def.='_$(TARGETCPU)' if ($FLAVOR =~ /CE/);
32$tmp_def="tmp32"; 108$tmp_def="tmp32"; $tmp_def.='_$(TARGETCPU)' if ($FLAVOR =~ /CE/);
33$inc_def="inc32"; 109$inc_def="inc32";
34 110
35if ($debug) 111if ($debug)
36 { 112 {
37 $cflags=" /MDd /W3 /WX /Zi /Yd /Od /nologo -DOPENSSL_SYSNAME_WIN32 -D_DEBUG -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DDEBUG -DDSO_WIN32"; 113 $cflags=$dbg_cflags.$base_cflags;
38 $lflags.=" /debug"; 114 $lflags.=" /debug";
39 $mlflags.=' /debug'; 115 $mlflags.=' /debug';
40 } 116 }
41$cflags .= " -DOPENSSL_SYSNAME_WINNT" if $NT == 1; 117else
118 {
119 $cflags=$opt_cflags.$base_cflags;
120 }
42 121
43$obj='.obj'; 122$obj='.obj';
44$ofile="/Fo"; 123$ofile="/Fo";
45 124
46# EXE linking stuff 125# EXE linking stuff
47$link="link"; 126$link="link";
127$rsc="rc";
48$efile="/out:"; 128$efile="/out:";
49$exep='.exe'; 129$exep='.exe';
50if ($no_sock) 130if ($no_sock) { $ex_libs=''; }
51 { $ex_libs=""; } 131elsif ($FLAVOR =~ /CE/) { $ex_libs='winsock.lib'; }
52else { $ex_libs="wsock32.lib user32.lib gdi32.lib"; } 132else { $ex_libs='wsock32.lib'; }
53 133
134if ($FLAVOR =~ /CE/)
135 {
136 $ex_libs.=' $(WCECOMPAT)/lib/wcecompatex.lib';
137 $ex_libs.=' /nodefaultlib:oldnames.lib coredll.lib corelibc.lib' if ($ENV{'TARGETCPU'} eq "X86");
138 }
139else
140 {
141 $ex_libs.=' gdi32.lib advapi32.lib user32.lib';
142 $ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
143 }
144
145# As native NT API is pure UNICODE, our WIN-NT build defaults to UNICODE,
146# but gets linked with unicows.lib to ensure backward compatibility.
147if ($FLAVOR =~ /NT/)
148 {
149 $cflags.=" -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE";
150 $ex_libs="unicows.lib $ex_libs";
151 }
54# static library stuff 152# static library stuff
55$mklib='lib'; 153$mklib='lib';
56$ranlib=''; 154$ranlib='';
@@ -60,9 +158,12 @@ $shlibp=($shlib)?".dll":".lib";
60$lfile='/out:'; 158$lfile='/out:';
61 159
62$shlib_ex_obj=""; 160$shlib_ex_obj="";
63$app_ex_obj="setargv.obj"; 161$app_ex_obj="setargv.obj" if ($FLAVOR !~ /CE/);
64if ($nasm) { 162if ($nasm) {
65 $asm='nasmw -f win32'; 163 my $ver=`nasm -v 2>NUL`;
164 my $vew=`nasmw -v 2>NUL`;
165 # pick newest version
166 $asm=($ver gt $vew?"nasm":"nasmw")." -f win32";
66 $afile='-o '; 167 $afile='-o ';
67} else { 168} else {
68 $asm='ml /Cp /coff /c /Cx'; 169 $asm='ml /Cp /coff /c /Cx';
@@ -77,10 +178,14 @@ $des_enc_src='';
77$bf_enc_obj=''; 178$bf_enc_obj='';
78$bf_enc_src=''; 179$bf_enc_src='';
79 180
80if (!$no_asm && !$fips) 181if (!$no_asm)
81 { 182 {
183 $aes_asm_obj='crypto\aes\asm\a_win32.obj';
184 $aes_asm_src='crypto\aes\asm\a_win32.asm';
82 $bn_asm_obj='crypto\bn\asm\bn_win32.obj'; 185 $bn_asm_obj='crypto\bn\asm\bn_win32.obj';
83 $bn_asm_src='crypto\bn\asm\bn_win32.asm'; 186 $bn_asm_src='crypto\bn\asm\bn_win32.asm';
187 $bnco_asm_obj='crypto\bn\asm\co_win32.obj';
188 $bnco_asm_src='crypto\bn\asm\co_win32.asm';
84 $des_enc_obj='crypto\des\asm\d_win32.obj crypto\des\asm\y_win32.obj'; 189 $des_enc_obj='crypto\des\asm\d_win32.obj crypto\des\asm\y_win32.obj';
85 $des_enc_src='crypto\des\asm\d_win32.asm crypto\des\asm\y_win32.asm'; 190 $des_enc_src='crypto\des\asm\d_win32.asm crypto\des\asm\y_win32.asm';
86 $bf_enc_obj='crypto\bf\asm\b_win32.obj'; 191 $bf_enc_obj='crypto\bf\asm\b_win32.obj';
@@ -93,76 +198,96 @@ if (!$no_asm && !$fips)
93 $rc5_enc_src='crypto\rc5\asm\r5_win32.asm'; 198 $rc5_enc_src='crypto\rc5\asm\r5_win32.asm';
94 $md5_asm_obj='crypto\md5\asm\m5_win32.obj'; 199 $md5_asm_obj='crypto\md5\asm\m5_win32.obj';
95 $md5_asm_src='crypto\md5\asm\m5_win32.asm'; 200 $md5_asm_src='crypto\md5\asm\m5_win32.asm';
96 $sha1_asm_obj='crypto\sha\asm\s1_win32.obj'; 201 $sha1_asm_obj='crypto\sha\asm\s1_win32.obj crypto\sha\asm\sha512-sse2.obj';
97 $sha1_asm_src='crypto\sha\asm\s1_win32.asm'; 202 $sha1_asm_src='crypto\sha\asm\s1_win32.asm crypto\sha\asm\sha512-sse2.asm';
98 $rmd160_asm_obj='crypto\ripemd\asm\rm_win32.obj'; 203 $rmd160_asm_obj='crypto\ripemd\asm\rm_win32.obj';
99 $rmd160_asm_src='crypto\ripemd\asm\rm_win32.asm'; 204 $rmd160_asm_src='crypto\ripemd\asm\rm_win32.asm';
100 $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM"; 205 $cpuid_asm_obj='crypto\cpu_win32.obj';
206 $cpuid_asm_src='crypto\cpu_win32.asm';
207 $cflags.=" -DOPENSSL_CPUID_OBJ -DOPENSSL_IA32_SSE2 -DAES_ASM -DBN_ASM -DOPENSSL_BN_ASM_PART_WORDS -DMD5_ASM -DSHA1_ASM -DRMD160_ASM";
101 } 208 }
102 209
103if ($shlib) 210if ($shlib && $FLAVOR !~ /CE/)
104 { 211 {
105 $mlflags.=" $lflags /dll"; 212 $mlflags.=" $lflags /dll";
106# $cflags =~ s| /MD| /MT|;
107 $lib_cflag=" -D_WINDLL"; 213 $lib_cflag=" -D_WINDLL";
108 $out_def="out32dll"; 214 $out_def="out32dll";
109 $tmp_def="tmp32dll"; 215 $tmp_def="tmp32dll";
216 #
217 # Engage Applink...
218 #
219 $app_ex_obj.=" \$(OBJ_D)\\applink.obj /implib:\$(TMP_D)\\junk.lib";
220 $cflags.=" -DOPENSSL_USE_APPLINK -I.";
221 # I'm open for better suggestions than overriding $banner...
222 $banner=<<'___';
223 @echo Building OpenSSL
224
225$(OBJ_D)\applink.obj: ms\applink.c
226 $(CC) /Fo$(OBJ_D)\applink.obj $(APP_CFLAGS) -c ms\applink.c
227$(OBJ_D)\uplink.obj: ms\uplink.c ms\applink.c
228 $(CC) /Fo$(OBJ_D)\uplink.obj $(SHLIB_CFLAGS) -c ms\uplink.c
229$(INCO_D)\applink.c: ms\applink.c
230 $(CP) ms\applink.c $(INCO_D)\applink.c
231
232EXHEADER= $(EXHEADER) $(INCO_D)\applink.c
233
234LIBS_DEP=$(LIBS_DEP) $(OBJ_D)\applink.obj
235CRYPTOOBJ=$(OBJ_D)\uplink.obj $(CRYPTOOBJ)
236___
237 $banner.=<<'___' if ($FLAVOR =~ /WIN64/);
238CRYPTOOBJ=ms\uptable.obj $(CRYPTOOBJ)
239___
240 }
241elsif ($shlib && $FLAVOR =~ /CE/)
242 {
243 $mlflags.=" $lflags /dll";
244 $lib_cflag=" -D_WINDLL -D_DLL";
245 $out_def='out32dll_$(TARGETCPU)';
246 $tmp_def='tmp32dll_$(TARGETCPU)';
110 } 247 }
111 248
112$cflags.=" /Fd$out_def"; 249$cflags.=" /Fd$out_def";
113 250
114sub do_lib_rule 251sub do_lib_rule
115 { 252 {
116 local($objs,$target,$name,$shlib,$ign,$base_addr) = @_; 253 local($objs,$target,$name,$shlib)=@_;
117 local($ret,$Name); 254 local($ret);
118 255
119 $taget =~ s/\//$o/g if $o ne '/'; 256 $taget =~ s/\//$o/g if $o ne '/';
120 ($Name=$name) =~ tr/a-z/A-Z/; 257 if ($name ne "")
121 my $base_arg;
122 if ($base_addr ne "")
123 {
124 $base_arg= " /base:$base_addr";
125 }
126 else
127 { 258 {
128 $base_arg = ""; 259 $name =~ tr/a-z/A-Z/;
260 $name = "/def:ms/${name}.def";
129 } 261 }
130 262
131
132# $target="\$(LIB_D)$o$target"; 263# $target="\$(LIB_D)$o$target";
264 $ret.="$target: $objs\n";
133 if (!$shlib) 265 if (!$shlib)
134 { 266 {
135# $ret.="\t\$(RM) \$(O_$Name)\n"; 267# $ret.="\t\$(RM) \$(O_$Name)\n";
136 $ret.="$target: $objs\n"; 268 $ex =' ';
137 $ex =' advapi32.lib';
138 $ex.=" \$(FIPSLIB_D)${o}_chkstk.o" if $fips && $target =~ /O_CRYPTO/;
139 $ret.="\t\$(MKLIB) $lfile$target @<<\n $objs $ex\n<<\n"; 269 $ret.="\t\$(MKLIB) $lfile$target @<<\n $objs $ex\n<<\n";
140 } 270 }
141 else 271 else
142 { 272 {
143 local($ex)=($target =~ /O_SSL/)?' $(L_CRYPTO)':''; 273 local($ex)=($target =~ /O_CRYPTO/)?'':' $(L_CRYPTO)';
144 $ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib'; 274 if ($name eq "")
145 $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/; 275 {
146 if ($fips && $target =~ /O_CRYPTO/) 276 $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
277 }
278 elsif ($FLAVOR =~ /CE/)
147 { 279 {
148 $ex.=" \$(FIPSLIB_D)${o}_chkstk.o"; 280 $ex.=' winsock.lib $(WCECOMPAT)/lib/wcecompatex.lib';
149 $ret.="$target: $objs \$(PREMAIN_DSO_EXE)\n";
150 $ret.="\tSET FIPS_LINK=\$(LINK)\n";
151 $ret.="\tSET FIPS_CC=\$(CC)\n";
152 $ret.="\tSET FIPS_CC_ARGS=/Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\n";
153 $ret.="\tSET PREMAIN_DSO_EXE=\$(PREMAIN_DSO_EXE)\n";
154 $ret.="\tSET FIPS_SHA1_EXE=\$(FIPS_SHA1_EXE)\n";
155 $ret.="\tSET FIPS_TARGET=$target\n";
156 $ret.="\tSET FIPSLIB_D=\$(FIPSLIB_D)\n";
157 $ret.="\t\$(FIPSLINK) \$(MLFLAGS) $base_arg $efile$target ";
158 $ret.="/def:ms/${Name}.def @<<\n \$(SHLIB_EX_OBJ) $objs ";
159 $ret.="\$(OBJ_D)${o}fips_premain.obj $ex\n<<\n";
160 } 281 }
161 else 282 else
162 { 283 {
163 $ret.="$target: $objs\n"; 284 $ex.=' unicows.lib' if ($FLAVOR =~ /NT/);
164 $ret.="\t\$(LINK) \$(MLFLAGS) $base_arg $efile$target /def:ms/${Name}.def @<<\n \$(SHLIB_EX_OBJ) $objs $ex\n<<\n"; 285 $ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib';
286 $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
165 } 287 }
288 $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;
289 $ret.="\t\$(LINK) \$(MLFLAGS) $efile$target $name @<<\n \$(SHLIB_EX_OBJ) $objs $ex\n<<\n";
290 $ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;2\n\n";
166 } 291 }
167 $ret.="\n"; 292 $ret.="\n";
168 return($ret); 293 return($ret);
@@ -170,51 +295,16 @@ sub do_lib_rule
170 295
171sub do_link_rule 296sub do_link_rule
172 { 297 {
173 local($target,$files,$dep_libs,$libs,$standalone)=@_;
174 local($ret,$_);
175 $file =~ s/\//$o/g if $o ne '/';
176 $n=&bname($targer);
177 $ret.="$target: $files $dep_libs\n";
178 if ($standalone)
179 {
180 $ret.=" \$(LINK) \$(LFLAGS) $efile$target @<<\n\t";
181 $ret.="\$(FIPSLIB_D)${o}_chkstk.o " if ($files =~ /O_FIPSCANISTER/);
182 $ret.="$files $libs\n<<\n";
183 }
184 elsif ($fips && !$shlib)
185 {
186 $ret.="\tSET FIPS_LINK=\$(LINK)\n";
187 $ret.="\tSET FIPS_CC=\$(CC)\n";
188 $ret.="\tSET FIPS_CC_ARGS=/Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\n";
189 $ret.="\tSET PREMAIN_DSO_EXE=\n";
190 $ret.="\tSET FIPS_TARGET=$target\n";
191 $ret.="\tSET FIPS_SHA1_EXE=\$(FIPS_SHA1_EXE)\n";
192 $ret.="\tSET FIPSLIB_D=\$(FIPSLIB_D)\n";
193 $ret.=" \$(FIPSLINK) \$(LFLAGS) $efile$target @<<\n";
194 $ret.=" \$(APP_EX_OBJ) $files \$(OBJ_D)${o}fips_premain.obj $libs\n<<\n";
195 }
196 else
197 {
198 $ret.=" \$(LINK) \$(LFLAGS) $efile$target @<<\n";
199 $ret.=" \$(APP_EX_OBJ) $files $libs\n<<\n";
200 }
201 $ret.="\n";
202 return($ret);
203 }
204
205sub do_rlink_rule
206 {
207 local($target,$files,$dep_libs,$libs)=@_; 298 local($target,$files,$dep_libs,$libs)=@_;
208 local($ret,$_); 299 local($ret,$_);
209 300
210 $file =~ s/\//$o/g if $o ne '/'; 301 $file =~ s/\//$o/g if $o ne '/';
211 $n=&bname($targer); 302 $n=&bname($targer);
212 $ret.="$target: $files $dep_libs\n"; 303 $ret.="$target: $files $dep_libs\n";
213 $ret.=" \$(MKCANISTER) $target <<\n"; 304 $ret.="\t\$(LINK) \$(LFLAGS) $efile$target @<<\n";
214 $ret.="INPUT($files)\n<<\n"; 305 $ret.=" \$(APP_EX_OBJ) $files $libs\n<<\n";
215 $ret.="\n"; 306 $ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;1\n\n";
216 return($ret); 307 return($ret);
217 } 308 }
218 309
219
2201; 3101;
diff --git a/src/lib/libcrypto/util/pl/linux.pl b/src/lib/libcrypto/util/pl/linux.pl
index df05c40526..d24f7b7291 100644
--- a/src/lib/libcrypto/util/pl/linux.pl
+++ b/src/lib/libcrypto/util/pl/linux.pl
@@ -39,7 +39,7 @@ if (!$no_asm)
39 $rmd160_asm_src='crypto/ripemd/asm/rm86unix.cpp'; 39 $rmd160_asm_src='crypto/ripemd/asm/rm86unix.cpp';
40 $sha1_asm_obj='$(OBJ_D)/sx86-elf.o'; 40 $sha1_asm_obj='$(OBJ_D)/sx86-elf.o';
41 $sha1_asm_src='crypto/sha/asm/sx86unix.cpp'; 41 $sha1_asm_src='crypto/sha/asm/sx86unix.cpp';
42 $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM"; 42 $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM -DOPENSSL_BN_ASM_PART_WORDS";
43 } 43 }
44 44
45$cflags.=" -DTERMIO -DL_ENDIAN -m486 -Wall"; 45$cflags.=" -DTERMIO -DL_ENDIAN -m486 -Wall";
@@ -72,18 +72,13 @@ sub do_shlib_rule
72 72
73sub do_link_rule 73sub do_link_rule
74 { 74 {
75 local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_; 75 local($target,$files,$dep_libs,$libs)=@_;
76 local($ret,$_); 76 local($ret,$_);
77 77
78 $file =~ s/\//$o/g if $o ne '/'; 78 $file =~ s/\//$o/g if $o ne '/';
79 $n=&bname($target); 79 $n=&bname($target);
80 $ret.="$target: $files $dep_libs\n"; 80 $ret.="$target: $files $dep_libs\n";
81 $ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n"; 81 $ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n\n";
82 if (defined $sha1file)
83 {
84 $ret.="\t$openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
85 }
86 $ret.="\n";
87 return($ret); 82 return($ret);
88 } 83 }
89 84
diff --git a/src/lib/libcrypto/util/pl/ultrix.pl b/src/lib/libcrypto/util/pl/ultrix.pl
index 447b854708..ea370c71f9 100644
--- a/src/lib/libcrypto/util/pl/ultrix.pl
+++ b/src/lib/libcrypto/util/pl/ultrix.pl
@@ -17,7 +17,7 @@ else
17 17
18$cflags.=" -std1 -DL_ENDIAN"; 18$cflags.=" -std1 -DL_ENDIAN";
19 19
20if (!$no_asm && !$fips) 20if (!$no_asm)
21 { 21 {
22 $bn_asm_obj='$(OBJ_D)/mips1.o'; 22 $bn_asm_obj='$(OBJ_D)/mips1.o';
23 $bn_asm_src='crypto/bn/asm/mips1.s'; 23 $bn_asm_src='crypto/bn/asm/mips1.s';
@@ -25,18 +25,13 @@ if (!$no_asm && !$fips)
25 25
26sub do_link_rule 26sub do_link_rule
27 { 27 {
28 local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_; 28 local($target,$files,$dep_libs,$libs)=@_;
29 local($ret,$_); 29 local($ret,$_);
30 30
31 $file =~ s/\//$o/g if $o ne '/'; 31 $file =~ s/\//$o/g if $o ne '/';
32 $n=&bname($target); 32 $n=&bname($target);
33 $ret.="$target: $files $dep_libs\n"; 33 $ret.="$target: $files $dep_libs\n";
34 $ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n"; 34 $ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n\n";
35 if (defined $sha1file)
36 {
37 $ret.="\t$openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
38 }
39 $ret.="\n";
40 return($ret); 35 return($ret);
41 } 36 }
42 37
diff --git a/src/lib/libcrypto/util/pl/unix.pl b/src/lib/libcrypto/util/pl/unix.pl
index bbd1798a2e..146611ad99 100644
--- a/src/lib/libcrypto/util/pl/unix.pl
+++ b/src/lib/libcrypto/util/pl/unix.pl
@@ -70,18 +70,13 @@ sub do_lib_rule
70 70
71sub do_link_rule 71sub do_link_rule
72 { 72 {
73 local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_; 73 local($target,$files,$dep_libs,$libs)=@_;
74 local($ret,$_); 74 local($ret,$_);
75 75
76 $file =~ s/\//$o/g if $o ne '/'; 76 $file =~ s/\//$o/g if $o ne '/';
77 $n=&bname($target); 77 $n=&bname($target);
78 $ret.="$target: $files $dep_libs\n"; 78 $ret.="$target: $files $dep_libs\n";
79 $ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n"; 79 $ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n\n";
80 if (defined $sha1file)
81 {
82 $ret.="\t$openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
83 }
84 $ret.="\n";
85 return($ret); 80 return($ret);
86 } 81 }
87 82
diff --git a/src/lib/libcrypto/util/shlib_wrap.sh b/src/lib/libcrypto/util/shlib_wrap.sh
index dc5f5b1ce4..a2f62d696f 100755
--- a/src/lib/libcrypto/util/shlib_wrap.sh
+++ b/src/lib/libcrypto/util/shlib_wrap.sh
@@ -22,19 +22,39 @@ SunOS|IRIX*)
22 # variables depending on target ABI... 22 # variables depending on target ABI...
23 rld_var=LD_LIBRARY_PATH 23 rld_var=LD_LIBRARY_PATH
24 case "`(/usr/bin/file "$LIBCRYPTOSO") 2>/dev/null`" in 24 case "`(/usr/bin/file "$LIBCRYPTOSO") 2>/dev/null`" in
25 *ELF\ 64*SPARC*) 25 *ELF\ 64*SPARC*|*ELF\ 64*AMD64*)
26 [ -n "$LD_LIBRARY_PATH_64" ] && rld_var=LD_LIBRARY_PATH_64 26 [ -n "$LD_LIBRARY_PATH_64" ] && rld_var=LD_LIBRARY_PATH_64
27 LD_PRELOAD_64="$LIBCRYPTOSO $LIBSSLSO"; export LD_PRELOAD_64
28 preload_var=LD_PRELOAD_64
29 ;;
30 # Why are newly built .so's preloaded anyway? Because run-time
31 # .so lookup path embedded into application takes precedence
32 # over LD_LIBRARY_PATH and as result application ends up linking
33 # to previously installed .so's. On IRIX instead of preloading
34 # newly built .so's we trick run-time linker to fail to find
35 # the installed .so by setting _RLD_ROOT variable.
36 *ELF\ 32*MIPS*)
37 #_RLD_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"; export _RLD_LIST
38 _RLD_ROOT=/no/such/dir; export _RLD_ROOT
39 eval $rld_var=\"/usr/lib'${'$rld_var':+:$'$rld_var'}'\"
40 preload_var=_RLD_LIST
27 ;; 41 ;;
28 *ELF\ N32*MIPS*) 42 *ELF\ N32*MIPS*)
29 [ -n "$LD_LIBRARYN32_PATH" ] && rld_var=LD_LIBRARYN32_PATH 43 [ -n "$LD_LIBRARYN32_PATH" ] && rld_var=LD_LIBRARYN32_PATH
30 _RLDN32_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"; export _RLDN32_LIST 44 #_RLDN32_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"; export _RLDN32_LIST
45 _RLDN32_ROOT=/no/such/dir; export _RLDN32_ROOT
46 eval $rld_var=\"/usr/lib32'${'$rld_var':+:$'$rld_var'}'\"
47 preload_var=_RLDN32_LIST
31 ;; 48 ;;
32 *ELF\ 64*MIPS*) 49 *ELF\ 64*MIPS*)
33 [ -n "$LD_LIBRARY64_PATH" ] && rld_var=LD_LIBRARY64_PATH 50 [ -n "$LD_LIBRARY64_PATH" ] && rld_var=LD_LIBRARY64_PATH
34 _RLD64_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"; export _RLD64_LIST 51 #_RLD64_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"; export _RLD64_LIST
52 _RLD64_ROOT=/no/such/dir; export _RLD64_ROOT
53 eval $rld_var=\"/usr/lib64'${'$rld_var':+:$'$rld_var'}'\"
54 preload_var=_RLD64_LIST
35 ;; 55 ;;
36 esac 56 esac
37 eval $rld_var=\"${THERE}:'$'$rld_var\"; export $rld_var 57 eval $rld_var=\"${THERE}'${'$rld_var':+:$'$rld_var'}'\"; export $rld_var
38 unset rld_var 58 unset rld_var
39 ;; 59 ;;
40*) LD_LIBRARY_PATH="${THERE}:$LD_LIBRARY_PATH" # Linux, ELF HP-UX 60*) LD_LIBRARY_PATH="${THERE}:$LD_LIBRARY_PATH" # Linux, ELF HP-UX
@@ -52,7 +72,7 @@ SunOS|IRIX*)
52 ;; 72 ;;
53esac 73esac
54 74
55if [ -f "$LIBCRYPTOSO" ]; then 75if [ -f "$LIBCRYPTOSO" -a -z "$preload_var" ]; then
56 # Following three lines are major excuse for isolating them into 76 # Following three lines are major excuse for isolating them into
57 # this wrapper script. Original reason for setting LD_PRELOAD 77 # this wrapper script. Original reason for setting LD_PRELOAD
58 # was to make it possible to pass 'make test' when user linked 78 # was to make it possible to pass 'make test' when user linked
@@ -64,7 +84,8 @@ if [ -f "$LIBCRYPTOSO" ]; then
64 *) LD_PRELOAD="$LIBCRYPTOSO $LIBSSLSO" ;; # SunOS, Linux, ELF HP-UX 84 *) LD_PRELOAD="$LIBCRYPTOSO $LIBSSLSO" ;; # SunOS, Linux, ELF HP-UX
65 esac 85 esac
66 _RLD_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT" # Tru64, o32 IRIX 86 _RLD_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT" # Tru64, o32 IRIX
67 export LD_PRELOAD _RLD_LIST 87 DYLD_INSERT_LIBRARIES="$LIBCRYPTOSO:$LIBSSLSO" # MacOS X
88 export LD_PRELOAD _RLD_LIST DYLD_INSERT_LIBRARIES
68fi 89fi
69 90
70exec "$@" 91exec "$@"
diff --git a/src/lib/libcrypto/util/ssleay.num b/src/lib/libcrypto/util/ssleay.num
index 46e38a131f..b3ac136a56 100644
--- a/src/lib/libcrypto/util/ssleay.num
+++ b/src/lib/libcrypto/util/ssleay.num
@@ -170,7 +170,7 @@ SSL_add_file_cert_subjs_to_stk 185 EXIST:VMS:FUNCTION:STDIO
170SSL_set_tmp_rsa_callback 186 EXIST::FUNCTION:RSA 170SSL_set_tmp_rsa_callback 186 EXIST::FUNCTION:RSA
171SSL_set_tmp_dh_callback 187 EXIST::FUNCTION:DH 171SSL_set_tmp_dh_callback 187 EXIST::FUNCTION:DH
172SSL_add_dir_cert_subjects_to_stack 188 EXIST:!VMS:FUNCTION:STDIO 172SSL_add_dir_cert_subjects_to_stack 188 EXIST:!VMS:FUNCTION:STDIO
173SSL_add_dir_cert_subjs_to_stk 188 NOEXIST::FUNCTION: 173SSL_add_dir_cert_subjs_to_stk 188 EXIST:VMS:FUNCTION:STDIO
174SSL_set_session_id_context 189 EXIST::FUNCTION: 174SSL_set_session_id_context 189 EXIST::FUNCTION:
175SSL_CTX_use_certificate_chain_file 222 EXIST:!VMS:FUNCTION:STDIO 175SSL_CTX_use_certificate_chain_file 222 EXIST:!VMS:FUNCTION:STDIO
176SSL_CTX_use_cert_chain_file 222 EXIST:VMS:FUNCTION:STDIO 176SSL_CTX_use_cert_chain_file 222 EXIST:VMS:FUNCTION:STDIO
@@ -215,3 +215,29 @@ SSL_CTX_set_generate_session_id 264 EXIST::FUNCTION:
215SSL_renegotiate_pending 265 EXIST::FUNCTION: 215SSL_renegotiate_pending 265 EXIST::FUNCTION:
216SSL_CTX_set_msg_callback 266 EXIST::FUNCTION: 216SSL_CTX_set_msg_callback 266 EXIST::FUNCTION:
217SSL_set_msg_callback 267 EXIST::FUNCTION: 217SSL_set_msg_callback 267 EXIST::FUNCTION:
218DTLSv1_client_method 268 EXIST::FUNCTION:
219SSL_CTX_set_tmp_ecdh_callback 269 EXIST::FUNCTION:ECDH
220SSL_set_tmp_ecdh_callback 270 EXIST::FUNCTION:ECDH
221SSL_COMP_get_name 271 EXIST::FUNCTION:COMP
222SSL_get_current_compression 272 EXIST::FUNCTION:COMP
223DTLSv1_method 273 EXIST::FUNCTION:
224SSL_get_current_expansion 274 EXIST::FUNCTION:COMP
225DTLSv1_server_method 275 EXIST::FUNCTION:
226SSL_COMP_get_compression_methods 276 EXIST:!VMS:FUNCTION:COMP
227SSL_COMP_get_compress_methods 276 EXIST:VMS:FUNCTION:COMP
228SSL_SESSION_get_id 277 EXIST::FUNCTION:
229SSL_CTX_sess_set_new_cb 278 EXIST::FUNCTION:
230SSL_CTX_sess_get_get_cb 279 EXIST::FUNCTION:
231SSL_CTX_sess_set_get_cb 280 EXIST::FUNCTION:
232SSL_CTX_set_cookie_verify_cb 281 EXIST::FUNCTION:
233SSL_CTX_get_info_callback 282 EXIST::FUNCTION:
234SSL_CTX_set_cookie_generate_cb 283 EXIST::FUNCTION:
235SSL_CTX_set_client_cert_cb 284 EXIST::FUNCTION:
236SSL_CTX_sess_set_remove_cb 285 EXIST::FUNCTION:
237SSL_CTX_set_info_callback 286 EXIST::FUNCTION:
238SSL_CTX_sess_get_new_cb 287 EXIST::FUNCTION:
239SSL_CTX_get_client_cert_cb 288 EXIST::FUNCTION:
240SSL_CTX_sess_get_remove_cb 289 EXIST::FUNCTION:
241SSL_set_SSL_CTX 290 EXIST::FUNCTION:
242SSL_get_servername 291 EXIST::FUNCTION:TLSEXT
243SSL_get_servername_type 292 EXIST::FUNCTION:TLSEXT
diff --git a/src/lib/libcrypto/x509/Makefile b/src/lib/libcrypto/x509/Makefile
index ee3f8a4a23..ddcc3124a7 100644
--- a/src/lib/libcrypto/x509/Makefile
+++ b/src/lib/libcrypto/x509/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include 8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -27,13 +22,13 @@ LIBSRC= x509_def.c x509_d2.c x509_r2x.c x509_cmp.c \
27 x509_set.c x509cset.c x509rset.c x509_err.c \ 22 x509_set.c x509cset.c x509rset.c x509_err.c \
28 x509name.c x509_v3.c x509_ext.c x509_att.c \ 23 x509name.c x509_v3.c x509_ext.c x509_att.c \
29 x509type.c x509_lu.c x_all.c x509_txt.c \ 24 x509type.c x509_lu.c x_all.c x509_txt.c \
30 x509_trs.c by_file.c by_dir.c 25 x509_trs.c by_file.c by_dir.c x509_vpm.c
31LIBOBJ= x509_def.o x509_d2.o x509_r2x.o x509_cmp.o \ 26LIBOBJ= x509_def.o x509_d2.o x509_r2x.o x509_cmp.o \
32 x509_obj.o x509_req.o x509spki.o x509_vfy.o \ 27 x509_obj.o x509_req.o x509spki.o x509_vfy.o \
33 x509_set.o x509cset.o x509rset.o x509_err.o \ 28 x509_set.o x509cset.o x509rset.o x509_err.o \
34 x509name.o x509_v3.o x509_ext.o x509_att.o \ 29 x509name.o x509_v3.o x509_ext.o x509_att.o \
35 x509type.o x509_lu.o x_all.o x509_txt.o \ 30 x509type.o x509_lu.o x_all.o x509_txt.o \
36 x509_trs.o by_file.o by_dir.o 31 x509_trs.o by_file.o by_dir.o x509_vpm.o
37 32
38SRC= $(LIBSRC) 33SRC= $(LIBSRC)
39 34
@@ -53,7 +48,7 @@ lib: $(LIBOBJ)
53 @touch lib 48 @touch lib
54 49
55files: 50files:
56 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO 51 $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
57 52
58links: 53links:
59 @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) 54 @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
@@ -61,6 +56,7 @@ links:
61 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 56 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
62 57
63install: 58install:
59 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
64 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 60 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
65 do \ 61 do \
66 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 62 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -76,6 +72,7 @@ lint:
76 lint -DLINT $(INCLUDES) $(SRC)>fluff 72 lint -DLINT $(INCLUDES) $(SRC)>fluff
77 73
78depend: 74depend:
75 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
79 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 76 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
80 77
81dclean: 78dclean:
@@ -87,506 +84,323 @@ clean:
87 84
88# DO NOT DELETE THIS LINE -- make depend depends on it. 85# DO NOT DELETE THIS LINE -- make depend depends on it.
89 86
90by_dir.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 87by_dir.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
91by_dir.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 88by_dir.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
92by_dir.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 89by_dir.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
93by_dir.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 90by_dir.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
94by_dir.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 91by_dir.o: ../../include/openssl/err.h ../../include/openssl/evp.h
95by_dir.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 92by_dir.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
96by_dir.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
97by_dir.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
98by_dir.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
99by_dir.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
100by_dir.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
101by_dir.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 93by_dir.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
102by_dir.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 94by_dir.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
103by_dir.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 95by_dir.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
104by_dir.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 96by_dir.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
105by_dir.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 97by_dir.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
106by_dir.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 98by_dir.o: ../../include/openssl/x509_vfy.h ../cryptlib.h by_dir.c
107by_dir.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 99by_file.o: ../../e_os.h ../../include/openssl/asn1.h
108by_dir.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 100by_file.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
109by_dir.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 101by_file.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
110by_dir.o: ../cryptlib.h by_dir.c 102by_file.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
111by_file.o: ../../e_os.h ../../include/openssl/aes.h 103by_file.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
112by_file.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 104by_file.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
113by_file.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
114by_file.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
115by_file.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
116by_file.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
117by_file.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
118by_file.o: ../../include/openssl/err.h ../../include/openssl/evp.h
119by_file.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
120by_file.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
121by_file.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
122by_file.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 105by_file.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
123by_file.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 106by_file.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
124by_file.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h 107by_file.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
125by_file.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h 108by_file.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
126by_file.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 109by_file.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
127by_file.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 110by_file.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
128by_file.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 111by_file.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
129by_file.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 112by_file.o: ../cryptlib.h by_file.c
130by_file.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 113x509_att.o: ../../e_os.h ../../include/openssl/asn1.h
131by_file.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 114x509_att.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
132by_file.o: ../../include/openssl/x509_vfy.h ../cryptlib.h by_file.c
133x509_att.o: ../../e_os.h ../../include/openssl/aes.h
134x509_att.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
135x509_att.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
136x509_att.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
137x509_att.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 115x509_att.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
138x509_att.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 116x509_att.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
139x509_att.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 117x509_att.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
140x509_att.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 118x509_att.o: ../../include/openssl/err.h ../../include/openssl/evp.h
141x509_att.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 119x509_att.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
142x509_att.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
143x509_att.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
144x509_att.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
145x509_att.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 120x509_att.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
146x509_att.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 121x509_att.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
147x509_att.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 122x509_att.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
148x509_att.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 123x509_att.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
149x509_att.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 124x509_att.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
150x509_att.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 125x509_att.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
151x509_att.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 126x509_att.o: ../cryptlib.h x509_att.c
152x509_att.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 127x509_cmp.o: ../../e_os.h ../../include/openssl/asn1.h
153x509_att.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 128x509_cmp.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
154x509_att.o: ../../include/openssl/x509v3.h ../cryptlib.h x509_att.c
155x509_cmp.o: ../../e_os.h ../../include/openssl/aes.h
156x509_cmp.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
157x509_cmp.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
158x509_cmp.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
159x509_cmp.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 129x509_cmp.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
160x509_cmp.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 130x509_cmp.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
161x509_cmp.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 131x509_cmp.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
162x509_cmp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 132x509_cmp.o: ../../include/openssl/err.h ../../include/openssl/evp.h
163x509_cmp.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 133x509_cmp.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
164x509_cmp.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
165x509_cmp.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
166x509_cmp.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
167x509_cmp.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 134x509_cmp.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
168x509_cmp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 135x509_cmp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
169x509_cmp.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 136x509_cmp.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
170x509_cmp.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 137x509_cmp.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
171x509_cmp.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 138x509_cmp.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
172x509_cmp.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 139x509_cmp.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
173x509_cmp.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 140x509_cmp.o: ../cryptlib.h x509_cmp.c
174x509_cmp.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 141x509_d2.o: ../../e_os.h ../../include/openssl/asn1.h
175x509_cmp.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 142x509_d2.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
176x509_cmp.o: ../../include/openssl/x509v3.h ../cryptlib.h x509_cmp.c 143x509_d2.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
177x509_d2.o: ../../e_os.h ../../include/openssl/aes.h 144x509_d2.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
178x509_d2.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 145x509_d2.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
179x509_d2.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 146x509_d2.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
180x509_d2.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
181x509_d2.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
182x509_d2.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
183x509_d2.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
184x509_d2.o: ../../include/openssl/err.h ../../include/openssl/evp.h
185x509_d2.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
186x509_d2.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
187x509_d2.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
188x509_d2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 147x509_d2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
189x509_d2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 148x509_d2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
190x509_d2.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 149x509_d2.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
191x509_d2.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 150x509_d2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
192x509_d2.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 151x509_d2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
193x509_d2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 152x509_d2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
194x509_d2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 153x509_d2.o: ../cryptlib.h x509_d2.c
195x509_d2.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 154x509_def.o: ../../e_os.h ../../include/openssl/asn1.h
196x509_d2.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 155x509_def.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
197x509_d2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509_d2.c 156x509_def.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
198x509_def.o: ../../e_os.h ../../include/openssl/aes.h 157x509_def.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
199x509_def.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 158x509_def.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
200x509_def.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 159x509_def.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
201x509_def.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
202x509_def.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
203x509_def.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
204x509_def.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
205x509_def.o: ../../include/openssl/err.h ../../include/openssl/evp.h
206x509_def.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
207x509_def.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
208x509_def.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
209x509_def.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 160x509_def.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
210x509_def.o: ../../include/openssl/opensslconf.h 161x509_def.o: ../../include/openssl/opensslconf.h
211x509_def.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 162x509_def.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
212x509_def.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 163x509_def.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
213x509_def.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 164x509_def.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
214x509_def.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 165x509_def.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
215x509_def.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 166x509_def.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509_def.c
216x509_def.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 167x509_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
217x509_def.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 168x509_err.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
218x509_def.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 169x509_err.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
219x509_def.o: ../cryptlib.h x509_def.c 170x509_err.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
220x509_err.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h 171x509_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
221x509_err.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 172x509_err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
222x509_err.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
223x509_err.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
224x509_err.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
225x509_err.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
226x509_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
227x509_err.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
228x509_err.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
229x509_err.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
230x509_err.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
231x509_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 173x509_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
232x509_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 174x509_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
233x509_err.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 175x509_err.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
234x509_err.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 176x509_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
235x509_err.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 177x509_err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
236x509_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 178x509_err.o: ../../include/openssl/x509_vfy.h x509_err.c
237x509_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 179x509_ext.o: ../../e_os.h ../../include/openssl/asn1.h
238x509_err.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 180x509_ext.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
239x509_err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
240x509_err.o: x509_err.c
241x509_ext.o: ../../e_os.h ../../include/openssl/aes.h
242x509_ext.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
243x509_ext.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
244x509_ext.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
245x509_ext.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 181x509_ext.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
246x509_ext.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 182x509_ext.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
247x509_ext.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 183x509_ext.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
248x509_ext.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 184x509_ext.o: ../../include/openssl/err.h ../../include/openssl/evp.h
249x509_ext.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 185x509_ext.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
250x509_ext.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
251x509_ext.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
252x509_ext.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
253x509_ext.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 186x509_ext.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
254x509_ext.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 187x509_ext.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
255x509_ext.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 188x509_ext.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
256x509_ext.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 189x509_ext.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
257x509_ext.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 190x509_ext.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
258x509_ext.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 191x509_ext.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
259x509_ext.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 192x509_ext.o: ../cryptlib.h x509_ext.c
260x509_ext.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 193x509_lu.o: ../../e_os.h ../../include/openssl/asn1.h
261x509_ext.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 194x509_lu.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
262x509_ext.o: ../../include/openssl/x509v3.h ../cryptlib.h x509_ext.c
263x509_lu.o: ../../e_os.h ../../include/openssl/aes.h
264x509_lu.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
265x509_lu.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
266x509_lu.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
267x509_lu.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 195x509_lu.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
268x509_lu.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 196x509_lu.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
269x509_lu.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 197x509_lu.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
270x509_lu.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 198x509_lu.o: ../../include/openssl/err.h ../../include/openssl/evp.h
271x509_lu.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 199x509_lu.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
272x509_lu.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
273x509_lu.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
274x509_lu.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
275x509_lu.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 200x509_lu.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
276x509_lu.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 201x509_lu.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
277x509_lu.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 202x509_lu.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
278x509_lu.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 203x509_lu.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
279x509_lu.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 204x509_lu.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
280x509_lu.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 205x509_lu.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
281x509_lu.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 206x509_lu.o: ../cryptlib.h x509_lu.c
282x509_lu.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 207x509_obj.o: ../../e_os.h ../../include/openssl/asn1.h
283x509_lu.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 208x509_obj.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
284x509_lu.o: ../../include/openssl/x509v3.h ../cryptlib.h x509_lu.c 209x509_obj.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
285x509_obj.o: ../../e_os.h ../../include/openssl/aes.h 210x509_obj.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
286x509_obj.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 211x509_obj.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
287x509_obj.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 212x509_obj.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
288x509_obj.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
289x509_obj.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
290x509_obj.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
291x509_obj.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
292x509_obj.o: ../../include/openssl/err.h ../../include/openssl/evp.h
293x509_obj.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
294x509_obj.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
295x509_obj.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
296x509_obj.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 213x509_obj.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
297x509_obj.o: ../../include/openssl/opensslconf.h 214x509_obj.o: ../../include/openssl/opensslconf.h
298x509_obj.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 215x509_obj.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
299x509_obj.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 216x509_obj.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
300x509_obj.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 217x509_obj.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
301x509_obj.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 218x509_obj.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
302x509_obj.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 219x509_obj.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509_obj.c
303x509_obj.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 220x509_r2x.o: ../../e_os.h ../../include/openssl/asn1.h
304x509_obj.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 221x509_r2x.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
305x509_obj.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 222x509_r2x.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
306x509_obj.o: ../cryptlib.h x509_obj.c 223x509_r2x.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
307x509_r2x.o: ../../e_os.h ../../include/openssl/aes.h 224x509_r2x.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
308x509_r2x.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
309x509_r2x.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
310x509_r2x.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
311x509_r2x.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
312x509_r2x.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
313x509_r2x.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
314x509_r2x.o: ../../include/openssl/err.h ../../include/openssl/evp.h 225x509_r2x.o: ../../include/openssl/err.h ../../include/openssl/evp.h
315x509_r2x.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 226x509_r2x.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
316x509_r2x.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 227x509_r2x.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
317x509_r2x.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
318x509_r2x.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
319x509_r2x.o: ../../include/openssl/opensslconf.h
320x509_r2x.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 228x509_r2x.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
321x509_r2x.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 229x509_r2x.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
322x509_r2x.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 230x509_r2x.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
323x509_r2x.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 231x509_r2x.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
324x509_r2x.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 232x509_r2x.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509_r2x.c
325x509_r2x.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 233x509_req.o: ../../e_os.h ../../include/openssl/asn1.h
326x509_r2x.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 234x509_req.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
327x509_r2x.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 235x509_req.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
328x509_r2x.o: ../cryptlib.h x509_r2x.c 236x509_req.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
329x509_req.o: ../../e_os.h ../../include/openssl/aes.h 237x509_req.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
330x509_req.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
331x509_req.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
332x509_req.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
333x509_req.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
334x509_req.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
335x509_req.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
336x509_req.o: ../../include/openssl/err.h ../../include/openssl/evp.h 238x509_req.o: ../../include/openssl/err.h ../../include/openssl/evp.h
337x509_req.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 239x509_req.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
338x509_req.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 240x509_req.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
339x509_req.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
340x509_req.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
341x509_req.o: ../../include/openssl/opensslconf.h
342x509_req.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 241x509_req.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
343x509_req.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h 242x509_req.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
344x509_req.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 243x509_req.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
345x509_req.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 244x509_req.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
346x509_req.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 245x509_req.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
347x509_req.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 246x509_req.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509_req.c
348x509_req.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 247x509_set.o: ../../e_os.h ../../include/openssl/asn1.h
349x509_req.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 248x509_set.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
350x509_req.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 249x509_set.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
351x509_req.o: ../cryptlib.h x509_req.c 250x509_set.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
352x509_set.o: ../../e_os.h ../../include/openssl/aes.h 251x509_set.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
353x509_set.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 252x509_set.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
354x509_set.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
355x509_set.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
356x509_set.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
357x509_set.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
358x509_set.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
359x509_set.o: ../../include/openssl/err.h ../../include/openssl/evp.h
360x509_set.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
361x509_set.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
362x509_set.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
363x509_set.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 253x509_set.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
364x509_set.o: ../../include/openssl/opensslconf.h 254x509_set.o: ../../include/openssl/opensslconf.h
365x509_set.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 255x509_set.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
366x509_set.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 256x509_set.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
367x509_set.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 257x509_set.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
368x509_set.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 258x509_set.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
369x509_set.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 259x509_set.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509_set.c
370x509_set.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 260x509_trs.o: ../../e_os.h ../../include/openssl/asn1.h
371x509_set.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 261x509_trs.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
372x509_set.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
373x509_set.o: ../cryptlib.h x509_set.c
374x509_trs.o: ../../e_os.h ../../include/openssl/aes.h
375x509_trs.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
376x509_trs.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
377x509_trs.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
378x509_trs.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 262x509_trs.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
379x509_trs.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 263x509_trs.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
380x509_trs.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 264x509_trs.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
381x509_trs.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 265x509_trs.o: ../../include/openssl/err.h ../../include/openssl/evp.h
382x509_trs.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 266x509_trs.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
383x509_trs.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
384x509_trs.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
385x509_trs.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
386x509_trs.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 267x509_trs.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
387x509_trs.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 268x509_trs.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
388x509_trs.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 269x509_trs.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
389x509_trs.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 270x509_trs.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
390x509_trs.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 271x509_trs.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
391x509_trs.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 272x509_trs.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
392x509_trs.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 273x509_trs.o: ../cryptlib.h x509_trs.c
393x509_trs.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 274x509_txt.o: ../../e_os.h ../../include/openssl/asn1.h
394x509_trs.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 275x509_txt.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
395x509_trs.o: ../../include/openssl/x509v3.h ../cryptlib.h x509_trs.c 276x509_txt.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
396x509_txt.o: ../../e_os.h ../../include/openssl/aes.h 277x509_txt.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
397x509_txt.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 278x509_txt.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
398x509_txt.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 279x509_txt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
399x509_txt.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
400x509_txt.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
401x509_txt.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
402x509_txt.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
403x509_txt.o: ../../include/openssl/err.h ../../include/openssl/evp.h
404x509_txt.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
405x509_txt.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
406x509_txt.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
407x509_txt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 280x509_txt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
408x509_txt.o: ../../include/openssl/opensslconf.h 281x509_txt.o: ../../include/openssl/opensslconf.h
409x509_txt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 282x509_txt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
410x509_txt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 283x509_txt.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
411x509_txt.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 284x509_txt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
412x509_txt.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 285x509_txt.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
413x509_txt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 286x509_txt.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509_txt.c
414x509_txt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 287x509_v3.o: ../../e_os.h ../../include/openssl/asn1.h
415x509_txt.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 288x509_v3.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
416x509_txt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
417x509_txt.o: ../cryptlib.h x509_txt.c
418x509_v3.o: ../../e_os.h ../../include/openssl/aes.h
419x509_v3.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
420x509_v3.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
421x509_v3.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
422x509_v3.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 289x509_v3.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
423x509_v3.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 290x509_v3.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
424x509_v3.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 291x509_v3.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
425x509_v3.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 292x509_v3.o: ../../include/openssl/err.h ../../include/openssl/evp.h
426x509_v3.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 293x509_v3.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
427x509_v3.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
428x509_v3.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
429x509_v3.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
430x509_v3.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 294x509_v3.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
431x509_v3.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 295x509_v3.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
432x509_v3.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 296x509_v3.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
433x509_v3.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 297x509_v3.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
434x509_v3.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 298x509_v3.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
435x509_v3.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 299x509_v3.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
436x509_v3.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 300x509_v3.o: ../cryptlib.h x509_v3.c
437x509_v3.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 301x509_vfy.o: ../../e_os.h ../../include/openssl/asn1.h
438x509_v3.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 302x509_vfy.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
439x509_v3.o: ../../include/openssl/x509v3.h ../cryptlib.h x509_v3.c
440x509_vfy.o: ../../e_os.h ../../include/openssl/aes.h
441x509_vfy.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
442x509_vfy.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
443x509_vfy.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
444x509_vfy.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 303x509_vfy.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
445x509_vfy.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 304x509_vfy.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
446x509_vfy.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 305x509_vfy.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
447x509_vfy.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 306x509_vfy.o: ../../include/openssl/err.h ../../include/openssl/evp.h
448x509_vfy.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 307x509_vfy.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
449x509_vfy.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
450x509_vfy.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
451x509_vfy.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
452x509_vfy.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 308x509_vfy.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
453x509_vfy.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 309x509_vfy.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
454x509_vfy.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 310x509_vfy.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
455x509_vfy.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 311x509_vfy.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
456x509_vfy.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 312x509_vfy.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
457x509_vfy.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 313x509_vfy.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
458x509_vfy.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 314x509_vfy.o: ../cryptlib.h x509_vfy.c
459x509_vfy.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 315x509_vpm.o: ../../e_os.h ../../include/openssl/asn1.h
460x509_vfy.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 316x509_vpm.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
461x509_vfy.o: ../../include/openssl/x509v3.h ../cryptlib.h x509_vfy.c 317x509_vpm.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
462x509cset.o: ../../e_os.h ../../include/openssl/aes.h 318x509_vpm.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
463x509cset.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 319x509_vpm.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
464x509cset.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 320x509_vpm.o: ../../include/openssl/err.h ../../include/openssl/evp.h
465x509cset.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 321x509_vpm.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
466x509cset.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 322x509_vpm.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
467x509cset.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h 323x509_vpm.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
468x509cset.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h 324x509_vpm.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
469x509cset.o: ../../include/openssl/err.h ../../include/openssl/evp.h 325x509_vpm.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
470x509cset.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 326x509_vpm.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
471x509cset.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 327x509_vpm.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
472x509cset.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h 328x509_vpm.o: ../cryptlib.h x509_vpm.c
329x509cset.o: ../../e_os.h ../../include/openssl/asn1.h
330x509cset.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
331x509cset.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
332x509cset.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
333x509cset.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
334x509cset.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
473x509cset.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 335x509cset.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
474x509cset.o: ../../include/openssl/opensslconf.h 336x509cset.o: ../../include/openssl/opensslconf.h
475x509cset.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 337x509cset.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
476x509cset.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 338x509cset.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
477x509cset.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 339x509cset.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
478x509cset.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 340x509cset.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
479x509cset.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 341x509cset.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509cset.c
480x509cset.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 342x509name.o: ../../e_os.h ../../include/openssl/asn1.h
481x509cset.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 343x509name.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
482x509cset.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 344x509name.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
483x509cset.o: ../cryptlib.h x509cset.c 345x509name.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
484x509name.o: ../../e_os.h ../../include/openssl/aes.h 346x509name.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
485x509name.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 347x509name.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
486x509name.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
487x509name.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
488x509name.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
489x509name.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
490x509name.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
491x509name.o: ../../include/openssl/err.h ../../include/openssl/evp.h
492x509name.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
493x509name.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
494x509name.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
495x509name.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 348x509name.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
496x509name.o: ../../include/openssl/opensslconf.h 349x509name.o: ../../include/openssl/opensslconf.h
497x509name.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 350x509name.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
498x509name.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 351x509name.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
499x509name.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 352x509name.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
500x509name.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 353x509name.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
501x509name.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 354x509name.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509name.c
502x509name.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 355x509rset.o: ../../e_os.h ../../include/openssl/asn1.h
503x509name.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 356x509rset.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
504x509name.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 357x509rset.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
505x509name.o: ../cryptlib.h x509name.c 358x509rset.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
506x509rset.o: ../../e_os.h ../../include/openssl/aes.h 359x509rset.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
507x509rset.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 360x509rset.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
508x509rset.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
509x509rset.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
510x509rset.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
511x509rset.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
512x509rset.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
513x509rset.o: ../../include/openssl/err.h ../../include/openssl/evp.h
514x509rset.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
515x509rset.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
516x509rset.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
517x509rset.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 361x509rset.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
518x509rset.o: ../../include/openssl/opensslconf.h 362x509rset.o: ../../include/openssl/opensslconf.h
519x509rset.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 363x509rset.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
520x509rset.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 364x509rset.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
521x509rset.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 365x509rset.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
522x509rset.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 366x509rset.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
523x509rset.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 367x509rset.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509rset.c
524x509rset.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 368x509spki.o: ../../e_os.h ../../include/openssl/asn1.h
525x509rset.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 369x509spki.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
526x509rset.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 370x509spki.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
527x509rset.o: ../cryptlib.h x509rset.c 371x509spki.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
528x509spki.o: ../../e_os.h ../../include/openssl/aes.h 372x509spki.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
529x509spki.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 373x509spki.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
530x509spki.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
531x509spki.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
532x509spki.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
533x509spki.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
534x509spki.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
535x509spki.o: ../../include/openssl/err.h ../../include/openssl/evp.h
536x509spki.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
537x509spki.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
538x509spki.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
539x509spki.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 374x509spki.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
540x509spki.o: ../../include/openssl/opensslconf.h 375x509spki.o: ../../include/openssl/opensslconf.h
541x509spki.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 376x509spki.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
542x509spki.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 377x509spki.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
543x509spki.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 378x509spki.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
544x509spki.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 379x509spki.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
545x509spki.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 380x509spki.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509spki.c
546x509spki.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 381x509type.o: ../../e_os.h ../../include/openssl/asn1.h
547x509spki.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 382x509type.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
548x509spki.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 383x509type.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
549x509spki.o: ../cryptlib.h x509spki.c 384x509type.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
550x509type.o: ../../e_os.h ../../include/openssl/aes.h 385x509type.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
551x509type.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 386x509type.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
552x509type.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
553x509type.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
554x509type.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
555x509type.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
556x509type.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
557x509type.o: ../../include/openssl/err.h ../../include/openssl/evp.h
558x509type.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
559x509type.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
560x509type.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
561x509type.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 387x509type.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
562x509type.o: ../../include/openssl/opensslconf.h 388x509type.o: ../../include/openssl/opensslconf.h
563x509type.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 389x509type.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
564x509type.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 390x509type.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
565x509type.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 391x509type.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
566x509type.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 392x509type.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
567x509type.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 393x509type.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x509type.c
568x509type.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 394x_all.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
569x509type.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 395x_all.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
570x509type.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 396x_all.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
571x509type.o: ../cryptlib.h x509type.c 397x_all.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
572x_all.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 398x_all.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
573x_all.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 399x_all.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
574x_all.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 400x_all.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
575x_all.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 401x_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
576x_all.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 402x_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
577x_all.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 403x_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
578x_all.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 404x_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
579x_all.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 405x_all.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
580x_all.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 406x_all.o: ../../include/openssl/x509_vfy.h ../cryptlib.h x_all.c
581x_all.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
582x_all.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
583x_all.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
584x_all.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
585x_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
586x_all.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
587x_all.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
588x_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
589x_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
590x_all.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
591x_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
592x_all.o: ../cryptlib.h x_all.c
diff --git a/src/lib/libcrypto/x509v3/Makefile b/src/lib/libcrypto/x509v3/Makefile
index 49423f39f7..556ef351bf 100644
--- a/src/lib/libcrypto/x509v3/Makefile
+++ b/src/lib/libcrypto/x509v3/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include 8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -25,16 +20,20 @@ LIB=$(TOP)/libcrypto.a
25LIBSRC= v3_bcons.c v3_bitst.c v3_conf.c v3_extku.c v3_ia5.c v3_lib.c \ 20LIBSRC= v3_bcons.c v3_bitst.c v3_conf.c v3_extku.c v3_ia5.c v3_lib.c \
26v3_prn.c v3_utl.c v3err.c v3_genn.c v3_alt.c v3_skey.c v3_akey.c v3_pku.c \ 21v3_prn.c v3_utl.c v3err.c v3_genn.c v3_alt.c v3_skey.c v3_akey.c v3_pku.c \
27v3_int.c v3_enum.c v3_sxnet.c v3_cpols.c v3_crld.c v3_purp.c v3_info.c \ 22v3_int.c v3_enum.c v3_sxnet.c v3_cpols.c v3_crld.c v3_purp.c v3_info.c \
28v3_ocsp.c v3_akeya.c v3_pcia.c v3_pci.c 23v3_ocsp.c v3_akeya.c v3_pmaps.c v3_pcons.c v3_ncons.c v3_pcia.c v3_pci.c \
24pcy_cache.c pcy_node.c pcy_data.c pcy_map.c pcy_tree.c pcy_lib.c \
25v3_asid.c v3_addr.c
29LIBOBJ= v3_bcons.o v3_bitst.o v3_conf.o v3_extku.o v3_ia5.o v3_lib.o \ 26LIBOBJ= v3_bcons.o v3_bitst.o v3_conf.o v3_extku.o v3_ia5.o v3_lib.o \
30v3_prn.o v3_utl.o v3err.o v3_genn.o v3_alt.o v3_skey.o v3_akey.o v3_pku.o \ 27v3_prn.o v3_utl.o v3err.o v3_genn.o v3_alt.o v3_skey.o v3_akey.o v3_pku.o \
31v3_int.o v3_enum.o v3_sxnet.o v3_cpols.o v3_crld.o v3_purp.o v3_info.o \ 28v3_int.o v3_enum.o v3_sxnet.o v3_cpols.o v3_crld.o v3_purp.o v3_info.o \
32v3_ocsp.o v3_akeya.o v3_pcia.o v3_pci.o 29v3_ocsp.o v3_akeya.o v3_pmaps.o v3_pcons.o v3_ncons.o v3_pcia.o v3_pci.o \
30pcy_cache.o pcy_node.o pcy_data.o pcy_map.o pcy_tree.o pcy_lib.o \
31v3_asid.o v3_addr.o
33 32
34SRC= $(LIBSRC) 33SRC= $(LIBSRC)
35 34
36EXHEADER= x509v3.h 35EXHEADER= x509v3.h
37HEADER= $(EXHEADER) 36HEADER= $(EXHEADER) pcy_int.h
38 37
39ALL= $(GENERAL) $(SRC) $(HEADER) 38ALL= $(GENERAL) $(SRC) $(HEADER)
40 39
@@ -57,6 +56,7 @@ links:
57 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 56 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
58 57
59install: 58install:
59 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
60 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 60 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
61 do \ 61 do \
62 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 62 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -72,6 +72,7 @@ lint:
72 lint -DLINT $(INCLUDES) $(SRC)>fluff 72 lint -DLINT $(INCLUDES) $(SRC)>fluff
73 73
74depend: 74depend:
75 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
75 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 76 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
76 77
77dclean: 78dclean:
@@ -83,563 +84,508 @@ clean:
83 84
84# DO NOT DELETE THIS LINE -- make depend depends on it. 85# DO NOT DELETE THIS LINE -- make depend depends on it.
85 86
86v3_akey.o: ../../e_os.h ../../include/openssl/aes.h 87pcy_cache.o: ../../e_os.h ../../include/openssl/asn1.h
87v3_akey.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h 88pcy_cache.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
88v3_akey.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 89pcy_cache.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
89v3_akey.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 90pcy_cache.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
90v3_akey.o: ../../include/openssl/cast.h ../../include/openssl/conf.h 91pcy_cache.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
91v3_akey.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 92pcy_cache.o: ../../include/openssl/err.h ../../include/openssl/evp.h
92v3_akey.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h 93pcy_cache.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
93v3_akey.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h 94pcy_cache.o: ../../include/openssl/objects.h
94v3_akey.o: ../../include/openssl/err.h ../../include/openssl/evp.h 95pcy_cache.o: ../../include/openssl/opensslconf.h
95v3_akey.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 96pcy_cache.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
96v3_akey.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 97pcy_cache.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
97v3_akey.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h 98pcy_cache.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
99pcy_cache.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
100pcy_cache.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
101pcy_cache.o: ../cryptlib.h pcy_cache.c pcy_int.h
102pcy_data.o: ../../e_os.h ../../include/openssl/asn1.h
103pcy_data.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
104pcy_data.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
105pcy_data.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
106pcy_data.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
107pcy_data.o: ../../include/openssl/err.h ../../include/openssl/evp.h
108pcy_data.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
109pcy_data.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
110pcy_data.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
111pcy_data.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
112pcy_data.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
113pcy_data.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
114pcy_data.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
115pcy_data.o: ../cryptlib.h pcy_data.c pcy_int.h
116pcy_lib.o: ../../e_os.h ../../include/openssl/asn1.h
117pcy_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
118pcy_lib.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
119pcy_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
120pcy_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
121pcy_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
122pcy_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
123pcy_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
124pcy_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
125pcy_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
126pcy_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
127pcy_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
128pcy_lib.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
129pcy_lib.o: ../cryptlib.h pcy_int.h pcy_lib.c
130pcy_map.o: ../../e_os.h ../../include/openssl/asn1.h
131pcy_map.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
132pcy_map.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
133pcy_map.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
134pcy_map.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
135pcy_map.o: ../../include/openssl/err.h ../../include/openssl/evp.h
136pcy_map.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
137pcy_map.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
138pcy_map.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
139pcy_map.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
140pcy_map.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
141pcy_map.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
142pcy_map.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
143pcy_map.o: ../cryptlib.h pcy_int.h pcy_map.c
144pcy_node.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
145pcy_node.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
146pcy_node.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
147pcy_node.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
148pcy_node.o: ../../include/openssl/ecdsa.h ../../include/openssl/evp.h
149pcy_node.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
150pcy_node.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
151pcy_node.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
152pcy_node.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
153pcy_node.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
154pcy_node.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
155pcy_node.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
156pcy_node.o: pcy_int.h pcy_node.c
157pcy_tree.o: ../../e_os.h ../../include/openssl/asn1.h
158pcy_tree.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
159pcy_tree.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
160pcy_tree.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
161pcy_tree.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
162pcy_tree.o: ../../include/openssl/err.h ../../include/openssl/evp.h
163pcy_tree.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
164pcy_tree.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
165pcy_tree.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
166pcy_tree.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
167pcy_tree.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
168pcy_tree.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
169pcy_tree.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
170pcy_tree.o: ../cryptlib.h pcy_int.h pcy_tree.c
171v3_addr.o: ../../e_os.h ../../include/openssl/asn1.h
172v3_addr.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
173v3_addr.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
174v3_addr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
175v3_addr.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
176v3_addr.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
177v3_addr.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
178v3_addr.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
179v3_addr.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
180v3_addr.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
181v3_addr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
182v3_addr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
183v3_addr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
184v3_addr.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_addr.c
185v3_akey.o: ../../e_os.h ../../include/openssl/asn1.h
186v3_akey.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
187v3_akey.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
188v3_akey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
189v3_akey.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
190v3_akey.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
191v3_akey.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
98v3_akey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 192v3_akey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
99v3_akey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 193v3_akey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
100v3_akey.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 194v3_akey.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
101v3_akey.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 195v3_akey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
102v3_akey.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 196v3_akey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
103v3_akey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 197v3_akey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
104v3_akey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 198v3_akey.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_akey.c
105v3_akey.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 199v3_akeya.o: ../../e_os.h ../../include/openssl/asn1.h
106v3_akey.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 200v3_akeya.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
107v3_akey.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h 201v3_akeya.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
108v3_akey.o: ../cryptlib.h v3_akey.c 202v3_akeya.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
109v3_akeya.o: ../../e_os.h ../../include/openssl/aes.h 203v3_akeya.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
110v3_akeya.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h 204v3_akeya.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
111v3_akeya.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 205v3_akeya.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
112v3_akeya.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
113v3_akeya.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
114v3_akeya.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
115v3_akeya.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
116v3_akeya.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
117v3_akeya.o: ../../include/openssl/err.h ../../include/openssl/evp.h
118v3_akeya.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
119v3_akeya.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
120v3_akeya.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
121v3_akeya.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 206v3_akeya.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
122v3_akeya.o: ../../include/openssl/opensslconf.h 207v3_akeya.o: ../../include/openssl/opensslconf.h
123v3_akeya.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 208v3_akeya.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
124v3_akeya.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 209v3_akeya.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
125v3_akeya.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 210v3_akeya.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
126v3_akeya.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 211v3_akeya.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
127v3_akeya.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 212v3_akeya.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
128v3_akeya.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 213v3_akeya.o: ../cryptlib.h v3_akeya.c
129v3_akeya.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 214v3_alt.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
130v3_akeya.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 215v3_alt.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
131v3_akeya.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_akeya.c 216v3_alt.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
132v3_alt.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 217v3_alt.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
133v3_alt.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 218v3_alt.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
134v3_alt.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 219v3_alt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
135v3_alt.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
136v3_alt.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
137v3_alt.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
138v3_alt.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
139v3_alt.o: ../../include/openssl/err.h ../../include/openssl/evp.h
140v3_alt.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
141v3_alt.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
142v3_alt.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
143v3_alt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 220v3_alt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
144v3_alt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 221v3_alt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
145v3_alt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 222v3_alt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
146v3_alt.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 223v3_alt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
147v3_alt.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 224v3_alt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
148v3_alt.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 225v3_alt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
149v3_alt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 226v3_alt.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_alt.c
150v3_alt.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 227v3_asid.o: ../../e_os.h ../../include/openssl/asn1.h
151v3_alt.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 228v3_asid.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
152v3_alt.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h 229v3_asid.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
153v3_alt.o: ../cryptlib.h v3_alt.c 230v3_asid.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
154v3_bcons.o: ../../e_os.h ../../include/openssl/aes.h 231v3_asid.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
155v3_bcons.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h 232v3_asid.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
156v3_bcons.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 233v3_asid.o: ../../include/openssl/err.h ../../include/openssl/evp.h
157v3_bcons.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 234v3_asid.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
158v3_bcons.o: ../../include/openssl/cast.h ../../include/openssl/conf.h 235v3_asid.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
159v3_bcons.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 236v3_asid.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
160v3_bcons.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h 237v3_asid.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
161v3_bcons.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h 238v3_asid.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
162v3_bcons.o: ../../include/openssl/err.h ../../include/openssl/evp.h 239v3_asid.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
163v3_bcons.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 240v3_asid.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
164v3_bcons.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 241v3_asid.o: ../cryptlib.h v3_asid.c
165v3_bcons.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h 242v3_bcons.o: ../../e_os.h ../../include/openssl/asn1.h
243v3_bcons.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
244v3_bcons.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
245v3_bcons.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
246v3_bcons.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
247v3_bcons.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
248v3_bcons.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
166v3_bcons.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 249v3_bcons.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
167v3_bcons.o: ../../include/openssl/opensslconf.h 250v3_bcons.o: ../../include/openssl/opensslconf.h
168v3_bcons.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 251v3_bcons.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
169v3_bcons.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 252v3_bcons.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
170v3_bcons.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 253v3_bcons.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
171v3_bcons.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 254v3_bcons.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
172v3_bcons.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 255v3_bcons.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
173v3_bcons.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 256v3_bcons.o: ../cryptlib.h v3_bcons.c
174v3_bcons.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 257v3_bitst.o: ../../e_os.h ../../include/openssl/asn1.h
175v3_bcons.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 258v3_bitst.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
176v3_bcons.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_bcons.c
177v3_bitst.o: ../../e_os.h ../../include/openssl/aes.h
178v3_bitst.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
179v3_bitst.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
180v3_bitst.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
181v3_bitst.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 259v3_bitst.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
182v3_bitst.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 260v3_bitst.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
183v3_bitst.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 261v3_bitst.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
184v3_bitst.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 262v3_bitst.o: ../../include/openssl/err.h ../../include/openssl/evp.h
185v3_bitst.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 263v3_bitst.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
186v3_bitst.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
187v3_bitst.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
188v3_bitst.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
189v3_bitst.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 264v3_bitst.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
190v3_bitst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 265v3_bitst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
191v3_bitst.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 266v3_bitst.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
192v3_bitst.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 267v3_bitst.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
193v3_bitst.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 268v3_bitst.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
194v3_bitst.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 269v3_bitst.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
195v3_bitst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 270v3_bitst.o: ../cryptlib.h v3_bitst.c
196v3_bitst.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 271v3_conf.o: ../../e_os.h ../../include/openssl/asn1.h
197v3_bitst.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 272v3_conf.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
198v3_bitst.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_bitst.c
199v3_conf.o: ../../e_os.h ../../include/openssl/aes.h
200v3_conf.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
201v3_conf.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
202v3_conf.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
203v3_conf.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 273v3_conf.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
204v3_conf.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 274v3_conf.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
205v3_conf.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 275v3_conf.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
206v3_conf.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 276v3_conf.o: ../../include/openssl/err.h ../../include/openssl/evp.h
207v3_conf.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 277v3_conf.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
208v3_conf.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
209v3_conf.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
210v3_conf.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
211v3_conf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 278v3_conf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
212v3_conf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 279v3_conf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
213v3_conf.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 280v3_conf.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
214v3_conf.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 281v3_conf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
215v3_conf.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 282v3_conf.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
216v3_conf.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 283v3_conf.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
217v3_conf.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 284v3_conf.o: ../cryptlib.h v3_conf.c
218v3_conf.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 285v3_cpols.o: ../../e_os.h ../../include/openssl/asn1.h
219v3_conf.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 286v3_cpols.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
220v3_conf.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_conf.c 287v3_cpols.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
221v3_cpols.o: ../../e_os.h ../../include/openssl/aes.h 288v3_cpols.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
222v3_cpols.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h 289v3_cpols.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
223v3_cpols.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 290v3_cpols.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
224v3_cpols.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 291v3_cpols.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
225v3_cpols.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
226v3_cpols.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
227v3_cpols.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
228v3_cpols.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
229v3_cpols.o: ../../include/openssl/err.h ../../include/openssl/evp.h
230v3_cpols.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
231v3_cpols.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
232v3_cpols.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
233v3_cpols.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 292v3_cpols.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
234v3_cpols.o: ../../include/openssl/opensslconf.h 293v3_cpols.o: ../../include/openssl/opensslconf.h
235v3_cpols.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 294v3_cpols.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
236v3_cpols.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 295v3_cpols.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
237v3_cpols.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 296v3_cpols.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
238v3_cpols.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 297v3_cpols.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
239v3_cpols.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 298v3_cpols.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
240v3_cpols.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 299v3_cpols.o: ../cryptlib.h pcy_int.h v3_cpols.c
241v3_cpols.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 300v3_crld.o: ../../e_os.h ../../include/openssl/asn1.h
242v3_cpols.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 301v3_crld.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
243v3_cpols.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_cpols.c 302v3_crld.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
244v3_crld.o: ../../e_os.h ../../include/openssl/aes.h 303v3_crld.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
245v3_crld.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h 304v3_crld.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
246v3_crld.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 305v3_crld.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
247v3_crld.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 306v3_crld.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
248v3_crld.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
249v3_crld.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
250v3_crld.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
251v3_crld.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
252v3_crld.o: ../../include/openssl/err.h ../../include/openssl/evp.h
253v3_crld.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
254v3_crld.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
255v3_crld.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
256v3_crld.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 307v3_crld.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
257v3_crld.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 308v3_crld.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
258v3_crld.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 309v3_crld.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
259v3_crld.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 310v3_crld.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
260v3_crld.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 311v3_crld.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
261v3_crld.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 312v3_crld.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
262v3_crld.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 313v3_crld.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_crld.c
263v3_crld.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 314v3_enum.o: ../../e_os.h ../../include/openssl/asn1.h
264v3_crld.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 315v3_enum.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
265v3_crld.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
266v3_crld.o: ../cryptlib.h v3_crld.c
267v3_enum.o: ../../e_os.h ../../include/openssl/aes.h
268v3_enum.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
269v3_enum.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
270v3_enum.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
271v3_enum.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 316v3_enum.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
272v3_enum.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 317v3_enum.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
273v3_enum.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 318v3_enum.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
274v3_enum.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 319v3_enum.o: ../../include/openssl/err.h ../../include/openssl/evp.h
275v3_enum.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 320v3_enum.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
276v3_enum.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
277v3_enum.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
278v3_enum.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
279v3_enum.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 321v3_enum.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
280v3_enum.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 322v3_enum.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
281v3_enum.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 323v3_enum.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
282v3_enum.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 324v3_enum.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
283v3_enum.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 325v3_enum.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
284v3_enum.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 326v3_enum.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
285v3_enum.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 327v3_enum.o: ../cryptlib.h v3_enum.c
286v3_enum.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 328v3_extku.o: ../../e_os.h ../../include/openssl/asn1.h
287v3_enum.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 329v3_extku.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
288v3_enum.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_enum.c 330v3_extku.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
289v3_extku.o: ../../e_os.h ../../include/openssl/aes.h 331v3_extku.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
290v3_extku.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h 332v3_extku.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
291v3_extku.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 333v3_extku.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
292v3_extku.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 334v3_extku.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
293v3_extku.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
294v3_extku.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
295v3_extku.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
296v3_extku.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
297v3_extku.o: ../../include/openssl/err.h ../../include/openssl/evp.h
298v3_extku.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
299v3_extku.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
300v3_extku.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
301v3_extku.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 335v3_extku.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
302v3_extku.o: ../../include/openssl/opensslconf.h 336v3_extku.o: ../../include/openssl/opensslconf.h
303v3_extku.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 337v3_extku.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
304v3_extku.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 338v3_extku.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
305v3_extku.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 339v3_extku.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
306v3_extku.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 340v3_extku.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
307v3_extku.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 341v3_extku.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
308v3_extku.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 342v3_extku.o: ../cryptlib.h v3_extku.c
309v3_extku.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 343v3_genn.o: ../../e_os.h ../../include/openssl/asn1.h
310v3_extku.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 344v3_genn.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
311v3_extku.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_extku.c 345v3_genn.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
312v3_genn.o: ../../e_os.h ../../include/openssl/aes.h 346v3_genn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
313v3_genn.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h 347v3_genn.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
314v3_genn.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 348v3_genn.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
315v3_genn.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 349v3_genn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
316v3_genn.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
317v3_genn.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
318v3_genn.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
319v3_genn.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
320v3_genn.o: ../../include/openssl/err.h ../../include/openssl/evp.h
321v3_genn.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
322v3_genn.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
323v3_genn.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
324v3_genn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 350v3_genn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
325v3_genn.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 351v3_genn.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
326v3_genn.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 352v3_genn.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
327v3_genn.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 353v3_genn.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
328v3_genn.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 354v3_genn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
329v3_genn.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 355v3_genn.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
330v3_genn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 356v3_genn.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_genn.c
331v3_genn.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 357v3_ia5.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
332v3_genn.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 358v3_ia5.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
333v3_genn.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h 359v3_ia5.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
334v3_genn.o: ../cryptlib.h v3_genn.c 360v3_ia5.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
335v3_ia5.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 361v3_ia5.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
336v3_ia5.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 362v3_ia5.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
337v3_ia5.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
338v3_ia5.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
339v3_ia5.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
340v3_ia5.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
341v3_ia5.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
342v3_ia5.o: ../../include/openssl/err.h ../../include/openssl/evp.h
343v3_ia5.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
344v3_ia5.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
345v3_ia5.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
346v3_ia5.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 363v3_ia5.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
347v3_ia5.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 364v3_ia5.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
348v3_ia5.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 365v3_ia5.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
349v3_ia5.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 366v3_ia5.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
350v3_ia5.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 367v3_ia5.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
351v3_ia5.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 368v3_ia5.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
352v3_ia5.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 369v3_ia5.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_ia5.c
353v3_ia5.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 370v3_info.o: ../../e_os.h ../../include/openssl/asn1.h
354v3_ia5.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 371v3_info.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
355v3_ia5.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h 372v3_info.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
356v3_ia5.o: ../cryptlib.h v3_ia5.c 373v3_info.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
357v3_info.o: ../../e_os.h ../../include/openssl/aes.h 374v3_info.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
358v3_info.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h 375v3_info.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
359v3_info.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 376v3_info.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
360v3_info.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
361v3_info.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
362v3_info.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
363v3_info.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
364v3_info.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
365v3_info.o: ../../include/openssl/err.h ../../include/openssl/evp.h
366v3_info.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
367v3_info.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
368v3_info.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
369v3_info.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 377v3_info.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
370v3_info.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 378v3_info.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
371v3_info.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 379v3_info.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
372v3_info.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 380v3_info.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
373v3_info.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 381v3_info.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
374v3_info.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 382v3_info.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
375v3_info.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 383v3_info.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_info.c
376v3_info.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 384v3_int.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
377v3_info.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 385v3_int.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
378v3_info.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h 386v3_int.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
379v3_info.o: ../cryptlib.h v3_info.c 387v3_int.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
380v3_int.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 388v3_int.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
381v3_int.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 389v3_int.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
382v3_int.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
383v3_int.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
384v3_int.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
385v3_int.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
386v3_int.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
387v3_int.o: ../../include/openssl/err.h ../../include/openssl/evp.h
388v3_int.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
389v3_int.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
390v3_int.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
391v3_int.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 390v3_int.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
392v3_int.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 391v3_int.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
393v3_int.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 392v3_int.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
394v3_int.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 393v3_int.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
395v3_int.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 394v3_int.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
396v3_int.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 395v3_int.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
397v3_int.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 396v3_int.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_int.c
398v3_int.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 397v3_lib.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
399v3_int.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 398v3_lib.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
400v3_int.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h 399v3_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
401v3_int.o: ../cryptlib.h v3_int.c 400v3_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
402v3_lib.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 401v3_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
403v3_lib.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 402v3_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
404v3_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
405v3_lib.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
406v3_lib.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
407v3_lib.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
408v3_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
409v3_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
410v3_lib.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
411v3_lib.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
412v3_lib.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
413v3_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 403v3_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
414v3_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 404v3_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
415v3_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 405v3_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
416v3_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 406v3_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
417v3_lib.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 407v3_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
418v3_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 408v3_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
419v3_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 409v3_lib.o: ../../include/openssl/x509v3.h ../cryptlib.h ext_dat.h v3_lib.c
420v3_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 410v3_ncons.o: ../../e_os.h ../../include/openssl/asn1.h
421v3_lib.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 411v3_ncons.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
422v3_lib.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h 412v3_ncons.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
423v3_lib.o: ../cryptlib.h ext_dat.h v3_lib.c 413v3_ncons.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
424v3_ocsp.o: ../../e_os.h ../../include/openssl/aes.h 414v3_ncons.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
425v3_ocsp.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 415v3_ncons.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
426v3_ocsp.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 416v3_ncons.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
427v3_ocsp.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 417v3_ncons.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
418v3_ncons.o: ../../include/openssl/opensslconf.h
419v3_ncons.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
420v3_ncons.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
421v3_ncons.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
422v3_ncons.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
423v3_ncons.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
424v3_ncons.o: ../cryptlib.h v3_ncons.c
425v3_ocsp.o: ../../e_os.h ../../include/openssl/asn1.h
426v3_ocsp.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
428v3_ocsp.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 427v3_ocsp.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
429v3_ocsp.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 428v3_ocsp.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
430v3_ocsp.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 429v3_ocsp.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
431v3_ocsp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 430v3_ocsp.o: ../../include/openssl/err.h ../../include/openssl/evp.h
432v3_ocsp.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 431v3_ocsp.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
433v3_ocsp.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
434v3_ocsp.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
435v3_ocsp.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
436v3_ocsp.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h 432v3_ocsp.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
437v3_ocsp.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 433v3_ocsp.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
438v3_ocsp.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 434v3_ocsp.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
439v3_ocsp.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 435v3_ocsp.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
440v3_ocsp.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 436v3_ocsp.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
441v3_ocsp.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 437v3_ocsp.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
442v3_ocsp.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 438v3_ocsp.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_ocsp.c
443v3_ocsp.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 439v3_pci.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
444v3_ocsp.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 440v3_pci.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
445v3_ocsp.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h 441v3_pci.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
446v3_ocsp.o: ../cryptlib.h v3_ocsp.c 442v3_pci.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
447v3_pci.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 443v3_pci.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
448v3_pci.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 444v3_pci.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
449v3_pci.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
450v3_pci.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
451v3_pci.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
452v3_pci.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
453v3_pci.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
454v3_pci.o: ../../include/openssl/err.h ../../include/openssl/evp.h
455v3_pci.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
456v3_pci.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
457v3_pci.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
458v3_pci.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 445v3_pci.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
459v3_pci.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 446v3_pci.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
460v3_pci.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 447v3_pci.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
461v3_pci.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 448v3_pci.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
462v3_pci.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 449v3_pci.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
463v3_pci.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 450v3_pci.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
464v3_pci.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 451v3_pci.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_pci.c
465v3_pci.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 452v3_pcia.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
466v3_pci.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 453v3_pcia.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
467v3_pci.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
468v3_pci.o: ../cryptlib.h v3_pci.c
469v3_pcia.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
470v3_pcia.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
471v3_pcia.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
472v3_pcia.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
473v3_pcia.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 454v3_pcia.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
474v3_pcia.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 455v3_pcia.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
475v3_pcia.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 456v3_pcia.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
476v3_pcia.o: ../../include/openssl/e_os2.h ../../include/openssl/evp.h 457v3_pcia.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
477v3_pcia.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
478v3_pcia.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
479v3_pcia.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
480v3_pcia.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 458v3_pcia.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
481v3_pcia.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 459v3_pcia.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
482v3_pcia.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 460v3_pcia.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
483v3_pcia.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 461v3_pcia.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
484v3_pcia.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 462v3_pcia.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
485v3_pcia.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 463v3_pcia.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
486v3_pcia.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 464v3_pcia.o: ../../include/openssl/x509v3.h v3_pcia.c
487v3_pcia.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 465v3_pcons.o: ../../e_os.h ../../include/openssl/asn1.h
488v3_pcia.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 466v3_pcons.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
489v3_pcia.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h 467v3_pcons.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
490v3_pcia.o: v3_pcia.c 468v3_pcons.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
491v3_pku.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 469v3_pcons.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
470v3_pcons.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
471v3_pcons.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
472v3_pcons.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
473v3_pcons.o: ../../include/openssl/opensslconf.h
474v3_pcons.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
475v3_pcons.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
476v3_pcons.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
477v3_pcons.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
478v3_pcons.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
479v3_pcons.o: ../cryptlib.h v3_pcons.c
480v3_pku.o: ../../e_os.h ../../include/openssl/asn1.h
492v3_pku.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h 481v3_pku.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
493v3_pku.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 482v3_pku.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
494v3_pku.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h 483v3_pku.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
495v3_pku.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 484v3_pku.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
496v3_pku.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 485v3_pku.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
497v3_pku.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 486v3_pku.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
498v3_pku.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 487v3_pku.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
499v3_pku.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 488v3_pku.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
500v3_pku.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h 489v3_pku.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
501v3_pku.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
502v3_pku.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
503v3_pku.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
504v3_pku.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
505v3_pku.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
506v3_pku.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
507v3_pku.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
508v3_pku.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 490v3_pku.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
509v3_pku.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 491v3_pku.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
510v3_pku.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
511v3_pku.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 492v3_pku.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
512v3_pku.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_pku.c 493v3_pku.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_pku.c
513v3_prn.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h 494v3_pmaps.o: ../../e_os.h ../../include/openssl/asn1.h
514v3_prn.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 495v3_pmaps.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
515v3_prn.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 496v3_pmaps.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
516v3_prn.o: ../../include/openssl/cast.h ../../include/openssl/conf.h 497v3_pmaps.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
517v3_prn.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 498v3_pmaps.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
518v3_prn.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h 499v3_pmaps.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
519v3_prn.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h 500v3_pmaps.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
520v3_prn.o: ../../include/openssl/err.h ../../include/openssl/evp.h 501v3_pmaps.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
521v3_prn.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 502v3_pmaps.o: ../../include/openssl/opensslconf.h
522v3_prn.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 503v3_pmaps.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
523v3_prn.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h 504v3_pmaps.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
505v3_pmaps.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
506v3_pmaps.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
507v3_pmaps.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
508v3_pmaps.o: ../cryptlib.h v3_pmaps.c
509v3_prn.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
510v3_prn.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
511v3_prn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
512v3_prn.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
513v3_prn.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
514v3_prn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
524v3_prn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 515v3_prn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
525v3_prn.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 516v3_prn.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
526v3_prn.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 517v3_prn.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
527v3_prn.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 518v3_prn.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
528v3_prn.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 519v3_prn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
529v3_prn.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 520v3_prn.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
530v3_prn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 521v3_prn.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_prn.c
531v3_prn.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 522v3_purp.o: ../../e_os.h ../../include/openssl/asn1.h
532v3_prn.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 523v3_purp.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
533v3_prn.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
534v3_prn.o: ../cryptlib.h v3_prn.c
535v3_purp.o: ../../e_os.h ../../include/openssl/aes.h
536v3_purp.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
537v3_purp.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
538v3_purp.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
539v3_purp.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 524v3_purp.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
540v3_purp.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 525v3_purp.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
541v3_purp.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 526v3_purp.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
542v3_purp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 527v3_purp.o: ../../include/openssl/err.h ../../include/openssl/evp.h
543v3_purp.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 528v3_purp.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
544v3_purp.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
545v3_purp.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
546v3_purp.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
547v3_purp.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 529v3_purp.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
548v3_purp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 530v3_purp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
549v3_purp.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 531v3_purp.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
550v3_purp.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 532v3_purp.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
551v3_purp.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 533v3_purp.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
552v3_purp.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 534v3_purp.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
553v3_purp.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 535v3_purp.o: ../cryptlib.h v3_purp.c
554v3_purp.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 536v3_skey.o: ../../e_os.h ../../include/openssl/asn1.h
555v3_purp.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 537v3_skey.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
556v3_purp.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_purp.c
557v3_skey.o: ../../e_os.h ../../include/openssl/aes.h
558v3_skey.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
559v3_skey.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
560v3_skey.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
561v3_skey.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 538v3_skey.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
562v3_skey.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 539v3_skey.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
563v3_skey.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 540v3_skey.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
564v3_skey.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 541v3_skey.o: ../../include/openssl/err.h ../../include/openssl/evp.h
565v3_skey.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 542v3_skey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
566v3_skey.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
567v3_skey.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
568v3_skey.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
569v3_skey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 543v3_skey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
570v3_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 544v3_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
571v3_skey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 545v3_skey.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
572v3_skey.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 546v3_skey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
573v3_skey.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 547v3_skey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
574v3_skey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 548v3_skey.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
575v3_skey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 549v3_skey.o: ../cryptlib.h v3_skey.c
576v3_skey.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 550v3_sxnet.o: ../../e_os.h ../../include/openssl/asn1.h
577v3_skey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 551v3_sxnet.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
578v3_skey.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_skey.c 552v3_sxnet.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
579v3_sxnet.o: ../../e_os.h ../../include/openssl/aes.h 553v3_sxnet.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
580v3_sxnet.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h 554v3_sxnet.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
581v3_sxnet.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 555v3_sxnet.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
582v3_sxnet.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 556v3_sxnet.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
583v3_sxnet.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
584v3_sxnet.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
585v3_sxnet.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
586v3_sxnet.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
587v3_sxnet.o: ../../include/openssl/err.h ../../include/openssl/evp.h
588v3_sxnet.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
589v3_sxnet.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
590v3_sxnet.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
591v3_sxnet.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 557v3_sxnet.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
592v3_sxnet.o: ../../include/openssl/opensslconf.h 558v3_sxnet.o: ../../include/openssl/opensslconf.h
593v3_sxnet.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 559v3_sxnet.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
594v3_sxnet.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 560v3_sxnet.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
595v3_sxnet.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 561v3_sxnet.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
596v3_sxnet.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 562v3_sxnet.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
597v3_sxnet.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 563v3_sxnet.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
598v3_sxnet.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 564v3_sxnet.o: ../cryptlib.h v3_sxnet.c
599v3_sxnet.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 565v3_utl.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
600v3_sxnet.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
601v3_sxnet.o: ../../include/openssl/x509v3.h ../cryptlib.h v3_sxnet.c
602v3_utl.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h
603v3_utl.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
604v3_utl.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 566v3_utl.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
605v3_utl.o: ../../include/openssl/cast.h ../../include/openssl/conf.h 567v3_utl.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
606v3_utl.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 568v3_utl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
607v3_utl.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h 569v3_utl.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
608v3_utl.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
609v3_utl.o: ../../include/openssl/err.h ../../include/openssl/evp.h 570v3_utl.o: ../../include/openssl/err.h ../../include/openssl/evp.h
610v3_utl.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h 571v3_utl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
611v3_utl.o: ../../include/openssl/md2.h ../../include/openssl/md4.h 572v3_utl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
612v3_utl.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h 573v3_utl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
613v3_utl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 574v3_utl.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
614v3_utl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
615v3_utl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
616v3_utl.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
617v3_utl.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
618v3_utl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
619v3_utl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 575v3_utl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
620v3_utl.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 576v3_utl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
621v3_utl.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
622v3_utl.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h 577v3_utl.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
623v3_utl.o: ../cryptlib.h v3_utl.c 578v3_utl.o: ../cryptlib.h v3_utl.c
624v3err.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h 579v3err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
625v3err.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 580v3err.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
626v3err.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 581v3err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
627v3err.o: ../../include/openssl/cast.h ../../include/openssl/conf.h 582v3err.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
628v3err.o: ../../include/openssl/crypto.h ../../include/openssl/des.h 583v3err.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
629v3err.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h 584v3err.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
630v3err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
631v3err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
632v3err.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
633v3err.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
634v3err.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
635v3err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 585v3err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
636v3err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 586v3err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
637v3err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 587v3err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
638v3err.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 588v3err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
639v3err.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 589v3err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
640v3err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 590v3err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
641v3err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 591v3err.o: ../../include/openssl/x509v3.h v3err.c
642v3err.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
643v3err.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
644v3err.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
645v3err.o: v3err.c