summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/err
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/err')
-rw-r--r--src/lib/libcrypto/err/Makefile110
-rw-r--r--src/lib/libcrypto/err/err.c13
-rw-r--r--src/lib/libcrypto/err/err.h3
-rw-r--r--src/lib/libcrypto/err/err_all.c7
4 files changed, 116 insertions, 17 deletions
diff --git a/src/lib/libcrypto/err/Makefile b/src/lib/libcrypto/err/Makefile
new file mode 100644
index 0000000000..862b23ba17
--- /dev/null
+++ b/src/lib/libcrypto/err/Makefile
@@ -0,0 +1,110 @@
1#
2# OpenSSL/crypto/err/Makefile
3#
4
5DIR= err
6TOP= ../..
7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g
10MAKEFILE= Makefile
11AR= ar r
12
13CFLAGS= $(INCLUDES) $(CFLAG)
14
15GENERAL=Makefile
16TEST=
17APPS=
18
19LIB=$(TOP)/libcrypto.a
20LIBSRC=err.c err_all.c err_prn.c
21LIBOBJ=err.o err_all.o err_prn.o
22
23SRC= $(LIBSRC)
24
25EXHEADER= err.h
26HEADER= $(EXHEADER)
27
28ALL= $(GENERAL) $(SRC) $(HEADER)
29
30top:
31 (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
32
33all: lib
34
35lib: $(LIBOBJ)
36 $(AR) $(LIB) $(LIBOBJ)
37 $(RANLIB) $(LIB) || echo Never mind.
38 @touch lib
39
40files:
41 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
42
43links:
44 @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
45 @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
46 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
47
48install:
49 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
50 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
51 do \
52 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
53 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
54 done;
55
56tags:
57 ctags $(SRC)
58
59tests:
60
61lint:
62 lint -DLINT $(INCLUDES) $(SRC)>fluff
63
64depend:
65 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
66 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
67
68dclean:
69 $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
70 mv -f Makefile.new $(MAKEFILE)
71
72clean:
73 rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
74
75# DO NOT DELETE THIS LINE -- make depend depends on it.
76
77err.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/buffer.h
78err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
79err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
80err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
81err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
82err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
83err.o: ../cryptlib.h err.c
84err_all.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
85err_all.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
86err_all.o: ../../include/openssl/cms.h ../../include/openssl/comp.h
87err_all.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
88err_all.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
89err_all.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
90err_all.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
91err_all.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
92err_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h
93err_all.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
94err_all.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
95err_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
96err_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem2.h
97err_all.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
98err_all.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
99err_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
100err_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
101err_all.o: ../../include/openssl/ts.h ../../include/openssl/ui.h
102err_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
103err_all.o: ../../include/openssl/x509v3.h err_all.c
104err_prn.o: ../../e_os.h ../../include/openssl/bio.h
105err_prn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
106err_prn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
107err_prn.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
108err_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
109err_prn.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
110err_prn.o: ../../include/openssl/symhacks.h ../cryptlib.h err_prn.c
diff --git a/src/lib/libcrypto/err/err.c b/src/lib/libcrypto/err/err.c
index fcdb244008..69713a6e2f 100644
--- a/src/lib/libcrypto/err/err.c
+++ b/src/lib/libcrypto/err/err.c
@@ -1066,13 +1066,6 @@ void ERR_set_error_data(char *data, int flags)
1066void ERR_add_error_data(int num, ...) 1066void ERR_add_error_data(int num, ...)
1067 { 1067 {
1068 va_list args; 1068 va_list args;
1069 va_start(args, num);
1070 ERR_add_error_vdata(num, args);
1071 va_end(args);
1072 }
1073
1074void ERR_add_error_vdata(int num, va_list args)
1075 {
1076 int i,n,s; 1069 int i,n,s;
1077 char *str,*p,*a; 1070 char *str,*p,*a;
1078 1071
@@ -1081,6 +1074,7 @@ void ERR_add_error_vdata(int num, va_list args)
1081 if (str == NULL) return; 1074 if (str == NULL) return;
1082 str[0]='\0'; 1075 str[0]='\0';
1083 1076
1077 va_start(args, num);
1084 n=0; 1078 n=0;
1085 for (i=0; i<num; i++) 1079 for (i=0; i<num; i++)
1086 { 1080 {
@@ -1096,7 +1090,7 @@ void ERR_add_error_vdata(int num, va_list args)
1096 if (p == NULL) 1090 if (p == NULL)
1097 { 1091 {
1098 OPENSSL_free(str); 1092 OPENSSL_free(str);
1099 return; 1093 goto err;
1100 } 1094 }
1101 else 1095 else
1102 str=p; 1096 str=p;
@@ -1105,6 +1099,9 @@ void ERR_add_error_vdata(int num, va_list args)
1105 } 1099 }
1106 } 1100 }
1107 ERR_set_error_data(str,ERR_TXT_MALLOCED|ERR_TXT_STRING); 1101 ERR_set_error_data(str,ERR_TXT_MALLOCED|ERR_TXT_STRING);
1102
1103err:
1104 va_end(args);
1108 } 1105 }
1109 1106
1110int ERR_set_mark(void) 1107int ERR_set_mark(void)
diff --git a/src/lib/libcrypto/err/err.h b/src/lib/libcrypto/err/err.h
index 974cc9cc6f..b9f8c16d47 100644
--- a/src/lib/libcrypto/err/err.h
+++ b/src/lib/libcrypto/err/err.h
@@ -344,9 +344,8 @@ void ERR_print_errors_fp(FILE *fp);
344#endif 344#endif
345#ifndef OPENSSL_NO_BIO 345#ifndef OPENSSL_NO_BIO
346void ERR_print_errors(BIO *bp); 346void ERR_print_errors(BIO *bp);
347#endif
348void ERR_add_error_data(int num, ...); 347void ERR_add_error_data(int num, ...);
349void ERR_add_error_vdata(int num, va_list args); 348#endif
350void ERR_load_strings(int lib,ERR_STRING_DATA str[]); 349void ERR_load_strings(int lib,ERR_STRING_DATA str[]);
351void ERR_unload_strings(int lib,ERR_STRING_DATA str[]); 350void ERR_unload_strings(int lib,ERR_STRING_DATA str[]);
352void ERR_load_ERR_strings(void); 351void ERR_load_ERR_strings(void);
diff --git a/src/lib/libcrypto/err/err_all.c b/src/lib/libcrypto/err/err_all.c
index bd8946d8ba..fc049e8e88 100644
--- a/src/lib/libcrypto/err/err_all.c
+++ b/src/lib/libcrypto/err/err_all.c
@@ -104,10 +104,6 @@
104#endif 104#endif
105#include <openssl/comp.h> 105#include <openssl/comp.h>
106 106
107#ifdef OPENSSL_FIPS
108#include <openssl/fips.h>
109#endif
110
111void ERR_load_crypto_strings(void) 107void ERR_load_crypto_strings(void)
112 { 108 {
113#ifndef OPENSSL_NO_ERR 109#ifndef OPENSSL_NO_ERR
@@ -161,7 +157,4 @@ void ERR_load_crypto_strings(void)
161#endif 157#endif
162 ERR_load_COMP_strings(); 158 ERR_load_COMP_strings();
163#endif 159#endif
164#ifdef OPENSSL_FIPS
165 ERR_load_FIPS_strings();
166#endif
167 } 160 }
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-11-02 11:26:36 +0000