diff options
Diffstat (limited to 'src/lib/libcrypto/buffer')
| -rw-r--r-- | src/lib/libcrypto/buffer/Makefile | 92 | ||||
| -rw-r--r-- | src/lib/libcrypto/buffer/Makefile.ssl | 94 | ||||
| -rw-r--r-- | src/lib/libcrypto/buffer/buf_err.c | 16 |
3 files changed, 192 insertions, 10 deletions
diff --git a/src/lib/libcrypto/buffer/Makefile b/src/lib/libcrypto/buffer/Makefile new file mode 100644 index 0000000000..4b53c595a3 --- /dev/null +++ b/src/lib/libcrypto/buffer/Makefile | |||
| @@ -0,0 +1,92 @@ | |||
| 1 | # | ||
| 2 | # OpenSSL/crypto/buffer/Makefile | ||
| 3 | # | ||
| 4 | |||
| 5 | DIR= buffer | ||
| 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= buffer.c buf_err.c | ||
| 26 | LIBOBJ= buffer.o buf_err.o | ||
| 27 | |||
| 28 | SRC= $(LIBSRC) | ||
| 29 | |||
| 30 | EXHEADER= buffer.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 | buf_err.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h | ||
| 81 | buf_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | ||
| 82 | buf_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h | ||
| 83 | buf_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | ||
| 84 | buf_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | ||
| 85 | buf_err.o: ../../include/openssl/symhacks.h buf_err.c | ||
| 86 | buffer.o: ../../e_os.h ../../include/openssl/bio.h | ||
| 87 | buffer.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | ||
| 88 | buffer.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | ||
| 89 | buffer.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h | ||
| 90 | buffer.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | ||
| 91 | buffer.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 92 | buffer.o: ../cryptlib.h buffer.c | ||
diff --git a/src/lib/libcrypto/buffer/Makefile.ssl b/src/lib/libcrypto/buffer/Makefile.ssl new file mode 100644 index 0000000000..b131ca3078 --- /dev/null +++ b/src/lib/libcrypto/buffer/Makefile.ssl | |||
| @@ -0,0 +1,94 @@ | |||
| 1 | # | ||
| 2 | # SSLeay/crypto/buffer/Makefile | ||
| 3 | # | ||
| 4 | |||
| 5 | DIR= buffer | ||
| 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= buffer.c buf_err.c | ||
| 27 | LIBOBJ= buffer.o buf_err.o | ||
| 28 | |||
| 29 | SRC= $(LIBSRC) | ||
| 30 | |||
| 31 | EXHEADER= buffer.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 | buf_err.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h | ||
| 83 | buf_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | ||
| 84 | buf_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h | ||
| 85 | buf_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | ||
| 86 | buf_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | ||
| 87 | buf_err.o: ../../include/openssl/symhacks.h buf_err.c | ||
| 88 | buffer.o: ../../e_os.h ../../include/openssl/bio.h | ||
| 89 | buffer.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | ||
| 90 | buffer.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | ||
| 91 | buffer.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h | ||
| 92 | buffer.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | ||
| 93 | buffer.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 94 | buffer.o: ../cryptlib.h buffer.c | ||
diff --git a/src/lib/libcrypto/buffer/buf_err.c b/src/lib/libcrypto/buffer/buf_err.c index 1fc32a6861..5eee653e14 100644 --- a/src/lib/libcrypto/buffer/buf_err.c +++ b/src/lib/libcrypto/buffer/buf_err.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* crypto/buffer/buf_err.c */ | 1 | /* crypto/buffer/buf_err.c */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1999-2005 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| 5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
| 6 | * modification, are permitted provided that the following conditions | 6 | * modification, are permitted provided that the following conditions |
| @@ -64,15 +64,11 @@ | |||
| 64 | 64 | ||
| 65 | /* BEGIN ERROR CODES */ | 65 | /* BEGIN ERROR CODES */ |
| 66 | #ifndef OPENSSL_NO_ERR | 66 | #ifndef OPENSSL_NO_ERR |
| 67 | |||
| 68 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_BUF,func,0) | ||
| 69 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_BUF,0,reason) | ||
| 70 | |||
| 71 | static ERR_STRING_DATA BUF_str_functs[]= | 67 | static ERR_STRING_DATA BUF_str_functs[]= |
| 72 | { | 68 | { |
| 73 | {ERR_FUNC(BUF_F_BUF_MEM_GROW), "BUF_MEM_grow"}, | 69 | {ERR_PACK(0,BUF_F_BUF_MEM_GROW,0), "BUF_MEM_grow"}, |
| 74 | {ERR_FUNC(BUF_F_BUF_MEM_NEW), "BUF_MEM_new"}, | 70 | {ERR_PACK(0,BUF_F_BUF_MEM_NEW,0), "BUF_MEM_new"}, |
| 75 | {ERR_FUNC(BUF_F_BUF_STRDUP), "BUF_strdup"}, | 71 | {ERR_PACK(0,BUF_F_BUF_STRDUP,0), "BUF_strdup"}, |
| 76 | {0,NULL} | 72 | {0,NULL} |
| 77 | }; | 73 | }; |
| 78 | 74 | ||
| @@ -91,8 +87,8 @@ void ERR_load_BUF_strings(void) | |||
| 91 | { | 87 | { |
| 92 | init=0; | 88 | init=0; |
| 93 | #ifndef OPENSSL_NO_ERR | 89 | #ifndef OPENSSL_NO_ERR |
| 94 | ERR_load_strings(0,BUF_str_functs); | 90 | ERR_load_strings(ERR_LIB_BUF,BUF_str_functs); |
| 95 | ERR_load_strings(0,BUF_str_reasons); | 91 | ERR_load_strings(ERR_LIB_BUF,BUF_str_reasons); |
| 96 | #endif | 92 | #endif |
| 97 | 93 | ||
| 98 | } | 94 | } |
