diff options
Diffstat (limited to 'src/lib/libcrypto/conf')
-rw-r--r-- | src/lib/libcrypto/conf/conf.h | 179 | ||||
-rw-r--r-- | src/lib/libcrypto/conf/conf_api.c | 289 | ||||
-rw-r--r-- | src/lib/libcrypto/conf/conf_api.h | 87 | ||||
-rw-r--r-- | src/lib/libcrypto/conf/conf_def.c | 703 | ||||
-rw-r--r-- | src/lib/libcrypto/conf/conf_def.h | 145 | ||||
-rw-r--r-- | src/lib/libcrypto/conf/conf_err.c | 112 | ||||
-rw-r--r-- | src/lib/libcrypto/conf/conf_lib.c | 392 | ||||
-rw-r--r-- | src/lib/libcrypto/conf/keysets.pl | 179 | ||||
-rw-r--r-- | src/lib/libcrypto/conf/ssleay.cnf | 78 |
9 files changed, 0 insertions, 2164 deletions
diff --git a/src/lib/libcrypto/conf/conf.h b/src/lib/libcrypto/conf/conf.h deleted file mode 100644 index cd40a0db21..0000000000 --- a/src/lib/libcrypto/conf/conf.h +++ /dev/null | |||
@@ -1,179 +0,0 @@ | |||
1 | /* crypto/conf/conf.h */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #ifndef HEADER_CONF_H | ||
60 | #define HEADER_CONF_H | ||
61 | |||
62 | #include <openssl/bio.h> | ||
63 | #include <openssl/lhash.h> | ||
64 | #include <openssl/stack.h> | ||
65 | #include <openssl/safestack.h> | ||
66 | #include <openssl/e_os.h> | ||
67 | |||
68 | #ifdef __cplusplus | ||
69 | extern "C" { | ||
70 | #endif | ||
71 | |||
72 | typedef struct | ||
73 | { | ||
74 | char *section; | ||
75 | char *name; | ||
76 | char *value; | ||
77 | } CONF_VALUE; | ||
78 | |||
79 | DECLARE_STACK_OF(CONF_VALUE) | ||
80 | |||
81 | struct conf_st; | ||
82 | typedef struct conf_st CONF; | ||
83 | struct conf_method_st; | ||
84 | typedef struct conf_method_st CONF_METHOD; | ||
85 | |||
86 | struct conf_method_st | ||
87 | { | ||
88 | const char *name; | ||
89 | CONF *(MS_FAR *create)(CONF_METHOD *meth); | ||
90 | int (MS_FAR *init)(CONF *conf); | ||
91 | int (MS_FAR *destroy)(CONF *conf); | ||
92 | int (MS_FAR *destroy_data)(CONF *conf); | ||
93 | int (MS_FAR *load)(CONF *conf, BIO *bp, long *eline); | ||
94 | int (MS_FAR *dump)(CONF *conf, BIO *bp); | ||
95 | int (MS_FAR *is_number)(CONF *conf, char c); | ||
96 | int (MS_FAR *to_int)(CONF *conf, char c); | ||
97 | }; | ||
98 | |||
99 | int CONF_set_default_method(CONF_METHOD *meth); | ||
100 | LHASH *CONF_load(LHASH *conf,const char *file,long *eline); | ||
101 | #ifndef NO_FP_API | ||
102 | LHASH *CONF_load_fp(LHASH *conf, FILE *fp,long *eline); | ||
103 | #endif | ||
104 | LHASH *CONF_load_bio(LHASH *conf, BIO *bp,long *eline); | ||
105 | STACK_OF(CONF_VALUE) *CONF_get_section(LHASH *conf,char *section); | ||
106 | char *CONF_get_string(LHASH *conf,char *group,char *name); | ||
107 | long CONF_get_number(LHASH *conf,char *group,char *name); | ||
108 | void CONF_free(LHASH *conf); | ||
109 | int CONF_dump_fp(LHASH *conf, FILE *out); | ||
110 | int CONF_dump_bio(LHASH *conf, BIO *out); | ||
111 | void ERR_load_CONF_strings(void ); | ||
112 | |||
113 | /* New conf code. The semantics are different from the functions above. | ||
114 | If that wasn't the case, the above functions would have been replaced */ | ||
115 | |||
116 | struct conf_st | ||
117 | { | ||
118 | CONF_METHOD *meth; | ||
119 | void *meth_data; | ||
120 | LHASH *data; | ||
121 | }; | ||
122 | |||
123 | CONF *NCONF_new(CONF_METHOD *meth); | ||
124 | CONF_METHOD *NCONF_default(); | ||
125 | CONF_METHOD *NCONF_WIN32(); | ||
126 | #if 0 /* Just to give you an idea of what I have in mind */ | ||
127 | CONF_METHOD *NCONF_XML(); | ||
128 | #endif | ||
129 | void NCONF_free(CONF *conf); | ||
130 | void NCONF_free_data(CONF *conf); | ||
131 | |||
132 | int NCONF_load(CONF *conf,const char *file,long *eline); | ||
133 | #ifndef NO_FP_API | ||
134 | int NCONF_load_fp(CONF *conf, FILE *fp,long *eline); | ||
135 | #endif | ||
136 | int NCONF_load_bio(CONF *conf, BIO *bp,long *eline); | ||
137 | STACK_OF(CONF_VALUE) *NCONF_get_section(CONF *conf,char *section); | ||
138 | char *NCONF_get_string(CONF *conf,char *group,char *name); | ||
139 | long NCONF_get_number(CONF *conf,char *group,char *name); | ||
140 | int NCONF_dump_fp(CONF *conf, FILE *out); | ||
141 | int NCONF_dump_bio(CONF *conf, BIO *out); | ||
142 | |||
143 | |||
144 | /* BEGIN ERROR CODES */ | ||
145 | /* The following lines are auto generated by the script mkerr.pl. Any changes | ||
146 | * made after this point may be overwritten when the script is next run. | ||
147 | */ | ||
148 | |||
149 | /* Error codes for the CONF functions. */ | ||
150 | |||
151 | /* Function codes. */ | ||
152 | #define CONF_F_CONF_DUMP_FP 104 | ||
153 | #define CONF_F_CONF_LOAD 100 | ||
154 | #define CONF_F_CONF_LOAD_BIO 102 | ||
155 | #define CONF_F_CONF_LOAD_FP 103 | ||
156 | #define CONF_F_NCONF_DUMP_BIO 105 | ||
157 | #define CONF_F_NCONF_DUMP_FP 106 | ||
158 | #define CONF_F_NCONF_GET_NUMBER 107 | ||
159 | #define CONF_F_NCONF_GET_SECTION 108 | ||
160 | #define CONF_F_NCONF_GET_STRING 109 | ||
161 | #define CONF_F_NCONF_LOAD_BIO 110 | ||
162 | #define CONF_F_NCONF_NEW 111 | ||
163 | #define CONF_F_STR_COPY 101 | ||
164 | |||
165 | /* Reason codes. */ | ||
166 | #define CONF_R_MISSING_CLOSE_SQUARE_BRACKET 100 | ||
167 | #define CONF_R_MISSING_EQUAL_SIGN 101 | ||
168 | #define CONF_R_NO_CLOSE_BRACE 102 | ||
169 | #define CONF_R_NO_CONF 105 | ||
170 | #define CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE 106 | ||
171 | #define CONF_R_NO_SECTION 107 | ||
172 | #define CONF_R_UNABLE_TO_CREATE_NEW_SECTION 103 | ||
173 | #define CONF_R_VARIABLE_HAS_NO_VALUE 104 | ||
174 | |||
175 | #ifdef __cplusplus | ||
176 | } | ||
177 | #endif | ||
178 | #endif | ||
179 | |||
diff --git a/src/lib/libcrypto/conf/conf_api.c b/src/lib/libcrypto/conf/conf_api.c deleted file mode 100644 index d05a778ff6..0000000000 --- a/src/lib/libcrypto/conf/conf_api.c +++ /dev/null | |||
@@ -1,289 +0,0 @@ | |||
1 | /* conf_api.c */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | /* Part of the code in here was originally in conf.c, which is now removed */ | ||
60 | |||
61 | #ifndef CONF_DEBUG | ||
62 | # undef NDEBUG /* avoid conflicting definitions */ | ||
63 | # define NDEBUG | ||
64 | #endif | ||
65 | |||
66 | #include <assert.h> | ||
67 | #include <string.h> | ||
68 | #include <openssl/conf.h> | ||
69 | #include <openssl/conf_api.h> | ||
70 | |||
71 | static void value_free_hash(CONF_VALUE *a, LHASH *conf); | ||
72 | static void value_free_stack(CONF_VALUE *a,LHASH *conf); | ||
73 | static unsigned long hash(CONF_VALUE *v); | ||
74 | static int cmp_conf(CONF_VALUE *a,CONF_VALUE *b); | ||
75 | |||
76 | /* Up until OpenSSL 0.9.5a, this was get_section */ | ||
77 | CONF_VALUE *_CONF_get_section(CONF *conf, char *section) | ||
78 | { | ||
79 | CONF_VALUE *v,vv; | ||
80 | |||
81 | if ((conf == NULL) || (section == NULL)) return(NULL); | ||
82 | vv.name=NULL; | ||
83 | vv.section=section; | ||
84 | v=(CONF_VALUE *)lh_retrieve(conf->data,&vv); | ||
85 | return(v); | ||
86 | } | ||
87 | |||
88 | /* Up until OpenSSL 0.9.5a, this was CONF_get_section */ | ||
89 | STACK_OF(CONF_VALUE) *_CONF_get_section_values(CONF *conf, char *section) | ||
90 | { | ||
91 | CONF_VALUE *v; | ||
92 | |||
93 | v=_CONF_get_section(conf,section); | ||
94 | if (v != NULL) | ||
95 | return((STACK_OF(CONF_VALUE) *)v->value); | ||
96 | else | ||
97 | return(NULL); | ||
98 | } | ||
99 | |||
100 | int _CONF_add_string(CONF *conf, CONF_VALUE *section, CONF_VALUE *value) | ||
101 | { | ||
102 | CONF_VALUE *v = NULL; | ||
103 | STACK_OF(CONF_VALUE) *ts; | ||
104 | |||
105 | ts = (STACK_OF(CONF_VALUE) *)section->value; | ||
106 | |||
107 | value->section=section->section; | ||
108 | if (!sk_CONF_VALUE_push(ts,value)) | ||
109 | { | ||
110 | return 0; | ||
111 | } | ||
112 | |||
113 | v = (CONF_VALUE *)lh_insert(conf->data, value); | ||
114 | if (v != NULL) | ||
115 | { | ||
116 | sk_CONF_VALUE_delete_ptr(ts,v); | ||
117 | OPENSSL_free(v->name); | ||
118 | OPENSSL_free(v->value); | ||
119 | OPENSSL_free(v); | ||
120 | } | ||
121 | return 1; | ||
122 | } | ||
123 | |||
124 | char *_CONF_get_string(CONF *conf, char *section, char *name) | ||
125 | { | ||
126 | CONF_VALUE *v,vv; | ||
127 | char *p; | ||
128 | |||
129 | if (name == NULL) return(NULL); | ||
130 | if (conf != NULL) | ||
131 | { | ||
132 | if (section != NULL) | ||
133 | { | ||
134 | vv.name=name; | ||
135 | vv.section=section; | ||
136 | v=(CONF_VALUE *)lh_retrieve(conf->data,&vv); | ||
137 | if (v != NULL) return(v->value); | ||
138 | if (strcmp(section,"ENV") == 0) | ||
139 | { | ||
140 | p=Getenv(name); | ||
141 | if (p != NULL) return(p); | ||
142 | } | ||
143 | } | ||
144 | vv.section="default"; | ||
145 | vv.name=name; | ||
146 | v=(CONF_VALUE *)lh_retrieve(conf->data,&vv); | ||
147 | if (v != NULL) | ||
148 | return(v->value); | ||
149 | else | ||
150 | return(NULL); | ||
151 | } | ||
152 | else | ||
153 | return(Getenv(name)); | ||
154 | } | ||
155 | |||
156 | long _CONF_get_number(CONF *conf, char *section, char *name) | ||
157 | { | ||
158 | char *str; | ||
159 | long ret=0; | ||
160 | |||
161 | str=_CONF_get_string(conf,section,name); | ||
162 | if (str == NULL) return(0); | ||
163 | for (;;) | ||
164 | { | ||
165 | if (conf->meth->is_number(conf, *str)) | ||
166 | ret=ret*10+conf->meth->to_int(conf, *str); | ||
167 | else | ||
168 | return(ret); | ||
169 | str++; | ||
170 | } | ||
171 | } | ||
172 | |||
173 | int _CONF_new_data(CONF *conf) | ||
174 | { | ||
175 | if (conf == NULL) | ||
176 | { | ||
177 | return 0; | ||
178 | } | ||
179 | if (conf->data == NULL) | ||
180 | if ((conf->data = lh_new(hash,cmp_conf)) == NULL) | ||
181 | { | ||
182 | return 0; | ||
183 | } | ||
184 | return 1; | ||
185 | } | ||
186 | |||
187 | void _CONF_free_data(CONF *conf) | ||
188 | { | ||
189 | if (conf == NULL || conf->data == NULL) return; | ||
190 | |||
191 | conf->data->down_load=0; /* evil thing to make sure the 'OPENSSL_free()' | ||
192 | * works as expected */ | ||
193 | lh_doall_arg(conf->data,(void (*)())value_free_hash,conf->data); | ||
194 | |||
195 | /* We now have only 'section' entries in the hash table. | ||
196 | * Due to problems with */ | ||
197 | |||
198 | lh_doall_arg(conf->data,(void (*)())value_free_stack,conf->data); | ||
199 | lh_free(conf->data); | ||
200 | } | ||
201 | |||
202 | static void value_free_hash(CONF_VALUE *a, LHASH *conf) | ||
203 | { | ||
204 | if (a->name != NULL) | ||
205 | { | ||
206 | a=(CONF_VALUE *)lh_delete(conf,a); | ||
207 | } | ||
208 | } | ||
209 | |||
210 | static void value_free_stack(CONF_VALUE *a, LHASH *conf) | ||
211 | { | ||
212 | CONF_VALUE *vv; | ||
213 | STACK *sk; | ||
214 | int i; | ||
215 | |||
216 | if (a->name != NULL) return; | ||
217 | |||
218 | sk=(STACK *)a->value; | ||
219 | for (i=sk_num(sk)-1; i>=0; i--) | ||
220 | { | ||
221 | vv=(CONF_VALUE *)sk_value(sk,i); | ||
222 | OPENSSL_free(vv->value); | ||
223 | OPENSSL_free(vv->name); | ||
224 | OPENSSL_free(vv); | ||
225 | } | ||
226 | if (sk != NULL) sk_free(sk); | ||
227 | OPENSSL_free(a->section); | ||
228 | OPENSSL_free(a); | ||
229 | } | ||
230 | |||
231 | static unsigned long hash(CONF_VALUE *v) | ||
232 | { | ||
233 | return((lh_strhash(v->section)<<2)^lh_strhash(v->name)); | ||
234 | } | ||
235 | |||
236 | static int cmp_conf(CONF_VALUE *a, CONF_VALUE *b) | ||
237 | { | ||
238 | int i; | ||
239 | |||
240 | if (a->section != b->section) | ||
241 | { | ||
242 | i=strcmp(a->section,b->section); | ||
243 | if (i) return(i); | ||
244 | } | ||
245 | |||
246 | if ((a->name != NULL) && (b->name != NULL)) | ||
247 | { | ||
248 | i=strcmp(a->name,b->name); | ||
249 | return(i); | ||
250 | } | ||
251 | else if (a->name == b->name) | ||
252 | return(0); | ||
253 | else | ||
254 | return((a->name == NULL)?-1:1); | ||
255 | } | ||
256 | |||
257 | /* Up until OpenSSL 0.9.5a, this was new_section */ | ||
258 | CONF_VALUE *_CONF_new_section(CONF *conf, char *section) | ||
259 | { | ||
260 | STACK *sk=NULL; | ||
261 | int ok=0,i; | ||
262 | CONF_VALUE *v=NULL,*vv; | ||
263 | |||
264 | if ((sk=sk_new_null()) == NULL) | ||
265 | goto err; | ||
266 | if ((v=(CONF_VALUE *)OPENSSL_malloc(sizeof(CONF_VALUE))) == NULL) | ||
267 | goto err; | ||
268 | i=strlen(section)+1; | ||
269 | if ((v->section=(char *)OPENSSL_malloc(i)) == NULL) | ||
270 | goto err; | ||
271 | |||
272 | memcpy(v->section,section,i); | ||
273 | v->name=NULL; | ||
274 | v->value=(char *)sk; | ||
275 | |||
276 | vv=(CONF_VALUE *)lh_insert(conf->data,v); | ||
277 | assert(vv == NULL); | ||
278 | ok=1; | ||
279 | err: | ||
280 | if (!ok) | ||
281 | { | ||
282 | if (sk != NULL) sk_free(sk); | ||
283 | if (v != NULL) OPENSSL_free(v); | ||
284 | v=NULL; | ||
285 | } | ||
286 | return(v); | ||
287 | } | ||
288 | |||
289 | IMPLEMENT_STACK_OF(CONF_VALUE) | ||
diff --git a/src/lib/libcrypto/conf/conf_api.h b/src/lib/libcrypto/conf/conf_api.h deleted file mode 100644 index a5cc17b233..0000000000 --- a/src/lib/libcrypto/conf/conf_api.h +++ /dev/null | |||
@@ -1,87 +0,0 @@ | |||
1 | /* conf_api.h */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #ifndef HEADER_CONF_API_H | ||
60 | #define HEADER_CONF_API_H | ||
61 | |||
62 | #include <openssl/lhash.h> | ||
63 | #include <openssl/conf.h> | ||
64 | |||
65 | #ifdef __cplusplus | ||
66 | extern "C" { | ||
67 | #endif | ||
68 | |||
69 | /* Up until OpenSSL 0.9.5a, this was new_section */ | ||
70 | CONF_VALUE *_CONF_new_section(CONF *conf, char *section); | ||
71 | /* Up until OpenSSL 0.9.5a, this was get_section */ | ||
72 | CONF_VALUE *_CONF_get_section(CONF *conf, char *section); | ||
73 | /* Up until OpenSSL 0.9.5a, this was CONF_get_section */ | ||
74 | STACK_OF(CONF_VALUE) *_CONF_get_section_values(CONF *conf, char *section); | ||
75 | |||
76 | int _CONF_add_string(CONF *conf, CONF_VALUE *section, CONF_VALUE *value); | ||
77 | char *_CONF_get_string(CONF *conf, char *section, char *name); | ||
78 | long _CONF_get_number(CONF *conf, char *section, char *name); | ||
79 | |||
80 | int _CONF_new_data(CONF *conf); | ||
81 | void _CONF_free_data(CONF *conf); | ||
82 | |||
83 | #ifdef __cplusplus | ||
84 | } | ||
85 | #endif | ||
86 | #endif | ||
87 | |||
diff --git a/src/lib/libcrypto/conf/conf_def.c b/src/lib/libcrypto/conf/conf_def.c deleted file mode 100644 index 773df32c68..0000000000 --- a/src/lib/libcrypto/conf/conf_def.c +++ /dev/null | |||
@@ -1,703 +0,0 @@ | |||
1 | /* crypto/conf/conf.c */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | /* Part of the code in here was originally in conf.c, which is now removed */ | ||
60 | |||
61 | #include <stdio.h> | ||
62 | #include <string.h> | ||
63 | #include <openssl/stack.h> | ||
64 | #include <openssl/lhash.h> | ||
65 | #include <openssl/conf.h> | ||
66 | #include <openssl/conf_api.h> | ||
67 | #include "conf_def.h" | ||
68 | #include <openssl/buffer.h> | ||
69 | #include <openssl/err.h> | ||
70 | |||
71 | static char *eat_ws(CONF *conf, char *p); | ||
72 | static char *eat_alpha_numeric(CONF *conf, char *p); | ||
73 | static void clear_comments(CONF *conf, char *p); | ||
74 | static int str_copy(CONF *conf,char *section,char **to, char *from); | ||
75 | static char *scan_quote(CONF *conf, char *p); | ||
76 | static char *scan_dquote(CONF *conf, char *p); | ||
77 | #define scan_esc(conf,p) (((IS_EOF((conf),(p)[1]))?((p)+1):((p)+2))) | ||
78 | |||
79 | static CONF *def_create(CONF_METHOD *meth); | ||
80 | static int def_init_default(CONF *conf); | ||
81 | static int def_init_WIN32(CONF *conf); | ||
82 | static int def_destroy(CONF *conf); | ||
83 | static int def_destroy_data(CONF *conf); | ||
84 | static int def_load(CONF *conf, BIO *bp, long *eline); | ||
85 | static int def_dump(CONF *conf, BIO *bp); | ||
86 | static int def_is_number(CONF *conf, char c); | ||
87 | static int def_to_int(CONF *conf, char c); | ||
88 | |||
89 | const char *CONF_def_version="CONF_def" OPENSSL_VERSION_PTEXT; | ||
90 | |||
91 | static CONF_METHOD default_method = { | ||
92 | "OpenSSL default", | ||
93 | def_create, | ||
94 | def_init_default, | ||
95 | def_destroy, | ||
96 | def_destroy_data, | ||
97 | def_load, | ||
98 | def_dump, | ||
99 | def_is_number, | ||
100 | def_to_int | ||
101 | }; | ||
102 | |||
103 | static CONF_METHOD WIN32_method = { | ||
104 | "WIN32", | ||
105 | def_create, | ||
106 | def_init_WIN32, | ||
107 | def_destroy, | ||
108 | def_destroy_data, | ||
109 | def_load, | ||
110 | def_dump, | ||
111 | def_is_number, | ||
112 | def_to_int | ||
113 | }; | ||
114 | |||
115 | CONF_METHOD *NCONF_default() | ||
116 | { | ||
117 | return &default_method; | ||
118 | } | ||
119 | CONF_METHOD *NCONF_WIN32() | ||
120 | { | ||
121 | return &WIN32_method; | ||
122 | } | ||
123 | |||
124 | static CONF *def_create(CONF_METHOD *meth) | ||
125 | { | ||
126 | CONF *ret; | ||
127 | |||
128 | ret = (CONF *)OPENSSL_malloc(sizeof(CONF) + sizeof(unsigned short *)); | ||
129 | if (ret) | ||
130 | if (meth->init(ret) == 0) | ||
131 | { | ||
132 | OPENSSL_free(ret); | ||
133 | ret = NULL; | ||
134 | } | ||
135 | return ret; | ||
136 | } | ||
137 | |||
138 | static int def_init_default(CONF *conf) | ||
139 | { | ||
140 | if (conf == NULL) | ||
141 | return 0; | ||
142 | |||
143 | conf->meth = &default_method; | ||
144 | conf->meth_data = (void *)CONF_type_default; | ||
145 | conf->data = NULL; | ||
146 | |||
147 | return 1; | ||
148 | } | ||
149 | |||
150 | static int def_init_WIN32(CONF *conf) | ||
151 | { | ||
152 | if (conf == NULL) | ||
153 | return 0; | ||
154 | |||
155 | conf->meth = &WIN32_method; | ||
156 | conf->meth_data = (void *)CONF_type_win32; | ||
157 | conf->data = NULL; | ||
158 | |||
159 | return 1; | ||
160 | } | ||
161 | |||
162 | static int def_destroy(CONF *conf) | ||
163 | { | ||
164 | if (def_destroy_data(conf)) | ||
165 | { | ||
166 | OPENSSL_free(conf); | ||
167 | return 1; | ||
168 | } | ||
169 | return 0; | ||
170 | } | ||
171 | |||
172 | static int def_destroy_data(CONF *conf) | ||
173 | { | ||
174 | if (conf == NULL) | ||
175 | return 0; | ||
176 | _CONF_free_data(conf); | ||
177 | return 1; | ||
178 | } | ||
179 | |||
180 | static int def_load(CONF *conf, BIO *in, long *line) | ||
181 | { | ||
182 | #define BUFSIZE 512 | ||
183 | char btmp[16]; | ||
184 | int bufnum=0,i,ii; | ||
185 | BUF_MEM *buff=NULL; | ||
186 | char *s,*p,*end; | ||
187 | int again,n; | ||
188 | long eline=0; | ||
189 | CONF_VALUE *v=NULL,*tv; | ||
190 | CONF_VALUE *sv=NULL; | ||
191 | char *section=NULL,*buf; | ||
192 | STACK_OF(CONF_VALUE) *section_sk=NULL,*ts; | ||
193 | char *start,*psection,*pname; | ||
194 | void *h = (void *)(conf->data); | ||
195 | |||
196 | if ((buff=BUF_MEM_new()) == NULL) | ||
197 | { | ||
198 | CONFerr(CONF_F_CONF_LOAD_BIO,ERR_R_BUF_LIB); | ||
199 | goto err; | ||
200 | } | ||
201 | |||
202 | section=(char *)OPENSSL_malloc(10); | ||
203 | if (section == NULL) | ||
204 | { | ||
205 | CONFerr(CONF_F_CONF_LOAD_BIO,ERR_R_MALLOC_FAILURE); | ||
206 | goto err; | ||
207 | } | ||
208 | strcpy(section,"default"); | ||
209 | |||
210 | if (_CONF_new_data(conf) == 0) | ||
211 | { | ||
212 | CONFerr(CONF_F_CONF_LOAD_BIO,ERR_R_MALLOC_FAILURE); | ||
213 | goto err; | ||
214 | } | ||
215 | |||
216 | sv=_CONF_new_section(conf,section); | ||
217 | if (sv == NULL) | ||
218 | { | ||
219 | CONFerr(CONF_F_CONF_LOAD_BIO, | ||
220 | CONF_R_UNABLE_TO_CREATE_NEW_SECTION); | ||
221 | goto err; | ||
222 | } | ||
223 | section_sk=(STACK_OF(CONF_VALUE) *)sv->value; | ||
224 | |||
225 | bufnum=0; | ||
226 | for (;;) | ||
227 | { | ||
228 | again=0; | ||
229 | if (!BUF_MEM_grow(buff,bufnum+BUFSIZE)) | ||
230 | { | ||
231 | CONFerr(CONF_F_CONF_LOAD_BIO,ERR_R_BUF_LIB); | ||
232 | goto err; | ||
233 | } | ||
234 | p= &(buff->data[bufnum]); | ||
235 | *p='\0'; | ||
236 | BIO_gets(in, p, BUFSIZE-1); | ||
237 | p[BUFSIZE-1]='\0'; | ||
238 | ii=i=strlen(p); | ||
239 | if (i == 0) break; | ||
240 | while (i > 0) | ||
241 | { | ||
242 | if ((p[i-1] != '\r') && (p[i-1] != '\n')) | ||
243 | break; | ||
244 | else | ||
245 | i--; | ||
246 | } | ||
247 | /* we removed some trailing stuff so there is a new | ||
248 | * line on the end. */ | ||
249 | if (i == ii) | ||
250 | again=1; /* long line */ | ||
251 | else | ||
252 | { | ||
253 | p[i]='\0'; | ||
254 | eline++; /* another input line */ | ||
255 | } | ||
256 | |||
257 | /* we now have a line with trailing \r\n removed */ | ||
258 | |||
259 | /* i is the number of bytes */ | ||
260 | bufnum+=i; | ||
261 | |||
262 | v=NULL; | ||
263 | /* check for line continuation */ | ||
264 | if (bufnum >= 1) | ||
265 | { | ||
266 | /* If we have bytes and the last char '\\' and | ||
267 | * second last char is not '\\' */ | ||
268 | p= &(buff->data[bufnum-1]); | ||
269 | if (IS_ESC(conf,p[0]) && | ||
270 | ((bufnum <= 1) || !IS_ESC(conf,p[-1]))) | ||
271 | { | ||
272 | bufnum--; | ||
273 | again=1; | ||
274 | } | ||
275 | } | ||
276 | if (again) continue; | ||
277 | bufnum=0; | ||
278 | buf=buff->data; | ||
279 | |||
280 | clear_comments(conf, buf); | ||
281 | n=strlen(buf); | ||
282 | s=eat_ws(conf, buf); | ||
283 | if (IS_EOF(conf,*s)) continue; /* blank line */ | ||
284 | if (*s == '[') | ||
285 | { | ||
286 | char *ss; | ||
287 | |||
288 | s++; | ||
289 | start=eat_ws(conf, s); | ||
290 | ss=start; | ||
291 | again: | ||
292 | end=eat_alpha_numeric(conf, ss); | ||
293 | p=eat_ws(conf, end); | ||
294 | if (*p != ']') | ||
295 | { | ||
296 | if (*p != '\0') | ||
297 | { | ||
298 | ss=p; | ||
299 | goto again; | ||
300 | } | ||
301 | CONFerr(CONF_F_CONF_LOAD_BIO, | ||
302 | CONF_R_MISSING_CLOSE_SQUARE_BRACKET); | ||
303 | goto err; | ||
304 | } | ||
305 | *end='\0'; | ||
306 | if (!str_copy(conf,NULL,§ion,start)) goto err; | ||
307 | if ((sv=_CONF_get_section(conf,section)) == NULL) | ||
308 | sv=_CONF_new_section(conf,section); | ||
309 | if (sv == NULL) | ||
310 | { | ||
311 | CONFerr(CONF_F_CONF_LOAD_BIO, | ||
312 | CONF_R_UNABLE_TO_CREATE_NEW_SECTION); | ||
313 | goto err; | ||
314 | } | ||
315 | section_sk=(STACK_OF(CONF_VALUE) *)sv->value; | ||
316 | continue; | ||
317 | } | ||
318 | else | ||
319 | { | ||
320 | pname=s; | ||
321 | psection=NULL; | ||
322 | end=eat_alpha_numeric(conf, s); | ||
323 | if ((end[0] == ':') && (end[1] == ':')) | ||
324 | { | ||
325 | *end='\0'; | ||
326 | end+=2; | ||
327 | psection=pname; | ||
328 | pname=end; | ||
329 | end=eat_alpha_numeric(conf, end); | ||
330 | } | ||
331 | p=eat_ws(conf, end); | ||
332 | if (*p != '=') | ||
333 | { | ||
334 | CONFerr(CONF_F_CONF_LOAD_BIO, | ||
335 | CONF_R_MISSING_EQUAL_SIGN); | ||
336 | goto err; | ||
337 | } | ||
338 | *end='\0'; | ||
339 | p++; | ||
340 | start=eat_ws(conf, p); | ||
341 | while (!IS_EOF(conf,*p)) | ||
342 | p++; | ||
343 | p--; | ||
344 | while ((p != start) && (IS_WS(conf,*p))) | ||
345 | p--; | ||
346 | p++; | ||
347 | *p='\0'; | ||
348 | |||
349 | if (!(v=(CONF_VALUE *)OPENSSL_malloc(sizeof(CONF_VALUE)))) | ||
350 | { | ||
351 | CONFerr(CONF_F_CONF_LOAD_BIO, | ||
352 | ERR_R_MALLOC_FAILURE); | ||
353 | goto err; | ||
354 | } | ||
355 | if (psection == NULL) psection=section; | ||
356 | v->name=(char *)OPENSSL_malloc(strlen(pname)+1); | ||
357 | v->value=NULL; | ||
358 | if (v->name == NULL) | ||
359 | { | ||
360 | CONFerr(CONF_F_CONF_LOAD_BIO, | ||
361 | ERR_R_MALLOC_FAILURE); | ||
362 | goto err; | ||
363 | } | ||
364 | strcpy(v->name,pname); | ||
365 | if (!str_copy(conf,psection,&(v->value),start)) goto err; | ||
366 | |||
367 | if (strcmp(psection,section) != 0) | ||
368 | { | ||
369 | if ((tv=_CONF_get_section(conf,psection)) | ||
370 | == NULL) | ||
371 | tv=_CONF_new_section(conf,psection); | ||
372 | if (tv == NULL) | ||
373 | { | ||
374 | CONFerr(CONF_F_CONF_LOAD_BIO, | ||
375 | CONF_R_UNABLE_TO_CREATE_NEW_SECTION); | ||
376 | goto err; | ||
377 | } | ||
378 | ts=(STACK_OF(CONF_VALUE) *)tv->value; | ||
379 | } | ||
380 | else | ||
381 | { | ||
382 | tv=sv; | ||
383 | ts=section_sk; | ||
384 | } | ||
385 | #if 1 | ||
386 | if (_CONF_add_string(conf, tv, v) == 0) | ||
387 | { | ||
388 | CONFerr(CONF_F_CONF_LOAD_BIO, | ||
389 | ERR_R_MALLOC_FAILURE); | ||
390 | goto err; | ||
391 | } | ||
392 | #else | ||
393 | v->section=tv->section; | ||
394 | if (!sk_CONF_VALUE_push(ts,v)) | ||
395 | { | ||
396 | CONFerr(CONF_F_CONF_LOAD_BIO, | ||
397 | ERR_R_MALLOC_FAILURE); | ||
398 | goto err; | ||
399 | } | ||
400 | vv=(CONF_VALUE *)lh_insert(conf->data,v); | ||
401 | if (vv != NULL) | ||
402 | { | ||
403 | sk_CONF_VALUE_delete_ptr(ts,vv); | ||
404 | OPENSSL_free(vv->name); | ||
405 | OPENSSL_free(vv->value); | ||
406 | OPENSSL_free(vv); | ||
407 | } | ||
408 | #endif | ||
409 | v=NULL; | ||
410 | } | ||
411 | } | ||
412 | if (buff != NULL) BUF_MEM_free(buff); | ||
413 | if (section != NULL) OPENSSL_free(section); | ||
414 | return(1); | ||
415 | err: | ||
416 | if (buff != NULL) BUF_MEM_free(buff); | ||
417 | if (section != NULL) OPENSSL_free(section); | ||
418 | if (line != NULL) *line=eline; | ||
419 | sprintf(btmp,"%ld",eline); | ||
420 | ERR_add_error_data(2,"line ",btmp); | ||
421 | if ((h != conf->data) && (conf->data != NULL)) CONF_free(conf->data); | ||
422 | if (v != NULL) | ||
423 | { | ||
424 | if (v->name != NULL) OPENSSL_free(v->name); | ||
425 | if (v->value != NULL) OPENSSL_free(v->value); | ||
426 | if (v != NULL) OPENSSL_free(v); | ||
427 | } | ||
428 | return(0); | ||
429 | } | ||
430 | |||
431 | static void clear_comments(CONF *conf, char *p) | ||
432 | { | ||
433 | char *to; | ||
434 | |||
435 | to=p; | ||
436 | for (;;) | ||
437 | { | ||
438 | if (IS_FCOMMENT(conf,*p)) | ||
439 | { | ||
440 | *p='\0'; | ||
441 | return; | ||
442 | } | ||
443 | if (!IS_WS(conf,*p)) | ||
444 | { | ||
445 | break; | ||
446 | } | ||
447 | p++; | ||
448 | } | ||
449 | |||
450 | for (;;) | ||
451 | { | ||
452 | if (IS_COMMENT(conf,*p)) | ||
453 | { | ||
454 | *p='\0'; | ||
455 | return; | ||
456 | } | ||
457 | if (IS_DQUOTE(conf,*p)) | ||
458 | { | ||
459 | p=scan_dquote(conf, p); | ||
460 | continue; | ||
461 | } | ||
462 | if (IS_QUOTE(conf,*p)) | ||
463 | { | ||
464 | p=scan_quote(conf, p); | ||
465 | continue; | ||
466 | } | ||
467 | if (IS_ESC(conf,*p)) | ||
468 | { | ||
469 | p=scan_esc(conf,p); | ||
470 | continue; | ||
471 | } | ||
472 | if (IS_EOF(conf,*p)) | ||
473 | return; | ||
474 | else | ||
475 | p++; | ||
476 | } | ||
477 | } | ||
478 | |||
479 | static int str_copy(CONF *conf, char *section, char **pto, char *from) | ||
480 | { | ||
481 | int q,r,rr=0,to=0,len=0; | ||
482 | char *s,*e,*rp,*p,*rrp,*np,*cp,v; | ||
483 | BUF_MEM *buf; | ||
484 | |||
485 | if ((buf=BUF_MEM_new()) == NULL) return(0); | ||
486 | |||
487 | len=strlen(from)+1; | ||
488 | if (!BUF_MEM_grow(buf,len)) goto err; | ||
489 | |||
490 | for (;;) | ||
491 | { | ||
492 | if (IS_QUOTE(conf,*from)) | ||
493 | { | ||
494 | q= *from; | ||
495 | from++; | ||
496 | while (!IS_EOF(conf,*from) && (*from != q)) | ||
497 | { | ||
498 | if (IS_ESC(conf,*from)) | ||
499 | { | ||
500 | from++; | ||
501 | if (IS_EOF(conf,*from)) break; | ||
502 | } | ||
503 | buf->data[to++]= *(from++); | ||
504 | } | ||
505 | if (*from == q) from++; | ||
506 | } | ||
507 | else if (IS_DQUOTE(conf,*from)) | ||
508 | { | ||
509 | q= *from; | ||
510 | from++; | ||
511 | while (!IS_EOF(conf,*from)) | ||
512 | { | ||
513 | if (*from == q) | ||
514 | { | ||
515 | if (*(from+1) == q) | ||
516 | { | ||
517 | from++; | ||
518 | } | ||
519 | else | ||
520 | { | ||
521 | break; | ||
522 | } | ||
523 | } | ||
524 | buf->data[to++]= *(from++); | ||
525 | } | ||
526 | if (*from == q) from++; | ||
527 | } | ||
528 | else if (IS_ESC(conf,*from)) | ||
529 | { | ||
530 | from++; | ||
531 | v= *(from++); | ||
532 | if (IS_EOF(conf,v)) break; | ||
533 | else if (v == 'r') v='\r'; | ||
534 | else if (v == 'n') v='\n'; | ||
535 | else if (v == 'b') v='\b'; | ||
536 | else if (v == 't') v='\t'; | ||
537 | buf->data[to++]= v; | ||
538 | } | ||
539 | else if (IS_EOF(conf,*from)) | ||
540 | break; | ||
541 | else if (*from == '$') | ||
542 | { | ||
543 | /* try to expand it */ | ||
544 | rrp=NULL; | ||
545 | s= &(from[1]); | ||
546 | if (*s == '{') | ||
547 | q='}'; | ||
548 | else if (*s == '(') | ||
549 | q=')'; | ||
550 | else q=0; | ||
551 | |||
552 | if (q) s++; | ||
553 | cp=section; | ||
554 | e=np=s; | ||
555 | while (IS_ALPHA_NUMERIC(conf,*e)) | ||
556 | e++; | ||
557 | if ((e[0] == ':') && (e[1] == ':')) | ||
558 | { | ||
559 | cp=np; | ||
560 | rrp=e; | ||
561 | rr= *e; | ||
562 | *rrp='\0'; | ||
563 | e+=2; | ||
564 | np=e; | ||
565 | while (IS_ALPHA_NUMERIC(conf,*e)) | ||
566 | e++; | ||
567 | } | ||
568 | r= *e; | ||
569 | *e='\0'; | ||
570 | rp=e; | ||
571 | if (q) | ||
572 | { | ||
573 | if (r != q) | ||
574 | { | ||
575 | CONFerr(CONF_F_STR_COPY,CONF_R_NO_CLOSE_BRACE); | ||
576 | goto err; | ||
577 | } | ||
578 | e++; | ||
579 | } | ||
580 | /* So at this point we have | ||
581 | * ns which is the start of the name string which is | ||
582 | * '\0' terminated. | ||
583 | * cs which is the start of the section string which is | ||
584 | * '\0' terminated. | ||
585 | * e is the 'next point after'. | ||
586 | * r and s are the chars replaced by the '\0' | ||
587 | * rp and sp is where 'r' and 's' came from. | ||
588 | */ | ||
589 | p=_CONF_get_string(conf,cp,np); | ||
590 | if (rrp != NULL) *rrp=rr; | ||
591 | *rp=r; | ||
592 | if (p == NULL) | ||
593 | { | ||
594 | CONFerr(CONF_F_STR_COPY,CONF_R_VARIABLE_HAS_NO_VALUE); | ||
595 | goto err; | ||
596 | } | ||
597 | BUF_MEM_grow(buf,(strlen(p)+len-(e-from))); | ||
598 | while (*p) | ||
599 | buf->data[to++]= *(p++); | ||
600 | from=e; | ||
601 | } | ||
602 | else | ||
603 | buf->data[to++]= *(from++); | ||
604 | } | ||
605 | buf->data[to]='\0'; | ||
606 | if (*pto != NULL) OPENSSL_free(*pto); | ||
607 | *pto=buf->data; | ||
608 | OPENSSL_free(buf); | ||
609 | return(1); | ||
610 | err: | ||
611 | if (buf != NULL) BUF_MEM_free(buf); | ||
612 | return(0); | ||
613 | } | ||
614 | |||
615 | static char *eat_ws(CONF *conf, char *p) | ||
616 | { | ||
617 | while (IS_WS(conf,*p) && (!IS_EOF(conf,*p))) | ||
618 | p++; | ||
619 | return(p); | ||
620 | } | ||
621 | |||
622 | static char *eat_alpha_numeric(CONF *conf, char *p) | ||
623 | { | ||
624 | for (;;) | ||
625 | { | ||
626 | if (IS_ESC(conf,*p)) | ||
627 | { | ||
628 | p=scan_esc(conf,p); | ||
629 | continue; | ||
630 | } | ||
631 | if (!IS_ALPHA_NUMERIC_PUNCT(conf,*p)) | ||
632 | return(p); | ||
633 | p++; | ||
634 | } | ||
635 | } | ||
636 | |||
637 | static char *scan_quote(CONF *conf, char *p) | ||
638 | { | ||
639 | int q= *p; | ||
640 | |||
641 | p++; | ||
642 | while (!(IS_EOF(conf,*p)) && (*p != q)) | ||
643 | { | ||
644 | if (IS_ESC(conf,*p)) | ||
645 | { | ||
646 | p++; | ||
647 | if (IS_EOF(conf,*p)) return(p); | ||
648 | } | ||
649 | p++; | ||
650 | } | ||
651 | if (*p == q) p++; | ||
652 | return(p); | ||
653 | } | ||
654 | |||
655 | |||
656 | static char *scan_dquote(CONF *conf, char *p) | ||
657 | { | ||
658 | int q= *p; | ||
659 | |||
660 | p++; | ||
661 | while (!(IS_EOF(conf,*p))) | ||
662 | { | ||
663 | if (*p == q) | ||
664 | { | ||
665 | if (*(p+1) == q) | ||
666 | { | ||
667 | p++; | ||
668 | } | ||
669 | else | ||
670 | { | ||
671 | break; | ||
672 | } | ||
673 | } | ||
674 | p++; | ||
675 | } | ||
676 | if (*p == q) p++; | ||
677 | return(p); | ||
678 | } | ||
679 | |||
680 | static void dump_value(CONF_VALUE *a, BIO *out) | ||
681 | { | ||
682 | if (a->name) | ||
683 | BIO_printf(out, "[%s] %s=%s\n", a->section, a->name, a->value); | ||
684 | else | ||
685 | BIO_printf(out, "[[%s]]\n", a->section); | ||
686 | } | ||
687 | |||
688 | static int def_dump(CONF *conf, BIO *out) | ||
689 | { | ||
690 | lh_doall_arg(conf->data, (void (*)())dump_value, out); | ||
691 | return 1; | ||
692 | } | ||
693 | |||
694 | static int def_is_number(CONF *conf, char c) | ||
695 | { | ||
696 | return IS_NUMBER(conf,c); | ||
697 | } | ||
698 | |||
699 | static int def_to_int(CONF *conf, char c) | ||
700 | { | ||
701 | return c - '0'; | ||
702 | } | ||
703 | |||
diff --git a/src/lib/libcrypto/conf/conf_def.h b/src/lib/libcrypto/conf/conf_def.h deleted file mode 100644 index 3244d9a331..0000000000 --- a/src/lib/libcrypto/conf/conf_def.h +++ /dev/null | |||
@@ -1,145 +0,0 @@ | |||
1 | /* crypto/conf/conf_def.h */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | /* THIS FILE WAS AUTOMAGICALLY GENERATED! | ||
60 | Please modify and use keysets.pl to regenerate it. */ | ||
61 | |||
62 | #define CONF_NUMBER 1 | ||
63 | #define CONF_UPPER 2 | ||
64 | #define CONF_LOWER 4 | ||
65 | #define CONF_UNDER 256 | ||
66 | #define CONF_PUNCTUATION 512 | ||
67 | #define CONF_WS 16 | ||
68 | #define CONF_ESC 32 | ||
69 | #define CONF_QUOTE 64 | ||
70 | #define CONF_DQUOTE 1024 | ||
71 | #define CONF_COMMENT 128 | ||
72 | #define CONF_FCOMMENT 2048 | ||
73 | #define CONF_EOF 8 | ||
74 | #define CONF_ALPHA (CONF_UPPER|CONF_LOWER) | ||
75 | #define CONF_ALPHA_NUMERIC (CONF_ALPHA|CONF_NUMBER|CONF_UNDER) | ||
76 | #define CONF_ALPHA_NUMERIC_PUNCT (CONF_ALPHA|CONF_NUMBER|CONF_UNDER| \ | ||
77 | CONF_PUNCTUATION) | ||
78 | |||
79 | #define KEYTYPES(c) ((unsigned short *)((c)->meth_data)) | ||
80 | #ifndef CHARSET_EBCDIC | ||
81 | #define IS_COMMENT(c,a) (KEYTYPES(c)[(a)&0x7f]&CONF_COMMENT) | ||
82 | #define IS_FCOMMENT(c,a) (KEYTYPES(c)[(a)&0x7f]&CONF_FCOMMENT) | ||
83 | #define IS_EOF(c,a) (KEYTYPES(c)[(a)&0x7f]&CONF_EOF) | ||
84 | #define IS_ESC(c,a) (KEYTYPES(c)[(a)&0x7f]&CONF_ESC) | ||
85 | #define IS_NUMBER(c,a) (KEYTYPES(c)[(a)&0x7f]&CONF_NUMBER) | ||
86 | #define IS_WS(c,a) (KEYTYPES(c)[(a)&0x7f]&CONF_WS) | ||
87 | #define IS_ALPHA_NUMERIC(c,a) (KEYTYPES(c)[(a)&0x7f]&CONF_ALPHA_NUMERIC) | ||
88 | #define IS_ALPHA_NUMERIC_PUNCT(c,a) \ | ||
89 | (KEYTYPES(c)[(a)&0x7f]&CONF_ALPHA_NUMERIC_PUNCT) | ||
90 | #define IS_QUOTE(c,a) (KEYTYPES(c)[(a)&0x7f]&CONF_QUOTE) | ||
91 | #define IS_DQUOTE(c,a) (KEYTYPES(c)[(a)&0x7f]&CONF_DQUOTE) | ||
92 | |||
93 | #else /*CHARSET_EBCDIC*/ | ||
94 | |||
95 | #define IS_COMMENT(c,a) (KEYTYPES(c)[os_toascii[a]&0x7f]&CONF_COMMENT) | ||
96 | #define IS_FCOMMENT(c,a) (KEYTYPES(c)[os_toascii[a]&0x7f]&CONF_FCOMMENT) | ||
97 | #define IS_EOF(c,a) (KEYTYPES(c)[os_toascii[a]&0x7f]&CONF_EOF) | ||
98 | #define IS_ESC(c,a) (KEYTYPES(c)[os_toascii[a]&0x7f]&CONF_ESC) | ||
99 | #define IS_NUMBER(c,a) (KEYTYPES(c)[os_toascii[a]&0x7f]&CONF_NUMBER) | ||
100 | #define IS_WS(c,a) (KEYTYPES(c)[os_toascii[a]&0x7f]&CONF_WS) | ||
101 | #define IS_ALPHA_NUMERIC(c,a) (KEYTYPES(c)[os_toascii[a]&0x7f]&CONF_ALPHA_NUMERIC) | ||
102 | #define IS_ALPHA_NUMERIC_PUNCT(c,a) \ | ||
103 | (KEYTYPES(c)[os_toascii[a]&0x7f]&CONF_ALPHA_NUMERIC_PUNCT) | ||
104 | #define IS_QUOTE(c,a) (KEYTYPES(c)[os_toascii[a]&0x7f]&CONF_QUOTE) | ||
105 | #define IS_DQUOTE(c,a) (KEYTYPES(c)[os_toascii[a]&0x7f]&CONF_DQUOTE) | ||
106 | #endif /*CHARSET_EBCDIC*/ | ||
107 | |||
108 | static unsigned short CONF_type_default[128]={ | ||
109 | 0x008,0x000,0x000,0x000,0x000,0x000,0x000,0x000, | ||
110 | 0x000,0x010,0x010,0x000,0x000,0x010,0x000,0x000, | ||
111 | 0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000, | ||
112 | 0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000, | ||
113 | 0x010,0x200,0x040,0x080,0x000,0x200,0x200,0x040, | ||
114 | 0x000,0x000,0x200,0x200,0x200,0x200,0x200,0x200, | ||
115 | 0x001,0x001,0x001,0x001,0x001,0x001,0x001,0x001, | ||
116 | 0x001,0x001,0x000,0x200,0x000,0x000,0x000,0x200, | ||
117 | 0x200,0x002,0x002,0x002,0x002,0x002,0x002,0x002, | ||
118 | 0x002,0x002,0x002,0x002,0x002,0x002,0x002,0x002, | ||
119 | 0x002,0x002,0x002,0x002,0x002,0x002,0x002,0x002, | ||
120 | 0x002,0x002,0x002,0x000,0x020,0x000,0x200,0x100, | ||
121 | 0x040,0x004,0x004,0x004,0x004,0x004,0x004,0x004, | ||
122 | 0x004,0x004,0x004,0x004,0x004,0x004,0x004,0x004, | ||
123 | 0x004,0x004,0x004,0x004,0x004,0x004,0x004,0x004, | ||
124 | 0x004,0x004,0x004,0x000,0x200,0x000,0x200,0x000, | ||
125 | }; | ||
126 | |||
127 | static unsigned short CONF_type_win32[128]={ | ||
128 | 0x008,0x000,0x000,0x000,0x000,0x000,0x000,0x000, | ||
129 | 0x000,0x010,0x010,0x000,0x000,0x010,0x000,0x000, | ||
130 | 0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000, | ||
131 | 0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000, | ||
132 | 0x010,0x200,0x400,0x000,0x000,0x200,0x200,0x000, | ||
133 | 0x000,0x000,0x200,0x200,0x200,0x200,0x200,0x200, | ||
134 | 0x001,0x001,0x001,0x001,0x001,0x001,0x001,0x001, | ||
135 | 0x001,0x001,0x000,0xA00,0x000,0x000,0x000,0x200, | ||
136 | 0x200,0x002,0x002,0x002,0x002,0x002,0x002,0x002, | ||
137 | 0x002,0x002,0x002,0x002,0x002,0x002,0x002,0x002, | ||
138 | 0x002,0x002,0x002,0x002,0x002,0x002,0x002,0x002, | ||
139 | 0x002,0x002,0x002,0x000,0x000,0x000,0x200,0x100, | ||
140 | 0x000,0x004,0x004,0x004,0x004,0x004,0x004,0x004, | ||
141 | 0x004,0x004,0x004,0x004,0x004,0x004,0x004,0x004, | ||
142 | 0x004,0x004,0x004,0x004,0x004,0x004,0x004,0x004, | ||
143 | 0x004,0x004,0x004,0x000,0x200,0x000,0x200,0x000, | ||
144 | }; | ||
145 | |||
diff --git a/src/lib/libcrypto/conf/conf_err.c b/src/lib/libcrypto/conf/conf_err.c deleted file mode 100644 index 8c2bc6f1c4..0000000000 --- a/src/lib/libcrypto/conf/conf_err.c +++ /dev/null | |||
@@ -1,112 +0,0 @@ | |||
1 | /* crypto/conf/conf_err.c */ | ||
2 | /* ==================================================================== | ||
3 | * Copyright (c) 1999 The OpenSSL Project. All rights reserved. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions | ||
7 | * are met: | ||
8 | * | ||
9 | * 1. Redistributions of source code must retain the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer. | ||
11 | * | ||
12 | * 2. Redistributions in binary form must reproduce the above copyright | ||
13 | * notice, this list of conditions and the following disclaimer in | ||
14 | * the documentation and/or other materials provided with the | ||
15 | * distribution. | ||
16 | * | ||
17 | * 3. All advertising materials mentioning features or use of this | ||
18 | * software must display the following acknowledgment: | ||
19 | * "This product includes software developed by the OpenSSL Project | ||
20 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
21 | * | ||
22 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
23 | * endorse or promote products derived from this software without | ||
24 | * prior written permission. For written permission, please contact | ||
25 | * openssl-core@OpenSSL.org. | ||
26 | * | ||
27 | * 5. Products derived from this software may not be called "OpenSSL" | ||
28 | * nor may "OpenSSL" appear in their names without prior written | ||
29 | * permission of the OpenSSL Project. | ||
30 | * | ||
31 | * 6. Redistributions of any form whatsoever must retain the following | ||
32 | * acknowledgment: | ||
33 | * "This product includes software developed by the OpenSSL Project | ||
34 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
35 | * | ||
36 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
37 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
38 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
39 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
40 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
41 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
42 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
43 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
44 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
45 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
46 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
47 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
48 | * ==================================================================== | ||
49 | * | ||
50 | * This product includes cryptographic software written by Eric Young | ||
51 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
52 | * Hudson (tjh@cryptsoft.com). | ||
53 | * | ||
54 | */ | ||
55 | |||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | ||
57 | * made to it will be overwritten when the script next updates this file, | ||
58 | * only reason strings will be preserved. | ||
59 | */ | ||
60 | |||
61 | #include <stdio.h> | ||
62 | #include <openssl/err.h> | ||
63 | #include <openssl/conf.h> | ||
64 | |||
65 | /* BEGIN ERROR CODES */ | ||
66 | #ifndef NO_ERR | ||
67 | static ERR_STRING_DATA CONF_str_functs[]= | ||
68 | { | ||
69 | {ERR_PACK(0,CONF_F_CONF_DUMP_FP,0), "CONF_dump_fp"}, | ||
70 | {ERR_PACK(0,CONF_F_CONF_LOAD,0), "CONF_load"}, | ||
71 | {ERR_PACK(0,CONF_F_CONF_LOAD_BIO,0), "CONF_load_bio"}, | ||
72 | {ERR_PACK(0,CONF_F_CONF_LOAD_FP,0), "CONF_load_fp"}, | ||
73 | {ERR_PACK(0,CONF_F_NCONF_DUMP_BIO,0), "NCONF_dump_bio"}, | ||
74 | {ERR_PACK(0,CONF_F_NCONF_DUMP_FP,0), "NCONF_dump_fp"}, | ||
75 | {ERR_PACK(0,CONF_F_NCONF_GET_NUMBER,0), "NCONF_get_number"}, | ||
76 | {ERR_PACK(0,CONF_F_NCONF_GET_SECTION,0), "NCONF_get_section"}, | ||
77 | {ERR_PACK(0,CONF_F_NCONF_GET_STRING,0), "NCONF_get_string"}, | ||
78 | {ERR_PACK(0,CONF_F_NCONF_LOAD_BIO,0), "NCONF_load_bio"}, | ||
79 | {ERR_PACK(0,CONF_F_NCONF_NEW,0), "NCONF_new"}, | ||
80 | {ERR_PACK(0,CONF_F_STR_COPY,0), "STR_COPY"}, | ||
81 | {0,NULL} | ||
82 | }; | ||
83 | |||
84 | static ERR_STRING_DATA CONF_str_reasons[]= | ||
85 | { | ||
86 | {CONF_R_MISSING_CLOSE_SQUARE_BRACKET ,"missing close square bracket"}, | ||
87 | {CONF_R_MISSING_EQUAL_SIGN ,"missing equal sign"}, | ||
88 | {CONF_R_NO_CLOSE_BRACE ,"no close brace"}, | ||
89 | {CONF_R_NO_CONF ,"no conf"}, | ||
90 | {CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE ,"no conf or environment variable"}, | ||
91 | {CONF_R_NO_SECTION ,"no section"}, | ||
92 | {CONF_R_UNABLE_TO_CREATE_NEW_SECTION ,"unable to create new section"}, | ||
93 | {CONF_R_VARIABLE_HAS_NO_VALUE ,"variable has no value"}, | ||
94 | {0,NULL} | ||
95 | }; | ||
96 | |||
97 | #endif | ||
98 | |||
99 | void ERR_load_CONF_strings(void) | ||
100 | { | ||
101 | static int init=1; | ||
102 | |||
103 | if (init) | ||
104 | { | ||
105 | init=0; | ||
106 | #ifndef NO_ERR | ||
107 | ERR_load_strings(ERR_LIB_CONF,CONF_str_functs); | ||
108 | ERR_load_strings(ERR_LIB_CONF,CONF_str_reasons); | ||
109 | #endif | ||
110 | |||
111 | } | ||
112 | } | ||
diff --git a/src/lib/libcrypto/conf/conf_lib.c b/src/lib/libcrypto/conf/conf_lib.c deleted file mode 100644 index 11ec639732..0000000000 --- a/src/lib/libcrypto/conf/conf_lib.c +++ /dev/null | |||
@@ -1,392 +0,0 @@ | |||
1 | /* conf_lib.c */ | ||
2 | /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL | ||
3 | * project 2000. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 2000 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 | * licensing@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 | #include <stdio.h> | ||
60 | #include <openssl/crypto.h> | ||
61 | #include <openssl/err.h> | ||
62 | #include <openssl/conf.h> | ||
63 | #include <openssl/conf_api.h> | ||
64 | #include <openssl/lhash.h> | ||
65 | |||
66 | const char *CONF_version="CONF" OPENSSL_VERSION_PTEXT; | ||
67 | |||
68 | static CONF_METHOD *default_CONF_method=NULL; | ||
69 | |||
70 | /* The following section contains the "CONF classic" functions, | ||
71 | rewritten in terms of the new CONF interface. */ | ||
72 | |||
73 | int CONF_set_default_method(CONF_METHOD *meth) | ||
74 | { | ||
75 | default_CONF_method = meth; | ||
76 | return 1; | ||
77 | } | ||
78 | |||
79 | LHASH *CONF_load(LHASH *conf, const char *file, long *eline) | ||
80 | { | ||
81 | LHASH *ltmp; | ||
82 | BIO *in=NULL; | ||
83 | |||
84 | #ifdef VMS | ||
85 | in=BIO_new_file(file, "r"); | ||
86 | #else | ||
87 | in=BIO_new_file(file, "rb"); | ||
88 | #endif | ||
89 | if (in == NULL) | ||
90 | { | ||
91 | CONFerr(CONF_F_CONF_LOAD,ERR_R_SYS_LIB); | ||
92 | return NULL; | ||
93 | } | ||
94 | |||
95 | ltmp = CONF_load_bio(conf, in, eline); | ||
96 | BIO_free(in); | ||
97 | |||
98 | return ltmp; | ||
99 | } | ||
100 | |||
101 | #ifndef NO_FP_API | ||
102 | LHASH *CONF_load_fp(LHASH *conf, FILE *fp,long *eline) | ||
103 | { | ||
104 | BIO *btmp; | ||
105 | LHASH *ltmp; | ||
106 | if(!(btmp = BIO_new_fp(fp, BIO_NOCLOSE))) { | ||
107 | CONFerr(CONF_F_CONF_LOAD_FP,ERR_R_BUF_LIB); | ||
108 | return NULL; | ||
109 | } | ||
110 | ltmp = CONF_load_bio(conf, btmp, eline); | ||
111 | BIO_free(btmp); | ||
112 | return ltmp; | ||
113 | } | ||
114 | #endif | ||
115 | |||
116 | LHASH *CONF_load_bio(LHASH *conf, BIO *bp,long *eline) | ||
117 | { | ||
118 | CONF ctmp; | ||
119 | int ret; | ||
120 | |||
121 | if (default_CONF_method == NULL) | ||
122 | default_CONF_method = NCONF_default(); | ||
123 | |||
124 | default_CONF_method->init(&ctmp); | ||
125 | ctmp.data = conf; | ||
126 | ret = NCONF_load_bio(&ctmp, bp, eline); | ||
127 | if (ret) | ||
128 | return ctmp.data; | ||
129 | return NULL; | ||
130 | } | ||
131 | |||
132 | STACK_OF(CONF_VALUE) *CONF_get_section(LHASH *conf,char *section) | ||
133 | { | ||
134 | if (conf == NULL) | ||
135 | { | ||
136 | return NULL; | ||
137 | } | ||
138 | else | ||
139 | { | ||
140 | CONF ctmp; | ||
141 | |||
142 | if (default_CONF_method == NULL) | ||
143 | default_CONF_method = NCONF_default(); | ||
144 | |||
145 | default_CONF_method->init(&ctmp); | ||
146 | ctmp.data = conf; | ||
147 | return NCONF_get_section(&ctmp, section); | ||
148 | } | ||
149 | } | ||
150 | |||
151 | char *CONF_get_string(LHASH *conf,char *group,char *name) | ||
152 | { | ||
153 | if (conf == NULL) | ||
154 | { | ||
155 | return NCONF_get_string(NULL, group, name); | ||
156 | } | ||
157 | else | ||
158 | { | ||
159 | CONF ctmp; | ||
160 | |||
161 | if (default_CONF_method == NULL) | ||
162 | default_CONF_method = NCONF_default(); | ||
163 | |||
164 | default_CONF_method->init(&ctmp); | ||
165 | ctmp.data = conf; | ||
166 | return NCONF_get_string(&ctmp, group, name); | ||
167 | } | ||
168 | } | ||
169 | |||
170 | long CONF_get_number(LHASH *conf,char *group,char *name) | ||
171 | { | ||
172 | if (conf == NULL) | ||
173 | { | ||
174 | return NCONF_get_number(NULL, group, name); | ||
175 | } | ||
176 | else | ||
177 | { | ||
178 | CONF ctmp; | ||
179 | |||
180 | if (default_CONF_method == NULL) | ||
181 | default_CONF_method = NCONF_default(); | ||
182 | |||
183 | default_CONF_method->init(&ctmp); | ||
184 | ctmp.data = conf; | ||
185 | return NCONF_get_number(&ctmp, group, name); | ||
186 | } | ||
187 | } | ||
188 | |||
189 | void CONF_free(LHASH *conf) | ||
190 | { | ||
191 | CONF ctmp; | ||
192 | |||
193 | if (default_CONF_method == NULL) | ||
194 | default_CONF_method = NCONF_default(); | ||
195 | |||
196 | default_CONF_method->init(&ctmp); | ||
197 | ctmp.data = conf; | ||
198 | NCONF_free_data(&ctmp); | ||
199 | } | ||
200 | |||
201 | #ifndef NO_FP_API | ||
202 | int CONF_dump_fp(LHASH *conf, FILE *out) | ||
203 | { | ||
204 | BIO *btmp; | ||
205 | int ret; | ||
206 | |||
207 | if(!(btmp = BIO_new_fp(out, BIO_NOCLOSE))) { | ||
208 | CONFerr(CONF_F_CONF_DUMP_FP,ERR_R_BUF_LIB); | ||
209 | return 0; | ||
210 | } | ||
211 | ret = CONF_dump_bio(conf, btmp); | ||
212 | BIO_free(btmp); | ||
213 | return ret; | ||
214 | } | ||
215 | #endif | ||
216 | |||
217 | int CONF_dump_bio(LHASH *conf, BIO *out) | ||
218 | { | ||
219 | CONF ctmp; | ||
220 | |||
221 | if (default_CONF_method == NULL) | ||
222 | default_CONF_method = NCONF_default(); | ||
223 | |||
224 | default_CONF_method->init(&ctmp); | ||
225 | ctmp.data = conf; | ||
226 | return NCONF_dump_bio(&ctmp, out); | ||
227 | } | ||
228 | |||
229 | /* The following section contains the "New CONF" functions. They are | ||
230 | completely centralised around a new CONF structure that may contain | ||
231 | basically anything, but at least a method pointer and a table of data. | ||
232 | These functions are also written in terms of the bridge functions used | ||
233 | by the "CONF classic" functions, for consistency. */ | ||
234 | |||
235 | CONF *NCONF_new(CONF_METHOD *meth) | ||
236 | { | ||
237 | CONF *ret; | ||
238 | |||
239 | if (meth == NULL) | ||
240 | meth = NCONF_default(); | ||
241 | |||
242 | ret = meth->create(meth); | ||
243 | if (ret == NULL) | ||
244 | { | ||
245 | CONFerr(CONF_F_NCONF_NEW,ERR_R_MALLOC_FAILURE); | ||
246 | return(NULL); | ||
247 | } | ||
248 | |||
249 | return ret; | ||
250 | } | ||
251 | |||
252 | void NCONF_free(CONF *conf) | ||
253 | { | ||
254 | if (conf == NULL) | ||
255 | return; | ||
256 | conf->meth->destroy(conf); | ||
257 | } | ||
258 | |||
259 | void NCONF_free_data(CONF *conf) | ||
260 | { | ||
261 | if (conf == NULL) | ||
262 | return; | ||
263 | conf->meth->destroy_data(conf); | ||
264 | } | ||
265 | |||
266 | int NCONF_load(CONF *conf, const char *file, long *eline) | ||
267 | { | ||
268 | int ret; | ||
269 | BIO *in=NULL; | ||
270 | |||
271 | #ifdef VMS | ||
272 | in=BIO_new_file(file, "r"); | ||
273 | #else | ||
274 | in=BIO_new_file(file, "rb"); | ||
275 | #endif | ||
276 | if (in == NULL) | ||
277 | { | ||
278 | CONFerr(CONF_F_CONF_LOAD,ERR_R_SYS_LIB); | ||
279 | return 0; | ||
280 | } | ||
281 | |||
282 | ret = NCONF_load_bio(conf, in, eline); | ||
283 | BIO_free(in); | ||
284 | |||
285 | return ret; | ||
286 | } | ||
287 | |||
288 | #ifndef NO_FP_API | ||
289 | int NCONF_load_fp(CONF *conf, FILE *fp,long *eline) | ||
290 | { | ||
291 | BIO *btmp; | ||
292 | int ret; | ||
293 | if(!(btmp = BIO_new_fp(fp, BIO_NOCLOSE))) | ||
294 | { | ||
295 | CONFerr(CONF_F_CONF_LOAD_FP,ERR_R_BUF_LIB); | ||
296 | return 0; | ||
297 | } | ||
298 | ret = NCONF_load_bio(conf, btmp, eline); | ||
299 | BIO_free(btmp); | ||
300 | return ret; | ||
301 | } | ||
302 | #endif | ||
303 | |||
304 | int NCONF_load_bio(CONF *conf, BIO *bp,long *eline) | ||
305 | { | ||
306 | if (conf == NULL) | ||
307 | { | ||
308 | CONFerr(CONF_F_NCONF_LOAD_BIO,CONF_R_NO_CONF); | ||
309 | return 0; | ||
310 | } | ||
311 | |||
312 | return conf->meth->load(conf, bp, eline); | ||
313 | } | ||
314 | |||
315 | STACK_OF(CONF_VALUE) *NCONF_get_section(CONF *conf,char *section) | ||
316 | { | ||
317 | if (conf == NULL) | ||
318 | { | ||
319 | CONFerr(CONF_F_NCONF_GET_SECTION,CONF_R_NO_CONF); | ||
320 | return NULL; | ||
321 | } | ||
322 | |||
323 | if (section == NULL) | ||
324 | { | ||
325 | CONFerr(CONF_F_NCONF_GET_SECTION,CONF_R_NO_SECTION); | ||
326 | return NULL; | ||
327 | } | ||
328 | |||
329 | return _CONF_get_section_values(conf, section); | ||
330 | } | ||
331 | |||
332 | char *NCONF_get_string(CONF *conf,char *group,char *name) | ||
333 | { | ||
334 | char *s = _CONF_get_string(conf, group, name); | ||
335 | |||
336 | /* Since we may get a value from an environment variable even | ||
337 | if conf is NULL, let's check the value first */ | ||
338 | if (s) return s; | ||
339 | |||
340 | if (conf == NULL) | ||
341 | { | ||
342 | CONFerr(CONF_F_NCONF_GET_STRING, | ||
343 | CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE); | ||
344 | return NULL; | ||
345 | } | ||
346 | return NULL; | ||
347 | } | ||
348 | |||
349 | long NCONF_get_number(CONF *conf,char *group,char *name) | ||
350 | { | ||
351 | #if 0 /* As with _CONF_get_string(), we rely on the possibility of finding | ||
352 | an environment variable with a suitable name. Unfortunately, there's | ||
353 | no way with the current API to see if we found one or not... | ||
354 | The meaning of this is that if a number is not found anywhere, it | ||
355 | will always default to 0. */ | ||
356 | if (conf == NULL) | ||
357 | { | ||
358 | CONFerr(CONF_F_NCONF_GET_NUMBER, | ||
359 | CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE); | ||
360 | return 0; | ||
361 | } | ||
362 | #endif | ||
363 | |||
364 | return _CONF_get_number(conf, group, name); | ||
365 | } | ||
366 | |||
367 | #ifndef NO_FP_API | ||
368 | int NCONF_dump_fp(CONF *conf, FILE *out) | ||
369 | { | ||
370 | BIO *btmp; | ||
371 | int ret; | ||
372 | if(!(btmp = BIO_new_fp(out, BIO_NOCLOSE))) { | ||
373 | CONFerr(CONF_F_NCONF_DUMP_FP,ERR_R_BUF_LIB); | ||
374 | return 0; | ||
375 | } | ||
376 | ret = NCONF_dump_bio(conf, btmp); | ||
377 | BIO_free(btmp); | ||
378 | return ret; | ||
379 | } | ||
380 | #endif | ||
381 | |||
382 | int NCONF_dump_bio(CONF *conf, BIO *out) | ||
383 | { | ||
384 | if (conf == NULL) | ||
385 | { | ||
386 | CONFerr(CONF_F_NCONF_DUMP_BIO,CONF_R_NO_CONF); | ||
387 | return 0; | ||
388 | } | ||
389 | |||
390 | return conf->meth->dump(conf, out); | ||
391 | } | ||
392 | |||
diff --git a/src/lib/libcrypto/conf/keysets.pl b/src/lib/libcrypto/conf/keysets.pl deleted file mode 100644 index 56669e76ac..0000000000 --- a/src/lib/libcrypto/conf/keysets.pl +++ /dev/null | |||
@@ -1,179 +0,0 @@ | |||
1 | #!/usr/local/bin/perl | ||
2 | |||
3 | $NUMBER=0x01; | ||
4 | $UPPER=0x02; | ||
5 | $LOWER=0x04; | ||
6 | $UNDER=0x100; | ||
7 | $PUNCTUATION=0x200; | ||
8 | $WS=0x10; | ||
9 | $ESC=0x20; | ||
10 | $QUOTE=0x40; | ||
11 | $DQUOTE=0x400; | ||
12 | $COMMENT=0x80; | ||
13 | $FCOMMENT=0x800; | ||
14 | $EOF=0x08; | ||
15 | |||
16 | foreach (0 .. 127) | ||
17 | { | ||
18 | $v=0; | ||
19 | $c=sprintf("%c",$_); | ||
20 | $v|=$NUMBER if ($c =~ /[0-9]/); | ||
21 | $v|=$UPPER if ($c =~ /[A-Z]/); | ||
22 | $v|=$LOWER if ($c =~ /[a-z]/); | ||
23 | $v|=$UNDER if ($c =~ /_/); | ||
24 | $v|=$PUNCTUATION if ($c =~ /[!\.%&\*\+,\/;\?\@\^\~\|-]/); | ||
25 | $v|=$WS if ($c =~ /[ \t\r\n]/); | ||
26 | $v|=$ESC if ($c =~ /\\/); | ||
27 | $v|=$QUOTE if ($c =~ /['`"]/); # for emacs: "`'}/) | ||
28 | $v|=$COMMENT if ($c =~ /\#/); | ||
29 | $v|=$EOF if ($c =~ /\0/); | ||
30 | |||
31 | push(@V_def,$v); | ||
32 | } | ||
33 | |||
34 | foreach (0 .. 127) | ||
35 | { | ||
36 | $v=0; | ||
37 | $c=sprintf("%c",$_); | ||
38 | $v|=$NUMBER if ($c =~ /[0-9]/); | ||
39 | $v|=$UPPER if ($c =~ /[A-Z]/); | ||
40 | $v|=$LOWER if ($c =~ /[a-z]/); | ||
41 | $v|=$UNDER if ($c =~ /_/); | ||
42 | $v|=$PUNCTUATION if ($c =~ /[!\.%&\*\+,\/;\?\@\^\~\|-]/); | ||
43 | $v|=$WS if ($c =~ /[ \t\r\n]/); | ||
44 | $v|=$DQUOTE if ($c =~ /["]/); # for emacs: "}/) | ||
45 | $v|=$FCOMMENT if ($c =~ /;/); | ||
46 | $v|=$EOF if ($c =~ /\0/); | ||
47 | |||
48 | push(@V_w32,$v); | ||
49 | } | ||
50 | |||
51 | print <<"EOF"; | ||
52 | /* crypto/conf/conf_def.h */ | ||
53 | /* Copyright (C) 1995-1998 Eric Young (eay\@cryptsoft.com) | ||
54 | * All rights reserved. | ||
55 | * | ||
56 | * This package is an SSL implementation written | ||
57 | * by Eric Young (eay\@cryptsoft.com). | ||
58 | * The implementation was written so as to conform with Netscapes SSL. | ||
59 | * | ||
60 | * This library is free for commercial and non-commercial use as long as | ||
61 | * the following conditions are aheared to. The following conditions | ||
62 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
63 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
64 | * included with this distribution is covered by the same copyright terms | ||
65 | * except that the holder is Tim Hudson (tjh\@cryptsoft.com). | ||
66 | * | ||
67 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
68 | * the code are not to be removed. | ||
69 | * If this package is used in a product, Eric Young should be given attribution | ||
70 | * as the author of the parts of the library used. | ||
71 | * This can be in the form of a textual message at program startup or | ||
72 | * in documentation (online or textual) provided with the package. | ||
73 | * | ||
74 | * Redistribution and use in source and binary forms, with or without | ||
75 | * modification, are permitted provided that the following conditions | ||
76 | * are met: | ||
77 | * 1. Redistributions of source code must retain the copyright | ||
78 | * notice, this list of conditions and the following disclaimer. | ||
79 | * 2. Redistributions in binary form must reproduce the above copyright | ||
80 | * notice, this list of conditions and the following disclaimer in the | ||
81 | * documentation and/or other materials provided with the distribution. | ||
82 | * 3. All advertising materials mentioning features or use of this software | ||
83 | * must display the following acknowledgement: | ||
84 | * "This product includes cryptographic software written by | ||
85 | * Eric Young (eay\@cryptsoft.com)" | ||
86 | * The word 'cryptographic' can be left out if the rouines from the library | ||
87 | * being used are not cryptographic related :-). | ||
88 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
89 | * the apps directory (application code) you must include an acknowledgement: | ||
90 | * "This product includes software written by Tim Hudson (tjh\@cryptsoft.com)" | ||
91 | * | ||
92 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
93 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
94 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
95 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
96 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
97 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
98 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
99 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
100 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
101 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
102 | * SUCH DAMAGE. | ||
103 | * | ||
104 | * The licence and distribution terms for any publically available version or | ||
105 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
106 | * copied and put under another distribution licence | ||
107 | * [including the GNU Public Licence.] | ||
108 | */ | ||
109 | |||
110 | /* THIS FILE WAS AUTOMAGICALLY GENERATED! | ||
111 | Please modify and use keysets.pl to regenerate it. */ | ||
112 | |||
113 | #define CONF_NUMBER $NUMBER | ||
114 | #define CONF_UPPER $UPPER | ||
115 | #define CONF_LOWER $LOWER | ||
116 | #define CONF_UNDER $UNDER | ||
117 | #define CONF_PUNCTUATION $PUNCTUATION | ||
118 | #define CONF_WS $WS | ||
119 | #define CONF_ESC $ESC | ||
120 | #define CONF_QUOTE $QUOTE | ||
121 | #define CONF_DQUOTE $DQUOTE | ||
122 | #define CONF_COMMENT $COMMENT | ||
123 | #define CONF_FCOMMENT $FCOMMENT | ||
124 | #define CONF_EOF $EOF | ||
125 | #define CONF_ALPHA (CONF_UPPER|CONF_LOWER) | ||
126 | #define CONF_ALPHA_NUMERIC (CONF_ALPHA|CONF_NUMBER|CONF_UNDER) | ||
127 | #define CONF_ALPHA_NUMERIC_PUNCT (CONF_ALPHA|CONF_NUMBER|CONF_UNDER| \\ | ||
128 | CONF_PUNCTUATION) | ||
129 | |||
130 | #define KEYTYPES(c) ((unsigned short *)((c)->meth_data)) | ||
131 | #ifndef CHARSET_EBCDIC | ||
132 | #define IS_COMMENT(c,a) (KEYTYPES(c)[(a)&0x7f]&CONF_COMMENT) | ||
133 | #define IS_FCOMMENT(c,a) (KEYTYPES(c)[(a)&0x7f]&CONF_FCOMMENT) | ||
134 | #define IS_EOF(c,a) (KEYTYPES(c)[(a)&0x7f]&CONF_EOF) | ||
135 | #define IS_ESC(c,a) (KEYTYPES(c)[(a)&0x7f]&CONF_ESC) | ||
136 | #define IS_NUMBER(c,a) (KEYTYPES(c)[(a)&0x7f]&CONF_NUMBER) | ||
137 | #define IS_WS(c,a) (KEYTYPES(c)[(a)&0x7f]&CONF_WS) | ||
138 | #define IS_ALPHA_NUMERIC(c,a) (KEYTYPES(c)[(a)&0x7f]&CONF_ALPHA_NUMERIC) | ||
139 | #define IS_ALPHA_NUMERIC_PUNCT(c,a) \\ | ||
140 | (KEYTYPES(c)[(a)&0x7f]&CONF_ALPHA_NUMERIC_PUNCT) | ||
141 | #define IS_QUOTE(c,a) (KEYTYPES(c)[(a)&0x7f]&CONF_QUOTE) | ||
142 | #define IS_DQUOTE(c,a) (KEYTYPES(c)[(a)&0x7f]&CONF_DQUOTE) | ||
143 | |||
144 | #else /*CHARSET_EBCDIC*/ | ||
145 | |||
146 | #define IS_COMMENT(c,a) (KEYTYPES(c)[os_toascii[a]&0x7f]&CONF_COMMENT) | ||
147 | #define IS_FCOMMENT(c,a) (KEYTYPES(c)[os_toascii[a]&0x7f]&CONF_FCOMMENT) | ||
148 | #define IS_EOF(c,a) (KEYTYPES(c)[os_toascii[a]&0x7f]&CONF_EOF) | ||
149 | #define IS_ESC(c,a) (KEYTYPES(c)[os_toascii[a]&0x7f]&CONF_ESC) | ||
150 | #define IS_NUMBER(c,a) (KEYTYPES(c)[os_toascii[a]&0x7f]&CONF_NUMBER) | ||
151 | #define IS_WS(c,a) (KEYTYPES(c)[os_toascii[a]&0x7f]&CONF_WS) | ||
152 | #define IS_ALPHA_NUMERIC(c,a) (KEYTYPES(c)[os_toascii[a]&0x7f]&CONF_ALPHA_NUMERIC) | ||
153 | #define IS_ALPHA_NUMERIC_PUNCT(c,a) \\ | ||
154 | (KEYTYPES(c)[os_toascii[a]&0x7f]&CONF_ALPHA_NUMERIC_PUNCT) | ||
155 | #define IS_QUOTE(c,a) (KEYTYPES(c)[os_toascii[a]&0x7f]&CONF_QUOTE) | ||
156 | #define IS_DQUOTE(c,a) (KEYTYPES(c)[os_toascii[a]&0x7f]&CONF_DQUOTE) | ||
157 | #endif /*CHARSET_EBCDIC*/ | ||
158 | |||
159 | EOF | ||
160 | |||
161 | print "static unsigned short CONF_type_default[128]={"; | ||
162 | |||
163 | for ($i=0; $i<128; $i++) | ||
164 | { | ||
165 | print "\n\t" if ($i % 8) == 0; | ||
166 | printf "0x%03X,",$V_def[$i]; | ||
167 | } | ||
168 | |||
169 | print "\n\t};\n\n"; | ||
170 | |||
171 | print "static unsigned short CONF_type_win32[128]={"; | ||
172 | |||
173 | for ($i=0; $i<128; $i++) | ||
174 | { | ||
175 | print "\n\t" if ($i % 8) == 0; | ||
176 | printf "0x%03X,",$V_w32[$i]; | ||
177 | } | ||
178 | |||
179 | print "\n\t};\n\n"; | ||
diff --git a/src/lib/libcrypto/conf/ssleay.cnf b/src/lib/libcrypto/conf/ssleay.cnf deleted file mode 100644 index ed33af601e..0000000000 --- a/src/lib/libcrypto/conf/ssleay.cnf +++ /dev/null | |||
@@ -1,78 +0,0 @@ | |||
1 | # | ||
2 | # This is a test configuration file for use in SSLeay etc... | ||
3 | # | ||
4 | |||
5 | init = 5 | ||
6 | in\#it1 =10 | ||
7 | init2='10' | ||
8 | init3='10\'' | ||
9 | init4="10'" | ||
10 | init5='='10\'' again' | ||
11 | |||
12 | SSLeay::version = 0.5.0 | ||
13 | |||
14 | [genrsa] | ||
15 | default_bits = 512 | ||
16 | SSLEAY::version = 0.5.0 | ||
17 | |||
18 | [gendh] | ||
19 | default_bits = 512 | ||
20 | def_generator = 2 | ||
21 | |||
22 | [s_client] | ||
23 | cipher1 = DES_CBC_MD5:DES_CBC_SHA:DES_EDE_SHA:RC4_MD5\ | ||
24 | cipher2 = 'DES_CBC_MD5 DES_CBC_SHA DES_EDE_SHA RC4_MD5' | ||
25 | cipher3 = "DES_CBC_MD5 DES_CBC_SHA DES_EDE_SHA RC4_MD5" | ||
26 | cipher4 = DES_CBC_MD5 DES_CBC_SHA DES_EDE_SHA RC4_MD5 | ||
27 | |||
28 | [ default ] | ||
29 | cert_dir = $ENV::HOME/.ca_certs | ||
30 | |||
31 | HOME = /tmp/eay | ||
32 | |||
33 | tmp_cert_dir = $HOME/.ca_certs | ||
34 | tmp2_cert_dir = thisis$(HOME)stuff | ||
35 | |||
36 | LOGNAME = Eric Young (home=$HOME) | ||
37 | |||
38 | [ special ] | ||
39 | |||
40 | H=$HOME | ||
41 | H=$default::HOME | ||
42 | H=$ENV::HOME | ||
43 | # | ||
44 | # SSLeay example configuration file. | ||
45 | # This is mostly being used for generation of certificate requests. | ||
46 | # | ||
47 | |||
48 | RANDFILE = $HOME/.rand | ||
49 | |||
50 | [ req ] | ||
51 | default_bits = 512 | ||
52 | default_keyfile = privkey.pem | ||
53 | |||
54 | Attribute_type_1 = countryName | ||
55 | Attribute_text_1 = Country Name (2 letter code) | ||
56 | Attribute_default_1 = AU | ||
57 | |||
58 | Attribute_type_2 = stateOrProvinceName | ||
59 | Attribute_text_2 = State or Province Name (full name) | ||
60 | Attribute_default_2 = Queensland | ||
61 | |||
62 | Attribute_type_3 = localityName | ||
63 | Attribute_text_3 = Locality Name (eg, city) | ||
64 | |||
65 | Attribute_type_4 = organizationName | ||
66 | Attribute_text_4 = Organization Name (eg, company) | ||
67 | Attribute_default_4 = Mincom Pty Ltd | ||
68 | |||
69 | Attribute_type_5 = organizationalUnitName | ||
70 | Attribute_text_5 = Organizational Unit Name (eg, section) | ||
71 | Attribute_default_5 = TR | ||
72 | |||
73 | Attribute_type_6 = commonName | ||
74 | Attribute_text_6 = Common Name (eg, YOUR name) | ||
75 | |||
76 | Attribute_type_7 = emailAddress | ||
77 | Attribute_text_7 = Email Address | ||
78 | |||