diff options
Diffstat (limited to 'src/lib/libcrypto/err')
| -rw-r--r-- | src/lib/libcrypto/err/Makefile | 118 | ||||
| -rw-r--r-- | src/lib/libcrypto/err/Makefile.ssl | 119 | ||||
| -rw-r--r-- | src/lib/libcrypto/err/err.c | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/err/openssl.ec | 2 |
4 files changed, 240 insertions, 5 deletions
diff --git a/src/lib/libcrypto/err/Makefile b/src/lib/libcrypto/err/Makefile new file mode 100644 index 0000000000..4adec55302 --- /dev/null +++ b/src/lib/libcrypto/err/Makefile | |||
| @@ -0,0 +1,118 @@ | |||
| 1 | # | ||
| 2 | # OpenSSL/crypto/err/Makefile | ||
| 3 | # | ||
| 4 | |||
| 5 | DIR= err | ||
| 6 | TOP= ../.. | ||
| 7 | CC= cc | ||
| 8 | INCLUDES= -I.. -I$(TOP) -I../../include | ||
| 9 | CFLAG=-g | ||
| 10 | INSTALL_PREFIX= | ||
| 11 | OPENSSLDIR= /usr/local/ssl | ||
| 12 | INSTALLTOP=/usr/local/ssl | ||
| 13 | MAKEDEPPROG= makedepend | ||
| 14 | MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) | ||
| 15 | MAKEFILE= Makefile | ||
| 16 | AR= ar r | ||
| 17 | |||
| 18 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
| 19 | |||
| 20 | GENERAL=Makefile | ||
| 21 | TEST= | ||
| 22 | APPS= | ||
| 23 | |||
| 24 | LIB=$(TOP)/libcrypto.a | ||
| 25 | LIBSRC=err.c err_all.c err_prn.c | ||
| 26 | LIBOBJ=err.o err_all.o err_prn.o | ||
| 27 | |||
| 28 | SRC= $(LIBSRC) | ||
| 29 | |||
| 30 | EXHEADER= err.h | ||
| 31 | HEADER= $(EXHEADER) | ||
| 32 | |||
| 33 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
| 34 | |||
| 35 | top: | ||
| 36 | (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) | ||
| 37 | |||
| 38 | all: lib | ||
| 39 | |||
| 40 | lib: $(LIBOBJ) | ||
| 41 | $(AR) $(LIB) $(LIBOBJ) | ||
| 42 | $(RANLIB) $(LIB) || echo Never mind. | ||
| 43 | @touch lib | ||
| 44 | |||
| 45 | files: | ||
| 46 | $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO | ||
| 47 | |||
| 48 | links: | ||
| 49 | @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) | ||
| 50 | @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) | ||
| 51 | @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) | ||
| 52 | |||
| 53 | install: | ||
| 54 | @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ | ||
| 55 | do \ | ||
| 56 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ | ||
| 57 | chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ | ||
| 58 | done; | ||
| 59 | |||
| 60 | tags: | ||
| 61 | ctags $(SRC) | ||
| 62 | |||
| 63 | tests: | ||
| 64 | |||
| 65 | lint: | ||
| 66 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
| 67 | |||
| 68 | depend: | ||
| 69 | $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) | ||
| 70 | |||
| 71 | dclean: | ||
| 72 | $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
| 73 | mv -f Makefile.new $(MAKEFILE) | ||
| 74 | |||
| 75 | clean: | ||
| 76 | rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
| 77 | |||
| 78 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
| 79 | |||
| 80 | err.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/buffer.h | ||
| 81 | err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | ||
| 82 | err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h | ||
| 83 | err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | ||
| 84 | err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | ||
| 85 | err.o: ../../include/openssl/symhacks.h ../cryptlib.h err.c | ||
| 86 | err_all.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h | ||
| 87 | err_all.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h | ||
| 88 | err_all.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h | ||
| 89 | err_all.o: ../../include/openssl/cast.h ../../include/openssl/conf.h | ||
| 90 | err_all.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | ||
| 91 | err_all.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h | ||
| 92 | err_all.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h | ||
| 93 | err_all.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h | ||
| 94 | err_all.o: ../../include/openssl/engine.h ../../include/openssl/err.h | ||
| 95 | err_all.o: ../../include/openssl/evp.h ../../include/openssl/fips.h | ||
| 96 | err_all.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h | ||
| 97 | err_all.o: ../../include/openssl/md2.h ../../include/openssl/md4.h | ||
| 98 | err_all.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h | ||
| 99 | err_all.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | ||
| 100 | err_all.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h | ||
| 101 | err_all.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 102 | err_all.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h | ||
| 103 | err_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h | ||
| 104 | err_all.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h | ||
| 105 | err_all.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h | ||
| 106 | err_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h | ||
| 107 | err_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h | ||
| 108 | err_all.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | ||
| 109 | err_all.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h | ||
| 110 | err_all.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h | ||
| 111 | err_all.o: err_all.c | ||
| 112 | err_prn.o: ../../e_os.h ../../include/openssl/bio.h | ||
| 113 | err_prn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | ||
| 114 | err_prn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | ||
| 115 | err_prn.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h | ||
| 116 | err_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | ||
| 117 | err_prn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 118 | err_prn.o: ../cryptlib.h err_prn.c | ||
diff --git a/src/lib/libcrypto/err/Makefile.ssl b/src/lib/libcrypto/err/Makefile.ssl new file mode 100644 index 0000000000..b253061d07 --- /dev/null +++ b/src/lib/libcrypto/err/Makefile.ssl | |||
| @@ -0,0 +1,119 @@ | |||
| 1 | # | ||
| 2 | # SSLeay/crypto/err/Makefile | ||
| 3 | # | ||
| 4 | |||
| 5 | DIR= err | ||
| 6 | TOP= ../.. | ||
| 7 | CC= cc | ||
| 8 | INCLUDES= -I.. -I$(TOP) -I../../include | ||
| 9 | CFLAG=-g | ||
| 10 | INSTALL_PREFIX= | ||
| 11 | OPENSSLDIR= /usr/local/ssl | ||
| 12 | INSTALLTOP=/usr/local/ssl | ||
| 13 | MAKE= make -f Makefile.ssl | ||
| 14 | MAKEDEPPROG= makedepend | ||
| 15 | MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) | ||
| 16 | MAKEFILE= Makefile.ssl | ||
| 17 | AR= ar r | ||
| 18 | |||
| 19 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
| 20 | |||
| 21 | GENERAL=Makefile | ||
| 22 | TEST= | ||
| 23 | APPS= | ||
| 24 | |||
| 25 | LIB=$(TOP)/libcrypto.a | ||
| 26 | LIBSRC=err.c err_all.c err_prn.c | ||
| 27 | LIBOBJ=err.o err_all.o err_prn.o | ||
| 28 | |||
| 29 | SRC= $(LIBSRC) | ||
| 30 | |||
| 31 | EXHEADER= err.h | ||
| 32 | HEADER= $(EXHEADER) | ||
| 33 | |||
| 34 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
| 35 | |||
| 36 | top: | ||
| 37 | (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) | ||
| 38 | |||
| 39 | all: lib | ||
| 40 | |||
| 41 | lib: $(LIBOBJ) | ||
| 42 | $(AR) $(LIB) $(LIBOBJ) | ||
| 43 | $(RANLIB) $(LIB) || echo Never mind. | ||
| 44 | @touch lib | ||
| 45 | |||
| 46 | files: | ||
| 47 | $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO | ||
| 48 | |||
| 49 | links: | ||
| 50 | @sh $(TOP)/util/point.sh Makefile.ssl Makefile | ||
| 51 | @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) | ||
| 52 | @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) | ||
| 53 | @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) | ||
| 54 | |||
| 55 | install: | ||
| 56 | @for i in $(EXHEADER) ; \ | ||
| 57 | do \ | ||
| 58 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ | ||
| 59 | chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ | ||
| 60 | done; | ||
| 61 | |||
| 62 | tags: | ||
| 63 | ctags $(SRC) | ||
| 64 | |||
| 65 | tests: | ||
| 66 | |||
| 67 | lint: | ||
| 68 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
| 69 | |||
| 70 | depend: | ||
| 71 | $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) | ||
| 72 | |||
| 73 | dclean: | ||
| 74 | $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
| 75 | mv -f Makefile.new $(MAKEFILE) | ||
| 76 | |||
| 77 | clean: | ||
| 78 | rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
| 79 | |||
| 80 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
| 81 | |||
| 82 | err.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/buffer.h | ||
| 83 | err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | ||
| 84 | err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h | ||
| 85 | err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | ||
| 86 | err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | ||
| 87 | err.o: ../../include/openssl/symhacks.h ../cryptlib.h err.c | ||
| 88 | err_all.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h | ||
| 89 | err_all.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h | ||
| 90 | err_all.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h | ||
| 91 | err_all.o: ../../include/openssl/cast.h ../../include/openssl/conf.h | ||
| 92 | err_all.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | ||
| 93 | err_all.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h | ||
| 94 | err_all.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h | ||
| 95 | err_all.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h | ||
| 96 | err_all.o: ../../include/openssl/engine.h ../../include/openssl/err.h | ||
| 97 | err_all.o: ../../include/openssl/evp.h ../../include/openssl/idea.h | ||
| 98 | err_all.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h | ||
| 99 | err_all.o: ../../include/openssl/md4.h ../../include/openssl/md5.h | ||
| 100 | err_all.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h | ||
| 101 | err_all.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h | ||
| 102 | err_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | ||
| 103 | err_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem2.h | ||
| 104 | err_all.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h | ||
| 105 | err_all.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h | ||
| 106 | err_all.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h | ||
| 107 | err_all.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h | ||
| 108 | err_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h | ||
| 109 | err_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 110 | err_all.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | ||
| 111 | err_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h | ||
| 112 | err_all.o: ../../include/openssl/x509v3.h err_all.c | ||
| 113 | err_prn.o: ../../e_os.h ../../include/openssl/bio.h | ||
| 114 | err_prn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | ||
| 115 | err_prn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | ||
| 116 | err_prn.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h | ||
| 117 | err_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | ||
| 118 | err_prn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 119 | err_prn.o: ../cryptlib.h err_prn.c | ||
diff --git a/src/lib/libcrypto/err/err.c b/src/lib/libcrypto/err/err.c index 53687d79ab..c78790a54c 100644 --- a/src/lib/libcrypto/err/err.c +++ b/src/lib/libcrypto/err/err.c | |||
| @@ -621,8 +621,7 @@ static void err_load_strings(int lib, ERR_STRING_DATA *str) | |||
| 621 | { | 621 | { |
| 622 | while (str->error) | 622 | while (str->error) |
| 623 | { | 623 | { |
| 624 | if (lib) | 624 | str->error|=ERR_PACK(lib,0,0); |
| 625 | str->error|=ERR_PACK(lib,0,0); | ||
| 626 | ERRFN(err_set_item)(str); | 625 | ERRFN(err_set_item)(str); |
| 627 | str++; | 626 | str++; |
| 628 | } | 627 | } |
| @@ -638,8 +637,7 @@ void ERR_unload_strings(int lib, ERR_STRING_DATA *str) | |||
| 638 | { | 637 | { |
| 639 | while (str->error) | 638 | while (str->error) |
| 640 | { | 639 | { |
| 641 | if (lib) | 640 | str->error|=ERR_PACK(lib,0,0); |
| 642 | str->error|=ERR_PACK(lib,0,0); | ||
| 643 | ERRFN(err_del_item)(str); | 641 | ERRFN(err_del_item)(str); |
| 644 | str++; | 642 | str++; |
| 645 | } | 643 | } |
diff --git a/src/lib/libcrypto/err/openssl.ec b/src/lib/libcrypto/err/openssl.ec index f8cd6937e7..447a7f87ed 100644 --- a/src/lib/libcrypto/err/openssl.ec +++ b/src/lib/libcrypto/err/openssl.ec | |||
| @@ -27,7 +27,7 @@ L DSO crypto/dso/dso.h crypto/dso/dso_err.c | |||
| 27 | L ENGINE crypto/engine/engine.h crypto/engine/eng_err.c | 27 | L ENGINE crypto/engine/engine.h crypto/engine/eng_err.c |
| 28 | L OCSP crypto/ocsp/ocsp.h crypto/ocsp/ocsp_err.c | 28 | L OCSP crypto/ocsp/ocsp.h crypto/ocsp/ocsp_err.c |
| 29 | L UI crypto/ui/ui.h crypto/ui/ui_err.c | 29 | L UI crypto/ui/ui.h crypto/ui/ui_err.c |
| 30 | L FIPS fips-1.0/fips.h fips-1.0/fips_err.h | 30 | L FIPS fips/fips.h fips/fips_err.h |
| 31 | 31 | ||
| 32 | # additional header files to be scanned for function names | 32 | # additional header files to be scanned for function names |
| 33 | L NONE crypto/x509/x509_vfy.h NONE | 33 | L NONE crypto/x509/x509_vfy.h NONE |
