diff options
Diffstat (limited to 'src/lib/libcrypto/x509v3')
23 files changed, 0 insertions, 6255 deletions
diff --git a/src/lib/libcrypto/x509v3/ext_dat.h b/src/lib/libcrypto/x509v3/ext_dat.h deleted file mode 100644 index 801a585a52..0000000000 --- a/src/lib/libcrypto/x509v3/ext_dat.h +++ /dev/null | |||
@@ -1,97 +0,0 @@ | |||
1 | /* ext_dat.h */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 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 | /* This file contains a table of "standard" extensions */ | ||
59 | |||
60 | extern X509V3_EXT_METHOD v3_bcons, v3_nscert, v3_key_usage, v3_ext_ku; | ||
61 | extern X509V3_EXT_METHOD v3_pkey_usage_period, v3_sxnet, v3_info; | ||
62 | extern X509V3_EXT_METHOD v3_ns_ia5_list[], v3_alt[], v3_skey_id, v3_akey_id; | ||
63 | extern X509V3_EXT_METHOD v3_crl_num, v3_crl_reason, v3_cpols, v3_crld; | ||
64 | |||
65 | /* This table will be searched using OBJ_bsearch so it *must* kept in | ||
66 | * order of the ext_nid values. | ||
67 | */ | ||
68 | |||
69 | static X509V3_EXT_METHOD *standard_exts[] = { | ||
70 | &v3_nscert, | ||
71 | &v3_ns_ia5_list[0], | ||
72 | &v3_ns_ia5_list[1], | ||
73 | &v3_ns_ia5_list[2], | ||
74 | &v3_ns_ia5_list[3], | ||
75 | &v3_ns_ia5_list[4], | ||
76 | &v3_ns_ia5_list[5], | ||
77 | &v3_ns_ia5_list[6], | ||
78 | &v3_skey_id, | ||
79 | &v3_key_usage, | ||
80 | &v3_pkey_usage_period, | ||
81 | &v3_alt[0], | ||
82 | &v3_alt[1], | ||
83 | &v3_bcons, | ||
84 | &v3_crl_num, | ||
85 | &v3_cpols, | ||
86 | &v3_akey_id, | ||
87 | &v3_crld, | ||
88 | &v3_ext_ku, | ||
89 | &v3_crl_reason, | ||
90 | &v3_sxnet, | ||
91 | &v3_info, | ||
92 | }; | ||
93 | |||
94 | /* Number of standard extensions */ | ||
95 | |||
96 | #define STANDARD_EXTENSION_COUNT (sizeof(standard_exts)/sizeof(X509V3_EXT_METHOD *)) | ||
97 | |||
diff --git a/src/lib/libcrypto/x509v3/v3_akey.c b/src/lib/libcrypto/x509v3/v3_akey.c deleted file mode 100644 index 0889a18993..0000000000 --- a/src/lib/libcrypto/x509v3/v3_akey.c +++ /dev/null | |||
@@ -1,249 +0,0 @@ | |||
1 | /* v3_akey.c */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 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 "cryptlib.h" | ||
61 | #include <openssl/conf.h> | ||
62 | #include <openssl/asn1.h> | ||
63 | #include <openssl/asn1_mac.h> | ||
64 | #include <openssl/x509v3.h> | ||
65 | |||
66 | static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, | ||
67 | AUTHORITY_KEYID *akeyid, STACK_OF(CONF_VALUE) *extlist); | ||
68 | static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, | ||
69 | X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values); | ||
70 | |||
71 | X509V3_EXT_METHOD v3_akey_id = { | ||
72 | NID_authority_key_identifier, X509V3_EXT_MULTILINE, | ||
73 | (X509V3_EXT_NEW)AUTHORITY_KEYID_new, | ||
74 | (X509V3_EXT_FREE)AUTHORITY_KEYID_free, | ||
75 | (X509V3_EXT_D2I)d2i_AUTHORITY_KEYID, | ||
76 | (X509V3_EXT_I2D)i2d_AUTHORITY_KEYID, | ||
77 | NULL, NULL, | ||
78 | (X509V3_EXT_I2V)i2v_AUTHORITY_KEYID, | ||
79 | (X509V3_EXT_V2I)v2i_AUTHORITY_KEYID, | ||
80 | NULL,NULL, | ||
81 | NULL | ||
82 | }; | ||
83 | |||
84 | |||
85 | int i2d_AUTHORITY_KEYID(AUTHORITY_KEYID *a, unsigned char **pp) | ||
86 | { | ||
87 | M_ASN1_I2D_vars(a); | ||
88 | |||
89 | M_ASN1_I2D_len_IMP_opt (a->keyid, i2d_ASN1_OCTET_STRING); | ||
90 | M_ASN1_I2D_len_IMP_opt (a->issuer, i2d_GENERAL_NAMES); | ||
91 | M_ASN1_I2D_len_IMP_opt (a->serial, i2d_ASN1_INTEGER); | ||
92 | |||
93 | M_ASN1_I2D_seq_total(); | ||
94 | |||
95 | M_ASN1_I2D_put_IMP_opt (a->keyid, i2d_ASN1_OCTET_STRING, 0); | ||
96 | M_ASN1_I2D_put_IMP_opt (a->issuer, i2d_GENERAL_NAMES, 1); | ||
97 | M_ASN1_I2D_put_IMP_opt (a->serial, i2d_ASN1_INTEGER, 2); | ||
98 | |||
99 | M_ASN1_I2D_finish(); | ||
100 | } | ||
101 | |||
102 | AUTHORITY_KEYID *AUTHORITY_KEYID_new(void) | ||
103 | { | ||
104 | AUTHORITY_KEYID *ret=NULL; | ||
105 | ASN1_CTX c; | ||
106 | M_ASN1_New_Malloc(ret, AUTHORITY_KEYID); | ||
107 | ret->keyid = NULL; | ||
108 | ret->issuer = NULL; | ||
109 | ret->serial = NULL; | ||
110 | return (ret); | ||
111 | M_ASN1_New_Error(ASN1_F_AUTHORITY_KEYID_NEW); | ||
112 | } | ||
113 | |||
114 | AUTHORITY_KEYID *d2i_AUTHORITY_KEYID(AUTHORITY_KEYID **a, unsigned char **pp, | ||
115 | long length) | ||
116 | { | ||
117 | M_ASN1_D2I_vars(a,AUTHORITY_KEYID *,AUTHORITY_KEYID_new); | ||
118 | M_ASN1_D2I_Init(); | ||
119 | M_ASN1_D2I_start_sequence(); | ||
120 | M_ASN1_D2I_get_IMP_opt (ret->keyid, d2i_ASN1_OCTET_STRING, 0, | ||
121 | V_ASN1_OCTET_STRING); | ||
122 | M_ASN1_D2I_get_IMP_opt (ret->issuer, d2i_GENERAL_NAMES, 1, | ||
123 | V_ASN1_SEQUENCE); | ||
124 | M_ASN1_D2I_get_IMP_opt (ret->serial, d2i_ASN1_INTEGER, 2, | ||
125 | V_ASN1_INTEGER); | ||
126 | M_ASN1_D2I_Finish(a, AUTHORITY_KEYID_free, ASN1_F_D2I_AUTHORITY_KEYID); | ||
127 | } | ||
128 | |||
129 | void AUTHORITY_KEYID_free(AUTHORITY_KEYID *a) | ||
130 | { | ||
131 | if (a == NULL) return; | ||
132 | M_ASN1_OCTET_STRING_free(a->keyid); | ||
133 | sk_GENERAL_NAME_pop_free(a->issuer, GENERAL_NAME_free); | ||
134 | M_ASN1_INTEGER_free (a->serial); | ||
135 | OPENSSL_free (a); | ||
136 | } | ||
137 | |||
138 | static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, | ||
139 | AUTHORITY_KEYID *akeyid, STACK_OF(CONF_VALUE) *extlist) | ||
140 | { | ||
141 | char *tmp; | ||
142 | if(akeyid->keyid) { | ||
143 | tmp = hex_to_string(akeyid->keyid->data, akeyid->keyid->length); | ||
144 | X509V3_add_value("keyid", tmp, &extlist); | ||
145 | OPENSSL_free(tmp); | ||
146 | } | ||
147 | if(akeyid->issuer) | ||
148 | extlist = i2v_GENERAL_NAMES(NULL, akeyid->issuer, extlist); | ||
149 | if(akeyid->serial) { | ||
150 | tmp = hex_to_string(akeyid->serial->data, | ||
151 | akeyid->serial->length); | ||
152 | X509V3_add_value("serial", tmp, &extlist); | ||
153 | OPENSSL_free(tmp); | ||
154 | } | ||
155 | return extlist; | ||
156 | } | ||
157 | |||
158 | /* Currently two options: | ||
159 | * keyid: use the issuers subject keyid, the value 'always' means its is | ||
160 | * an error if the issuer certificate doesn't have a key id. | ||
161 | * issuer: use the issuers cert issuer and serial number. The default is | ||
162 | * to only use this if keyid is not present. With the option 'always' | ||
163 | * this is always included. | ||
164 | */ | ||
165 | |||
166 | static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, | ||
167 | X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values) | ||
168 | { | ||
169 | char keyid=0, issuer=0; | ||
170 | int i; | ||
171 | CONF_VALUE *cnf; | ||
172 | ASN1_OCTET_STRING *ikeyid = NULL; | ||
173 | X509_NAME *isname = NULL; | ||
174 | STACK_OF(GENERAL_NAME) * gens = NULL; | ||
175 | GENERAL_NAME *gen = NULL; | ||
176 | ASN1_INTEGER *serial = NULL; | ||
177 | X509_EXTENSION *ext; | ||
178 | X509 *cert; | ||
179 | AUTHORITY_KEYID *akeyid; | ||
180 | for(i = 0; i < sk_CONF_VALUE_num(values); i++) { | ||
181 | cnf = sk_CONF_VALUE_value(values, i); | ||
182 | if(!strcmp(cnf->name, "keyid")) { | ||
183 | keyid = 1; | ||
184 | if(cnf->value && !strcmp(cnf->value, "always")) keyid = 2; | ||
185 | } else if(!strcmp(cnf->name, "issuer")) { | ||
186 | issuer = 1; | ||
187 | if(cnf->value && !strcmp(cnf->value, "always")) issuer = 2; | ||
188 | } else { | ||
189 | X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,X509V3_R_UNKNOWN_OPTION); | ||
190 | ERR_add_error_data(2, "name=", cnf->name); | ||
191 | return NULL; | ||
192 | } | ||
193 | } | ||
194 | |||
195 | |||
196 | |||
197 | if(!ctx || !ctx->issuer_cert) { | ||
198 | if(ctx && (ctx->flags==CTX_TEST)) return AUTHORITY_KEYID_new(); | ||
199 | X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,X509V3_R_NO_ISSUER_CERTIFICATE); | ||
200 | return NULL; | ||
201 | } | ||
202 | |||
203 | cert = ctx->issuer_cert; | ||
204 | |||
205 | if(keyid) { | ||
206 | i = X509_get_ext_by_NID(cert, NID_subject_key_identifier, -1); | ||
207 | if((i >= 0) && (ext = X509_get_ext(cert, i))) | ||
208 | ikeyid = X509V3_EXT_d2i(ext); | ||
209 | if(keyid==2 && !ikeyid) { | ||
210 | X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,X509V3_R_UNABLE_TO_GET_ISSUER_KEYID); | ||
211 | return NULL; | ||
212 | } | ||
213 | } | ||
214 | |||
215 | if((issuer && !ikeyid) || (issuer == 2)) { | ||
216 | isname = X509_NAME_dup(X509_get_issuer_name(cert)); | ||
217 | serial = M_ASN1_INTEGER_dup(X509_get_serialNumber(cert)); | ||
218 | if(!isname || !serial) { | ||
219 | X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS); | ||
220 | goto err; | ||
221 | } | ||
222 | } | ||
223 | |||
224 | if(!(akeyid = AUTHORITY_KEYID_new())) goto err; | ||
225 | |||
226 | if(isname) { | ||
227 | if(!(gens = sk_GENERAL_NAME_new_null()) || !(gen = GENERAL_NAME_new()) | ||
228 | || !sk_GENERAL_NAME_push(gens, gen)) { | ||
229 | X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,ERR_R_MALLOC_FAILURE); | ||
230 | goto err; | ||
231 | } | ||
232 | gen->type = GEN_DIRNAME; | ||
233 | gen->d.dirn = isname; | ||
234 | } | ||
235 | |||
236 | akeyid->issuer = gens; | ||
237 | akeyid->serial = serial; | ||
238 | akeyid->keyid = ikeyid; | ||
239 | |||
240 | return akeyid; | ||
241 | |||
242 | err: | ||
243 | X509_NAME_free(isname); | ||
244 | M_ASN1_INTEGER_free(serial); | ||
245 | M_ASN1_OCTET_STRING_free(ikeyid); | ||
246 | return NULL; | ||
247 | |||
248 | } | ||
249 | |||
diff --git a/src/lib/libcrypto/x509v3/v3_alt.c b/src/lib/libcrypto/x509v3/v3_alt.c deleted file mode 100644 index 94bebcd448..0000000000 --- a/src/lib/libcrypto/x509v3/v3_alt.c +++ /dev/null | |||
@@ -1,401 +0,0 @@ | |||
1 | /* v3_alt.c */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 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 "cryptlib.h" | ||
61 | #include <openssl/conf.h> | ||
62 | #include <openssl/x509v3.h> | ||
63 | |||
64 | static STACK_OF(GENERAL_NAME) *v2i_subject_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval); | ||
65 | static STACK_OF(GENERAL_NAME) *v2i_issuer_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval); | ||
66 | static int copy_email(X509V3_CTX *ctx, STACK_OF(GENERAL_NAME) *gens); | ||
67 | static int copy_issuer(X509V3_CTX *ctx, STACK_OF(GENERAL_NAME) *gens); | ||
68 | X509V3_EXT_METHOD v3_alt[] = { | ||
69 | { NID_subject_alt_name, 0, | ||
70 | (X509V3_EXT_NEW)GENERAL_NAMES_new, | ||
71 | (X509V3_EXT_FREE)GENERAL_NAMES_free, | ||
72 | (X509V3_EXT_D2I)d2i_GENERAL_NAMES, | ||
73 | (X509V3_EXT_I2D)i2d_GENERAL_NAMES, | ||
74 | NULL, NULL, | ||
75 | (X509V3_EXT_I2V)i2v_GENERAL_NAMES, | ||
76 | (X509V3_EXT_V2I)v2i_subject_alt, | ||
77 | NULL, NULL, NULL}, | ||
78 | { NID_issuer_alt_name, 0, | ||
79 | (X509V3_EXT_NEW)GENERAL_NAMES_new, | ||
80 | (X509V3_EXT_FREE)GENERAL_NAMES_free, | ||
81 | (X509V3_EXT_D2I)d2i_GENERAL_NAMES, | ||
82 | (X509V3_EXT_I2D)i2d_GENERAL_NAMES, | ||
83 | NULL, NULL, | ||
84 | (X509V3_EXT_I2V)i2v_GENERAL_NAMES, | ||
85 | (X509V3_EXT_V2I)v2i_issuer_alt, | ||
86 | NULL, NULL, NULL}, | ||
87 | }; | ||
88 | |||
89 | STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES(X509V3_EXT_METHOD *method, | ||
90 | STACK_OF(GENERAL_NAME) *gens, STACK_OF(CONF_VALUE) *ret) | ||
91 | { | ||
92 | int i; | ||
93 | GENERAL_NAME *gen; | ||
94 | for(i = 0; i < sk_GENERAL_NAME_num(gens); i++) { | ||
95 | gen = sk_GENERAL_NAME_value(gens, i); | ||
96 | ret = i2v_GENERAL_NAME(method, gen, ret); | ||
97 | } | ||
98 | if(!ret) return sk_CONF_VALUE_new_null(); | ||
99 | return ret; | ||
100 | } | ||
101 | |||
102 | STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method, | ||
103 | GENERAL_NAME *gen, STACK_OF(CONF_VALUE) *ret) | ||
104 | { | ||
105 | char oline[256]; | ||
106 | unsigned char *p; | ||
107 | switch (gen->type) | ||
108 | { | ||
109 | case GEN_OTHERNAME: | ||
110 | X509V3_add_value("othername","<unsupported>", &ret); | ||
111 | break; | ||
112 | |||
113 | case GEN_X400: | ||
114 | X509V3_add_value("X400Name","<unsupported>", &ret); | ||
115 | break; | ||
116 | |||
117 | case GEN_EDIPARTY: | ||
118 | X509V3_add_value("EdiPartyName","<unsupported>", &ret); | ||
119 | break; | ||
120 | |||
121 | case GEN_EMAIL: | ||
122 | X509V3_add_value_uchar("email",gen->d.ia5->data, &ret); | ||
123 | break; | ||
124 | |||
125 | case GEN_DNS: | ||
126 | X509V3_add_value_uchar("DNS",gen->d.ia5->data, &ret); | ||
127 | break; | ||
128 | |||
129 | case GEN_URI: | ||
130 | X509V3_add_value_uchar("URI",gen->d.ia5->data, &ret); | ||
131 | break; | ||
132 | |||
133 | case GEN_DIRNAME: | ||
134 | X509_NAME_oneline(gen->d.dirn, oline, 256); | ||
135 | X509V3_add_value("DirName",oline, &ret); | ||
136 | break; | ||
137 | |||
138 | case GEN_IPADD: | ||
139 | p = gen->d.ip->data; | ||
140 | /* BUG: doesn't support IPV6 */ | ||
141 | if(gen->d.ip->length != 4) { | ||
142 | X509V3_add_value("IP Address","<invalid>", &ret); | ||
143 | break; | ||
144 | } | ||
145 | sprintf(oline, "%d.%d.%d.%d", p[0], p[1], p[2], p[3]); | ||
146 | X509V3_add_value("IP Address",oline, &ret); | ||
147 | break; | ||
148 | |||
149 | case GEN_RID: | ||
150 | i2t_ASN1_OBJECT(oline, 256, gen->d.rid); | ||
151 | X509V3_add_value("Registered ID",oline, &ret); | ||
152 | break; | ||
153 | } | ||
154 | return ret; | ||
155 | } | ||
156 | |||
157 | static STACK_OF(GENERAL_NAME) *v2i_issuer_alt(X509V3_EXT_METHOD *method, | ||
158 | X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval) | ||
159 | { | ||
160 | STACK_OF(GENERAL_NAME) *gens = NULL; | ||
161 | CONF_VALUE *cnf; | ||
162 | int i; | ||
163 | if(!(gens = sk_GENERAL_NAME_new_null())) { | ||
164 | X509V3err(X509V3_F_V2I_GENERAL_NAMES,ERR_R_MALLOC_FAILURE); | ||
165 | return NULL; | ||
166 | } | ||
167 | for(i = 0; i < sk_CONF_VALUE_num(nval); i++) { | ||
168 | cnf = sk_CONF_VALUE_value(nval, i); | ||
169 | if(!name_cmp(cnf->name, "issuer") && cnf->value && | ||
170 | !strcmp(cnf->value, "copy")) { | ||
171 | if(!copy_issuer(ctx, gens)) goto err; | ||
172 | } else { | ||
173 | GENERAL_NAME *gen; | ||
174 | if(!(gen = v2i_GENERAL_NAME(method, ctx, cnf))) | ||
175 | goto err; | ||
176 | sk_GENERAL_NAME_push(gens, gen); | ||
177 | } | ||
178 | } | ||
179 | return gens; | ||
180 | err: | ||
181 | sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free); | ||
182 | return NULL; | ||
183 | } | ||
184 | |||
185 | /* Append subject altname of issuer to issuer alt name of subject */ | ||
186 | |||
187 | static int copy_issuer(X509V3_CTX *ctx, STACK_OF(GENERAL_NAME) *gens) | ||
188 | { | ||
189 | STACK_OF(GENERAL_NAME) *ialt; | ||
190 | GENERAL_NAME *gen; | ||
191 | X509_EXTENSION *ext; | ||
192 | int i; | ||
193 | if(ctx && (ctx->flags == CTX_TEST)) return 1; | ||
194 | if(!ctx || !ctx->issuer_cert) { | ||
195 | X509V3err(X509V3_F_COPY_ISSUER,X509V3_R_NO_ISSUER_DETAILS); | ||
196 | goto err; | ||
197 | } | ||
198 | i = X509_get_ext_by_NID(ctx->issuer_cert, NID_subject_alt_name, -1); | ||
199 | if(i < 0) return 1; | ||
200 | if(!(ext = X509_get_ext(ctx->issuer_cert, i)) || | ||
201 | !(ialt = X509V3_EXT_d2i(ext)) ) { | ||
202 | X509V3err(X509V3_F_COPY_ISSUER,X509V3_R_ISSUER_DECODE_ERROR); | ||
203 | goto err; | ||
204 | } | ||
205 | |||
206 | for(i = 0; i < sk_GENERAL_NAME_num(ialt); i++) { | ||
207 | gen = sk_GENERAL_NAME_value(ialt, i); | ||
208 | if(!sk_GENERAL_NAME_push(gens, gen)) { | ||
209 | X509V3err(X509V3_F_COPY_ISSUER,ERR_R_MALLOC_FAILURE); | ||
210 | goto err; | ||
211 | } | ||
212 | } | ||
213 | sk_GENERAL_NAME_free(ialt); | ||
214 | |||
215 | return 1; | ||
216 | |||
217 | err: | ||
218 | return 0; | ||
219 | |||
220 | } | ||
221 | |||
222 | static STACK_OF(GENERAL_NAME) *v2i_subject_alt(X509V3_EXT_METHOD *method, | ||
223 | X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval) | ||
224 | { | ||
225 | STACK_OF(GENERAL_NAME) *gens = NULL; | ||
226 | CONF_VALUE *cnf; | ||
227 | int i; | ||
228 | if(!(gens = sk_GENERAL_NAME_new_null())) { | ||
229 | X509V3err(X509V3_F_V2I_GENERAL_NAMES,ERR_R_MALLOC_FAILURE); | ||
230 | return NULL; | ||
231 | } | ||
232 | for(i = 0; i < sk_CONF_VALUE_num(nval); i++) { | ||
233 | cnf = sk_CONF_VALUE_value(nval, i); | ||
234 | if(!name_cmp(cnf->name, "email") && cnf->value && | ||
235 | !strcmp(cnf->value, "copy")) { | ||
236 | if(!copy_email(ctx, gens)) goto err; | ||
237 | } else { | ||
238 | GENERAL_NAME *gen; | ||
239 | if(!(gen = v2i_GENERAL_NAME(method, ctx, cnf))) | ||
240 | goto err; | ||
241 | sk_GENERAL_NAME_push(gens, gen); | ||
242 | } | ||
243 | } | ||
244 | return gens; | ||
245 | err: | ||
246 | sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free); | ||
247 | return NULL; | ||
248 | } | ||
249 | |||
250 | /* Copy any email addresses in a certificate or request to | ||
251 | * GENERAL_NAMES | ||
252 | */ | ||
253 | |||
254 | static int copy_email(X509V3_CTX *ctx, STACK_OF(GENERAL_NAME) *gens) | ||
255 | { | ||
256 | X509_NAME *nm; | ||
257 | ASN1_IA5STRING *email = NULL; | ||
258 | X509_NAME_ENTRY *ne; | ||
259 | GENERAL_NAME *gen = NULL; | ||
260 | int i; | ||
261 | if(ctx->flags == CTX_TEST) return 1; | ||
262 | if(!ctx || (!ctx->subject_cert && !ctx->subject_req)) { | ||
263 | X509V3err(X509V3_F_COPY_EMAIL,X509V3_R_NO_SUBJECT_DETAILS); | ||
264 | goto err; | ||
265 | } | ||
266 | /* Find the subject name */ | ||
267 | if(ctx->subject_cert) nm = X509_get_subject_name(ctx->subject_cert); | ||
268 | else nm = X509_REQ_get_subject_name(ctx->subject_req); | ||
269 | |||
270 | /* Now add any email address(es) to STACK */ | ||
271 | i = -1; | ||
272 | while((i = X509_NAME_get_index_by_NID(nm, | ||
273 | NID_pkcs9_emailAddress, i)) >= 0) { | ||
274 | ne = X509_NAME_get_entry(nm, i); | ||
275 | email = M_ASN1_IA5STRING_dup(X509_NAME_ENTRY_get_data(ne)); | ||
276 | if(!email || !(gen = GENERAL_NAME_new())) { | ||
277 | X509V3err(X509V3_F_COPY_EMAIL,ERR_R_MALLOC_FAILURE); | ||
278 | goto err; | ||
279 | } | ||
280 | gen->d.ia5 = email; | ||
281 | email = NULL; | ||
282 | gen->type = GEN_EMAIL; | ||
283 | if(!sk_GENERAL_NAME_push(gens, gen)) { | ||
284 | X509V3err(X509V3_F_COPY_EMAIL,ERR_R_MALLOC_FAILURE); | ||
285 | goto err; | ||
286 | } | ||
287 | gen = NULL; | ||
288 | } | ||
289 | |||
290 | |||
291 | return 1; | ||
292 | |||
293 | err: | ||
294 | GENERAL_NAME_free(gen); | ||
295 | M_ASN1_IA5STRING_free(email); | ||
296 | return 0; | ||
297 | |||
298 | } | ||
299 | |||
300 | STACK_OF(GENERAL_NAME) *v2i_GENERAL_NAMES(X509V3_EXT_METHOD *method, | ||
301 | X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval) | ||
302 | { | ||
303 | GENERAL_NAME *gen; | ||
304 | STACK_OF(GENERAL_NAME) *gens = NULL; | ||
305 | CONF_VALUE *cnf; | ||
306 | int i; | ||
307 | if(!(gens = sk_GENERAL_NAME_new_null())) { | ||
308 | X509V3err(X509V3_F_V2I_GENERAL_NAMES,ERR_R_MALLOC_FAILURE); | ||
309 | return NULL; | ||
310 | } | ||
311 | for(i = 0; i < sk_CONF_VALUE_num(nval); i++) { | ||
312 | cnf = sk_CONF_VALUE_value(nval, i); | ||
313 | if(!(gen = v2i_GENERAL_NAME(method, ctx, cnf))) goto err; | ||
314 | sk_GENERAL_NAME_push(gens, gen); | ||
315 | } | ||
316 | return gens; | ||
317 | err: | ||
318 | sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free); | ||
319 | return NULL; | ||
320 | } | ||
321 | |||
322 | GENERAL_NAME *v2i_GENERAL_NAME(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, | ||
323 | CONF_VALUE *cnf) | ||
324 | { | ||
325 | char is_string = 0; | ||
326 | int type; | ||
327 | GENERAL_NAME *gen = NULL; | ||
328 | |||
329 | char *name, *value; | ||
330 | |||
331 | name = cnf->name; | ||
332 | value = cnf->value; | ||
333 | |||
334 | if(!value) { | ||
335 | X509V3err(X509V3_F_V2I_GENERAL_NAME,X509V3_R_MISSING_VALUE); | ||
336 | return NULL; | ||
337 | } | ||
338 | |||
339 | if(!(gen = GENERAL_NAME_new())) { | ||
340 | X509V3err(X509V3_F_V2I_GENERAL_NAME,ERR_R_MALLOC_FAILURE); | ||
341 | return NULL; | ||
342 | } | ||
343 | |||
344 | if(!name_cmp(name, "email")) { | ||
345 | is_string = 1; | ||
346 | type = GEN_EMAIL; | ||
347 | } else if(!name_cmp(name, "URI")) { | ||
348 | is_string = 1; | ||
349 | type = GEN_URI; | ||
350 | } else if(!name_cmp(name, "DNS")) { | ||
351 | is_string = 1; | ||
352 | type = GEN_DNS; | ||
353 | } else if(!name_cmp(name, "RID")) { | ||
354 | ASN1_OBJECT *obj; | ||
355 | if(!(obj = OBJ_txt2obj(value,0))) { | ||
356 | X509V3err(X509V3_F_V2I_GENERAL_NAME,X509V3_R_BAD_OBJECT); | ||
357 | ERR_add_error_data(2, "value=", value); | ||
358 | goto err; | ||
359 | } | ||
360 | gen->d.rid = obj; | ||
361 | type = GEN_RID; | ||
362 | } else if(!name_cmp(name, "IP")) { | ||
363 | int i1,i2,i3,i4; | ||
364 | unsigned char ip[4]; | ||
365 | if((sscanf(value, "%d.%d.%d.%d",&i1,&i2,&i3,&i4) != 4) || | ||
366 | (i1 < 0) || (i1 > 255) || (i2 < 0) || (i2 > 255) || | ||
367 | (i3 < 0) || (i3 > 255) || (i4 < 0) || (i4 > 255) ) { | ||
368 | X509V3err(X509V3_F_V2I_GENERAL_NAME,X509V3_R_BAD_IP_ADDRESS); | ||
369 | ERR_add_error_data(2, "value=", value); | ||
370 | goto err; | ||
371 | } | ||
372 | ip[0] = i1; ip[1] = i2 ; ip[2] = i3 ; ip[3] = i4; | ||
373 | if(!(gen->d.ip = M_ASN1_OCTET_STRING_new()) || | ||
374 | !ASN1_STRING_set(gen->d.ip, ip, 4)) { | ||
375 | X509V3err(X509V3_F_V2I_GENERAL_NAME,ERR_R_MALLOC_FAILURE); | ||
376 | goto err; | ||
377 | } | ||
378 | type = GEN_IPADD; | ||
379 | } else { | ||
380 | X509V3err(X509V3_F_V2I_GENERAL_NAME,X509V3_R_UNSUPPORTED_OPTION); | ||
381 | ERR_add_error_data(2, "name=", name); | ||
382 | goto err; | ||
383 | } | ||
384 | |||
385 | if(is_string) { | ||
386 | if(!(gen->d.ia5 = M_ASN1_IA5STRING_new()) || | ||
387 | !ASN1_STRING_set(gen->d.ia5, (unsigned char*)value, | ||
388 | strlen(value))) { | ||
389 | X509V3err(X509V3_F_V2I_GENERAL_NAME,ERR_R_MALLOC_FAILURE); | ||
390 | goto err; | ||
391 | } | ||
392 | } | ||
393 | |||
394 | gen->type = type; | ||
395 | |||
396 | return gen; | ||
397 | |||
398 | err: | ||
399 | GENERAL_NAME_free(gen); | ||
400 | return NULL; | ||
401 | } | ||
diff --git a/src/lib/libcrypto/x509v3/v3_bcons.c b/src/lib/libcrypto/x509v3/v3_bcons.c deleted file mode 100644 index c576b8e955..0000000000 --- a/src/lib/libcrypto/x509v3/v3_bcons.c +++ /dev/null | |||
@@ -1,164 +0,0 @@ | |||
1 | /* v3_bcons.c */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 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 | |||
60 | #include <stdio.h> | ||
61 | #include "cryptlib.h" | ||
62 | #include <openssl/asn1.h> | ||
63 | #include <openssl/asn1_mac.h> | ||
64 | #include <openssl/conf.h> | ||
65 | #include <openssl/x509v3.h> | ||
66 | |||
67 | static STACK_OF(CONF_VALUE) *i2v_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method, BASIC_CONSTRAINTS *bcons, STACK_OF(CONF_VALUE) *extlist); | ||
68 | static BASIC_CONSTRAINTS *v2i_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values); | ||
69 | |||
70 | X509V3_EXT_METHOD v3_bcons = { | ||
71 | NID_basic_constraints, 0, | ||
72 | (X509V3_EXT_NEW)BASIC_CONSTRAINTS_new, | ||
73 | (X509V3_EXT_FREE)BASIC_CONSTRAINTS_free, | ||
74 | (X509V3_EXT_D2I)d2i_BASIC_CONSTRAINTS, | ||
75 | (X509V3_EXT_I2D)i2d_BASIC_CONSTRAINTS, | ||
76 | NULL, NULL, | ||
77 | (X509V3_EXT_I2V)i2v_BASIC_CONSTRAINTS, | ||
78 | (X509V3_EXT_V2I)v2i_BASIC_CONSTRAINTS, | ||
79 | NULL,NULL, | ||
80 | NULL | ||
81 | }; | ||
82 | |||
83 | |||
84 | int i2d_BASIC_CONSTRAINTS(BASIC_CONSTRAINTS *a, unsigned char **pp) | ||
85 | { | ||
86 | M_ASN1_I2D_vars(a); | ||
87 | if(a->ca) M_ASN1_I2D_len (a->ca, i2d_ASN1_BOOLEAN); | ||
88 | M_ASN1_I2D_len (a->pathlen, i2d_ASN1_INTEGER); | ||
89 | |||
90 | M_ASN1_I2D_seq_total(); | ||
91 | |||
92 | if (a->ca) M_ASN1_I2D_put (a->ca, i2d_ASN1_BOOLEAN); | ||
93 | M_ASN1_I2D_put (a->pathlen, i2d_ASN1_INTEGER); | ||
94 | M_ASN1_I2D_finish(); | ||
95 | } | ||
96 | |||
97 | BASIC_CONSTRAINTS *BASIC_CONSTRAINTS_new(void) | ||
98 | { | ||
99 | BASIC_CONSTRAINTS *ret=NULL; | ||
100 | ASN1_CTX c; | ||
101 | M_ASN1_New_Malloc(ret, BASIC_CONSTRAINTS); | ||
102 | ret->ca = 0; | ||
103 | ret->pathlen = NULL; | ||
104 | return (ret); | ||
105 | M_ASN1_New_Error(ASN1_F_BASIC_CONSTRAINTS_NEW); | ||
106 | } | ||
107 | |||
108 | BASIC_CONSTRAINTS *d2i_BASIC_CONSTRAINTS(BASIC_CONSTRAINTS **a, | ||
109 | unsigned char **pp, long length) | ||
110 | { | ||
111 | M_ASN1_D2I_vars(a,BASIC_CONSTRAINTS *,BASIC_CONSTRAINTS_new); | ||
112 | M_ASN1_D2I_Init(); | ||
113 | M_ASN1_D2I_start_sequence(); | ||
114 | if((M_ASN1_next & (~V_ASN1_CONSTRUCTED)) == | ||
115 | (V_ASN1_UNIVERSAL|V_ASN1_BOOLEAN) ) { | ||
116 | M_ASN1_D2I_get_int (ret->ca, d2i_ASN1_BOOLEAN); | ||
117 | } | ||
118 | M_ASN1_D2I_get_opt (ret->pathlen, d2i_ASN1_INTEGER, V_ASN1_INTEGER); | ||
119 | M_ASN1_D2I_Finish(a, BASIC_CONSTRAINTS_free, ASN1_F_D2I_BASIC_CONSTRAINTS); | ||
120 | } | ||
121 | |||
122 | void BASIC_CONSTRAINTS_free(BASIC_CONSTRAINTS *a) | ||
123 | { | ||
124 | if (a == NULL) return; | ||
125 | M_ASN1_INTEGER_free (a->pathlen); | ||
126 | OPENSSL_free (a); | ||
127 | } | ||
128 | |||
129 | static STACK_OF(CONF_VALUE) *i2v_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method, | ||
130 | BASIC_CONSTRAINTS *bcons, STACK_OF(CONF_VALUE) *extlist) | ||
131 | { | ||
132 | X509V3_add_value_bool("CA", bcons->ca, &extlist); | ||
133 | X509V3_add_value_int("pathlen", bcons->pathlen, &extlist); | ||
134 | return extlist; | ||
135 | } | ||
136 | |||
137 | static BASIC_CONSTRAINTS *v2i_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method, | ||
138 | X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values) | ||
139 | { | ||
140 | BASIC_CONSTRAINTS *bcons=NULL; | ||
141 | CONF_VALUE *val; | ||
142 | int i; | ||
143 | if(!(bcons = BASIC_CONSTRAINTS_new())) { | ||
144 | X509V3err(X509V3_F_V2I_BASIC_CONSTRAINTS, ERR_R_MALLOC_FAILURE); | ||
145 | return NULL; | ||
146 | } | ||
147 | for(i = 0; i < sk_CONF_VALUE_num(values); i++) { | ||
148 | val = sk_CONF_VALUE_value(values, i); | ||
149 | if(!strcmp(val->name, "CA")) { | ||
150 | if(!X509V3_get_value_bool(val, &bcons->ca)) goto err; | ||
151 | } else if(!strcmp(val->name, "pathlen")) { | ||
152 | if(!X509V3_get_value_int(val, &bcons->pathlen)) goto err; | ||
153 | } else { | ||
154 | X509V3err(X509V3_F_V2I_BASIC_CONSTRAINTS, X509V3_R_INVALID_NAME); | ||
155 | X509V3_conf_err(val); | ||
156 | goto err; | ||
157 | } | ||
158 | } | ||
159 | return bcons; | ||
160 | err: | ||
161 | BASIC_CONSTRAINTS_free(bcons); | ||
162 | return NULL; | ||
163 | } | ||
164 | |||
diff --git a/src/lib/libcrypto/x509v3/v3_bitst.c b/src/lib/libcrypto/x509v3/v3_bitst.c deleted file mode 100644 index 0e1167d05c..0000000000 --- a/src/lib/libcrypto/x509v3/v3_bitst.c +++ /dev/null | |||
@@ -1,141 +0,0 @@ | |||
1 | /* v3_bitst.c */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 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 "cryptlib.h" | ||
61 | #include <openssl/conf.h> | ||
62 | #include <openssl/x509v3.h> | ||
63 | |||
64 | static ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, | ||
65 | X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval); | ||
66 | static STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, | ||
67 | ASN1_BIT_STRING *bits, | ||
68 | STACK_OF(CONF_VALUE) *extlist); | ||
69 | static BIT_STRING_BITNAME ns_cert_type_table[] = { | ||
70 | {0, "SSL Client", "client"}, | ||
71 | {1, "SSL Server", "server"}, | ||
72 | {2, "S/MIME", "email"}, | ||
73 | {3, "Object Signing", "objsign"}, | ||
74 | {4, "Unused", "reserved"}, | ||
75 | {5, "SSL CA", "sslCA"}, | ||
76 | {6, "S/MIME CA", "emailCA"}, | ||
77 | {7, "Object Signing CA", "objCA"}, | ||
78 | {-1, NULL, NULL} | ||
79 | }; | ||
80 | |||
81 | static BIT_STRING_BITNAME key_usage_type_table[] = { | ||
82 | {0, "Digital Signature", "digitalSignature"}, | ||
83 | {1, "Non Repudiation", "nonRepudiation"}, | ||
84 | {2, "Key Encipherment", "keyEncipherment"}, | ||
85 | {3, "Data Encipherment", "dataEncipherment"}, | ||
86 | {4, "Key Agreement", "keyAgreement"}, | ||
87 | {5, "Certificate Sign", "keyCertSign"}, | ||
88 | {6, "CRL Sign", "cRLSign"}, | ||
89 | {7, "Encipher Only", "encipherOnly"}, | ||
90 | {8, "Decipher Only", "decipherOnly"}, | ||
91 | {-1, NULL, NULL} | ||
92 | }; | ||
93 | |||
94 | |||
95 | |||
96 | X509V3_EXT_METHOD v3_nscert = EXT_BITSTRING(NID_netscape_cert_type, ns_cert_type_table); | ||
97 | X509V3_EXT_METHOD v3_key_usage = EXT_BITSTRING(NID_key_usage, key_usage_type_table); | ||
98 | |||
99 | static STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, | ||
100 | ASN1_BIT_STRING *bits, STACK_OF(CONF_VALUE) *ret) | ||
101 | { | ||
102 | BIT_STRING_BITNAME *bnam; | ||
103 | for(bnam =method->usr_data; bnam->lname; bnam++) { | ||
104 | if(ASN1_BIT_STRING_get_bit(bits, bnam->bitnum)) | ||
105 | X509V3_add_value(bnam->lname, NULL, &ret); | ||
106 | } | ||
107 | return ret; | ||
108 | } | ||
109 | |||
110 | static ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, | ||
111 | X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval) | ||
112 | { | ||
113 | CONF_VALUE *val; | ||
114 | ASN1_BIT_STRING *bs; | ||
115 | int i; | ||
116 | BIT_STRING_BITNAME *bnam; | ||
117 | if(!(bs = M_ASN1_BIT_STRING_new())) { | ||
118 | X509V3err(X509V3_F_V2I_ASN1_BIT_STRING,ERR_R_MALLOC_FAILURE); | ||
119 | return NULL; | ||
120 | } | ||
121 | for(i = 0; i < sk_CONF_VALUE_num(nval); i++) { | ||
122 | val = sk_CONF_VALUE_value(nval, i); | ||
123 | for(bnam = method->usr_data; bnam->lname; bnam++) { | ||
124 | if(!strcmp(bnam->sname, val->name) || | ||
125 | !strcmp(bnam->lname, val->name) ) { | ||
126 | ASN1_BIT_STRING_set_bit(bs, bnam->bitnum, 1); | ||
127 | break; | ||
128 | } | ||
129 | } | ||
130 | if(!bnam->lname) { | ||
131 | X509V3err(X509V3_F_V2I_ASN1_BIT_STRING, | ||
132 | X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT); | ||
133 | X509V3_conf_err(val); | ||
134 | M_ASN1_BIT_STRING_free(bs); | ||
135 | return NULL; | ||
136 | } | ||
137 | } | ||
138 | return bs; | ||
139 | } | ||
140 | |||
141 | |||
diff --git a/src/lib/libcrypto/x509v3/v3_conf.c b/src/lib/libcrypto/x509v3/v3_conf.c deleted file mode 100644 index bdc9c1cbc1..0000000000 --- a/src/lib/libcrypto/x509v3/v3_conf.c +++ /dev/null | |||
@@ -1,390 +0,0 @@ | |||
1 | /* v3_conf.c */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 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 | /* extension creation utilities */ | ||
59 | |||
60 | |||
61 | |||
62 | #include <stdio.h> | ||
63 | #include <ctype.h> | ||
64 | #include "cryptlib.h" | ||
65 | #include <openssl/conf.h> | ||
66 | #include <openssl/x509.h> | ||
67 | #include <openssl/x509v3.h> | ||
68 | |||
69 | static int v3_check_critical(char **value); | ||
70 | static int v3_check_generic(char **value); | ||
71 | static X509_EXTENSION *do_ext_conf(LHASH *conf, X509V3_CTX *ctx, int ext_nid, int crit, char *value); | ||
72 | static X509_EXTENSION *v3_generic_extension(const char *ext, char *value, int crit, int type); | ||
73 | static char *conf_lhash_get_string(void *db, char *section, char *value); | ||
74 | static STACK_OF(CONF_VALUE) *conf_lhash_get_section(void *db, char *section); | ||
75 | static X509_EXTENSION *do_ext_i2d(X509V3_EXT_METHOD *method, int ext_nid, | ||
76 | int crit, void *ext_struc); | ||
77 | /* LHASH *conf: Config file */ | ||
78 | /* char *name: Name */ | ||
79 | /* char *value: Value */ | ||
80 | X509_EXTENSION *X509V3_EXT_conf(LHASH *conf, X509V3_CTX *ctx, char *name, | ||
81 | char *value) | ||
82 | { | ||
83 | int crit; | ||
84 | int ext_type; | ||
85 | X509_EXTENSION *ret; | ||
86 | crit = v3_check_critical(&value); | ||
87 | if((ext_type = v3_check_generic(&value))) | ||
88 | return v3_generic_extension(name, value, crit, ext_type); | ||
89 | ret = do_ext_conf(conf, ctx, OBJ_sn2nid(name), crit, value); | ||
90 | if(!ret) { | ||
91 | X509V3err(X509V3_F_X509V3_EXT_CONF,X509V3_R_ERROR_IN_EXTENSION); | ||
92 | ERR_add_error_data(4,"name=", name, ", value=", value); | ||
93 | } | ||
94 | return ret; | ||
95 | } | ||
96 | |||
97 | /* LHASH *conf: Config file */ | ||
98 | /* char *value: Value */ | ||
99 | X509_EXTENSION *X509V3_EXT_conf_nid(LHASH *conf, X509V3_CTX *ctx, int ext_nid, | ||
100 | char *value) | ||
101 | { | ||
102 | int crit; | ||
103 | int ext_type; | ||
104 | crit = v3_check_critical(&value); | ||
105 | if((ext_type = v3_check_generic(&value))) | ||
106 | return v3_generic_extension(OBJ_nid2sn(ext_nid), | ||
107 | value, crit, ext_type); | ||
108 | return do_ext_conf(conf, ctx, ext_nid, crit, value); | ||
109 | } | ||
110 | |||
111 | /* LHASH *conf: Config file */ | ||
112 | /* char *value: Value */ | ||
113 | static X509_EXTENSION *do_ext_conf(LHASH *conf, X509V3_CTX *ctx, int ext_nid, | ||
114 | int crit, char *value) | ||
115 | { | ||
116 | X509V3_EXT_METHOD *method; | ||
117 | X509_EXTENSION *ext; | ||
118 | STACK_OF(CONF_VALUE) *nval; | ||
119 | void *ext_struc; | ||
120 | if(ext_nid == NID_undef) { | ||
121 | X509V3err(X509V3_F_DO_EXT_CONF,X509V3_R_UNKNOWN_EXTENSION_NAME); | ||
122 | return NULL; | ||
123 | } | ||
124 | if(!(method = X509V3_EXT_get_nid(ext_nid))) { | ||
125 | X509V3err(X509V3_F_DO_EXT_CONF,X509V3_R_UNKNOWN_EXTENSION); | ||
126 | return NULL; | ||
127 | } | ||
128 | /* Now get internal extension representation based on type */ | ||
129 | if(method->v2i) { | ||
130 | if(*value == '@') nval = CONF_get_section(conf, value + 1); | ||
131 | else nval = X509V3_parse_list(value); | ||
132 | if(!nval) { | ||
133 | X509V3err(X509V3_F_X509V3_EXT_CONF,X509V3_R_INVALID_EXTENSION_STRING); | ||
134 | ERR_add_error_data(4, "name=", OBJ_nid2sn(ext_nid), ",section=", value); | ||
135 | return NULL; | ||
136 | } | ||
137 | ext_struc = method->v2i(method, ctx, nval); | ||
138 | if(*value != '@') sk_CONF_VALUE_pop_free(nval, | ||
139 | X509V3_conf_free); | ||
140 | if(!ext_struc) return NULL; | ||
141 | } else if(method->s2i) { | ||
142 | if(!(ext_struc = method->s2i(method, ctx, value))) return NULL; | ||
143 | } else if(method->r2i) { | ||
144 | if(!ctx->db) { | ||
145 | X509V3err(X509V3_F_X509V3_EXT_CONF,X509V3_R_NO_CONFIG_DATABASE); | ||
146 | return NULL; | ||
147 | } | ||
148 | if(!(ext_struc = method->r2i(method, ctx, value))) return NULL; | ||
149 | } else { | ||
150 | X509V3err(X509V3_F_X509V3_EXT_CONF,X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED); | ||
151 | ERR_add_error_data(2, "name=", OBJ_nid2sn(ext_nid)); | ||
152 | return NULL; | ||
153 | } | ||
154 | |||
155 | ext = do_ext_i2d(method, ext_nid, crit, ext_struc); | ||
156 | method->ext_free(ext_struc); | ||
157 | return ext; | ||
158 | |||
159 | } | ||
160 | |||
161 | static X509_EXTENSION *do_ext_i2d(X509V3_EXT_METHOD *method, int ext_nid, | ||
162 | int crit, void *ext_struc) | ||
163 | { | ||
164 | unsigned char *ext_der, *p; | ||
165 | int ext_len; | ||
166 | ASN1_OCTET_STRING *ext_oct; | ||
167 | X509_EXTENSION *ext; | ||
168 | /* Convert internal representation to DER */ | ||
169 | ext_len = method->i2d(ext_struc, NULL); | ||
170 | if(!(ext_der = OPENSSL_malloc(ext_len))) goto merr; | ||
171 | p = ext_der; | ||
172 | method->i2d(ext_struc, &p); | ||
173 | if(!(ext_oct = M_ASN1_OCTET_STRING_new())) goto merr; | ||
174 | ext_oct->data = ext_der; | ||
175 | ext_oct->length = ext_len; | ||
176 | |||
177 | ext = X509_EXTENSION_create_by_NID(NULL, ext_nid, crit, ext_oct); | ||
178 | if(!ext) goto merr; | ||
179 | M_ASN1_OCTET_STRING_free(ext_oct); | ||
180 | |||
181 | return ext; | ||
182 | |||
183 | merr: | ||
184 | X509V3err(X509V3_F_DO_EXT_I2D,ERR_R_MALLOC_FAILURE); | ||
185 | return NULL; | ||
186 | |||
187 | } | ||
188 | |||
189 | /* Given an internal structure, nid and critical flag create an extension */ | ||
190 | |||
191 | X509_EXTENSION *X509V3_EXT_i2d(int ext_nid, int crit, void *ext_struc) | ||
192 | { | ||
193 | X509V3_EXT_METHOD *method; | ||
194 | if(!(method = X509V3_EXT_get_nid(ext_nid))) { | ||
195 | X509V3err(X509V3_F_X509V3_EXT_I2D,X509V3_R_UNKNOWN_EXTENSION); | ||
196 | return NULL; | ||
197 | } | ||
198 | return do_ext_i2d(method, ext_nid, crit, ext_struc); | ||
199 | } | ||
200 | |||
201 | /* Check the extension string for critical flag */ | ||
202 | static int v3_check_critical(char **value) | ||
203 | { | ||
204 | char *p = *value; | ||
205 | if((strlen(p) < 9) || strncmp(p, "critical,", 9)) return 0; | ||
206 | p+=9; | ||
207 | while(isspace((unsigned char)*p)) p++; | ||
208 | *value = p; | ||
209 | return 1; | ||
210 | } | ||
211 | |||
212 | /* Check extension string for generic extension and return the type */ | ||
213 | static int v3_check_generic(char **value) | ||
214 | { | ||
215 | char *p = *value; | ||
216 | if((strlen(p) < 4) || strncmp(p, "DER:,", 4)) return 0; | ||
217 | p+=4; | ||
218 | while(isspace((unsigned char)*p)) p++; | ||
219 | *value = p; | ||
220 | return 1; | ||
221 | } | ||
222 | |||
223 | /* Create a generic extension: for now just handle DER type */ | ||
224 | static X509_EXTENSION *v3_generic_extension(const char *ext, char *value, | ||
225 | int crit, int type) | ||
226 | { | ||
227 | unsigned char *ext_der=NULL; | ||
228 | long ext_len; | ||
229 | ASN1_OBJECT *obj=NULL; | ||
230 | ASN1_OCTET_STRING *oct=NULL; | ||
231 | X509_EXTENSION *extension=NULL; | ||
232 | if(!(obj = OBJ_txt2obj(ext, 0))) { | ||
233 | X509V3err(X509V3_F_V3_GENERIC_EXTENSION,X509V3_R_EXTENSION_NAME_ERROR); | ||
234 | ERR_add_error_data(2, "name=", ext); | ||
235 | goto err; | ||
236 | } | ||
237 | |||
238 | if(!(ext_der = string_to_hex(value, &ext_len))) { | ||
239 | X509V3err(X509V3_F_V3_GENERIC_EXTENSION,X509V3_R_EXTENSION_VALUE_ERROR); | ||
240 | ERR_add_error_data(2, "value=", value); | ||
241 | goto err; | ||
242 | } | ||
243 | |||
244 | if(!(oct = M_ASN1_OCTET_STRING_new())) { | ||
245 | X509V3err(X509V3_F_V3_GENERIC_EXTENSION,ERR_R_MALLOC_FAILURE); | ||
246 | goto err; | ||
247 | } | ||
248 | |||
249 | oct->data = ext_der; | ||
250 | oct->length = ext_len; | ||
251 | ext_der = NULL; | ||
252 | |||
253 | extension = X509_EXTENSION_create_by_OBJ(NULL, obj, crit, oct); | ||
254 | |||
255 | err: | ||
256 | ASN1_OBJECT_free(obj); | ||
257 | M_ASN1_OCTET_STRING_free(oct); | ||
258 | if(ext_der) OPENSSL_free(ext_der); | ||
259 | return extension; | ||
260 | } | ||
261 | |||
262 | |||
263 | /* This is the main function: add a bunch of extensions based on a config file | ||
264 | * section | ||
265 | */ | ||
266 | |||
267 | int X509V3_EXT_add_conf(LHASH *conf, X509V3_CTX *ctx, char *section, | ||
268 | X509 *cert) | ||
269 | { | ||
270 | X509_EXTENSION *ext; | ||
271 | STACK_OF(CONF_VALUE) *nval; | ||
272 | CONF_VALUE *val; | ||
273 | int i; | ||
274 | if(!(nval = CONF_get_section(conf, section))) return 0; | ||
275 | for(i = 0; i < sk_CONF_VALUE_num(nval); i++) { | ||
276 | val = sk_CONF_VALUE_value(nval, i); | ||
277 | if(!(ext = X509V3_EXT_conf(conf, ctx, val->name, val->value))) | ||
278 | return 0; | ||
279 | if(cert) X509_add_ext(cert, ext, -1); | ||
280 | X509_EXTENSION_free(ext); | ||
281 | } | ||
282 | return 1; | ||
283 | } | ||
284 | |||
285 | /* Same as above but for a CRL */ | ||
286 | |||
287 | int X509V3_EXT_CRL_add_conf(LHASH *conf, X509V3_CTX *ctx, char *section, | ||
288 | X509_CRL *crl) | ||
289 | { | ||
290 | X509_EXTENSION *ext; | ||
291 | STACK_OF(CONF_VALUE) *nval; | ||
292 | CONF_VALUE *val; | ||
293 | int i; | ||
294 | if(!(nval = CONF_get_section(conf, section))) return 0; | ||
295 | for(i = 0; i < sk_CONF_VALUE_num(nval); i++) { | ||
296 | val = sk_CONF_VALUE_value(nval, i); | ||
297 | if(!(ext = X509V3_EXT_conf(conf, ctx, val->name, val->value))) | ||
298 | return 0; | ||
299 | if(crl) X509_CRL_add_ext(crl, ext, -1); | ||
300 | X509_EXTENSION_free(ext); | ||
301 | } | ||
302 | return 1; | ||
303 | } | ||
304 | |||
305 | /* Add extensions to certificate request */ | ||
306 | |||
307 | int X509V3_EXT_REQ_add_conf(LHASH *conf, X509V3_CTX *ctx, char *section, | ||
308 | X509_REQ *req) | ||
309 | { | ||
310 | X509_EXTENSION *ext; | ||
311 | STACK_OF(X509_EXTENSION) *extlist = NULL; | ||
312 | STACK_OF(CONF_VALUE) *nval; | ||
313 | CONF_VALUE *val; | ||
314 | int i; | ||
315 | if(!(nval = CONF_get_section(conf, section))) return 0; | ||
316 | for(i = 0; i < sk_CONF_VALUE_num(nval); i++) { | ||
317 | val = sk_CONF_VALUE_value(nval, i); | ||
318 | if(!(ext = X509V3_EXT_conf(conf, ctx, val->name, val->value))) | ||
319 | return 0; | ||
320 | if(!extlist) extlist = sk_X509_EXTENSION_new_null(); | ||
321 | sk_X509_EXTENSION_push(extlist, ext); | ||
322 | } | ||
323 | if(req) i = X509_REQ_add_extensions(req, extlist); | ||
324 | else i = 1; | ||
325 | sk_X509_EXTENSION_pop_free(extlist, X509_EXTENSION_free); | ||
326 | return i; | ||
327 | } | ||
328 | |||
329 | /* Config database functions */ | ||
330 | |||
331 | char * X509V3_get_string(X509V3_CTX *ctx, char *name, char *section) | ||
332 | { | ||
333 | if(ctx->db_meth->get_string) | ||
334 | return ctx->db_meth->get_string(ctx->db, name, section); | ||
335 | return NULL; | ||
336 | } | ||
337 | |||
338 | STACK_OF(CONF_VALUE) * X509V3_get_section(X509V3_CTX *ctx, char *section) | ||
339 | { | ||
340 | if(ctx->db_meth->get_section) | ||
341 | return ctx->db_meth->get_section(ctx->db, section); | ||
342 | return NULL; | ||
343 | } | ||
344 | |||
345 | void X509V3_string_free(X509V3_CTX *ctx, char *str) | ||
346 | { | ||
347 | if(!str) return; | ||
348 | if(ctx->db_meth->free_string) | ||
349 | ctx->db_meth->free_string(ctx->db, str); | ||
350 | } | ||
351 | |||
352 | void X509V3_section_free(X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *section) | ||
353 | { | ||
354 | if(!section) return; | ||
355 | if(ctx->db_meth->free_section) | ||
356 | ctx->db_meth->free_section(ctx->db, section); | ||
357 | } | ||
358 | |||
359 | static char *conf_lhash_get_string(void *db, char *section, char *value) | ||
360 | { | ||
361 | return CONF_get_string(db, section, value); | ||
362 | } | ||
363 | |||
364 | static STACK_OF(CONF_VALUE) *conf_lhash_get_section(void *db, char *section) | ||
365 | { | ||
366 | return CONF_get_section(db, section); | ||
367 | } | ||
368 | |||
369 | static X509V3_CONF_METHOD conf_lhash_method = { | ||
370 | conf_lhash_get_string, | ||
371 | conf_lhash_get_section, | ||
372 | NULL, | ||
373 | NULL | ||
374 | }; | ||
375 | |||
376 | void X509V3_set_conf_lhash(X509V3_CTX *ctx, LHASH *lhash) | ||
377 | { | ||
378 | ctx->db_meth = &conf_lhash_method; | ||
379 | ctx->db = lhash; | ||
380 | } | ||
381 | |||
382 | void X509V3_set_ctx(X509V3_CTX *ctx, X509 *issuer, X509 *subj, X509_REQ *req, | ||
383 | X509_CRL *crl, int flags) | ||
384 | { | ||
385 | ctx->issuer_cert = issuer; | ||
386 | ctx->subject_cert = subj; | ||
387 | ctx->crl = crl; | ||
388 | ctx->subject_req = req; | ||
389 | ctx->flags = flags; | ||
390 | } | ||
diff --git a/src/lib/libcrypto/x509v3/v3_cpols.c b/src/lib/libcrypto/x509v3/v3_cpols.c deleted file mode 100644 index 8203ed7571..0000000000 --- a/src/lib/libcrypto/x509v3/v3_cpols.c +++ /dev/null | |||
@@ -1,660 +0,0 @@ | |||
1 | /* v3_cpols.c */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 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 "cryptlib.h" | ||
61 | #include <openssl/conf.h> | ||
62 | #include <openssl/asn1.h> | ||
63 | #include <openssl/asn1_mac.h> | ||
64 | #include <openssl/x509v3.h> | ||
65 | |||
66 | /* Certificate policies extension support: this one is a bit complex... */ | ||
67 | |||
68 | static int i2r_certpol(X509V3_EXT_METHOD *method, STACK_OF(POLICYINFO) *pol, BIO *out, int indent); | ||
69 | static STACK_OF(POLICYINFO) *r2i_certpol(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *value); | ||
70 | static void print_qualifiers(BIO *out, STACK_OF(POLICYQUALINFO) *quals, int indent); | ||
71 | static void print_notice(BIO *out, USERNOTICE *notice, int indent); | ||
72 | static POLICYINFO *policy_section(X509V3_CTX *ctx, | ||
73 | STACK_OF(CONF_VALUE) *polstrs, int ia5org); | ||
74 | static POLICYQUALINFO *notice_section(X509V3_CTX *ctx, | ||
75 | STACK_OF(CONF_VALUE) *unot, int ia5org); | ||
76 | static STACK_OF(ASN1_INTEGER) *nref_nos(STACK_OF(CONF_VALUE) *nos); | ||
77 | |||
78 | X509V3_EXT_METHOD v3_cpols = { | ||
79 | NID_certificate_policies, 0, | ||
80 | (X509V3_EXT_NEW)CERTIFICATEPOLICIES_new, | ||
81 | (X509V3_EXT_FREE)CERTIFICATEPOLICIES_free, | ||
82 | (X509V3_EXT_D2I)d2i_CERTIFICATEPOLICIES, | ||
83 | (X509V3_EXT_I2D)i2d_CERTIFICATEPOLICIES, | ||
84 | NULL, NULL, | ||
85 | NULL, NULL, | ||
86 | (X509V3_EXT_I2R)i2r_certpol, | ||
87 | (X509V3_EXT_R2I)r2i_certpol, | ||
88 | NULL | ||
89 | }; | ||
90 | |||
91 | |||
92 | static STACK_OF(POLICYINFO) *r2i_certpol(X509V3_EXT_METHOD *method, | ||
93 | X509V3_CTX *ctx, char *value) | ||
94 | { | ||
95 | STACK_OF(POLICYINFO) *pols = NULL; | ||
96 | char *pstr; | ||
97 | POLICYINFO *pol; | ||
98 | ASN1_OBJECT *pobj; | ||
99 | STACK_OF(CONF_VALUE) *vals; | ||
100 | CONF_VALUE *cnf; | ||
101 | int i, ia5org; | ||
102 | pols = sk_POLICYINFO_new_null(); | ||
103 | vals = X509V3_parse_list(value); | ||
104 | ia5org = 0; | ||
105 | for(i = 0; i < sk_CONF_VALUE_num(vals); i++) { | ||
106 | cnf = sk_CONF_VALUE_value(vals, i); | ||
107 | if(cnf->value || !cnf->name ) { | ||
108 | X509V3err(X509V3_F_R2I_CERTPOL,X509V3_R_INVALID_POLICY_IDENTIFIER); | ||
109 | X509V3_conf_err(cnf); | ||
110 | goto err; | ||
111 | } | ||
112 | pstr = cnf->name; | ||
113 | if(!strcmp(pstr,"ia5org")) { | ||
114 | ia5org = 1; | ||
115 | continue; | ||
116 | } else if(*pstr == '@') { | ||
117 | STACK_OF(CONF_VALUE) *polsect; | ||
118 | polsect = X509V3_get_section(ctx, pstr + 1); | ||
119 | if(!polsect) { | ||
120 | X509V3err(X509V3_F_R2I_CERTPOL,X509V3_R_INVALID_SECTION); | ||
121 | |||
122 | X509V3_conf_err(cnf); | ||
123 | goto err; | ||
124 | } | ||
125 | pol = policy_section(ctx, polsect, ia5org); | ||
126 | X509V3_section_free(ctx, polsect); | ||
127 | if(!pol) goto err; | ||
128 | } else { | ||
129 | if(!(pobj = OBJ_txt2obj(cnf->name, 0))) { | ||
130 | X509V3err(X509V3_F_R2I_CERTPOL,X509V3_R_INVALID_OBJECT_IDENTIFIER); | ||
131 | X509V3_conf_err(cnf); | ||
132 | goto err; | ||
133 | } | ||
134 | pol = POLICYINFO_new(); | ||
135 | pol->policyid = pobj; | ||
136 | } | ||
137 | sk_POLICYINFO_push(pols, pol); | ||
138 | } | ||
139 | sk_CONF_VALUE_pop_free(vals, X509V3_conf_free); | ||
140 | return pols; | ||
141 | err: | ||
142 | sk_POLICYINFO_pop_free(pols, POLICYINFO_free); | ||
143 | return NULL; | ||
144 | } | ||
145 | |||
146 | static POLICYINFO *policy_section(X509V3_CTX *ctx, | ||
147 | STACK_OF(CONF_VALUE) *polstrs, int ia5org) | ||
148 | { | ||
149 | int i; | ||
150 | CONF_VALUE *cnf; | ||
151 | POLICYINFO *pol; | ||
152 | POLICYQUALINFO *qual; | ||
153 | if(!(pol = POLICYINFO_new())) goto merr; | ||
154 | for(i = 0; i < sk_CONF_VALUE_num(polstrs); i++) { | ||
155 | cnf = sk_CONF_VALUE_value(polstrs, i); | ||
156 | if(!strcmp(cnf->name, "policyIdentifier")) { | ||
157 | ASN1_OBJECT *pobj; | ||
158 | if(!(pobj = OBJ_txt2obj(cnf->value, 0))) { | ||
159 | X509V3err(X509V3_F_POLICY_SECTION,X509V3_R_INVALID_OBJECT_IDENTIFIER); | ||
160 | X509V3_conf_err(cnf); | ||
161 | goto err; | ||
162 | } | ||
163 | pol->policyid = pobj; | ||
164 | |||
165 | } else if(!name_cmp(cnf->name, "CPS")) { | ||
166 | if(!pol->qualifiers) pol->qualifiers = | ||
167 | sk_POLICYQUALINFO_new_null(); | ||
168 | if(!(qual = POLICYQUALINFO_new())) goto merr; | ||
169 | if(!sk_POLICYQUALINFO_push(pol->qualifiers, qual)) | ||
170 | goto merr; | ||
171 | qual->pqualid = OBJ_nid2obj(NID_id_qt_cps); | ||
172 | qual->d.cpsuri = M_ASN1_IA5STRING_new(); | ||
173 | if(!ASN1_STRING_set(qual->d.cpsuri, cnf->value, | ||
174 | strlen(cnf->value))) goto merr; | ||
175 | } else if(!name_cmp(cnf->name, "userNotice")) { | ||
176 | STACK_OF(CONF_VALUE) *unot; | ||
177 | if(*cnf->value != '@') { | ||
178 | X509V3err(X509V3_F_POLICY_SECTION,X509V3_R_EXPECTED_A_SECTION_NAME); | ||
179 | X509V3_conf_err(cnf); | ||
180 | goto err; | ||
181 | } | ||
182 | unot = X509V3_get_section(ctx, cnf->value + 1); | ||
183 | if(!unot) { | ||
184 | X509V3err(X509V3_F_POLICY_SECTION,X509V3_R_INVALID_SECTION); | ||
185 | |||
186 | X509V3_conf_err(cnf); | ||
187 | goto err; | ||
188 | } | ||
189 | qual = notice_section(ctx, unot, ia5org); | ||
190 | X509V3_section_free(ctx, unot); | ||
191 | if(!qual) goto err; | ||
192 | if(!sk_POLICYQUALINFO_push(pol->qualifiers, qual)) | ||
193 | goto merr; | ||
194 | } else { | ||
195 | X509V3err(X509V3_F_POLICY_SECTION,X509V3_R_INVALID_OPTION); | ||
196 | |||
197 | X509V3_conf_err(cnf); | ||
198 | goto err; | ||
199 | } | ||
200 | } | ||
201 | if(!pol->policyid) { | ||
202 | X509V3err(X509V3_F_POLICY_SECTION,X509V3_R_NO_POLICY_IDENTIFIER); | ||
203 | goto err; | ||
204 | } | ||
205 | |||
206 | return pol; | ||
207 | |||
208 | merr: | ||
209 | X509V3err(X509V3_F_POLICY_SECTION,ERR_R_MALLOC_FAILURE); | ||
210 | |||
211 | err: | ||
212 | POLICYINFO_free(pol); | ||
213 | return NULL; | ||
214 | |||
215 | |||
216 | } | ||
217 | |||
218 | static POLICYQUALINFO *notice_section(X509V3_CTX *ctx, | ||
219 | STACK_OF(CONF_VALUE) *unot, int ia5org) | ||
220 | { | ||
221 | int i; | ||
222 | CONF_VALUE *cnf; | ||
223 | USERNOTICE *not; | ||
224 | POLICYQUALINFO *qual; | ||
225 | if(!(qual = POLICYQUALINFO_new())) goto merr; | ||
226 | qual->pqualid = OBJ_nid2obj(NID_id_qt_unotice); | ||
227 | if(!(not = USERNOTICE_new())) goto merr; | ||
228 | qual->d.usernotice = not; | ||
229 | for(i = 0; i < sk_CONF_VALUE_num(unot); i++) { | ||
230 | cnf = sk_CONF_VALUE_value(unot, i); | ||
231 | if(!strcmp(cnf->name, "explicitText")) { | ||
232 | not->exptext = M_ASN1_VISIBLESTRING_new(); | ||
233 | if(!ASN1_STRING_set(not->exptext, cnf->value, | ||
234 | strlen(cnf->value))) goto merr; | ||
235 | } else if(!strcmp(cnf->name, "organization")) { | ||
236 | NOTICEREF *nref; | ||
237 | if(!not->noticeref) { | ||
238 | if(!(nref = NOTICEREF_new())) goto merr; | ||
239 | not->noticeref = nref; | ||
240 | } else nref = not->noticeref; | ||
241 | if(ia5org) nref->organization = M_ASN1_IA5STRING_new(); | ||
242 | else nref->organization = M_ASN1_VISIBLESTRING_new(); | ||
243 | if(!ASN1_STRING_set(nref->organization, cnf->value, | ||
244 | strlen(cnf->value))) goto merr; | ||
245 | } else if(!strcmp(cnf->name, "noticeNumbers")) { | ||
246 | NOTICEREF *nref; | ||
247 | STACK_OF(CONF_VALUE) *nos; | ||
248 | if(!not->noticeref) { | ||
249 | if(!(nref = NOTICEREF_new())) goto merr; | ||
250 | not->noticeref = nref; | ||
251 | } else nref = not->noticeref; | ||
252 | nos = X509V3_parse_list(cnf->value); | ||
253 | if(!nos || !sk_CONF_VALUE_num(nos)) { | ||
254 | X509V3err(X509V3_F_NOTICE_SECTION,X509V3_R_INVALID_NUMBERS); | ||
255 | X509V3_conf_err(cnf); | ||
256 | goto err; | ||
257 | } | ||
258 | nref->noticenos = nref_nos(nos); | ||
259 | sk_CONF_VALUE_pop_free(nos, X509V3_conf_free); | ||
260 | if(!nref->noticenos) goto err; | ||
261 | } else { | ||
262 | X509V3err(X509V3_F_NOTICE_SECTION,X509V3_R_INVALID_OPTION); | ||
263 | |||
264 | X509V3_conf_err(cnf); | ||
265 | goto err; | ||
266 | } | ||
267 | } | ||
268 | |||
269 | if(not->noticeref && | ||
270 | (!not->noticeref->noticenos || !not->noticeref->organization)) { | ||
271 | X509V3err(X509V3_F_NOTICE_SECTION,X509V3_R_NEED_ORGANIZATION_AND_NUMBERS); | ||
272 | goto err; | ||
273 | } | ||
274 | |||
275 | return qual; | ||
276 | |||
277 | merr: | ||
278 | X509V3err(X509V3_F_NOTICE_SECTION,ERR_R_MALLOC_FAILURE); | ||
279 | |||
280 | err: | ||
281 | POLICYQUALINFO_free(qual); | ||
282 | return NULL; | ||
283 | } | ||
284 | |||
285 | static STACK_OF(ASN1_INTEGER) *nref_nos(STACK_OF(CONF_VALUE) *nos) | ||
286 | { | ||
287 | STACK_OF(ASN1_INTEGER) *nnums; | ||
288 | CONF_VALUE *cnf; | ||
289 | ASN1_INTEGER *aint; | ||
290 | |||
291 | int i; | ||
292 | |||
293 | if(!(nnums = sk_ASN1_INTEGER_new_null())) goto merr; | ||
294 | for(i = 0; i < sk_CONF_VALUE_num(nos); i++) { | ||
295 | cnf = sk_CONF_VALUE_value(nos, i); | ||
296 | if(!(aint = s2i_ASN1_INTEGER(NULL, cnf->name))) { | ||
297 | X509V3err(X509V3_F_NREF_NOS,X509V3_R_INVALID_NUMBER); | ||
298 | goto err; | ||
299 | } | ||
300 | if(!sk_ASN1_INTEGER_push(nnums, aint)) goto merr; | ||
301 | } | ||
302 | return nnums; | ||
303 | |||
304 | merr: | ||
305 | X509V3err(X509V3_F_NOTICE_SECTION,ERR_R_MALLOC_FAILURE); | ||
306 | |||
307 | err: | ||
308 | sk_ASN1_INTEGER_pop_free(nnums, ASN1_STRING_free); | ||
309 | return NULL; | ||
310 | } | ||
311 | |||
312 | |||
313 | static int i2r_certpol(X509V3_EXT_METHOD *method, STACK_OF(POLICYINFO) *pol, | ||
314 | BIO *out, int indent) | ||
315 | { | ||
316 | int i; | ||
317 | POLICYINFO *pinfo; | ||
318 | /* First print out the policy OIDs */ | ||
319 | for(i = 0; i < sk_POLICYINFO_num(pol); i++) { | ||
320 | pinfo = sk_POLICYINFO_value(pol, i); | ||
321 | BIO_printf(out, "%*sPolicy: ", indent, ""); | ||
322 | i2a_ASN1_OBJECT(out, pinfo->policyid); | ||
323 | BIO_puts(out, "\n"); | ||
324 | if(pinfo->qualifiers) | ||
325 | print_qualifiers(out, pinfo->qualifiers, indent + 2); | ||
326 | } | ||
327 | return 1; | ||
328 | } | ||
329 | |||
330 | |||
331 | int i2d_CERTIFICATEPOLICIES(STACK_OF(POLICYINFO) *a, unsigned char **pp) | ||
332 | { | ||
333 | |||
334 | return i2d_ASN1_SET_OF_POLICYINFO(a, pp, i2d_POLICYINFO, V_ASN1_SEQUENCE, | ||
335 | V_ASN1_UNIVERSAL, IS_SEQUENCE);} | ||
336 | |||
337 | STACK_OF(POLICYINFO) *CERTIFICATEPOLICIES_new(void) | ||
338 | { | ||
339 | return sk_POLICYINFO_new_null(); | ||
340 | } | ||
341 | |||
342 | void CERTIFICATEPOLICIES_free(STACK_OF(POLICYINFO) *a) | ||
343 | { | ||
344 | sk_POLICYINFO_pop_free(a, POLICYINFO_free); | ||
345 | } | ||
346 | |||
347 | STACK_OF(POLICYINFO) *d2i_CERTIFICATEPOLICIES(STACK_OF(POLICYINFO) **a, | ||
348 | unsigned char **pp,long length) | ||
349 | { | ||
350 | return d2i_ASN1_SET_OF_POLICYINFO(a, pp, length, d2i_POLICYINFO, | ||
351 | POLICYINFO_free, V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL); | ||
352 | |||
353 | } | ||
354 | |||
355 | IMPLEMENT_STACK_OF(POLICYINFO) | ||
356 | IMPLEMENT_ASN1_SET_OF(POLICYINFO) | ||
357 | |||
358 | int i2d_POLICYINFO(POLICYINFO *a, unsigned char **pp) | ||
359 | { | ||
360 | M_ASN1_I2D_vars(a); | ||
361 | |||
362 | M_ASN1_I2D_len (a->policyid, i2d_ASN1_OBJECT); | ||
363 | M_ASN1_I2D_len_SEQUENCE_type(POLICYQUALINFO, a->qualifiers, | ||
364 | i2d_POLICYQUALINFO); | ||
365 | |||
366 | M_ASN1_I2D_seq_total(); | ||
367 | |||
368 | M_ASN1_I2D_put (a->policyid, i2d_ASN1_OBJECT); | ||
369 | M_ASN1_I2D_put_SEQUENCE_type(POLICYQUALINFO, a->qualifiers, | ||
370 | i2d_POLICYQUALINFO); | ||
371 | |||
372 | M_ASN1_I2D_finish(); | ||
373 | } | ||
374 | |||
375 | POLICYINFO *POLICYINFO_new(void) | ||
376 | { | ||
377 | POLICYINFO *ret=NULL; | ||
378 | ASN1_CTX c; | ||
379 | M_ASN1_New_Malloc(ret, POLICYINFO); | ||
380 | ret->policyid = NULL; | ||
381 | ret->qualifiers = NULL; | ||
382 | return (ret); | ||
383 | M_ASN1_New_Error(ASN1_F_POLICYINFO_NEW); | ||
384 | } | ||
385 | |||
386 | POLICYINFO *d2i_POLICYINFO(POLICYINFO **a, unsigned char **pp,long length) | ||
387 | { | ||
388 | M_ASN1_D2I_vars(a,POLICYINFO *,POLICYINFO_new); | ||
389 | M_ASN1_D2I_Init(); | ||
390 | M_ASN1_D2I_start_sequence(); | ||
391 | M_ASN1_D2I_get(ret->policyid, d2i_ASN1_OBJECT); | ||
392 | if(!M_ASN1_D2I_end_sequence()) { | ||
393 | M_ASN1_D2I_get_seq_type (POLICYQUALINFO, ret->qualifiers, | ||
394 | d2i_POLICYQUALINFO, POLICYQUALINFO_free); | ||
395 | } | ||
396 | M_ASN1_D2I_Finish(a, POLICYINFO_free, ASN1_F_D2I_POLICYINFO); | ||
397 | } | ||
398 | |||
399 | void POLICYINFO_free(POLICYINFO *a) | ||
400 | { | ||
401 | if (a == NULL) return; | ||
402 | ASN1_OBJECT_free(a->policyid); | ||
403 | sk_POLICYQUALINFO_pop_free(a->qualifiers, POLICYQUALINFO_free); | ||
404 | OPENSSL_free (a); | ||
405 | } | ||
406 | |||
407 | static void print_qualifiers(BIO *out, STACK_OF(POLICYQUALINFO) *quals, | ||
408 | int indent) | ||
409 | { | ||
410 | POLICYQUALINFO *qualinfo; | ||
411 | int i; | ||
412 | for(i = 0; i < sk_POLICYQUALINFO_num(quals); i++) { | ||
413 | qualinfo = sk_POLICYQUALINFO_value(quals, i); | ||
414 | switch(OBJ_obj2nid(qualinfo->pqualid)) | ||
415 | { | ||
416 | case NID_id_qt_cps: | ||
417 | BIO_printf(out, "%*sCPS: %s\n", indent, "", | ||
418 | qualinfo->d.cpsuri->data); | ||
419 | break; | ||
420 | |||
421 | case NID_id_qt_unotice: | ||
422 | BIO_printf(out, "%*sUser Notice:\n", indent, ""); | ||
423 | print_notice(out, qualinfo->d.usernotice, indent + 2); | ||
424 | break; | ||
425 | |||
426 | default: | ||
427 | BIO_printf(out, "%*sUnknown Qualifier: ", | ||
428 | indent + 2, ""); | ||
429 | |||
430 | i2a_ASN1_OBJECT(out, qualinfo->pqualid); | ||
431 | BIO_puts(out, "\n"); | ||
432 | break; | ||
433 | } | ||
434 | } | ||
435 | } | ||
436 | |||
437 | static void print_notice(BIO *out, USERNOTICE *notice, int indent) | ||
438 | { | ||
439 | int i; | ||
440 | if(notice->noticeref) { | ||
441 | NOTICEREF *ref; | ||
442 | ref = notice->noticeref; | ||
443 | BIO_printf(out, "%*sOrganization: %s\n", indent, "", | ||
444 | ref->organization->data); | ||
445 | BIO_printf(out, "%*sNumber%s: ", indent, "", | ||
446 | sk_ASN1_INTEGER_num(ref->noticenos) > 1 ? "s" : ""); | ||
447 | for(i = 0; i < sk_ASN1_INTEGER_num(ref->noticenos); i++) { | ||
448 | ASN1_INTEGER *num; | ||
449 | char *tmp; | ||
450 | num = sk_ASN1_INTEGER_value(ref->noticenos, i); | ||
451 | if(i) BIO_puts(out, ", "); | ||
452 | tmp = i2s_ASN1_INTEGER(NULL, num); | ||
453 | BIO_puts(out, tmp); | ||
454 | OPENSSL_free(tmp); | ||
455 | } | ||
456 | BIO_puts(out, "\n"); | ||
457 | } | ||
458 | if(notice->exptext) | ||
459 | BIO_printf(out, "%*sExplicit Text: %s\n", indent, "", | ||
460 | notice->exptext->data); | ||
461 | } | ||
462 | |||
463 | |||
464 | |||
465 | int i2d_POLICYQUALINFO(POLICYQUALINFO *a, unsigned char **pp) | ||
466 | { | ||
467 | M_ASN1_I2D_vars(a); | ||
468 | |||
469 | M_ASN1_I2D_len (a->pqualid, i2d_ASN1_OBJECT); | ||
470 | switch(OBJ_obj2nid(a->pqualid)) { | ||
471 | case NID_id_qt_cps: | ||
472 | M_ASN1_I2D_len(a->d.cpsuri, i2d_ASN1_IA5STRING); | ||
473 | break; | ||
474 | |||
475 | case NID_id_qt_unotice: | ||
476 | M_ASN1_I2D_len(a->d.usernotice, i2d_USERNOTICE); | ||
477 | break; | ||
478 | |||
479 | default: | ||
480 | M_ASN1_I2D_len(a->d.other, i2d_ASN1_TYPE); | ||
481 | break; | ||
482 | } | ||
483 | |||
484 | M_ASN1_I2D_seq_total(); | ||
485 | |||
486 | M_ASN1_I2D_put (a->pqualid, i2d_ASN1_OBJECT); | ||
487 | switch(OBJ_obj2nid(a->pqualid)) { | ||
488 | case NID_id_qt_cps: | ||
489 | M_ASN1_I2D_put(a->d.cpsuri, i2d_ASN1_IA5STRING); | ||
490 | break; | ||
491 | |||
492 | case NID_id_qt_unotice: | ||
493 | M_ASN1_I2D_put(a->d.usernotice, i2d_USERNOTICE); | ||
494 | break; | ||
495 | |||
496 | default: | ||
497 | M_ASN1_I2D_put(a->d.other, i2d_ASN1_TYPE); | ||
498 | break; | ||
499 | } | ||
500 | |||
501 | M_ASN1_I2D_finish(); | ||
502 | } | ||
503 | |||
504 | POLICYQUALINFO *POLICYQUALINFO_new(void) | ||
505 | { | ||
506 | POLICYQUALINFO *ret=NULL; | ||
507 | ASN1_CTX c; | ||
508 | M_ASN1_New_Malloc(ret, POLICYQUALINFO); | ||
509 | ret->pqualid = NULL; | ||
510 | ret->d.other = NULL; | ||
511 | return (ret); | ||
512 | M_ASN1_New_Error(ASN1_F_POLICYQUALINFO_NEW); | ||
513 | } | ||
514 | |||
515 | POLICYQUALINFO *d2i_POLICYQUALINFO(POLICYQUALINFO **a, unsigned char **pp, | ||
516 | long length) | ||
517 | { | ||
518 | M_ASN1_D2I_vars(a,POLICYQUALINFO *,POLICYQUALINFO_new); | ||
519 | M_ASN1_D2I_Init(); | ||
520 | M_ASN1_D2I_start_sequence(); | ||
521 | M_ASN1_D2I_get (ret->pqualid, d2i_ASN1_OBJECT); | ||
522 | switch(OBJ_obj2nid(ret->pqualid)) { | ||
523 | case NID_id_qt_cps: | ||
524 | M_ASN1_D2I_get(ret->d.cpsuri, d2i_ASN1_IA5STRING); | ||
525 | break; | ||
526 | |||
527 | case NID_id_qt_unotice: | ||
528 | M_ASN1_D2I_get(ret->d.usernotice, d2i_USERNOTICE); | ||
529 | break; | ||
530 | |||
531 | default: | ||
532 | M_ASN1_D2I_get(ret->d.other, d2i_ASN1_TYPE); | ||
533 | break; | ||
534 | } | ||
535 | M_ASN1_D2I_Finish(a, POLICYQUALINFO_free, ASN1_F_D2I_POLICYQUALINFO); | ||
536 | } | ||
537 | |||
538 | void POLICYQUALINFO_free(POLICYQUALINFO *a) | ||
539 | { | ||
540 | if (a == NULL) return; | ||
541 | switch(OBJ_obj2nid(a->pqualid)) { | ||
542 | case NID_id_qt_cps: | ||
543 | M_ASN1_IA5STRING_free(a->d.cpsuri); | ||
544 | break; | ||
545 | |||
546 | case NID_id_qt_unotice: | ||
547 | USERNOTICE_free(a->d.usernotice); | ||
548 | break; | ||
549 | |||
550 | default: | ||
551 | ASN1_TYPE_free(a->d.other); | ||
552 | break; | ||
553 | } | ||
554 | |||
555 | ASN1_OBJECT_free(a->pqualid); | ||
556 | OPENSSL_free (a); | ||
557 | } | ||
558 | |||
559 | int i2d_USERNOTICE(USERNOTICE *a, unsigned char **pp) | ||
560 | { | ||
561 | M_ASN1_I2D_vars(a); | ||
562 | |||
563 | M_ASN1_I2D_len (a->noticeref, i2d_NOTICEREF); | ||
564 | M_ASN1_I2D_len (a->exptext, i2d_DISPLAYTEXT); | ||
565 | |||
566 | M_ASN1_I2D_seq_total(); | ||
567 | |||
568 | M_ASN1_I2D_put (a->noticeref, i2d_NOTICEREF); | ||
569 | M_ASN1_I2D_put (a->exptext, i2d_DISPLAYTEXT); | ||
570 | |||
571 | M_ASN1_I2D_finish(); | ||
572 | } | ||
573 | |||
574 | USERNOTICE *USERNOTICE_new(void) | ||
575 | { | ||
576 | USERNOTICE *ret=NULL; | ||
577 | ASN1_CTX c; | ||
578 | M_ASN1_New_Malloc(ret, USERNOTICE); | ||
579 | ret->noticeref = NULL; | ||
580 | ret->exptext = NULL; | ||
581 | return (ret); | ||
582 | M_ASN1_New_Error(ASN1_F_USERNOTICE_NEW); | ||
583 | } | ||
584 | |||
585 | USERNOTICE *d2i_USERNOTICE(USERNOTICE **a, unsigned char **pp,long length) | ||
586 | { | ||
587 | M_ASN1_D2I_vars(a,USERNOTICE *,USERNOTICE_new); | ||
588 | M_ASN1_D2I_Init(); | ||
589 | M_ASN1_D2I_start_sequence(); | ||
590 | M_ASN1_D2I_get_opt(ret->noticeref, d2i_NOTICEREF, V_ASN1_SEQUENCE); | ||
591 | if (!M_ASN1_D2I_end_sequence()) { | ||
592 | M_ASN1_D2I_get(ret->exptext, d2i_DISPLAYTEXT); | ||
593 | } | ||
594 | M_ASN1_D2I_Finish(a, USERNOTICE_free, ASN1_F_D2I_USERNOTICE); | ||
595 | } | ||
596 | |||
597 | void USERNOTICE_free(USERNOTICE *a) | ||
598 | { | ||
599 | if (a == NULL) return; | ||
600 | NOTICEREF_free(a->noticeref); | ||
601 | M_DISPLAYTEXT_free(a->exptext); | ||
602 | OPENSSL_free (a); | ||
603 | } | ||
604 | |||
605 | int i2d_NOTICEREF(NOTICEREF *a, unsigned char **pp) | ||
606 | { | ||
607 | M_ASN1_I2D_vars(a); | ||
608 | |||
609 | M_ASN1_I2D_len (a->organization, i2d_DISPLAYTEXT); | ||
610 | M_ASN1_I2D_len_SEQUENCE_type(ASN1_INTEGER, a->noticenos, | ||
611 | i2d_ASN1_INTEGER); | ||
612 | |||
613 | M_ASN1_I2D_seq_total(); | ||
614 | |||
615 | M_ASN1_I2D_put (a->organization, i2d_DISPLAYTEXT); | ||
616 | M_ASN1_I2D_put_SEQUENCE_type(ASN1_INTEGER, a->noticenos, | ||
617 | i2d_ASN1_INTEGER); | ||
618 | |||
619 | M_ASN1_I2D_finish(); | ||
620 | } | ||
621 | |||
622 | NOTICEREF *NOTICEREF_new(void) | ||
623 | { | ||
624 | NOTICEREF *ret=NULL; | ||
625 | ASN1_CTX c; | ||
626 | M_ASN1_New_Malloc(ret, NOTICEREF); | ||
627 | ret->organization = NULL; | ||
628 | ret->noticenos = NULL; | ||
629 | return (ret); | ||
630 | M_ASN1_New_Error(ASN1_F_NOTICEREF_NEW); | ||
631 | } | ||
632 | |||
633 | NOTICEREF *d2i_NOTICEREF(NOTICEREF **a, unsigned char **pp,long length) | ||
634 | { | ||
635 | M_ASN1_D2I_vars(a,NOTICEREF *,NOTICEREF_new); | ||
636 | M_ASN1_D2I_Init(); | ||
637 | M_ASN1_D2I_start_sequence(); | ||
638 | /* This is to cope with some broken encodings that use IA5STRING for | ||
639 | * the organization field | ||
640 | */ | ||
641 | M_ASN1_D2I_get_opt(ret->organization, d2i_ASN1_IA5STRING, | ||
642 | V_ASN1_IA5STRING); | ||
643 | if(!ret->organization) { | ||
644 | M_ASN1_D2I_get(ret->organization, d2i_DISPLAYTEXT); | ||
645 | } | ||
646 | M_ASN1_D2I_get_seq_type(ASN1_INTEGER, ret->noticenos, d2i_ASN1_INTEGER, | ||
647 | ASN1_STRING_free); | ||
648 | M_ASN1_D2I_Finish(a, NOTICEREF_free, ASN1_F_D2I_NOTICEREF); | ||
649 | } | ||
650 | |||
651 | void NOTICEREF_free(NOTICEREF *a) | ||
652 | { | ||
653 | if (a == NULL) return; | ||
654 | M_DISPLAYTEXT_free(a->organization); | ||
655 | sk_ASN1_INTEGER_pop_free(a->noticenos, ASN1_STRING_free); | ||
656 | OPENSSL_free (a); | ||
657 | } | ||
658 | |||
659 | IMPLEMENT_STACK_OF(POLICYQUALINFO) | ||
660 | IMPLEMENT_ASN1_SET_OF(POLICYQUALINFO) | ||
diff --git a/src/lib/libcrypto/x509v3/v3_crld.c b/src/lib/libcrypto/x509v3/v3_crld.c deleted file mode 100644 index 67feea4017..0000000000 --- a/src/lib/libcrypto/x509v3/v3_crld.c +++ /dev/null | |||
@@ -1,285 +0,0 @@ | |||
1 | /* v3_crld.c */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 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 "cryptlib.h" | ||
61 | #include <openssl/conf.h> | ||
62 | #include <openssl/asn1.h> | ||
63 | #include <openssl/asn1_mac.h> | ||
64 | #include <openssl/x509v3.h> | ||
65 | |||
66 | static STACK_OF(CONF_VALUE) *i2v_crld(X509V3_EXT_METHOD *method, | ||
67 | STACK_OF(DIST_POINT) *crld, STACK_OF(CONF_VALUE) *extlist); | ||
68 | static STACK_OF(DIST_POINT) *v2i_crld(X509V3_EXT_METHOD *method, | ||
69 | X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval); | ||
70 | |||
71 | X509V3_EXT_METHOD v3_crld = { | ||
72 | NID_crl_distribution_points, X509V3_EXT_MULTILINE, | ||
73 | (X509V3_EXT_NEW)CRL_DIST_POINTS_new, | ||
74 | (X509V3_EXT_FREE)CRL_DIST_POINTS_free, | ||
75 | (X509V3_EXT_D2I)d2i_CRL_DIST_POINTS, | ||
76 | (X509V3_EXT_I2D)i2d_CRL_DIST_POINTS, | ||
77 | NULL, NULL, | ||
78 | (X509V3_EXT_I2V)i2v_crld, | ||
79 | (X509V3_EXT_V2I)v2i_crld, | ||
80 | NULL, NULL, NULL | ||
81 | }; | ||
82 | |||
83 | static STACK_OF(CONF_VALUE) *i2v_crld(X509V3_EXT_METHOD *method, | ||
84 | STACK_OF(DIST_POINT) *crld, STACK_OF(CONF_VALUE) *exts) | ||
85 | { | ||
86 | DIST_POINT *point; | ||
87 | int i; | ||
88 | for(i = 0; i < sk_DIST_POINT_num(crld); i++) { | ||
89 | point = sk_DIST_POINT_value(crld, i); | ||
90 | if(point->distpoint && point->distpoint->fullname) { | ||
91 | exts = i2v_GENERAL_NAMES(NULL, | ||
92 | point->distpoint->fullname, exts); | ||
93 | } | ||
94 | if(point->reasons) | ||
95 | X509V3_add_value("reasons","<UNSUPPORTED>", &exts); | ||
96 | if(point->CRLissuer) | ||
97 | X509V3_add_value("CRLissuer","<UNSUPPORTED>", &exts); | ||
98 | if(point->distpoint && point->distpoint->relativename) | ||
99 | X509V3_add_value("RelativeName","<UNSUPPORTED>", &exts); | ||
100 | } | ||
101 | return exts; | ||
102 | } | ||
103 | |||
104 | static STACK_OF(DIST_POINT) *v2i_crld(X509V3_EXT_METHOD *method, | ||
105 | X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval) | ||
106 | { | ||
107 | STACK_OF(DIST_POINT) *crld = NULL; | ||
108 | STACK_OF(GENERAL_NAME) *gens = NULL; | ||
109 | GENERAL_NAME *gen = NULL; | ||
110 | CONF_VALUE *cnf; | ||
111 | int i; | ||
112 | if(!(crld = sk_DIST_POINT_new_null())) goto merr; | ||
113 | for(i = 0; i < sk_CONF_VALUE_num(nval); i++) { | ||
114 | DIST_POINT *point; | ||
115 | cnf = sk_CONF_VALUE_value(nval, i); | ||
116 | if(!(gen = v2i_GENERAL_NAME(method, ctx, cnf))) goto err; | ||
117 | if(!(gens = GENERAL_NAMES_new())) goto merr; | ||
118 | if(!sk_GENERAL_NAME_push(gens, gen)) goto merr; | ||
119 | gen = NULL; | ||
120 | if(!(point = DIST_POINT_new())) goto merr; | ||
121 | if(!sk_DIST_POINT_push(crld, point)) { | ||
122 | DIST_POINT_free(point); | ||
123 | goto merr; | ||
124 | } | ||
125 | if(!(point->distpoint = DIST_POINT_NAME_new())) goto merr; | ||
126 | point->distpoint->fullname = gens; | ||
127 | gens = NULL; | ||
128 | } | ||
129 | return crld; | ||
130 | |||
131 | merr: | ||
132 | X509V3err(X509V3_F_V2I_CRLD,ERR_R_MALLOC_FAILURE); | ||
133 | err: | ||
134 | GENERAL_NAME_free(gen); | ||
135 | GENERAL_NAMES_free(gens); | ||
136 | sk_DIST_POINT_pop_free(crld, DIST_POINT_free); | ||
137 | return NULL; | ||
138 | } | ||
139 | |||
140 | int i2d_CRL_DIST_POINTS(STACK_OF(DIST_POINT) *a, unsigned char **pp) | ||
141 | { | ||
142 | |||
143 | return i2d_ASN1_SET_OF_DIST_POINT(a, pp, i2d_DIST_POINT, V_ASN1_SEQUENCE, | ||
144 | V_ASN1_UNIVERSAL, IS_SEQUENCE);} | ||
145 | |||
146 | STACK_OF(DIST_POINT) *CRL_DIST_POINTS_new(void) | ||
147 | { | ||
148 | return sk_DIST_POINT_new_null(); | ||
149 | } | ||
150 | |||
151 | void CRL_DIST_POINTS_free(STACK_OF(DIST_POINT) *a) | ||
152 | { | ||
153 | sk_DIST_POINT_pop_free(a, DIST_POINT_free); | ||
154 | } | ||
155 | |||
156 | STACK_OF(DIST_POINT) *d2i_CRL_DIST_POINTS(STACK_OF(DIST_POINT) **a, | ||
157 | unsigned char **pp,long length) | ||
158 | { | ||
159 | return d2i_ASN1_SET_OF_DIST_POINT(a, pp, length, d2i_DIST_POINT, | ||
160 | DIST_POINT_free, V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL); | ||
161 | |||
162 | } | ||
163 | |||
164 | IMPLEMENT_STACK_OF(DIST_POINT) | ||
165 | IMPLEMENT_ASN1_SET_OF(DIST_POINT) | ||
166 | |||
167 | int i2d_DIST_POINT(DIST_POINT *a, unsigned char **pp) | ||
168 | { | ||
169 | int v = 0; | ||
170 | M_ASN1_I2D_vars(a); | ||
171 | /* NB: underlying type is a CHOICE so need EXPLICIT tagging */ | ||
172 | M_ASN1_I2D_len_EXP_opt (a->distpoint, i2d_DIST_POINT_NAME, 0, v); | ||
173 | M_ASN1_I2D_len_IMP_opt (a->reasons, i2d_ASN1_BIT_STRING); | ||
174 | M_ASN1_I2D_len_IMP_opt (a->CRLissuer, i2d_GENERAL_NAMES); | ||
175 | |||
176 | M_ASN1_I2D_seq_total(); | ||
177 | |||
178 | M_ASN1_I2D_put_EXP_opt (a->distpoint, i2d_DIST_POINT_NAME, 0, v); | ||
179 | M_ASN1_I2D_put_IMP_opt (a->reasons, i2d_ASN1_BIT_STRING, 1); | ||
180 | M_ASN1_I2D_put_IMP_opt (a->CRLissuer, i2d_GENERAL_NAMES, 2); | ||
181 | |||
182 | M_ASN1_I2D_finish(); | ||
183 | } | ||
184 | |||
185 | DIST_POINT *DIST_POINT_new(void) | ||
186 | { | ||
187 | DIST_POINT *ret=NULL; | ||
188 | ASN1_CTX c; | ||
189 | M_ASN1_New_Malloc(ret, DIST_POINT); | ||
190 | ret->distpoint = NULL; | ||
191 | ret->reasons = NULL; | ||
192 | ret->CRLissuer = NULL; | ||
193 | return (ret); | ||
194 | M_ASN1_New_Error(ASN1_F_DIST_POINT_NEW); | ||
195 | } | ||
196 | |||
197 | DIST_POINT *d2i_DIST_POINT(DIST_POINT **a, unsigned char **pp, long length) | ||
198 | { | ||
199 | M_ASN1_D2I_vars(a,DIST_POINT *,DIST_POINT_new); | ||
200 | M_ASN1_D2I_Init(); | ||
201 | M_ASN1_D2I_start_sequence(); | ||
202 | M_ASN1_D2I_get_EXP_opt (ret->distpoint, d2i_DIST_POINT_NAME, 0); | ||
203 | M_ASN1_D2I_get_IMP_opt (ret->reasons, d2i_ASN1_BIT_STRING, 1, | ||
204 | V_ASN1_BIT_STRING); | ||
205 | M_ASN1_D2I_get_IMP_opt (ret->CRLissuer, d2i_GENERAL_NAMES, 2, | ||
206 | V_ASN1_SEQUENCE); | ||
207 | M_ASN1_D2I_Finish(a, DIST_POINT_free, ASN1_F_D2I_DIST_POINT); | ||
208 | } | ||
209 | |||
210 | void DIST_POINT_free(DIST_POINT *a) | ||
211 | { | ||
212 | if (a == NULL) return; | ||
213 | DIST_POINT_NAME_free(a->distpoint); | ||
214 | M_ASN1_BIT_STRING_free(a->reasons); | ||
215 | sk_GENERAL_NAME_pop_free(a->CRLissuer, GENERAL_NAME_free); | ||
216 | OPENSSL_free (a); | ||
217 | } | ||
218 | |||
219 | int i2d_DIST_POINT_NAME(DIST_POINT_NAME *a, unsigned char **pp) | ||
220 | { | ||
221 | M_ASN1_I2D_vars(a); | ||
222 | |||
223 | if(a->fullname) { | ||
224 | M_ASN1_I2D_len_IMP_opt (a->fullname, i2d_GENERAL_NAMES); | ||
225 | } else { | ||
226 | M_ASN1_I2D_len_IMP_SET_opt_type(X509_NAME_ENTRY, | ||
227 | a->relativename, i2d_X509_NAME_ENTRY, 1); | ||
228 | } | ||
229 | |||
230 | /* Don't want a SEQUENCE so... */ | ||
231 | if(pp == NULL) return ret; | ||
232 | p = *pp; | ||
233 | |||
234 | if(a->fullname) { | ||
235 | M_ASN1_I2D_put_IMP_opt (a->fullname, i2d_GENERAL_NAMES, 0); | ||
236 | } else { | ||
237 | M_ASN1_I2D_put_IMP_SET_opt_type(X509_NAME_ENTRY, | ||
238 | a->relativename, i2d_X509_NAME_ENTRY, 1); | ||
239 | } | ||
240 | M_ASN1_I2D_finish(); | ||
241 | } | ||
242 | |||
243 | DIST_POINT_NAME *DIST_POINT_NAME_new(void) | ||
244 | { | ||
245 | DIST_POINT_NAME *ret=NULL; | ||
246 | ASN1_CTX c; | ||
247 | M_ASN1_New_Malloc(ret, DIST_POINT_NAME); | ||
248 | ret->fullname = NULL; | ||
249 | ret->relativename = NULL; | ||
250 | return (ret); | ||
251 | M_ASN1_New_Error(ASN1_F_DIST_POINT_NAME_NEW); | ||
252 | } | ||
253 | |||
254 | void DIST_POINT_NAME_free(DIST_POINT_NAME *a) | ||
255 | { | ||
256 | if (a == NULL) return; | ||
257 | sk_X509_NAME_ENTRY_pop_free(a->relativename, X509_NAME_ENTRY_free); | ||
258 | sk_GENERAL_NAME_pop_free(a->fullname, GENERAL_NAME_free); | ||
259 | OPENSSL_free (a); | ||
260 | } | ||
261 | |||
262 | DIST_POINT_NAME *d2i_DIST_POINT_NAME(DIST_POINT_NAME **a, unsigned char **pp, | ||
263 | long length) | ||
264 | { | ||
265 | unsigned char _tmp, tag; | ||
266 | M_ASN1_D2I_vars(a,DIST_POINT_NAME *,DIST_POINT_NAME_new); | ||
267 | M_ASN1_D2I_Init(); | ||
268 | c.slen = length; | ||
269 | |||
270 | _tmp = M_ASN1_next; | ||
271 | tag = _tmp & ~V_ASN1_CONSTRUCTED; | ||
272 | |||
273 | if(tag == (0|V_ASN1_CONTEXT_SPECIFIC)) { | ||
274 | M_ASN1_D2I_get_imp(ret->fullname, d2i_GENERAL_NAMES, | ||
275 | V_ASN1_SEQUENCE); | ||
276 | } else if (tag == (1|V_ASN1_CONTEXT_SPECIFIC)) { | ||
277 | M_ASN1_D2I_get_IMP_set_opt_type (X509_NAME_ENTRY, | ||
278 | ret->relativename, d2i_X509_NAME_ENTRY, X509_NAME_ENTRY_free, 1); | ||
279 | } else { | ||
280 | c.error = ASN1_R_BAD_TAG; | ||
281 | goto err; | ||
282 | } | ||
283 | |||
284 | M_ASN1_D2I_Finish(a, DIST_POINT_NAME_free, ASN1_F_D2I_DIST_POINT_NAME); | ||
285 | } | ||
diff --git a/src/lib/libcrypto/x509v3/v3_enum.c b/src/lib/libcrypto/x509v3/v3_enum.c deleted file mode 100644 index aecfdc87f8..0000000000 --- a/src/lib/libcrypto/x509v3/v3_enum.c +++ /dev/null | |||
@@ -1,96 +0,0 @@ | |||
1 | /* v3_enum.c */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 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 "cryptlib.h" | ||
61 | #include <openssl/x509v3.h> | ||
62 | |||
63 | static ENUMERATED_NAMES crl_reasons[] = { | ||
64 | {0, "Unspecified", "unspecified"}, | ||
65 | {1, "Key Compromise", "keyCompromise"}, | ||
66 | {2, "CA Compromise", "CACompromise"}, | ||
67 | {3, "Affiliation Changed", "affiliationChanged"}, | ||
68 | {4, "Superseded", "superseded"}, | ||
69 | {5, "Cessation Of Operation", "cessationOfOperation"}, | ||
70 | {6, "Certificate Hold", "certificateHold"}, | ||
71 | {8, "Remove From CRL", "removeFromCRL"}, | ||
72 | {-1, NULL, NULL} | ||
73 | }; | ||
74 | |||
75 | X509V3_EXT_METHOD v3_crl_reason = { | ||
76 | NID_crl_reason, 0, | ||
77 | (X509V3_EXT_NEW)ASN1_ENUMERATED_new, | ||
78 | (X509V3_EXT_FREE)ASN1_ENUMERATED_free, | ||
79 | (X509V3_EXT_D2I)d2i_ASN1_ENUMERATED, | ||
80 | (X509V3_EXT_I2D)i2d_ASN1_ENUMERATED, | ||
81 | (X509V3_EXT_I2S)i2s_ASN1_ENUMERATED_TABLE, | ||
82 | (X509V3_EXT_S2I)0, | ||
83 | NULL, NULL, NULL, NULL, crl_reasons}; | ||
84 | |||
85 | |||
86 | char *i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *method, | ||
87 | ASN1_ENUMERATED *e) | ||
88 | { | ||
89 | ENUMERATED_NAMES *enam; | ||
90 | long strval; | ||
91 | strval = ASN1_ENUMERATED_get(e); | ||
92 | for(enam = method->usr_data; enam->lname; enam++) { | ||
93 | if(strval == enam->bitnum) return BUF_strdup(enam->lname); | ||
94 | } | ||
95 | return i2s_ASN1_ENUMERATED(method, e); | ||
96 | } | ||
diff --git a/src/lib/libcrypto/x509v3/v3_extku.c b/src/lib/libcrypto/x509v3/v3_extku.c deleted file mode 100644 index 53ec40a027..0000000000 --- a/src/lib/libcrypto/x509v3/v3_extku.c +++ /dev/null | |||
@@ -1,150 +0,0 @@ | |||
1 | /* v3_extku.c */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 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 | |||
60 | #include <stdio.h> | ||
61 | #include "cryptlib.h" | ||
62 | #include <openssl/asn1.h> | ||
63 | #include <openssl/conf.h> | ||
64 | #include <openssl/x509v3.h> | ||
65 | |||
66 | static STACK_OF(ASN1_OBJECT) *v2i_ext_ku(X509V3_EXT_METHOD *method, | ||
67 | X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval); | ||
68 | static STACK_OF(CONF_VALUE) *i2v_ext_ku(X509V3_EXT_METHOD *method, | ||
69 | STACK_OF(ASN1_OBJECT) *eku, STACK_OF(CONF_VALUE) *extlist); | ||
70 | X509V3_EXT_METHOD v3_ext_ku = { | ||
71 | NID_ext_key_usage, 0, | ||
72 | (X509V3_EXT_NEW)ext_ku_new, | ||
73 | (X509V3_EXT_FREE)ext_ku_free, | ||
74 | (X509V3_EXT_D2I)d2i_ext_ku, | ||
75 | (X509V3_EXT_I2D)i2d_ext_ku, | ||
76 | NULL, NULL, | ||
77 | (X509V3_EXT_I2V)i2v_ext_ku, | ||
78 | (X509V3_EXT_V2I)v2i_ext_ku, | ||
79 | NULL,NULL, | ||
80 | NULL | ||
81 | }; | ||
82 | |||
83 | STACK_OF(ASN1_OBJECT) *ext_ku_new(void) | ||
84 | { | ||
85 | return sk_ASN1_OBJECT_new_null(); | ||
86 | } | ||
87 | |||
88 | void ext_ku_free(STACK_OF(ASN1_OBJECT) *eku) | ||
89 | { | ||
90 | sk_ASN1_OBJECT_pop_free(eku, ASN1_OBJECT_free); | ||
91 | return; | ||
92 | } | ||
93 | |||
94 | int i2d_ext_ku(STACK_OF(ASN1_OBJECT) *a, unsigned char **pp) | ||
95 | { | ||
96 | return i2d_ASN1_SET_OF_ASN1_OBJECT(a, pp, i2d_ASN1_OBJECT, | ||
97 | V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL, IS_SEQUENCE); | ||
98 | } | ||
99 | |||
100 | STACK_OF(ASN1_OBJECT) *d2i_ext_ku(STACK_OF(ASN1_OBJECT) **a, | ||
101 | unsigned char **pp, long length) | ||
102 | { | ||
103 | return d2i_ASN1_SET_OF_ASN1_OBJECT(a, pp, length, d2i_ASN1_OBJECT, | ||
104 | ASN1_OBJECT_free, V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL); | ||
105 | } | ||
106 | |||
107 | |||
108 | |||
109 | static STACK_OF(CONF_VALUE) *i2v_ext_ku(X509V3_EXT_METHOD *method, | ||
110 | STACK_OF(ASN1_OBJECT) *eku, STACK_OF(CONF_VALUE) *ext_list) | ||
111 | { | ||
112 | int i; | ||
113 | ASN1_OBJECT *obj; | ||
114 | char obj_tmp[80]; | ||
115 | for(i = 0; i < sk_ASN1_OBJECT_num(eku); i++) { | ||
116 | obj = sk_ASN1_OBJECT_value(eku, i); | ||
117 | i2t_ASN1_OBJECT(obj_tmp, 80, obj); | ||
118 | X509V3_add_value(NULL, obj_tmp, &ext_list); | ||
119 | } | ||
120 | return ext_list; | ||
121 | } | ||
122 | |||
123 | static STACK_OF(ASN1_OBJECT) *v2i_ext_ku(X509V3_EXT_METHOD *method, | ||
124 | X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval) | ||
125 | { | ||
126 | STACK_OF(ASN1_OBJECT) *extku; | ||
127 | char *extval; | ||
128 | ASN1_OBJECT *objtmp; | ||
129 | CONF_VALUE *val; | ||
130 | int i; | ||
131 | |||
132 | if(!(extku = sk_ASN1_OBJECT_new_null())) { | ||
133 | X509V3err(X509V3_F_V2I_EXT_KU,ERR_R_MALLOC_FAILURE); | ||
134 | return NULL; | ||
135 | } | ||
136 | |||
137 | for(i = 0; i < sk_CONF_VALUE_num(nval); i++) { | ||
138 | val = sk_CONF_VALUE_value(nval, i); | ||
139 | if(val->value) extval = val->value; | ||
140 | else extval = val->name; | ||
141 | if(!(objtmp = OBJ_txt2obj(extval, 0))) { | ||
142 | sk_ASN1_OBJECT_pop_free(extku, ASN1_OBJECT_free); | ||
143 | X509V3err(X509V3_F_V2I_EXT_KU,X509V3_R_INVALID_OBJECT_IDENTIFIER); | ||
144 | X509V3_conf_err(val); | ||
145 | return NULL; | ||
146 | } | ||
147 | sk_ASN1_OBJECT_push(extku, objtmp); | ||
148 | } | ||
149 | return extku; | ||
150 | } | ||
diff --git a/src/lib/libcrypto/x509v3/v3_genn.c b/src/lib/libcrypto/x509v3/v3_genn.c deleted file mode 100644 index d44751458e..0000000000 --- a/src/lib/libcrypto/x509v3/v3_genn.c +++ /dev/null | |||
@@ -1,291 +0,0 @@ | |||
1 | /* v3_genn.c */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 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 | |||
60 | #include <stdio.h> | ||
61 | #include "cryptlib.h" | ||
62 | #include <openssl/asn1.h> | ||
63 | #include <openssl/asn1_mac.h> | ||
64 | #include <openssl/conf.h> | ||
65 | #include <openssl/x509v3.h> | ||
66 | |||
67 | int i2d_GENERAL_NAME(GENERAL_NAME *a, unsigned char **pp) | ||
68 | { | ||
69 | unsigned char *p; | ||
70 | int ret; | ||
71 | |||
72 | ret = 0; | ||
73 | |||
74 | /* Save the location of initial TAG */ | ||
75 | if(pp) p = *pp; | ||
76 | else p = NULL; | ||
77 | |||
78 | /* GEN_DNAME needs special treatment because of EXPLICIT tag */ | ||
79 | |||
80 | if(a->type == GEN_DIRNAME) { | ||
81 | int v = 0; | ||
82 | M_ASN1_I2D_len_EXP_opt(a->d.dirn, i2d_X509_NAME, 4, v); | ||
83 | if(!p) return ret; | ||
84 | M_ASN1_I2D_put_EXP_opt(a->d.dirn, i2d_X509_NAME, 4, v); | ||
85 | *pp = p; | ||
86 | return ret; | ||
87 | } | ||
88 | |||
89 | switch(a->type) { | ||
90 | |||
91 | case GEN_X400: | ||
92 | case GEN_EDIPARTY: | ||
93 | ret = i2d_ASN1_TYPE(a->d.other, pp); | ||
94 | break; | ||
95 | |||
96 | case GEN_OTHERNAME: | ||
97 | ret = i2d_OTHERNAME(a->d.otherName, pp); | ||
98 | break; | ||
99 | |||
100 | case GEN_EMAIL: | ||
101 | case GEN_DNS: | ||
102 | case GEN_URI: | ||
103 | ret = i2d_ASN1_IA5STRING(a->d.ia5, pp); | ||
104 | break; | ||
105 | |||
106 | case GEN_IPADD: | ||
107 | ret = i2d_ASN1_OCTET_STRING(a->d.ip, pp); | ||
108 | break; | ||
109 | |||
110 | case GEN_RID: | ||
111 | ret = i2d_ASN1_OBJECT(a->d.rid, pp); | ||
112 | break; | ||
113 | } | ||
114 | /* Replace TAG with IMPLICIT value */ | ||
115 | if(p) *p = (*p & V_ASN1_CONSTRUCTED) | a->type; | ||
116 | return ret; | ||
117 | } | ||
118 | |||
119 | GENERAL_NAME *GENERAL_NAME_new() | ||
120 | { | ||
121 | GENERAL_NAME *ret=NULL; | ||
122 | ASN1_CTX c; | ||
123 | M_ASN1_New_Malloc(ret, GENERAL_NAME); | ||
124 | ret->type = -1; | ||
125 | ret->d.ptr = NULL; | ||
126 | return (ret); | ||
127 | M_ASN1_New_Error(ASN1_F_GENERAL_NAME_NEW); | ||
128 | } | ||
129 | |||
130 | GENERAL_NAME *d2i_GENERAL_NAME(GENERAL_NAME **a, unsigned char **pp, | ||
131 | long length) | ||
132 | { | ||
133 | unsigned char _tmp; | ||
134 | M_ASN1_D2I_vars(a,GENERAL_NAME *,GENERAL_NAME_new); | ||
135 | M_ASN1_D2I_Init(); | ||
136 | c.slen = length; | ||
137 | |||
138 | _tmp = M_ASN1_next; | ||
139 | ret->type = _tmp & ~V_ASN1_CONSTRUCTED; | ||
140 | |||
141 | switch(ret->type) { | ||
142 | /* Just put these in a "blob" for now */ | ||
143 | case GEN_X400: | ||
144 | case GEN_EDIPARTY: | ||
145 | M_ASN1_D2I_get_imp(ret->d.other, d2i_ASN1_TYPE,V_ASN1_SEQUENCE); | ||
146 | break; | ||
147 | |||
148 | case GEN_OTHERNAME: | ||
149 | M_ASN1_D2I_get_imp(ret->d.otherName, d2i_OTHERNAME,V_ASN1_SEQUENCE); | ||
150 | break; | ||
151 | |||
152 | case GEN_EMAIL: | ||
153 | case GEN_DNS: | ||
154 | case GEN_URI: | ||
155 | M_ASN1_D2I_get_imp(ret->d.ia5, d2i_ASN1_IA5STRING, | ||
156 | V_ASN1_IA5STRING); | ||
157 | break; | ||
158 | |||
159 | case GEN_DIRNAME: | ||
160 | M_ASN1_D2I_get_EXP_opt(ret->d.dirn, d2i_X509_NAME, 4); | ||
161 | break; | ||
162 | |||
163 | case GEN_IPADD: | ||
164 | M_ASN1_D2I_get_imp(ret->d.ip, d2i_ASN1_OCTET_STRING, | ||
165 | V_ASN1_OCTET_STRING); | ||
166 | break; | ||
167 | |||
168 | case GEN_RID: | ||
169 | M_ASN1_D2I_get_imp(ret->d.rid, d2i_ASN1_OBJECT,V_ASN1_OBJECT); | ||
170 | break; | ||
171 | |||
172 | default: | ||
173 | c.error = ASN1_R_BAD_TAG; | ||
174 | goto err; | ||
175 | } | ||
176 | |||
177 | c.slen = 0; | ||
178 | M_ASN1_D2I_Finish(a, GENERAL_NAME_free, ASN1_F_D2I_GENERAL_NAME); | ||
179 | } | ||
180 | |||
181 | void GENERAL_NAME_free(GENERAL_NAME *a) | ||
182 | { | ||
183 | if (a == NULL) return; | ||
184 | switch(a->type) { | ||
185 | case GEN_X400: | ||
186 | case GEN_EDIPARTY: | ||
187 | ASN1_TYPE_free(a->d.other); | ||
188 | break; | ||
189 | |||
190 | case GEN_OTHERNAME: | ||
191 | OTHERNAME_free(a->d.otherName); | ||
192 | break; | ||
193 | |||
194 | case GEN_EMAIL: | ||
195 | case GEN_DNS: | ||
196 | case GEN_URI: | ||
197 | |||
198 | M_ASN1_IA5STRING_free(a->d.ia5); | ||
199 | break; | ||
200 | |||
201 | case GEN_DIRNAME: | ||
202 | X509_NAME_free(a->d.dirn); | ||
203 | break; | ||
204 | |||
205 | case GEN_IPADD: | ||
206 | M_ASN1_OCTET_STRING_free(a->d.ip); | ||
207 | break; | ||
208 | |||
209 | case GEN_RID: | ||
210 | ASN1_OBJECT_free(a->d.rid); | ||
211 | break; | ||
212 | |||
213 | } | ||
214 | OPENSSL_free (a); | ||
215 | } | ||
216 | |||
217 | /* Now the GeneralNames versions: a SEQUENCE OF GeneralName. These are needed as | ||
218 | * explicit functions. | ||
219 | */ | ||
220 | |||
221 | STACK_OF(GENERAL_NAME) *GENERAL_NAMES_new() | ||
222 | { | ||
223 | return sk_GENERAL_NAME_new_null(); | ||
224 | } | ||
225 | |||
226 | void GENERAL_NAMES_free(STACK_OF(GENERAL_NAME) *a) | ||
227 | { | ||
228 | sk_GENERAL_NAME_pop_free(a, GENERAL_NAME_free); | ||
229 | } | ||
230 | |||
231 | STACK_OF(GENERAL_NAME) *d2i_GENERAL_NAMES(STACK_OF(GENERAL_NAME) **a, | ||
232 | unsigned char **pp, long length) | ||
233 | { | ||
234 | return d2i_ASN1_SET_OF_GENERAL_NAME(a, pp, length, d2i_GENERAL_NAME, | ||
235 | GENERAL_NAME_free, V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL); | ||
236 | } | ||
237 | |||
238 | int i2d_GENERAL_NAMES(STACK_OF(GENERAL_NAME) *a, unsigned char **pp) | ||
239 | { | ||
240 | return i2d_ASN1_SET_OF_GENERAL_NAME(a, pp, i2d_GENERAL_NAME, V_ASN1_SEQUENCE, | ||
241 | V_ASN1_UNIVERSAL, IS_SEQUENCE); | ||
242 | } | ||
243 | |||
244 | IMPLEMENT_STACK_OF(GENERAL_NAME) | ||
245 | IMPLEMENT_ASN1_SET_OF(GENERAL_NAME) | ||
246 | |||
247 | int i2d_OTHERNAME(OTHERNAME *a, unsigned char **pp) | ||
248 | { | ||
249 | int v = 0; | ||
250 | M_ASN1_I2D_vars(a); | ||
251 | |||
252 | M_ASN1_I2D_len(a->type_id, i2d_ASN1_OBJECT); | ||
253 | M_ASN1_I2D_len_EXP_opt(a->value, i2d_ASN1_TYPE, 0, v); | ||
254 | |||
255 | M_ASN1_I2D_seq_total(); | ||
256 | |||
257 | M_ASN1_I2D_put(a->type_id, i2d_ASN1_OBJECT); | ||
258 | M_ASN1_I2D_put_EXP_opt(a->value, i2d_ASN1_TYPE, 0, v); | ||
259 | |||
260 | M_ASN1_I2D_finish(); | ||
261 | } | ||
262 | |||
263 | OTHERNAME *OTHERNAME_new(void) | ||
264 | { | ||
265 | OTHERNAME *ret=NULL; | ||
266 | ASN1_CTX c; | ||
267 | M_ASN1_New_Malloc(ret, OTHERNAME); | ||
268 | ret->type_id = OBJ_nid2obj(NID_undef); | ||
269 | M_ASN1_New(ret->value, ASN1_TYPE_new); | ||
270 | return (ret); | ||
271 | M_ASN1_New_Error(ASN1_F_OTHERNAME_NEW); | ||
272 | } | ||
273 | |||
274 | OTHERNAME *d2i_OTHERNAME(OTHERNAME **a, unsigned char **pp, long length) | ||
275 | { | ||
276 | M_ASN1_D2I_vars(a,OTHERNAME *,OTHERNAME_new); | ||
277 | M_ASN1_D2I_Init(); | ||
278 | M_ASN1_D2I_start_sequence(); | ||
279 | M_ASN1_D2I_get(ret->type_id, d2i_ASN1_OBJECT); | ||
280 | M_ASN1_D2I_get_EXP_opt(ret->value, d2i_ASN1_TYPE, 0); | ||
281 | M_ASN1_D2I_Finish(a, OTHERNAME_free, ASN1_F_D2I_OTHERNAME); | ||
282 | } | ||
283 | |||
284 | void OTHERNAME_free(OTHERNAME *a) | ||
285 | { | ||
286 | if (a == NULL) return; | ||
287 | ASN1_OBJECT_free(a->type_id); | ||
288 | ASN1_TYPE_free(a->value); | ||
289 | OPENSSL_free (a); | ||
290 | } | ||
291 | |||
diff --git a/src/lib/libcrypto/x509v3/v3_ia5.c b/src/lib/libcrypto/x509v3/v3_ia5.c deleted file mode 100644 index f3bba38269..0000000000 --- a/src/lib/libcrypto/x509v3/v3_ia5.c +++ /dev/null | |||
@@ -1,113 +0,0 @@ | |||
1 | /* v3_ia5.c */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 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 | |||
60 | #include <stdio.h> | ||
61 | #include "cryptlib.h" | ||
62 | #include <openssl/asn1.h> | ||
63 | #include <openssl/conf.h> | ||
64 | #include <openssl/x509v3.h> | ||
65 | |||
66 | static char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method, ASN1_IA5STRING *ia5); | ||
67 | static ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str); | ||
68 | X509V3_EXT_METHOD v3_ns_ia5_list[] = { | ||
69 | EXT_IA5STRING(NID_netscape_base_url), | ||
70 | EXT_IA5STRING(NID_netscape_revocation_url), | ||
71 | EXT_IA5STRING(NID_netscape_ca_revocation_url), | ||
72 | EXT_IA5STRING(NID_netscape_renewal_url), | ||
73 | EXT_IA5STRING(NID_netscape_ca_policy_url), | ||
74 | EXT_IA5STRING(NID_netscape_ssl_server_name), | ||
75 | EXT_IA5STRING(NID_netscape_comment), | ||
76 | EXT_END | ||
77 | }; | ||
78 | |||
79 | |||
80 | static char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method, | ||
81 | ASN1_IA5STRING *ia5) | ||
82 | { | ||
83 | char *tmp; | ||
84 | if(!ia5 || !ia5->length) return NULL; | ||
85 | tmp = OPENSSL_malloc(ia5->length + 1); | ||
86 | memcpy(tmp, ia5->data, ia5->length); | ||
87 | tmp[ia5->length] = 0; | ||
88 | return tmp; | ||
89 | } | ||
90 | |||
91 | static ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method, | ||
92 | X509V3_CTX *ctx, char *str) | ||
93 | { | ||
94 | ASN1_IA5STRING *ia5; | ||
95 | if(!str) { | ||
96 | X509V3err(X509V3_F_S2I_ASN1_IA5STRING,X509V3_R_INVALID_NULL_ARGUMENT); | ||
97 | return NULL; | ||
98 | } | ||
99 | if(!(ia5 = M_ASN1_IA5STRING_new())) goto err; | ||
100 | if(!ASN1_STRING_set((ASN1_STRING *)ia5, (unsigned char*)str, | ||
101 | strlen(str))) { | ||
102 | M_ASN1_IA5STRING_free(ia5); | ||
103 | goto err; | ||
104 | } | ||
105 | #ifdef CHARSET_EBCDIC | ||
106 | ebcdic2ascii(ia5->data, ia5->data, ia5->length); | ||
107 | #endif /*CHARSET_EBCDIC*/ | ||
108 | return ia5; | ||
109 | err: | ||
110 | X509V3err(X509V3_F_S2I_ASN1_IA5STRING,ERR_R_MALLOC_FAILURE); | ||
111 | return NULL; | ||
112 | } | ||
113 | |||
diff --git a/src/lib/libcrypto/x509v3/v3_info.c b/src/lib/libcrypto/x509v3/v3_info.c deleted file mode 100644 index a045a629ee..0000000000 --- a/src/lib/libcrypto/x509v3/v3_info.c +++ /dev/null | |||
@@ -1,236 +0,0 @@ | |||
1 | /* v3_info.c */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 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 "cryptlib.h" | ||
61 | #include <openssl/conf.h> | ||
62 | #include <openssl/asn1.h> | ||
63 | #include <openssl/asn1_mac.h> | ||
64 | #include <openssl/x509v3.h> | ||
65 | |||
66 | static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD *method, | ||
67 | STACK_OF(ACCESS_DESCRIPTION) *ainfo, | ||
68 | STACK_OF(CONF_VALUE) *ret); | ||
69 | static STACK_OF(ACCESS_DESCRIPTION) *v2i_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD *method, | ||
70 | X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval); | ||
71 | |||
72 | X509V3_EXT_METHOD v3_info = | ||
73 | { NID_info_access, X509V3_EXT_MULTILINE, | ||
74 | (X509V3_EXT_NEW)AUTHORITY_INFO_ACCESS_new, | ||
75 | (X509V3_EXT_FREE)AUTHORITY_INFO_ACCESS_free, | ||
76 | (X509V3_EXT_D2I)d2i_AUTHORITY_INFO_ACCESS, | ||
77 | (X509V3_EXT_I2D)i2d_AUTHORITY_INFO_ACCESS, | ||
78 | NULL, NULL, | ||
79 | (X509V3_EXT_I2V)i2v_AUTHORITY_INFO_ACCESS, | ||
80 | (X509V3_EXT_V2I)v2i_AUTHORITY_INFO_ACCESS, | ||
81 | NULL, NULL, NULL}; | ||
82 | |||
83 | static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD *method, | ||
84 | STACK_OF(ACCESS_DESCRIPTION) *ainfo, | ||
85 | STACK_OF(CONF_VALUE) *ret) | ||
86 | { | ||
87 | ACCESS_DESCRIPTION *desc; | ||
88 | int i; | ||
89 | char objtmp[80], *ntmp; | ||
90 | CONF_VALUE *vtmp; | ||
91 | for(i = 0; i < sk_ACCESS_DESCRIPTION_num(ainfo); i++) { | ||
92 | desc = sk_ACCESS_DESCRIPTION_value(ainfo, i); | ||
93 | ret = i2v_GENERAL_NAME(method, desc->location, ret); | ||
94 | if(!ret) break; | ||
95 | vtmp = sk_CONF_VALUE_value(ret, i); | ||
96 | i2t_ASN1_OBJECT(objtmp, 80, desc->method); | ||
97 | ntmp = OPENSSL_malloc(strlen(objtmp) + strlen(vtmp->name) + 5); | ||
98 | if(!ntmp) { | ||
99 | X509V3err(X509V3_F_I2V_AUTHORITY_INFO_ACCESS, | ||
100 | ERR_R_MALLOC_FAILURE); | ||
101 | return NULL; | ||
102 | } | ||
103 | strcpy(ntmp, objtmp); | ||
104 | strcat(ntmp, " - "); | ||
105 | strcat(ntmp, vtmp->name); | ||
106 | OPENSSL_free(vtmp->name); | ||
107 | vtmp->name = ntmp; | ||
108 | |||
109 | } | ||
110 | if(!ret) return sk_CONF_VALUE_new_null(); | ||
111 | return ret; | ||
112 | } | ||
113 | |||
114 | static STACK_OF(ACCESS_DESCRIPTION) *v2i_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD *method, | ||
115 | X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval) | ||
116 | { | ||
117 | STACK_OF(ACCESS_DESCRIPTION) *ainfo = NULL; | ||
118 | CONF_VALUE *cnf, ctmp; | ||
119 | ACCESS_DESCRIPTION *acc; | ||
120 | int i, objlen; | ||
121 | char *objtmp, *ptmp; | ||
122 | if(!(ainfo = sk_ACCESS_DESCRIPTION_new_null())) { | ||
123 | X509V3err(X509V3_F_V2I_ACCESS_DESCRIPTION,ERR_R_MALLOC_FAILURE); | ||
124 | return NULL; | ||
125 | } | ||
126 | for(i = 0; i < sk_CONF_VALUE_num(nval); i++) { | ||
127 | cnf = sk_CONF_VALUE_value(nval, i); | ||
128 | if(!(acc = ACCESS_DESCRIPTION_new()) | ||
129 | || !sk_ACCESS_DESCRIPTION_push(ainfo, acc)) { | ||
130 | X509V3err(X509V3_F_V2I_ACCESS_DESCRIPTION,ERR_R_MALLOC_FAILURE); | ||
131 | goto err; | ||
132 | } | ||
133 | ptmp = strchr(cnf->name, ';'); | ||
134 | if(!ptmp) { | ||
135 | X509V3err(X509V3_F_V2I_ACCESS_DESCRIPTION,X509V3_R_INVALID_SYNTAX); | ||
136 | goto err; | ||
137 | } | ||
138 | objlen = ptmp - cnf->name; | ||
139 | ctmp.name = ptmp + 1; | ||
140 | ctmp.value = cnf->value; | ||
141 | if(!(acc->location = v2i_GENERAL_NAME(method, ctx, &ctmp))) | ||
142 | goto err; | ||
143 | if(!(objtmp = OPENSSL_malloc(objlen + 1))) { | ||
144 | X509V3err(X509V3_F_V2I_ACCESS_DESCRIPTION,ERR_R_MALLOC_FAILURE); | ||
145 | goto err; | ||
146 | } | ||
147 | strncpy(objtmp, cnf->name, objlen); | ||
148 | objtmp[objlen] = 0; | ||
149 | acc->method = OBJ_txt2obj(objtmp, 0); | ||
150 | if(!acc->method) { | ||
151 | X509V3err(X509V3_F_V2I_ACCESS_DESCRIPTION,X509V3_R_BAD_OBJECT); | ||
152 | ERR_add_error_data(2, "value=", objtmp); | ||
153 | OPENSSL_free(objtmp); | ||
154 | goto err; | ||
155 | } | ||
156 | OPENSSL_free(objtmp); | ||
157 | |||
158 | } | ||
159 | return ainfo; | ||
160 | err: | ||
161 | sk_ACCESS_DESCRIPTION_pop_free(ainfo, ACCESS_DESCRIPTION_free); | ||
162 | return NULL; | ||
163 | } | ||
164 | |||
165 | int i2d_ACCESS_DESCRIPTION(ACCESS_DESCRIPTION *a, unsigned char **pp) | ||
166 | { | ||
167 | M_ASN1_I2D_vars(a); | ||
168 | |||
169 | M_ASN1_I2D_len(a->method, i2d_ASN1_OBJECT); | ||
170 | M_ASN1_I2D_len(a->location, i2d_GENERAL_NAME); | ||
171 | |||
172 | M_ASN1_I2D_seq_total(); | ||
173 | |||
174 | M_ASN1_I2D_put(a->method, i2d_ASN1_OBJECT); | ||
175 | M_ASN1_I2D_put(a->location, i2d_GENERAL_NAME); | ||
176 | |||
177 | M_ASN1_I2D_finish(); | ||
178 | } | ||
179 | |||
180 | ACCESS_DESCRIPTION *ACCESS_DESCRIPTION_new(void) | ||
181 | { | ||
182 | ACCESS_DESCRIPTION *ret=NULL; | ||
183 | ASN1_CTX c; | ||
184 | M_ASN1_New_Malloc(ret, ACCESS_DESCRIPTION); | ||
185 | ret->method = OBJ_nid2obj(NID_undef); | ||
186 | ret->location = NULL; | ||
187 | return (ret); | ||
188 | M_ASN1_New_Error(ASN1_F_ACCESS_DESCRIPTION_NEW); | ||
189 | } | ||
190 | |||
191 | ACCESS_DESCRIPTION *d2i_ACCESS_DESCRIPTION(ACCESS_DESCRIPTION **a, unsigned char **pp, | ||
192 | long length) | ||
193 | { | ||
194 | M_ASN1_D2I_vars(a,ACCESS_DESCRIPTION *,ACCESS_DESCRIPTION_new); | ||
195 | M_ASN1_D2I_Init(); | ||
196 | M_ASN1_D2I_start_sequence(); | ||
197 | M_ASN1_D2I_get(ret->method, d2i_ASN1_OBJECT); | ||
198 | M_ASN1_D2I_get(ret->location, d2i_GENERAL_NAME); | ||
199 | M_ASN1_D2I_Finish(a, ACCESS_DESCRIPTION_free, ASN1_F_D2I_ACCESS_DESCRIPTION); | ||
200 | } | ||
201 | |||
202 | void ACCESS_DESCRIPTION_free(ACCESS_DESCRIPTION *a) | ||
203 | { | ||
204 | if (a == NULL) return; | ||
205 | ASN1_OBJECT_free(a->method); | ||
206 | GENERAL_NAME_free(a->location); | ||
207 | OPENSSL_free (a); | ||
208 | } | ||
209 | |||
210 | STACK_OF(ACCESS_DESCRIPTION) *AUTHORITY_INFO_ACCESS_new(void) | ||
211 | { | ||
212 | return sk_ACCESS_DESCRIPTION_new_null(); | ||
213 | } | ||
214 | |||
215 | void AUTHORITY_INFO_ACCESS_free(STACK_OF(ACCESS_DESCRIPTION) *a) | ||
216 | { | ||
217 | sk_ACCESS_DESCRIPTION_pop_free(a, ACCESS_DESCRIPTION_free); | ||
218 | } | ||
219 | |||
220 | STACK_OF(ACCESS_DESCRIPTION) *d2i_AUTHORITY_INFO_ACCESS(STACK_OF(ACCESS_DESCRIPTION) **a, | ||
221 | unsigned char **pp, long length) | ||
222 | { | ||
223 | return d2i_ASN1_SET_OF_ACCESS_DESCRIPTION(a, pp, length, d2i_ACCESS_DESCRIPTION, | ||
224 | ACCESS_DESCRIPTION_free, V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL); | ||
225 | } | ||
226 | |||
227 | int i2d_AUTHORITY_INFO_ACCESS(STACK_OF(ACCESS_DESCRIPTION) *a, unsigned char **pp) | ||
228 | { | ||
229 | return i2d_ASN1_SET_OF_ACCESS_DESCRIPTION(a, pp, i2d_ACCESS_DESCRIPTION, V_ASN1_SEQUENCE, | ||
230 | V_ASN1_UNIVERSAL, IS_SEQUENCE); | ||
231 | } | ||
232 | |||
233 | IMPLEMENT_STACK_OF(ACCESS_DESCRIPTION) | ||
234 | IMPLEMENT_ASN1_SET_OF(ACCESS_DESCRIPTION) | ||
235 | |||
236 | |||
diff --git a/src/lib/libcrypto/x509v3/v3_int.c b/src/lib/libcrypto/x509v3/v3_int.c deleted file mode 100644 index 63c201e5f4..0000000000 --- a/src/lib/libcrypto/x509v3/v3_int.c +++ /dev/null | |||
@@ -1,72 +0,0 @@ | |||
1 | /* v3_int.c */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 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 "cryptlib.h" | ||
61 | #include <openssl/x509v3.h> | ||
62 | |||
63 | X509V3_EXT_METHOD v3_crl_num = { | ||
64 | NID_crl_number, 0, | ||
65 | (X509V3_EXT_NEW)ASN1_INTEGER_new, | ||
66 | (X509V3_EXT_FREE)ASN1_INTEGER_free, | ||
67 | (X509V3_EXT_D2I)d2i_ASN1_INTEGER, | ||
68 | (X509V3_EXT_I2D)i2d_ASN1_INTEGER, | ||
69 | (X509V3_EXT_I2S)i2s_ASN1_INTEGER, | ||
70 | (X509V3_EXT_S2I)0, | ||
71 | NULL, NULL, NULL, NULL, NULL}; | ||
72 | |||
diff --git a/src/lib/libcrypto/x509v3/v3_lib.c b/src/lib/libcrypto/x509v3/v3_lib.c deleted file mode 100644 index ea86b9ebb9..0000000000 --- a/src/lib/libcrypto/x509v3/v3_lib.c +++ /dev/null | |||
@@ -1,225 +0,0 @@ | |||
1 | /* v3_lib.c */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 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 | /* X509 v3 extension utilities */ | ||
59 | |||
60 | #include <stdio.h> | ||
61 | #include "cryptlib.h" | ||
62 | #include <openssl/conf.h> | ||
63 | #include <openssl/x509v3.h> | ||
64 | |||
65 | #include "ext_dat.h" | ||
66 | |||
67 | static STACK_OF(X509V3_EXT_METHOD) *ext_list = NULL; | ||
68 | |||
69 | static int ext_cmp(const X509V3_EXT_METHOD * const *a, | ||
70 | const X509V3_EXT_METHOD * const *b); | ||
71 | static void ext_list_free(X509V3_EXT_METHOD *ext); | ||
72 | |||
73 | int X509V3_EXT_add(X509V3_EXT_METHOD *ext) | ||
74 | { | ||
75 | if(!ext_list && !(ext_list = sk_X509V3_EXT_METHOD_new(ext_cmp))) { | ||
76 | X509V3err(X509V3_F_X509V3_EXT_ADD,ERR_R_MALLOC_FAILURE); | ||
77 | return 0; | ||
78 | } | ||
79 | if(!sk_X509V3_EXT_METHOD_push(ext_list, ext)) { | ||
80 | X509V3err(X509V3_F_X509V3_EXT_ADD,ERR_R_MALLOC_FAILURE); | ||
81 | return 0; | ||
82 | } | ||
83 | return 1; | ||
84 | } | ||
85 | |||
86 | static int ext_cmp(const X509V3_EXT_METHOD * const *a, | ||
87 | const X509V3_EXT_METHOD * const *b) | ||
88 | { | ||
89 | return ((*a)->ext_nid - (*b)->ext_nid); | ||
90 | } | ||
91 | |||
92 | X509V3_EXT_METHOD *X509V3_EXT_get_nid(int nid) | ||
93 | { | ||
94 | X509V3_EXT_METHOD tmp, *t = &tmp, **ret; | ||
95 | int idx; | ||
96 | if(nid < 0) return NULL; | ||
97 | tmp.ext_nid = nid; | ||
98 | ret = (X509V3_EXT_METHOD **) OBJ_bsearch((char *)&t, | ||
99 | (char *)standard_exts, STANDARD_EXTENSION_COUNT, | ||
100 | sizeof(X509V3_EXT_METHOD *), (int (*)(const void *, const void *))ext_cmp); | ||
101 | if(ret) return *ret; | ||
102 | if(!ext_list) return NULL; | ||
103 | idx = sk_X509V3_EXT_METHOD_find(ext_list, &tmp); | ||
104 | if(idx == -1) return NULL; | ||
105 | return sk_X509V3_EXT_METHOD_value(ext_list, idx); | ||
106 | } | ||
107 | |||
108 | X509V3_EXT_METHOD *X509V3_EXT_get(X509_EXTENSION *ext) | ||
109 | { | ||
110 | int nid; | ||
111 | if((nid = OBJ_obj2nid(ext->object)) == NID_undef) return NULL; | ||
112 | return X509V3_EXT_get_nid(nid); | ||
113 | } | ||
114 | |||
115 | |||
116 | int X509V3_EXT_add_list(X509V3_EXT_METHOD *extlist) | ||
117 | { | ||
118 | for(;extlist->ext_nid!=-1;extlist++) | ||
119 | if(!X509V3_EXT_add(extlist)) return 0; | ||
120 | return 1; | ||
121 | } | ||
122 | |||
123 | int X509V3_EXT_add_alias(int nid_to, int nid_from) | ||
124 | { | ||
125 | X509V3_EXT_METHOD *ext, *tmpext; | ||
126 | if(!(ext = X509V3_EXT_get_nid(nid_from))) { | ||
127 | X509V3err(X509V3_F_X509V3_EXT_ADD_ALIAS,X509V3_R_EXTENSION_NOT_FOUND); | ||
128 | return 0; | ||
129 | } | ||
130 | if(!(tmpext = (X509V3_EXT_METHOD *)OPENSSL_malloc(sizeof(X509V3_EXT_METHOD)))) { | ||
131 | X509V3err(X509V3_F_X509V3_EXT_ADD_ALIAS,ERR_R_MALLOC_FAILURE); | ||
132 | return 0; | ||
133 | } | ||
134 | *tmpext = *ext; | ||
135 | tmpext->ext_nid = nid_to; | ||
136 | tmpext->ext_flags |= X509V3_EXT_DYNAMIC; | ||
137 | return X509V3_EXT_add(tmpext); | ||
138 | } | ||
139 | |||
140 | void X509V3_EXT_cleanup(void) | ||
141 | { | ||
142 | sk_X509V3_EXT_METHOD_pop_free(ext_list, ext_list_free); | ||
143 | ext_list = NULL; | ||
144 | } | ||
145 | |||
146 | static void ext_list_free(X509V3_EXT_METHOD *ext) | ||
147 | { | ||
148 | if(ext->ext_flags & X509V3_EXT_DYNAMIC) OPENSSL_free(ext); | ||
149 | } | ||
150 | |||
151 | /* Legacy function: we don't need to add standard extensions | ||
152 | * any more because they are now kept in ext_dat.h. | ||
153 | */ | ||
154 | |||
155 | int X509V3_add_standard_extensions(void) | ||
156 | { | ||
157 | return 1; | ||
158 | } | ||
159 | |||
160 | /* Return an extension internal structure */ | ||
161 | |||
162 | void *X509V3_EXT_d2i(X509_EXTENSION *ext) | ||
163 | { | ||
164 | X509V3_EXT_METHOD *method; | ||
165 | unsigned char *p; | ||
166 | if(!(method = X509V3_EXT_get(ext)) || !method->d2i) return NULL; | ||
167 | p = ext->value->data; | ||
168 | return method->d2i(NULL, &p, ext->value->length); | ||
169 | } | ||
170 | |||
171 | /* Get critical flag and decoded version of extension from a NID. | ||
172 | * The "idx" variable returns the last found extension and can | ||
173 | * be used to retrieve multiple extensions of the same NID. | ||
174 | * However multiple extensions with the same NID is usually | ||
175 | * due to a badly encoded certificate so if idx is NULL we | ||
176 | * choke if multiple extensions exist. | ||
177 | * The "crit" variable is set to the critical value. | ||
178 | * The return value is the decoded extension or NULL on | ||
179 | * error. The actual error can have several different causes, | ||
180 | * the value of *crit reflects the cause: | ||
181 | * >= 0, extension found but not decoded (reflects critical value). | ||
182 | * -1 extension not found. | ||
183 | * -2 extension occurs more than once. | ||
184 | */ | ||
185 | |||
186 | void *X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit, int *idx) | ||
187 | { | ||
188 | int lastpos, i; | ||
189 | X509_EXTENSION *ex, *found_ex = NULL; | ||
190 | if(!x) { | ||
191 | if(idx) *idx = -1; | ||
192 | if(crit) *crit = -1; | ||
193 | return NULL; | ||
194 | } | ||
195 | if(idx) lastpos = *idx + 1; | ||
196 | else lastpos = 0; | ||
197 | if(lastpos < 0) lastpos = 0; | ||
198 | for(i = lastpos; i < sk_X509_EXTENSION_num(x); i++) | ||
199 | { | ||
200 | ex = sk_X509_EXTENSION_value(x, i); | ||
201 | if(OBJ_obj2nid(ex->object) == nid) { | ||
202 | if(idx) { | ||
203 | *idx = i; | ||
204 | break; | ||
205 | } else if(found_ex) { | ||
206 | /* Found more than one */ | ||
207 | if(crit) *crit = -2; | ||
208 | return NULL; | ||
209 | } | ||
210 | found_ex = ex; | ||
211 | } | ||
212 | } | ||
213 | if(found_ex) { | ||
214 | /* Found it */ | ||
215 | if(crit) *crit = found_ex->critical; | ||
216 | return X509V3_EXT_d2i(found_ex); | ||
217 | } | ||
218 | |||
219 | /* Extension not found */ | ||
220 | if(idx) *idx = -1; | ||
221 | if(crit) *crit = -1; | ||
222 | return NULL; | ||
223 | } | ||
224 | |||
225 | IMPLEMENT_STACK_OF(X509V3_EXT_METHOD) | ||
diff --git a/src/lib/libcrypto/x509v3/v3_pku.c b/src/lib/libcrypto/x509v3/v3_pku.c deleted file mode 100644 index 47f9e8f123..0000000000 --- a/src/lib/libcrypto/x509v3/v3_pku.c +++ /dev/null | |||
@@ -1,151 +0,0 @@ | |||
1 | /* v3_pku.c */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 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 "cryptlib.h" | ||
61 | #include <openssl/asn1.h> | ||
62 | #include <openssl/asn1_mac.h> | ||
63 | #include <openssl/x509v3.h> | ||
64 | |||
65 | static int i2r_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method, PKEY_USAGE_PERIOD *usage, BIO *out, int indent); | ||
66 | /* | ||
67 | static PKEY_USAGE_PERIOD *v2i_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values); | ||
68 | */ | ||
69 | X509V3_EXT_METHOD v3_pkey_usage_period = { | ||
70 | NID_private_key_usage_period, 0, | ||
71 | (X509V3_EXT_NEW)PKEY_USAGE_PERIOD_new, | ||
72 | (X509V3_EXT_FREE)PKEY_USAGE_PERIOD_free, | ||
73 | (X509V3_EXT_D2I)d2i_PKEY_USAGE_PERIOD, | ||
74 | (X509V3_EXT_I2D)i2d_PKEY_USAGE_PERIOD, | ||
75 | NULL, NULL, NULL, NULL, | ||
76 | (X509V3_EXT_I2R)i2r_PKEY_USAGE_PERIOD, NULL, | ||
77 | NULL | ||
78 | }; | ||
79 | |||
80 | int i2d_PKEY_USAGE_PERIOD(PKEY_USAGE_PERIOD *a, unsigned char **pp) | ||
81 | { | ||
82 | M_ASN1_I2D_vars(a); | ||
83 | |||
84 | M_ASN1_I2D_len_IMP_opt (a->notBefore, i2d_ASN1_GENERALIZEDTIME); | ||
85 | M_ASN1_I2D_len_IMP_opt (a->notAfter, i2d_ASN1_GENERALIZEDTIME); | ||
86 | |||
87 | M_ASN1_I2D_seq_total(); | ||
88 | |||
89 | M_ASN1_I2D_put_IMP_opt (a->notBefore, i2d_ASN1_GENERALIZEDTIME, 0); | ||
90 | M_ASN1_I2D_put_IMP_opt (a->notAfter, i2d_ASN1_GENERALIZEDTIME, 1); | ||
91 | |||
92 | M_ASN1_I2D_finish(); | ||
93 | } | ||
94 | |||
95 | PKEY_USAGE_PERIOD *PKEY_USAGE_PERIOD_new(void) | ||
96 | { | ||
97 | PKEY_USAGE_PERIOD *ret=NULL; | ||
98 | ASN1_CTX c; | ||
99 | M_ASN1_New_Malloc(ret, PKEY_USAGE_PERIOD); | ||
100 | ret->notBefore = NULL; | ||
101 | ret->notAfter = NULL; | ||
102 | return (ret); | ||
103 | M_ASN1_New_Error(ASN1_F_PKEY_USAGE_PERIOD_NEW); | ||
104 | } | ||
105 | |||
106 | PKEY_USAGE_PERIOD *d2i_PKEY_USAGE_PERIOD(PKEY_USAGE_PERIOD **a, | ||
107 | unsigned char **pp, long length) | ||
108 | { | ||
109 | M_ASN1_D2I_vars(a,PKEY_USAGE_PERIOD *,PKEY_USAGE_PERIOD_new); | ||
110 | M_ASN1_D2I_Init(); | ||
111 | M_ASN1_D2I_start_sequence(); | ||
112 | M_ASN1_D2I_get_IMP_opt (ret->notBefore, d2i_ASN1_GENERALIZEDTIME, 0, | ||
113 | V_ASN1_GENERALIZEDTIME); | ||
114 | M_ASN1_D2I_get_IMP_opt (ret->notAfter, d2i_ASN1_GENERALIZEDTIME, 1, | ||
115 | V_ASN1_GENERALIZEDTIME); | ||
116 | M_ASN1_D2I_Finish(a, PKEY_USAGE_PERIOD_free, ASN1_F_D2I_PKEY_USAGE_PERIOD); | ||
117 | } | ||
118 | |||
119 | void PKEY_USAGE_PERIOD_free(PKEY_USAGE_PERIOD *a) | ||
120 | { | ||
121 | if (a == NULL) return; | ||
122 | M_ASN1_GENERALIZEDTIME_free(a->notBefore); | ||
123 | M_ASN1_GENERALIZEDTIME_free(a->notAfter); | ||
124 | OPENSSL_free (a); | ||
125 | } | ||
126 | |||
127 | static int i2r_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method, | ||
128 | PKEY_USAGE_PERIOD *usage, BIO *out, int indent) | ||
129 | { | ||
130 | BIO_printf(out, "%*s", indent, ""); | ||
131 | if(usage->notBefore) { | ||
132 | BIO_write(out, "Not Before: ", 12); | ||
133 | ASN1_GENERALIZEDTIME_print(out, usage->notBefore); | ||
134 | if(usage->notAfter) BIO_write(out, ", ", 2); | ||
135 | } | ||
136 | if(usage->notAfter) { | ||
137 | BIO_write(out, "Not After: ", 11); | ||
138 | ASN1_GENERALIZEDTIME_print(out, usage->notAfter); | ||
139 | } | ||
140 | return 1; | ||
141 | } | ||
142 | |||
143 | /* | ||
144 | static PKEY_USAGE_PERIOD *v2i_PKEY_USAGE_PERIOD(method, ctx, values) | ||
145 | X509V3_EXT_METHOD *method; | ||
146 | X509V3_CTX *ctx; | ||
147 | STACK_OF(CONF_VALUE) *values; | ||
148 | { | ||
149 | return NULL; | ||
150 | } | ||
151 | */ | ||
diff --git a/src/lib/libcrypto/x509v3/v3_prn.c b/src/lib/libcrypto/x509v3/v3_prn.c deleted file mode 100644 index 14b804c4ad..0000000000 --- a/src/lib/libcrypto/x509v3/v3_prn.c +++ /dev/null | |||
@@ -1,165 +0,0 @@ | |||
1 | /* v3_prn.c */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 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 | /* X509 v3 extension utilities */ | ||
59 | |||
60 | #include <stdio.h> | ||
61 | #include "cryptlib.h" | ||
62 | #include <openssl/conf.h> | ||
63 | #include <openssl/x509v3.h> | ||
64 | |||
65 | /* Extension printing routines */ | ||
66 | |||
67 | /* Print out a name+value stack */ | ||
68 | |||
69 | void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent, int ml) | ||
70 | { | ||
71 | int i; | ||
72 | CONF_VALUE *nval; | ||
73 | if(!val) return; | ||
74 | if(!ml || !sk_CONF_VALUE_num(val)) { | ||
75 | BIO_printf(out, "%*s", indent, ""); | ||
76 | if(!sk_CONF_VALUE_num(val)) BIO_puts(out, "<EMPTY>\n"); | ||
77 | } | ||
78 | for(i = 0; i < sk_CONF_VALUE_num(val); i++) { | ||
79 | if(ml) BIO_printf(out, "%*s", indent, ""); | ||
80 | else if(i > 0) BIO_printf(out, ", "); | ||
81 | nval = sk_CONF_VALUE_value(val, i); | ||
82 | if(!nval->name) BIO_puts(out, nval->value); | ||
83 | else if(!nval->value) BIO_puts(out, nval->name); | ||
84 | #ifndef CHARSET_EBCDIC | ||
85 | else BIO_printf(out, "%s:%s", nval->name, nval->value); | ||
86 | #else | ||
87 | else { | ||
88 | int len; | ||
89 | char *tmp; | ||
90 | len = strlen(nval->value)+1; | ||
91 | tmp = OPENSSL_malloc(len); | ||
92 | if (tmp) | ||
93 | { | ||
94 | ascii2ebcdic(tmp, nval->value, len); | ||
95 | BIO_printf(out, "%s:%s", nval->name, tmp); | ||
96 | OPENSSL_free(tmp); | ||
97 | } | ||
98 | } | ||
99 | #endif | ||
100 | if(ml) BIO_puts(out, "\n"); | ||
101 | } | ||
102 | } | ||
103 | |||
104 | /* Main routine: print out a general extension */ | ||
105 | |||
106 | int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, int flag, int indent) | ||
107 | { | ||
108 | char *ext_str = NULL, *value = NULL; | ||
109 | unsigned char *p; | ||
110 | X509V3_EXT_METHOD *method; | ||
111 | STACK_OF(CONF_VALUE) *nval = NULL; | ||
112 | int ok = 1; | ||
113 | if(!(method = X509V3_EXT_get(ext))) return 0; | ||
114 | p = ext->value->data; | ||
115 | if(!(ext_str = method->d2i(NULL, &p, ext->value->length))) return 0; | ||
116 | if(method->i2s) { | ||
117 | if(!(value = method->i2s(method, ext_str))) { | ||
118 | ok = 0; | ||
119 | goto err; | ||
120 | } | ||
121 | #ifndef CHARSET_EBCDIC | ||
122 | BIO_printf(out, "%*s%s", indent, "", value); | ||
123 | #else | ||
124 | { | ||
125 | int len; | ||
126 | char *tmp; | ||
127 | len = strlen(value)+1; | ||
128 | tmp = OPENSSL_malloc(len); | ||
129 | if (tmp) | ||
130 | { | ||
131 | ascii2ebcdic(tmp, value, len); | ||
132 | BIO_printf(out, "%*s%s", indent, "", tmp); | ||
133 | OPENSSL_free(tmp); | ||
134 | } | ||
135 | } | ||
136 | #endif | ||
137 | } else if(method->i2v) { | ||
138 | if(!(nval = method->i2v(method, ext_str, NULL))) { | ||
139 | ok = 0; | ||
140 | goto err; | ||
141 | } | ||
142 | X509V3_EXT_val_prn(out, nval, indent, | ||
143 | method->ext_flags & X509V3_EXT_MULTILINE); | ||
144 | } else if(method->i2r) { | ||
145 | if(!method->i2r(method, ext_str, out, indent)) ok = 0; | ||
146 | } else ok = 0; | ||
147 | |||
148 | err: | ||
149 | sk_CONF_VALUE_pop_free(nval, X509V3_conf_free); | ||
150 | if(value) OPENSSL_free(value); | ||
151 | method->ext_free(ext_str); | ||
152 | return ok; | ||
153 | } | ||
154 | |||
155 | #ifndef NO_FP_API | ||
156 | int X509V3_EXT_print_fp(FILE *fp, X509_EXTENSION *ext, int flag, int indent) | ||
157 | { | ||
158 | BIO *bio_tmp; | ||
159 | int ret; | ||
160 | if(!(bio_tmp = BIO_new_fp(fp, BIO_NOCLOSE))) return 0; | ||
161 | ret = X509V3_EXT_print(bio_tmp, ext, flag, indent); | ||
162 | BIO_free(bio_tmp); | ||
163 | return ret; | ||
164 | } | ||
165 | #endif | ||
diff --git a/src/lib/libcrypto/x509v3/v3_purp.c b/src/lib/libcrypto/x509v3/v3_purp.c deleted file mode 100644 index 8aecd00e63..0000000000 --- a/src/lib/libcrypto/x509v3/v3_purp.c +++ /dev/null | |||
@@ -1,535 +0,0 @@ | |||
1 | /* v3_purp.c */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 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 "cryptlib.h" | ||
61 | #include <openssl/x509v3.h> | ||
62 | #include <openssl/x509_vfy.h> | ||
63 | |||
64 | |||
65 | static void x509v3_cache_extensions(X509 *x); | ||
66 | |||
67 | static int ca_check(const X509 *x); | ||
68 | static int check_ssl_ca(const X509 *x); | ||
69 | static int check_purpose_ssl_client(const X509_PURPOSE *xp, const X509 *x, int ca); | ||
70 | static int check_purpose_ssl_server(const X509_PURPOSE *xp, const X509 *x, int ca); | ||
71 | static int check_purpose_ns_ssl_server(const X509_PURPOSE *xp, const X509 *x, int ca); | ||
72 | static int purpose_smime(const X509 *x, int ca); | ||
73 | static int check_purpose_smime_sign(const X509_PURPOSE *xp, const X509 *x, int ca); | ||
74 | static int check_purpose_smime_encrypt(const X509_PURPOSE *xp, const X509 *x, int ca); | ||
75 | static int check_purpose_crl_sign(const X509_PURPOSE *xp, const X509 *x, int ca); | ||
76 | static int no_check(const X509_PURPOSE *xp, const X509 *x, int ca); | ||
77 | |||
78 | static int xp_cmp(const X509_PURPOSE * const *a, | ||
79 | const X509_PURPOSE * const *b); | ||
80 | static void xptable_free(X509_PURPOSE *p); | ||
81 | |||
82 | static X509_PURPOSE xstandard[] = { | ||
83 | {X509_PURPOSE_SSL_CLIENT, X509_TRUST_SSL_CLIENT, 0, check_purpose_ssl_client, "SSL client", "sslclient", NULL}, | ||
84 | {X509_PURPOSE_SSL_SERVER, X509_TRUST_SSL_SERVER, 0, check_purpose_ssl_server, "SSL server", "sslserver", NULL}, | ||
85 | {X509_PURPOSE_NS_SSL_SERVER, X509_TRUST_SSL_SERVER, 0, check_purpose_ns_ssl_server, "Netscape SSL server", "nssslserver", NULL}, | ||
86 | {X509_PURPOSE_SMIME_SIGN, X509_TRUST_EMAIL, 0, check_purpose_smime_sign, "S/MIME signing", "smimesign", NULL}, | ||
87 | {X509_PURPOSE_SMIME_ENCRYPT, X509_TRUST_EMAIL, 0, check_purpose_smime_encrypt, "S/MIME encryption", "smimeencrypt", NULL}, | ||
88 | {X509_PURPOSE_CRL_SIGN, X509_TRUST_COMPAT, 0, check_purpose_crl_sign, "CRL signing", "crlsign", NULL}, | ||
89 | {X509_PURPOSE_ANY, X509_TRUST_DEFAULT, 0, no_check, "Any Purpose", "any", NULL}, | ||
90 | }; | ||
91 | |||
92 | #define X509_PURPOSE_COUNT (sizeof(xstandard)/sizeof(X509_PURPOSE)) | ||
93 | |||
94 | IMPLEMENT_STACK_OF(X509_PURPOSE) | ||
95 | |||
96 | static STACK_OF(X509_PURPOSE) *xptable = NULL; | ||
97 | |||
98 | static int xp_cmp(const X509_PURPOSE * const *a, | ||
99 | const X509_PURPOSE * const *b) | ||
100 | { | ||
101 | return (*a)->purpose - (*b)->purpose; | ||
102 | } | ||
103 | |||
104 | /* As much as I'd like to make X509_check_purpose use a "const" X509* | ||
105 | * I really can't because it does recalculate hashes and do other non-const | ||
106 | * things. */ | ||
107 | int X509_check_purpose(X509 *x, int id, int ca) | ||
108 | { | ||
109 | int idx; | ||
110 | const X509_PURPOSE *pt; | ||
111 | if(!(x->ex_flags & EXFLAG_SET)) { | ||
112 | CRYPTO_w_lock(CRYPTO_LOCK_X509); | ||
113 | x509v3_cache_extensions(x); | ||
114 | CRYPTO_w_unlock(CRYPTO_LOCK_X509); | ||
115 | } | ||
116 | if(id == -1) return 1; | ||
117 | idx = X509_PURPOSE_get_by_id(id); | ||
118 | if(idx == -1) return -1; | ||
119 | pt = X509_PURPOSE_get0(idx); | ||
120 | return pt->check_purpose(pt, x, ca); | ||
121 | } | ||
122 | |||
123 | int X509_PURPOSE_get_count(void) | ||
124 | { | ||
125 | if(!xptable) return X509_PURPOSE_COUNT; | ||
126 | return sk_X509_PURPOSE_num(xptable) + X509_PURPOSE_COUNT; | ||
127 | } | ||
128 | |||
129 | X509_PURPOSE * X509_PURPOSE_get0(int idx) | ||
130 | { | ||
131 | if(idx < 0) return NULL; | ||
132 | if(idx < X509_PURPOSE_COUNT) return xstandard + idx; | ||
133 | return sk_X509_PURPOSE_value(xptable, idx - X509_PURPOSE_COUNT); | ||
134 | } | ||
135 | |||
136 | int X509_PURPOSE_get_by_sname(char *sname) | ||
137 | { | ||
138 | int i; | ||
139 | X509_PURPOSE *xptmp; | ||
140 | for(i = 0; i < X509_PURPOSE_get_count(); i++) { | ||
141 | xptmp = X509_PURPOSE_get0(i); | ||
142 | if(!strcmp(xptmp->sname, sname)) return i; | ||
143 | } | ||
144 | return -1; | ||
145 | } | ||
146 | |||
147 | |||
148 | int X509_PURPOSE_get_by_id(int purpose) | ||
149 | { | ||
150 | X509_PURPOSE tmp; | ||
151 | int idx; | ||
152 | if((purpose >= X509_PURPOSE_MIN) && (purpose <= X509_PURPOSE_MAX)) | ||
153 | return purpose - X509_PURPOSE_MIN; | ||
154 | tmp.purpose = purpose; | ||
155 | if(!xptable) return -1; | ||
156 | idx = sk_X509_PURPOSE_find(xptable, &tmp); | ||
157 | if(idx == -1) return -1; | ||
158 | return idx + X509_PURPOSE_COUNT; | ||
159 | } | ||
160 | |||
161 | int X509_PURPOSE_add(int id, int trust, int flags, | ||
162 | int (*ck)(const X509_PURPOSE *, const X509 *, int), | ||
163 | char *name, char *sname, void *arg) | ||
164 | { | ||
165 | int idx; | ||
166 | X509_PURPOSE *ptmp; | ||
167 | /* This is set according to what we change: application can't set it */ | ||
168 | flags &= ~X509_PURPOSE_DYNAMIC; | ||
169 | /* This will always be set for application modified trust entries */ | ||
170 | flags |= X509_PURPOSE_DYNAMIC_NAME; | ||
171 | /* Get existing entry if any */ | ||
172 | idx = X509_PURPOSE_get_by_id(id); | ||
173 | /* Need a new entry */ | ||
174 | if(idx == -1) { | ||
175 | if(!(ptmp = OPENSSL_malloc(sizeof(X509_PURPOSE)))) { | ||
176 | X509V3err(X509V3_F_X509_PURPOSE_ADD,ERR_R_MALLOC_FAILURE); | ||
177 | return 0; | ||
178 | } | ||
179 | ptmp->flags = X509_PURPOSE_DYNAMIC; | ||
180 | } else ptmp = X509_PURPOSE_get0(idx); | ||
181 | |||
182 | /* OPENSSL_free existing name if dynamic */ | ||
183 | if(ptmp->flags & X509_PURPOSE_DYNAMIC_NAME) { | ||
184 | OPENSSL_free(ptmp->name); | ||
185 | OPENSSL_free(ptmp->sname); | ||
186 | } | ||
187 | /* dup supplied name */ | ||
188 | ptmp->name = BUF_strdup(name); | ||
189 | ptmp->sname = BUF_strdup(sname); | ||
190 | if(!ptmp->name || !ptmp->sname) { | ||
191 | X509V3err(X509V3_F_X509_PURPOSE_ADD,ERR_R_MALLOC_FAILURE); | ||
192 | return 0; | ||
193 | } | ||
194 | /* Keep the dynamic flag of existing entry */ | ||
195 | ptmp->flags &= X509_PURPOSE_DYNAMIC; | ||
196 | /* Set all other flags */ | ||
197 | ptmp->flags |= flags; | ||
198 | |||
199 | ptmp->purpose = id; | ||
200 | ptmp->trust = trust; | ||
201 | ptmp->check_purpose = ck; | ||
202 | ptmp->usr_data = arg; | ||
203 | |||
204 | /* If its a new entry manage the dynamic table */ | ||
205 | if(idx == -1) { | ||
206 | if(!xptable && !(xptable = sk_X509_PURPOSE_new(xp_cmp))) { | ||
207 | X509V3err(X509V3_F_X509_PURPOSE_ADD,ERR_R_MALLOC_FAILURE); | ||
208 | return 0; | ||
209 | } | ||
210 | if (!sk_X509_PURPOSE_push(xptable, ptmp)) { | ||
211 | X509V3err(X509V3_F_X509_PURPOSE_ADD,ERR_R_MALLOC_FAILURE); | ||
212 | return 0; | ||
213 | } | ||
214 | } | ||
215 | return 1; | ||
216 | } | ||
217 | |||
218 | static void xptable_free(X509_PURPOSE *p) | ||
219 | { | ||
220 | if(!p) return; | ||
221 | if (p->flags & X509_PURPOSE_DYNAMIC) | ||
222 | { | ||
223 | if (p->flags & X509_PURPOSE_DYNAMIC_NAME) { | ||
224 | OPENSSL_free(p->name); | ||
225 | OPENSSL_free(p->sname); | ||
226 | } | ||
227 | OPENSSL_free(p); | ||
228 | } | ||
229 | } | ||
230 | |||
231 | void X509_PURPOSE_cleanup(void) | ||
232 | { | ||
233 | int i; | ||
234 | sk_X509_PURPOSE_pop_free(xptable, xptable_free); | ||
235 | for(i = 0; i < X509_PURPOSE_COUNT; i++) xptable_free(xstandard + i); | ||
236 | xptable = NULL; | ||
237 | } | ||
238 | |||
239 | int X509_PURPOSE_get_id(X509_PURPOSE *xp) | ||
240 | { | ||
241 | return xp->purpose; | ||
242 | } | ||
243 | |||
244 | char *X509_PURPOSE_get0_name(X509_PURPOSE *xp) | ||
245 | { | ||
246 | return xp->name; | ||
247 | } | ||
248 | |||
249 | char *X509_PURPOSE_get0_sname(X509_PURPOSE *xp) | ||
250 | { | ||
251 | return xp->sname; | ||
252 | } | ||
253 | |||
254 | int X509_PURPOSE_get_trust(X509_PURPOSE *xp) | ||
255 | { | ||
256 | return xp->trust; | ||
257 | } | ||
258 | |||
259 | static void x509v3_cache_extensions(X509 *x) | ||
260 | { | ||
261 | BASIC_CONSTRAINTS *bs; | ||
262 | ASN1_BIT_STRING *usage; | ||
263 | ASN1_BIT_STRING *ns; | ||
264 | STACK_OF(ASN1_OBJECT) *extusage; | ||
265 | |||
266 | int i; | ||
267 | if(x->ex_flags & EXFLAG_SET) return; | ||
268 | #ifndef NO_SHA | ||
269 | X509_digest(x, EVP_sha1(), x->sha1_hash, NULL); | ||
270 | #endif | ||
271 | /* Does subject name match issuer ? */ | ||
272 | if(!X509_NAME_cmp(X509_get_subject_name(x), X509_get_issuer_name(x))) | ||
273 | x->ex_flags |= EXFLAG_SS; | ||
274 | /* V1 should mean no extensions ... */ | ||
275 | if(!X509_get_version(x)) x->ex_flags |= EXFLAG_V1; | ||
276 | /* Handle basic constraints */ | ||
277 | if((bs=X509_get_ext_d2i(x, NID_basic_constraints, NULL, NULL))) { | ||
278 | if(bs->ca) x->ex_flags |= EXFLAG_CA; | ||
279 | if(bs->pathlen) { | ||
280 | if((bs->pathlen->type == V_ASN1_NEG_INTEGER) | ||
281 | || !bs->ca) { | ||
282 | x->ex_flags |= EXFLAG_INVALID; | ||
283 | x->ex_pathlen = 0; | ||
284 | } else x->ex_pathlen = ASN1_INTEGER_get(bs->pathlen); | ||
285 | } else x->ex_pathlen = -1; | ||
286 | BASIC_CONSTRAINTS_free(bs); | ||
287 | x->ex_flags |= EXFLAG_BCONS; | ||
288 | } | ||
289 | /* Handle key usage */ | ||
290 | if((usage=X509_get_ext_d2i(x, NID_key_usage, NULL, NULL))) { | ||
291 | if(usage->length > 0) { | ||
292 | x->ex_kusage = usage->data[0]; | ||
293 | if(usage->length > 1) | ||
294 | x->ex_kusage |= usage->data[1] << 8; | ||
295 | } else x->ex_kusage = 0; | ||
296 | x->ex_flags |= EXFLAG_KUSAGE; | ||
297 | ASN1_BIT_STRING_free(usage); | ||
298 | } | ||
299 | x->ex_xkusage = 0; | ||
300 | if((extusage=X509_get_ext_d2i(x, NID_ext_key_usage, NULL, NULL))) { | ||
301 | x->ex_flags |= EXFLAG_XKUSAGE; | ||
302 | for(i = 0; i < sk_ASN1_OBJECT_num(extusage); i++) { | ||
303 | switch(OBJ_obj2nid(sk_ASN1_OBJECT_value(extusage,i))) { | ||
304 | case NID_server_auth: | ||
305 | x->ex_xkusage |= XKU_SSL_SERVER; | ||
306 | break; | ||
307 | |||
308 | case NID_client_auth: | ||
309 | x->ex_xkusage |= XKU_SSL_CLIENT; | ||
310 | break; | ||
311 | |||
312 | case NID_email_protect: | ||
313 | x->ex_xkusage |= XKU_SMIME; | ||
314 | break; | ||
315 | |||
316 | case NID_code_sign: | ||
317 | x->ex_xkusage |= XKU_CODE_SIGN; | ||
318 | break; | ||
319 | |||
320 | case NID_ms_sgc: | ||
321 | case NID_ns_sgc: | ||
322 | x->ex_xkusage |= XKU_SGC; | ||
323 | } | ||
324 | } | ||
325 | sk_ASN1_OBJECT_pop_free(extusage, ASN1_OBJECT_free); | ||
326 | } | ||
327 | |||
328 | if((ns=X509_get_ext_d2i(x, NID_netscape_cert_type, NULL, NULL))) { | ||
329 | if(ns->length > 0) x->ex_nscert = ns->data[0]; | ||
330 | else x->ex_nscert = 0; | ||
331 | x->ex_flags |= EXFLAG_NSCERT; | ||
332 | ASN1_BIT_STRING_free(ns); | ||
333 | } | ||
334 | x->skid =X509_get_ext_d2i(x, NID_subject_key_identifier, NULL, NULL); | ||
335 | x->akid =X509_get_ext_d2i(x, NID_authority_key_identifier, NULL, NULL); | ||
336 | x->ex_flags |= EXFLAG_SET; | ||
337 | } | ||
338 | |||
339 | /* CA checks common to all purposes | ||
340 | * return codes: | ||
341 | * 0 not a CA | ||
342 | * 1 is a CA | ||
343 | * 2 basicConstraints absent so "maybe" a CA | ||
344 | * 3 basicConstraints absent but self signed V1. | ||
345 | */ | ||
346 | |||
347 | #define V1_ROOT (EXFLAG_V1|EXFLAG_SS) | ||
348 | #define ku_reject(x, usage) \ | ||
349 | (((x)->ex_flags & EXFLAG_KUSAGE) && !((x)->ex_kusage & (usage))) | ||
350 | #define xku_reject(x, usage) \ | ||
351 | (((x)->ex_flags & EXFLAG_XKUSAGE) && !((x)->ex_xkusage & (usage))) | ||
352 | #define ns_reject(x, usage) \ | ||
353 | (((x)->ex_flags & EXFLAG_NSCERT) && !((x)->ex_nscert & (usage))) | ||
354 | |||
355 | static int ca_check(const X509 *x) | ||
356 | { | ||
357 | /* keyUsage if present should allow cert signing */ | ||
358 | if(ku_reject(x, KU_KEY_CERT_SIGN)) return 0; | ||
359 | if(x->ex_flags & EXFLAG_BCONS) { | ||
360 | if(x->ex_flags & EXFLAG_CA) return 1; | ||
361 | /* If basicConstraints says not a CA then say so */ | ||
362 | else return 0; | ||
363 | } else { | ||
364 | if((x->ex_flags & V1_ROOT) == V1_ROOT) return 3; | ||
365 | /* If key usage present it must have certSign so tolerate it */ | ||
366 | else if (x->ex_flags & EXFLAG_KUSAGE) return 3; | ||
367 | else return 2; | ||
368 | } | ||
369 | } | ||
370 | |||
371 | /* Check SSL CA: common checks for SSL client and server */ | ||
372 | static int check_ssl_ca(const X509 *x) | ||
373 | { | ||
374 | int ca_ret; | ||
375 | ca_ret = ca_check(x); | ||
376 | if(!ca_ret) return 0; | ||
377 | /* check nsCertType if present */ | ||
378 | if(x->ex_flags & EXFLAG_NSCERT) { | ||
379 | if(x->ex_nscert & NS_SSL_CA) return ca_ret; | ||
380 | return 0; | ||
381 | } | ||
382 | if(ca_ret != 2) return ca_ret; | ||
383 | else return 0; | ||
384 | } | ||
385 | |||
386 | |||
387 | static int check_purpose_ssl_client(const X509_PURPOSE *xp, const X509 *x, int ca) | ||
388 | { | ||
389 | if(xku_reject(x,XKU_SSL_CLIENT)) return 0; | ||
390 | if(ca) return check_ssl_ca(x); | ||
391 | /* We need to do digital signatures with it */ | ||
392 | if(ku_reject(x,KU_DIGITAL_SIGNATURE)) return 0; | ||
393 | /* nsCertType if present should allow SSL client use */ | ||
394 | if(ns_reject(x, NS_SSL_CLIENT)) return 0; | ||
395 | return 1; | ||
396 | } | ||
397 | |||
398 | static int check_purpose_ssl_server(const X509_PURPOSE *xp, const X509 *x, int ca) | ||
399 | { | ||
400 | if(xku_reject(x,XKU_SSL_SERVER|XKU_SGC)) return 0; | ||
401 | if(ca) return check_ssl_ca(x); | ||
402 | |||
403 | if(ns_reject(x, NS_SSL_SERVER)) return 0; | ||
404 | /* Now as for keyUsage: we'll at least need to sign OR encipher */ | ||
405 | if(ku_reject(x, KU_DIGITAL_SIGNATURE|KU_KEY_ENCIPHERMENT)) return 0; | ||
406 | |||
407 | return 1; | ||
408 | |||
409 | } | ||
410 | |||
411 | static int check_purpose_ns_ssl_server(const X509_PURPOSE *xp, const X509 *x, int ca) | ||
412 | { | ||
413 | int ret; | ||
414 | ret = check_purpose_ssl_server(xp, x, ca); | ||
415 | if(!ret || ca) return ret; | ||
416 | /* We need to encipher or Netscape complains */ | ||
417 | if(ku_reject(x, KU_KEY_ENCIPHERMENT)) return 0; | ||
418 | return ret; | ||
419 | } | ||
420 | |||
421 | /* common S/MIME checks */ | ||
422 | static int purpose_smime(const X509 *x, int ca) | ||
423 | { | ||
424 | if(xku_reject(x,XKU_SMIME)) return 0; | ||
425 | if(ca) { | ||
426 | int ca_ret; | ||
427 | ca_ret = ca_check(x); | ||
428 | if(!ca_ret) return 0; | ||
429 | /* check nsCertType if present */ | ||
430 | if(x->ex_flags & EXFLAG_NSCERT) { | ||
431 | if(x->ex_nscert & NS_SMIME_CA) return ca_ret; | ||
432 | return 0; | ||
433 | } | ||
434 | if(ca_ret != 2) return ca_ret; | ||
435 | else return 0; | ||
436 | } | ||
437 | if(x->ex_flags & EXFLAG_NSCERT) { | ||
438 | if(x->ex_nscert & NS_SMIME) return 1; | ||
439 | /* Workaround for some buggy certificates */ | ||
440 | if(x->ex_nscert & NS_SSL_CLIENT) return 2; | ||
441 | return 0; | ||
442 | } | ||
443 | return 1; | ||
444 | } | ||
445 | |||
446 | static int check_purpose_smime_sign(const X509_PURPOSE *xp, const X509 *x, int ca) | ||
447 | { | ||
448 | int ret; | ||
449 | ret = purpose_smime(x, ca); | ||
450 | if(!ret || ca) return ret; | ||
451 | if(ku_reject(x, KU_DIGITAL_SIGNATURE|KU_NON_REPUDIATION)) return 0; | ||
452 | return ret; | ||
453 | } | ||
454 | |||
455 | static int check_purpose_smime_encrypt(const X509_PURPOSE *xp, const X509 *x, int ca) | ||
456 | { | ||
457 | int ret; | ||
458 | ret = purpose_smime(x, ca); | ||
459 | if(!ret || ca) return ret; | ||
460 | if(ku_reject(x, KU_KEY_ENCIPHERMENT)) return 0; | ||
461 | return ret; | ||
462 | } | ||
463 | |||
464 | static int check_purpose_crl_sign(const X509_PURPOSE *xp, const X509 *x, int ca) | ||
465 | { | ||
466 | if(ca) { | ||
467 | int ca_ret; | ||
468 | if((ca_ret = ca_check(x)) != 2) return ca_ret; | ||
469 | else return 0; | ||
470 | } | ||
471 | if(ku_reject(x, KU_CRL_SIGN)) return 0; | ||
472 | return 1; | ||
473 | } | ||
474 | |||
475 | static int no_check(const X509_PURPOSE *xp, const X509 *x, int ca) | ||
476 | { | ||
477 | return 1; | ||
478 | } | ||
479 | |||
480 | /* Various checks to see if one certificate issued the second. | ||
481 | * This can be used to prune a set of possible issuer certificates | ||
482 | * which have been looked up using some simple method such as by | ||
483 | * subject name. | ||
484 | * These are: | ||
485 | * 1. Check issuer_name(subject) == subject_name(issuer) | ||
486 | * 2. If akid(subject) exists check it matches issuer | ||
487 | * 3. If key_usage(issuer) exists check it supports certificate signing | ||
488 | * returns 0 for OK, positive for reason for mismatch, reasons match | ||
489 | * codes for X509_verify_cert() | ||
490 | */ | ||
491 | |||
492 | int X509_check_issued(X509 *issuer, X509 *subject) | ||
493 | { | ||
494 | if(X509_NAME_cmp(X509_get_subject_name(issuer), | ||
495 | X509_get_issuer_name(subject))) | ||
496 | return X509_V_ERR_SUBJECT_ISSUER_MISMATCH; | ||
497 | x509v3_cache_extensions(issuer); | ||
498 | x509v3_cache_extensions(subject); | ||
499 | if(subject->akid) { | ||
500 | /* Check key ids (if present) */ | ||
501 | if(subject->akid->keyid && issuer->skid && | ||
502 | ASN1_OCTET_STRING_cmp(subject->akid->keyid, issuer->skid) ) | ||
503 | return X509_V_ERR_AKID_SKID_MISMATCH; | ||
504 | /* Check serial number */ | ||
505 | if(subject->akid->serial && | ||
506 | ASN1_INTEGER_cmp(X509_get_serialNumber(issuer), | ||
507 | subject->akid->serial)) | ||
508 | return X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH; | ||
509 | /* Check issuer name */ | ||
510 | if(subject->akid->issuer) { | ||
511 | /* Ugh, for some peculiar reason AKID includes | ||
512 | * SEQUENCE OF GeneralName. So look for a DirName. | ||
513 | * There may be more than one but we only take any | ||
514 | * notice of the first. | ||
515 | */ | ||
516 | STACK_OF(GENERAL_NAME) *gens; | ||
517 | GENERAL_NAME *gen; | ||
518 | X509_NAME *nm = NULL; | ||
519 | int i; | ||
520 | gens = subject->akid->issuer; | ||
521 | for(i = 0; i < sk_GENERAL_NAME_num(gens); i++) { | ||
522 | gen = sk_GENERAL_NAME_value(gens, i); | ||
523 | if(gen->type == GEN_DIRNAME) { | ||
524 | nm = gen->d.dirn; | ||
525 | break; | ||
526 | } | ||
527 | } | ||
528 | if(nm && X509_NAME_cmp(nm, X509_get_issuer_name(issuer))) | ||
529 | return X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH; | ||
530 | } | ||
531 | } | ||
532 | if(ku_reject(issuer, KU_KEY_CERT_SIGN)) return X509_V_ERR_KEYUSAGE_NO_CERTSIGN; | ||
533 | return X509_V_OK; | ||
534 | } | ||
535 | |||
diff --git a/src/lib/libcrypto/x509v3/v3_skey.c b/src/lib/libcrypto/x509v3/v3_skey.c deleted file mode 100644 index 939845fa8f..0000000000 --- a/src/lib/libcrypto/x509v3/v3_skey.c +++ /dev/null | |||
@@ -1,149 +0,0 @@ | |||
1 | /* v3_skey.c */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 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 | |||
60 | #include <stdio.h> | ||
61 | #include "cryptlib.h" | ||
62 | #include <openssl/x509v3.h> | ||
63 | |||
64 | static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str); | ||
65 | X509V3_EXT_METHOD v3_skey_id = { | ||
66 | NID_subject_key_identifier, 0, | ||
67 | (X509V3_EXT_NEW)ASN1_OCTET_STRING_new, | ||
68 | (X509V3_EXT_FREE)ASN1_OCTET_STRING_free, | ||
69 | (X509V3_EXT_D2I)d2i_ASN1_OCTET_STRING, | ||
70 | (X509V3_EXT_I2D)i2d_ASN1_OCTET_STRING, | ||
71 | (X509V3_EXT_I2S)i2s_ASN1_OCTET_STRING, | ||
72 | (X509V3_EXT_S2I)s2i_skey_id, | ||
73 | NULL, NULL, NULL, NULL, NULL}; | ||
74 | |||
75 | char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, | ||
76 | ASN1_OCTET_STRING *oct) | ||
77 | { | ||
78 | return hex_to_string(oct->data, oct->length); | ||
79 | } | ||
80 | |||
81 | ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, | ||
82 | X509V3_CTX *ctx, char *str) | ||
83 | { | ||
84 | ASN1_OCTET_STRING *oct; | ||
85 | long length; | ||
86 | |||
87 | if(!(oct = M_ASN1_OCTET_STRING_new())) { | ||
88 | X509V3err(X509V3_F_S2I_ASN1_OCTET_STRING,ERR_R_MALLOC_FAILURE); | ||
89 | return NULL; | ||
90 | } | ||
91 | |||
92 | if(!(oct->data = string_to_hex(str, &length))) { | ||
93 | M_ASN1_OCTET_STRING_free(oct); | ||
94 | return NULL; | ||
95 | } | ||
96 | |||
97 | oct->length = length; | ||
98 | |||
99 | return oct; | ||
100 | |||
101 | } | ||
102 | |||
103 | static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method, | ||
104 | X509V3_CTX *ctx, char *str) | ||
105 | { | ||
106 | ASN1_OCTET_STRING *oct; | ||
107 | ASN1_BIT_STRING *pk; | ||
108 | unsigned char pkey_dig[EVP_MAX_MD_SIZE]; | ||
109 | EVP_MD_CTX md; | ||
110 | unsigned int diglen; | ||
111 | |||
112 | if(strcmp(str, "hash")) return s2i_ASN1_OCTET_STRING(method, ctx, str); | ||
113 | |||
114 | if(!(oct = M_ASN1_OCTET_STRING_new())) { | ||
115 | X509V3err(X509V3_F_S2I_S2I_SKEY_ID,ERR_R_MALLOC_FAILURE); | ||
116 | return NULL; | ||
117 | } | ||
118 | |||
119 | if(ctx && (ctx->flags == CTX_TEST)) return oct; | ||
120 | |||
121 | if(!ctx || (!ctx->subject_req && !ctx->subject_cert)) { | ||
122 | X509V3err(X509V3_F_S2I_ASN1_SKEY_ID,X509V3_R_NO_PUBLIC_KEY); | ||
123 | goto err; | ||
124 | } | ||
125 | |||
126 | if(ctx->subject_req) | ||
127 | pk = ctx->subject_req->req_info->pubkey->public_key; | ||
128 | else pk = ctx->subject_cert->cert_info->key->public_key; | ||
129 | |||
130 | if(!pk) { | ||
131 | X509V3err(X509V3_F_S2I_ASN1_SKEY_ID,X509V3_R_NO_PUBLIC_KEY); | ||
132 | goto err; | ||
133 | } | ||
134 | |||
135 | EVP_DigestInit(&md, EVP_sha1()); | ||
136 | EVP_DigestUpdate(&md, pk->data, pk->length); | ||
137 | EVP_DigestFinal(&md, pkey_dig, &diglen); | ||
138 | |||
139 | if(!M_ASN1_OCTET_STRING_set(oct, pkey_dig, diglen)) { | ||
140 | X509V3err(X509V3_F_S2I_S2I_SKEY_ID,ERR_R_MALLOC_FAILURE); | ||
141 | goto err; | ||
142 | } | ||
143 | |||
144 | return oct; | ||
145 | |||
146 | err: | ||
147 | M_ASN1_OCTET_STRING_free(oct); | ||
148 | return NULL; | ||
149 | } | ||
diff --git a/src/lib/libcrypto/x509v3/v3_sxnet.c b/src/lib/libcrypto/x509v3/v3_sxnet.c deleted file mode 100644 index bfecacd336..0000000000 --- a/src/lib/libcrypto/x509v3/v3_sxnet.c +++ /dev/null | |||
@@ -1,340 +0,0 @@ | |||
1 | /* v3_sxnet.c */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 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 "cryptlib.h" | ||
61 | #include <openssl/conf.h> | ||
62 | #include <openssl/asn1.h> | ||
63 | #include <openssl/asn1_mac.h> | ||
64 | #include <openssl/x509v3.h> | ||
65 | |||
66 | /* Support for Thawte strong extranet extension */ | ||
67 | |||
68 | #define SXNET_TEST | ||
69 | |||
70 | static int sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out, int indent); | ||
71 | #ifdef SXNET_TEST | ||
72 | static SXNET * sxnet_v2i(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, | ||
73 | STACK_OF(CONF_VALUE) *nval); | ||
74 | #endif | ||
75 | X509V3_EXT_METHOD v3_sxnet = { | ||
76 | NID_sxnet, X509V3_EXT_MULTILINE, | ||
77 | (X509V3_EXT_NEW)SXNET_new, | ||
78 | (X509V3_EXT_FREE)SXNET_free, | ||
79 | (X509V3_EXT_D2I)d2i_SXNET, | ||
80 | (X509V3_EXT_I2D)i2d_SXNET, | ||
81 | NULL, NULL, | ||
82 | NULL, | ||
83 | #ifdef SXNET_TEST | ||
84 | (X509V3_EXT_V2I)sxnet_v2i, | ||
85 | #else | ||
86 | NULL, | ||
87 | #endif | ||
88 | (X509V3_EXT_I2R)sxnet_i2r, | ||
89 | NULL, | ||
90 | NULL | ||
91 | }; | ||
92 | |||
93 | |||
94 | int i2d_SXNET(SXNET *a, unsigned char **pp) | ||
95 | { | ||
96 | M_ASN1_I2D_vars(a); | ||
97 | |||
98 | M_ASN1_I2D_len (a->version, i2d_ASN1_INTEGER); | ||
99 | M_ASN1_I2D_len_SEQUENCE_type (SXNETID, a->ids, i2d_SXNETID); | ||
100 | |||
101 | M_ASN1_I2D_seq_total(); | ||
102 | |||
103 | M_ASN1_I2D_put (a->version, i2d_ASN1_INTEGER); | ||
104 | M_ASN1_I2D_put_SEQUENCE_type (SXNETID, a->ids, i2d_SXNETID); | ||
105 | |||
106 | M_ASN1_I2D_finish(); | ||
107 | } | ||
108 | |||
109 | SXNET *SXNET_new(void) | ||
110 | { | ||
111 | SXNET *ret=NULL; | ||
112 | ASN1_CTX c; | ||
113 | M_ASN1_New_Malloc(ret, SXNET); | ||
114 | M_ASN1_New(ret->version,M_ASN1_INTEGER_new); | ||
115 | M_ASN1_New(ret->ids,sk_SXNETID_new_null); | ||
116 | return (ret); | ||
117 | M_ASN1_New_Error(ASN1_F_SXNET_NEW); | ||
118 | } | ||
119 | |||
120 | SXNET *d2i_SXNET(SXNET **a, unsigned char **pp, long length) | ||
121 | { | ||
122 | M_ASN1_D2I_vars(a,SXNET *,SXNET_new); | ||
123 | M_ASN1_D2I_Init(); | ||
124 | M_ASN1_D2I_start_sequence(); | ||
125 | M_ASN1_D2I_get (ret->version, d2i_ASN1_INTEGER); | ||
126 | M_ASN1_D2I_get_seq_type (SXNETID, ret->ids, d2i_SXNETID, SXNETID_free); | ||
127 | M_ASN1_D2I_Finish(a, SXNET_free, ASN1_F_D2I_SXNET); | ||
128 | } | ||
129 | |||
130 | void SXNET_free(SXNET *a) | ||
131 | { | ||
132 | if (a == NULL) return; | ||
133 | M_ASN1_INTEGER_free(a->version); | ||
134 | sk_SXNETID_pop_free(a->ids, SXNETID_free); | ||
135 | OPENSSL_free (a); | ||
136 | } | ||
137 | |||
138 | int i2d_SXNETID(SXNETID *a, unsigned char **pp) | ||
139 | { | ||
140 | M_ASN1_I2D_vars(a); | ||
141 | |||
142 | M_ASN1_I2D_len (a->zone, i2d_ASN1_INTEGER); | ||
143 | M_ASN1_I2D_len (a->user, i2d_ASN1_OCTET_STRING); | ||
144 | |||
145 | M_ASN1_I2D_seq_total(); | ||
146 | |||
147 | M_ASN1_I2D_put (a->zone, i2d_ASN1_INTEGER); | ||
148 | M_ASN1_I2D_put (a->user, i2d_ASN1_OCTET_STRING); | ||
149 | |||
150 | M_ASN1_I2D_finish(); | ||
151 | } | ||
152 | |||
153 | SXNETID *SXNETID_new(void) | ||
154 | { | ||
155 | SXNETID *ret=NULL; | ||
156 | ASN1_CTX c; | ||
157 | M_ASN1_New_Malloc(ret, SXNETID); | ||
158 | ret->zone = NULL; | ||
159 | M_ASN1_New(ret->user,M_ASN1_OCTET_STRING_new); | ||
160 | return (ret); | ||
161 | M_ASN1_New_Error(ASN1_F_SXNETID_NEW); | ||
162 | } | ||
163 | |||
164 | SXNETID *d2i_SXNETID(SXNETID **a, unsigned char **pp, long length) | ||
165 | { | ||
166 | M_ASN1_D2I_vars(a,SXNETID *,SXNETID_new); | ||
167 | M_ASN1_D2I_Init(); | ||
168 | M_ASN1_D2I_start_sequence(); | ||
169 | M_ASN1_D2I_get(ret->zone, d2i_ASN1_INTEGER); | ||
170 | M_ASN1_D2I_get(ret->user, d2i_ASN1_OCTET_STRING); | ||
171 | M_ASN1_D2I_Finish(a, SXNETID_free, ASN1_F_D2I_SXNETID); | ||
172 | } | ||
173 | |||
174 | void SXNETID_free(SXNETID *a) | ||
175 | { | ||
176 | if (a == NULL) return; | ||
177 | M_ASN1_INTEGER_free(a->zone); | ||
178 | M_ASN1_OCTET_STRING_free(a->user); | ||
179 | OPENSSL_free (a); | ||
180 | } | ||
181 | |||
182 | static int sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out, | ||
183 | int indent) | ||
184 | { | ||
185 | long v; | ||
186 | char *tmp; | ||
187 | SXNETID *id; | ||
188 | int i; | ||
189 | v = ASN1_INTEGER_get(sx->version); | ||
190 | BIO_printf(out, "%*sVersion: %d (0x%X)", indent, "", v + 1, v); | ||
191 | for(i = 0; i < sk_SXNETID_num(sx->ids); i++) { | ||
192 | id = sk_SXNETID_value(sx->ids, i); | ||
193 | tmp = i2s_ASN1_INTEGER(NULL, id->zone); | ||
194 | BIO_printf(out, "\n%*sZone: %s, User: ", indent, "", tmp); | ||
195 | OPENSSL_free(tmp); | ||
196 | M_ASN1_OCTET_STRING_print(out, id->user); | ||
197 | } | ||
198 | return 1; | ||
199 | } | ||
200 | |||
201 | #ifdef SXNET_TEST | ||
202 | |||
203 | /* NBB: this is used for testing only. It should *not* be used for anything | ||
204 | * else because it will just take static IDs from the configuration file and | ||
205 | * they should really be separate values for each user. | ||
206 | */ | ||
207 | |||
208 | |||
209 | static SXNET * sxnet_v2i(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, | ||
210 | STACK_OF(CONF_VALUE) *nval) | ||
211 | { | ||
212 | CONF_VALUE *cnf; | ||
213 | SXNET *sx = NULL; | ||
214 | int i; | ||
215 | for(i = 0; i < sk_CONF_VALUE_num(nval); i++) { | ||
216 | cnf = sk_CONF_VALUE_value(nval, i); | ||
217 | if(!SXNET_add_id_asc(&sx, cnf->name, cnf->value, -1)) | ||
218 | return NULL; | ||
219 | } | ||
220 | return sx; | ||
221 | } | ||
222 | |||
223 | |||
224 | #endif | ||
225 | |||
226 | /* Strong Extranet utility functions */ | ||
227 | |||
228 | /* Add an id given the zone as an ASCII number */ | ||
229 | |||
230 | int SXNET_add_id_asc(SXNET **psx, char *zone, char *user, | ||
231 | int userlen) | ||
232 | { | ||
233 | ASN1_INTEGER *izone = NULL; | ||
234 | if(!(izone = s2i_ASN1_INTEGER(NULL, zone))) { | ||
235 | X509V3err(X509V3_F_SXNET_ADD_ASC,X509V3_R_ERROR_CONVERTING_ZONE); | ||
236 | return 0; | ||
237 | } | ||
238 | return SXNET_add_id_INTEGER(psx, izone, user, userlen); | ||
239 | } | ||
240 | |||
241 | /* Add an id given the zone as an unsigned long */ | ||
242 | |||
243 | int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, char *user, | ||
244 | int userlen) | ||
245 | { | ||
246 | ASN1_INTEGER *izone = NULL; | ||
247 | if(!(izone = M_ASN1_INTEGER_new()) || !ASN1_INTEGER_set(izone, lzone)) { | ||
248 | X509V3err(X509V3_F_SXNET_ADD_ID_ULONG,ERR_R_MALLOC_FAILURE); | ||
249 | M_ASN1_INTEGER_free(izone); | ||
250 | return 0; | ||
251 | } | ||
252 | return SXNET_add_id_INTEGER(psx, izone, user, userlen); | ||
253 | |||
254 | } | ||
255 | |||
256 | /* Add an id given the zone as an ASN1_INTEGER. | ||
257 | * Note this version uses the passed integer and doesn't make a copy so don't | ||
258 | * free it up afterwards. | ||
259 | */ | ||
260 | |||
261 | int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *zone, char *user, | ||
262 | int userlen) | ||
263 | { | ||
264 | SXNET *sx = NULL; | ||
265 | SXNETID *id = NULL; | ||
266 | if(!psx || !zone || !user) { | ||
267 | X509V3err(X509V3_F_SXNET_ADD_ID_INTEGER,X509V3_R_INVALID_NULL_ARGUMENT); | ||
268 | return 0; | ||
269 | } | ||
270 | if(userlen == -1) userlen = strlen(user); | ||
271 | if(userlen > 64) { | ||
272 | X509V3err(X509V3_F_SXNET_ADD_ID_INTEGER,X509V3_R_USER_TOO_LONG); | ||
273 | return 0; | ||
274 | } | ||
275 | if(!*psx) { | ||
276 | if(!(sx = SXNET_new())) goto err; | ||
277 | if(!ASN1_INTEGER_set(sx->version, 0)) goto err; | ||
278 | *psx = sx; | ||
279 | } else sx = *psx; | ||
280 | if(SXNET_get_id_INTEGER(sx, zone)) { | ||
281 | X509V3err(X509V3_F_SXNET_ADD_ID_INTEGER,X509V3_R_DUPLICATE_ZONE_ID); | ||
282 | return 0; | ||
283 | } | ||
284 | |||
285 | if(!(id = SXNETID_new())) goto err; | ||
286 | if(userlen == -1) userlen = strlen(user); | ||
287 | |||
288 | if(!M_ASN1_OCTET_STRING_set(id->user, user, userlen)) goto err; | ||
289 | if(!sk_SXNETID_push(sx->ids, id)) goto err; | ||
290 | id->zone = zone; | ||
291 | return 1; | ||
292 | |||
293 | err: | ||
294 | X509V3err(X509V3_F_SXNET_ADD_ID_INTEGER,ERR_R_MALLOC_FAILURE); | ||
295 | SXNETID_free(id); | ||
296 | SXNET_free(sx); | ||
297 | *psx = NULL; | ||
298 | return 0; | ||
299 | } | ||
300 | |||
301 | ASN1_OCTET_STRING *SXNET_get_id_asc(SXNET *sx, char *zone) | ||
302 | { | ||
303 | ASN1_INTEGER *izone = NULL; | ||
304 | ASN1_OCTET_STRING *oct; | ||
305 | if(!(izone = s2i_ASN1_INTEGER(NULL, zone))) { | ||
306 | X509V3err(X509V3_F_SXNET_GET_ID_ASC,X509V3_R_ERROR_CONVERTING_ZONE); | ||
307 | return NULL; | ||
308 | } | ||
309 | oct = SXNET_get_id_INTEGER(sx, izone); | ||
310 | M_ASN1_INTEGER_free(izone); | ||
311 | return oct; | ||
312 | } | ||
313 | |||
314 | ASN1_OCTET_STRING *SXNET_get_id_ulong(SXNET *sx, unsigned long lzone) | ||
315 | { | ||
316 | ASN1_INTEGER *izone = NULL; | ||
317 | ASN1_OCTET_STRING *oct; | ||
318 | if(!(izone = M_ASN1_INTEGER_new()) || !ASN1_INTEGER_set(izone, lzone)) { | ||
319 | X509V3err(X509V3_F_SXNET_GET_ID_ULONG,ERR_R_MALLOC_FAILURE); | ||
320 | M_ASN1_INTEGER_free(izone); | ||
321 | return NULL; | ||
322 | } | ||
323 | oct = SXNET_get_id_INTEGER(sx, izone); | ||
324 | M_ASN1_INTEGER_free(izone); | ||
325 | return oct; | ||
326 | } | ||
327 | |||
328 | ASN1_OCTET_STRING *SXNET_get_id_INTEGER(SXNET *sx, ASN1_INTEGER *zone) | ||
329 | { | ||
330 | SXNETID *id; | ||
331 | int i; | ||
332 | for(i = 0; i < sk_SXNETID_num(sx->ids); i++) { | ||
333 | id = sk_SXNETID_value(sx->ids, i); | ||
334 | if(!M_ASN1_INTEGER_cmp(id->zone, zone)) return id->user; | ||
335 | } | ||
336 | return NULL; | ||
337 | } | ||
338 | |||
339 | IMPLEMENT_STACK_OF(SXNETID) | ||
340 | IMPLEMENT_ASN1_SET_OF(SXNETID) | ||
diff --git a/src/lib/libcrypto/x509v3/v3_utl.c b/src/lib/libcrypto/x509v3/v3_utl.c deleted file mode 100644 index 619f161b58..0000000000 --- a/src/lib/libcrypto/x509v3/v3_utl.c +++ /dev/null | |||
@@ -1,516 +0,0 @@ | |||
1 | /* v3_utl.c */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 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 | /* X509 v3 extension utilities */ | ||
59 | |||
60 | |||
61 | #include <stdio.h> | ||
62 | #include <ctype.h> | ||
63 | #include "cryptlib.h" | ||
64 | #include <openssl/conf.h> | ||
65 | #include <openssl/x509v3.h> | ||
66 | |||
67 | static char *strip_spaces(char *name); | ||
68 | static int sk_strcmp(const char * const *a, const char * const *b); | ||
69 | static STACK *get_email(X509_NAME *name, STACK_OF(GENERAL_NAME) *gens); | ||
70 | static void str_free(void *str); | ||
71 | static int append_ia5(STACK **sk, ASN1_IA5STRING *email); | ||
72 | |||
73 | /* Add a CONF_VALUE name value pair to stack */ | ||
74 | |||
75 | int X509V3_add_value(const char *name, const char *value, | ||
76 | STACK_OF(CONF_VALUE) **extlist) | ||
77 | { | ||
78 | CONF_VALUE *vtmp = NULL; | ||
79 | char *tname = NULL, *tvalue = NULL; | ||
80 | if(name && !(tname = BUF_strdup(name))) goto err; | ||
81 | if(value && !(tvalue = BUF_strdup(value))) goto err;; | ||
82 | if(!(vtmp = (CONF_VALUE *)OPENSSL_malloc(sizeof(CONF_VALUE)))) goto err; | ||
83 | if(!*extlist && !(*extlist = sk_CONF_VALUE_new_null())) goto err; | ||
84 | vtmp->section = NULL; | ||
85 | vtmp->name = tname; | ||
86 | vtmp->value = tvalue; | ||
87 | if(!sk_CONF_VALUE_push(*extlist, vtmp)) goto err; | ||
88 | return 1; | ||
89 | err: | ||
90 | X509V3err(X509V3_F_X509V3_ADD_VALUE,ERR_R_MALLOC_FAILURE); | ||
91 | if(vtmp) OPENSSL_free(vtmp); | ||
92 | if(tname) OPENSSL_free(tname); | ||
93 | if(tvalue) OPENSSL_free(tvalue); | ||
94 | return 0; | ||
95 | } | ||
96 | |||
97 | int X509V3_add_value_uchar(const char *name, const unsigned char *value, | ||
98 | STACK_OF(CONF_VALUE) **extlist) | ||
99 | { | ||
100 | return X509V3_add_value(name,(const char *)value,extlist); | ||
101 | } | ||
102 | |||
103 | /* Free function for STACK_OF(CONF_VALUE) */ | ||
104 | |||
105 | void X509V3_conf_free(CONF_VALUE *conf) | ||
106 | { | ||
107 | if(!conf) return; | ||
108 | if(conf->name) OPENSSL_free(conf->name); | ||
109 | if(conf->value) OPENSSL_free(conf->value); | ||
110 | if(conf->section) OPENSSL_free(conf->section); | ||
111 | OPENSSL_free(conf); | ||
112 | } | ||
113 | |||
114 | int X509V3_add_value_bool(const char *name, int asn1_bool, | ||
115 | STACK_OF(CONF_VALUE) **extlist) | ||
116 | { | ||
117 | if(asn1_bool) return X509V3_add_value(name, "TRUE", extlist); | ||
118 | return X509V3_add_value(name, "FALSE", extlist); | ||
119 | } | ||
120 | |||
121 | int X509V3_add_value_bool_nf(char *name, int asn1_bool, | ||
122 | STACK_OF(CONF_VALUE) **extlist) | ||
123 | { | ||
124 | if(asn1_bool) return X509V3_add_value(name, "TRUE", extlist); | ||
125 | return 1; | ||
126 | } | ||
127 | |||
128 | |||
129 | char *i2s_ASN1_ENUMERATED(X509V3_EXT_METHOD *method, ASN1_ENUMERATED *a) | ||
130 | { | ||
131 | BIGNUM *bntmp = NULL; | ||
132 | char *strtmp = NULL; | ||
133 | if(!a) return NULL; | ||
134 | if(!(bntmp = ASN1_ENUMERATED_to_BN(a, NULL)) || | ||
135 | !(strtmp = BN_bn2dec(bntmp)) ) | ||
136 | X509V3err(X509V3_F_I2S_ASN1_ENUMERATED,ERR_R_MALLOC_FAILURE); | ||
137 | BN_free(bntmp); | ||
138 | return strtmp; | ||
139 | } | ||
140 | |||
141 | char *i2s_ASN1_INTEGER(X509V3_EXT_METHOD *method, ASN1_INTEGER *a) | ||
142 | { | ||
143 | BIGNUM *bntmp = NULL; | ||
144 | char *strtmp = NULL; | ||
145 | if(!a) return NULL; | ||
146 | if(!(bntmp = ASN1_INTEGER_to_BN(a, NULL)) || | ||
147 | !(strtmp = BN_bn2dec(bntmp)) ) | ||
148 | X509V3err(X509V3_F_I2S_ASN1_INTEGER,ERR_R_MALLOC_FAILURE); | ||
149 | BN_free(bntmp); | ||
150 | return strtmp; | ||
151 | } | ||
152 | |||
153 | ASN1_INTEGER *s2i_ASN1_INTEGER(X509V3_EXT_METHOD *method, char *value) | ||
154 | { | ||
155 | BIGNUM *bn = NULL; | ||
156 | ASN1_INTEGER *aint; | ||
157 | bn = BN_new(); | ||
158 | if(!value) { | ||
159 | X509V3err(X509V3_F_S2I_ASN1_INTEGER,X509V3_R_INVALID_NULL_VALUE); | ||
160 | return 0; | ||
161 | } | ||
162 | if(!BN_dec2bn(&bn, value)) { | ||
163 | X509V3err(X509V3_F_S2I_ASN1_INTEGER,X509V3_R_BN_DEC2BN_ERROR); | ||
164 | return 0; | ||
165 | } | ||
166 | |||
167 | if(!(aint = BN_to_ASN1_INTEGER(bn, NULL))) { | ||
168 | X509V3err(X509V3_F_S2I_ASN1_INTEGER,X509V3_R_BN_TO_ASN1_INTEGER_ERROR); | ||
169 | return 0; | ||
170 | } | ||
171 | BN_free(bn); | ||
172 | return aint; | ||
173 | } | ||
174 | |||
175 | int X509V3_add_value_int(const char *name, ASN1_INTEGER *aint, | ||
176 | STACK_OF(CONF_VALUE) **extlist) | ||
177 | { | ||
178 | char *strtmp; | ||
179 | int ret; | ||
180 | if(!aint) return 1; | ||
181 | if(!(strtmp = i2s_ASN1_INTEGER(NULL, aint))) return 0; | ||
182 | ret = X509V3_add_value(name, strtmp, extlist); | ||
183 | OPENSSL_free(strtmp); | ||
184 | return ret; | ||
185 | } | ||
186 | |||
187 | int X509V3_get_value_bool(CONF_VALUE *value, int *asn1_bool) | ||
188 | { | ||
189 | char *btmp; | ||
190 | if(!(btmp = value->value)) goto err; | ||
191 | if(!strcmp(btmp, "TRUE") || !strcmp(btmp, "true") | ||
192 | || !strcmp(btmp, "Y") || !strcmp(btmp, "y") | ||
193 | || !strcmp(btmp, "YES") || !strcmp(btmp, "yes")) { | ||
194 | *asn1_bool = 0xff; | ||
195 | return 1; | ||
196 | } else if(!strcmp(btmp, "FALSE") || !strcmp(btmp, "false") | ||
197 | || !strcmp(btmp, "N") || !strcmp(btmp, "n") | ||
198 | || !strcmp(btmp, "NO") || !strcmp(btmp, "no")) { | ||
199 | *asn1_bool = 0; | ||
200 | return 1; | ||
201 | } | ||
202 | err: | ||
203 | X509V3err(X509V3_F_X509V3_GET_VALUE_BOOL,X509V3_R_INVALID_BOOLEAN_STRING); | ||
204 | X509V3_conf_err(value); | ||
205 | return 0; | ||
206 | } | ||
207 | |||
208 | int X509V3_get_value_int(CONF_VALUE *value, ASN1_INTEGER **aint) | ||
209 | { | ||
210 | ASN1_INTEGER *itmp; | ||
211 | if(!(itmp = s2i_ASN1_INTEGER(NULL, value->value))) { | ||
212 | X509V3_conf_err(value); | ||
213 | return 0; | ||
214 | } | ||
215 | *aint = itmp; | ||
216 | return 1; | ||
217 | } | ||
218 | |||
219 | #define HDR_NAME 1 | ||
220 | #define HDR_VALUE 2 | ||
221 | |||
222 | /*#define DEBUG*/ | ||
223 | |||
224 | STACK_OF(CONF_VALUE) *X509V3_parse_list(char *line) | ||
225 | { | ||
226 | char *p, *q, c; | ||
227 | char *ntmp, *vtmp; | ||
228 | STACK_OF(CONF_VALUE) *values = NULL; | ||
229 | char *linebuf; | ||
230 | int state; | ||
231 | /* We are going to modify the line so copy it first */ | ||
232 | linebuf = BUF_strdup(line); | ||
233 | state = HDR_NAME; | ||
234 | ntmp = NULL; | ||
235 | /* Go through all characters */ | ||
236 | for(p = linebuf, q = linebuf; (c = *p) && (c!='\r') && (c!='\n'); p++) { | ||
237 | |||
238 | switch(state) { | ||
239 | case HDR_NAME: | ||
240 | if(c == ':') { | ||
241 | state = HDR_VALUE; | ||
242 | *p = 0; | ||
243 | ntmp = strip_spaces(q); | ||
244 | if(!ntmp) { | ||
245 | X509V3err(X509V3_F_X509V3_PARSE_LIST, X509V3_R_INVALID_NULL_NAME); | ||
246 | goto err; | ||
247 | } | ||
248 | q = p + 1; | ||
249 | } else if(c == ',') { | ||
250 | *p = 0; | ||
251 | ntmp = strip_spaces(q); | ||
252 | q = p + 1; | ||
253 | #ifdef DEBUG | ||
254 | printf("%s\n", ntmp); | ||
255 | #endif | ||
256 | if(!ntmp) { | ||
257 | X509V3err(X509V3_F_X509V3_PARSE_LIST, X509V3_R_INVALID_NULL_NAME); | ||
258 | goto err; | ||
259 | } | ||
260 | X509V3_add_value(ntmp, NULL, &values); | ||
261 | } | ||
262 | break ; | ||
263 | |||
264 | case HDR_VALUE: | ||
265 | if(c == ',') { | ||
266 | state = HDR_NAME; | ||
267 | *p = 0; | ||
268 | vtmp = strip_spaces(q); | ||
269 | #ifdef DEBUG | ||
270 | printf("%s\n", ntmp); | ||
271 | #endif | ||
272 | if(!vtmp) { | ||
273 | X509V3err(X509V3_F_X509V3_PARSE_LIST, X509V3_R_INVALID_NULL_VALUE); | ||
274 | goto err; | ||
275 | } | ||
276 | X509V3_add_value(ntmp, vtmp, &values); | ||
277 | ntmp = NULL; | ||
278 | q = p + 1; | ||
279 | } | ||
280 | |||
281 | } | ||
282 | } | ||
283 | |||
284 | if(state == HDR_VALUE) { | ||
285 | vtmp = strip_spaces(q); | ||
286 | #ifdef DEBUG | ||
287 | printf("%s=%s\n", ntmp, vtmp); | ||
288 | #endif | ||
289 | if(!vtmp) { | ||
290 | X509V3err(X509V3_F_X509V3_PARSE_LIST, X509V3_R_INVALID_NULL_VALUE); | ||
291 | goto err; | ||
292 | } | ||
293 | X509V3_add_value(ntmp, vtmp, &values); | ||
294 | } else { | ||
295 | ntmp = strip_spaces(q); | ||
296 | #ifdef DEBUG | ||
297 | printf("%s\n", ntmp); | ||
298 | #endif | ||
299 | if(!ntmp) { | ||
300 | X509V3err(X509V3_F_X509V3_PARSE_LIST, X509V3_R_INVALID_NULL_NAME); | ||
301 | goto err; | ||
302 | } | ||
303 | X509V3_add_value(ntmp, NULL, &values); | ||
304 | } | ||
305 | OPENSSL_free(linebuf); | ||
306 | return values; | ||
307 | |||
308 | err: | ||
309 | OPENSSL_free(linebuf); | ||
310 | sk_CONF_VALUE_pop_free(values, X509V3_conf_free); | ||
311 | return NULL; | ||
312 | |||
313 | } | ||
314 | |||
315 | /* Delete leading and trailing spaces from a string */ | ||
316 | static char *strip_spaces(char *name) | ||
317 | { | ||
318 | char *p, *q; | ||
319 | /* Skip over leading spaces */ | ||
320 | p = name; | ||
321 | while(*p && isspace((unsigned char)*p)) p++; | ||
322 | if(!*p) return NULL; | ||
323 | q = p + strlen(p) - 1; | ||
324 | while((q != p) && isspace((unsigned char)*q)) q--; | ||
325 | if(p != q) q[1] = 0; | ||
326 | if(!*p) return NULL; | ||
327 | return p; | ||
328 | } | ||
329 | |||
330 | /* hex string utilities */ | ||
331 | |||
332 | /* Given a buffer of length 'len' return a OPENSSL_malloc'ed string with its | ||
333 | * hex representation | ||
334 | * @@@ (Contents of buffer are always kept in ASCII, also on EBCDIC machines) | ||
335 | */ | ||
336 | |||
337 | char *hex_to_string(unsigned char *buffer, long len) | ||
338 | { | ||
339 | char *tmp, *q; | ||
340 | unsigned char *p; | ||
341 | int i; | ||
342 | static char hexdig[] = "0123456789ABCDEF"; | ||
343 | if(!buffer || !len) return NULL; | ||
344 | if(!(tmp = OPENSSL_malloc(len * 3 + 1))) { | ||
345 | X509V3err(X509V3_F_HEX_TO_STRING,ERR_R_MALLOC_FAILURE); | ||
346 | return NULL; | ||
347 | } | ||
348 | q = tmp; | ||
349 | for(i = 0, p = buffer; i < len; i++,p++) { | ||
350 | *q++ = hexdig[(*p >> 4) & 0xf]; | ||
351 | *q++ = hexdig[*p & 0xf]; | ||
352 | *q++ = ':'; | ||
353 | } | ||
354 | q[-1] = 0; | ||
355 | #ifdef CHARSET_EBCDIC | ||
356 | ebcdic2ascii(tmp, tmp, q - tmp - 1); | ||
357 | #endif | ||
358 | |||
359 | return tmp; | ||
360 | } | ||
361 | |||
362 | /* Give a string of hex digits convert to | ||
363 | * a buffer | ||
364 | */ | ||
365 | |||
366 | unsigned char *string_to_hex(char *str, long *len) | ||
367 | { | ||
368 | unsigned char *hexbuf, *q; | ||
369 | unsigned char ch, cl, *p; | ||
370 | if(!str) { | ||
371 | X509V3err(X509V3_F_STRING_TO_HEX,X509V3_R_INVALID_NULL_ARGUMENT); | ||
372 | return NULL; | ||
373 | } | ||
374 | if(!(hexbuf = OPENSSL_malloc(strlen(str) >> 1))) goto err; | ||
375 | for(p = (unsigned char *)str, q = hexbuf; *p;) { | ||
376 | ch = *p++; | ||
377 | #ifdef CHARSET_EBCDIC | ||
378 | ch = os_toebcdic[ch]; | ||
379 | #endif | ||
380 | if(ch == ':') continue; | ||
381 | cl = *p++; | ||
382 | #ifdef CHARSET_EBCDIC | ||
383 | cl = os_toebcdic[cl]; | ||
384 | #endif | ||
385 | if(!cl) { | ||
386 | X509V3err(X509V3_F_STRING_TO_HEX,X509V3_R_ODD_NUMBER_OF_DIGITS); | ||
387 | OPENSSL_free(hexbuf); | ||
388 | return NULL; | ||
389 | } | ||
390 | if(isupper(ch)) ch = tolower(ch); | ||
391 | if(isupper(cl)) cl = tolower(cl); | ||
392 | |||
393 | if((ch >= '0') && (ch <= '9')) ch -= '0'; | ||
394 | else if ((ch >= 'a') && (ch <= 'f')) ch -= 'a' - 10; | ||
395 | else goto badhex; | ||
396 | |||
397 | if((cl >= '0') && (cl <= '9')) cl -= '0'; | ||
398 | else if ((cl >= 'a') && (cl <= 'f')) cl -= 'a' - 10; | ||
399 | else goto badhex; | ||
400 | |||
401 | *q++ = (ch << 4) | cl; | ||
402 | } | ||
403 | |||
404 | if(len) *len = q - hexbuf; | ||
405 | |||
406 | return hexbuf; | ||
407 | |||
408 | err: | ||
409 | if(hexbuf) OPENSSL_free(hexbuf); | ||
410 | X509V3err(X509V3_F_STRING_TO_HEX,ERR_R_MALLOC_FAILURE); | ||
411 | return NULL; | ||
412 | |||
413 | badhex: | ||
414 | OPENSSL_free(hexbuf); | ||
415 | X509V3err(X509V3_F_STRING_TO_HEX,X509V3_R_ILLEGAL_HEX_DIGIT); | ||
416 | return NULL; | ||
417 | |||
418 | } | ||
419 | |||
420 | /* V2I name comparison function: returns zero if 'name' matches | ||
421 | * cmp or cmp.* | ||
422 | */ | ||
423 | |||
424 | int name_cmp(const char *name, const char *cmp) | ||
425 | { | ||
426 | int len, ret; | ||
427 | char c; | ||
428 | len = strlen(cmp); | ||
429 | if((ret = strncmp(name, cmp, len))) return ret; | ||
430 | c = name[len]; | ||
431 | if(!c || (c=='.')) return 0; | ||
432 | return 1; | ||
433 | } | ||
434 | |||
435 | static int sk_strcmp(const char * const *a, const char * const *b) | ||
436 | { | ||
437 | return strcmp(*a, *b); | ||
438 | } | ||
439 | |||
440 | STACK *X509_get1_email(X509 *x) | ||
441 | { | ||
442 | STACK_OF(GENERAL_NAME) *gens; | ||
443 | STACK *ret; | ||
444 | gens = X509_get_ext_d2i(x, NID_subject_alt_name, NULL, NULL); | ||
445 | ret = get_email(X509_get_subject_name(x), gens); | ||
446 | sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free); | ||
447 | return ret; | ||
448 | } | ||
449 | |||
450 | STACK *X509_REQ_get1_email(X509_REQ *x) | ||
451 | { | ||
452 | STACK_OF(GENERAL_NAME) *gens; | ||
453 | STACK_OF(X509_EXTENSION) *exts; | ||
454 | STACK *ret; | ||
455 | exts = X509_REQ_get_extensions(x); | ||
456 | gens = X509V3_get_d2i(exts, NID_subject_alt_name, NULL, NULL); | ||
457 | ret = get_email(X509_REQ_get_subject_name(x), gens); | ||
458 | sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free); | ||
459 | sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free); | ||
460 | return ret; | ||
461 | } | ||
462 | |||
463 | |||
464 | static STACK *get_email(X509_NAME *name, STACK_OF(GENERAL_NAME) *gens) | ||
465 | { | ||
466 | STACK *ret = NULL; | ||
467 | X509_NAME_ENTRY *ne; | ||
468 | ASN1_IA5STRING *email; | ||
469 | GENERAL_NAME *gen; | ||
470 | int i; | ||
471 | /* Now add any email address(es) to STACK */ | ||
472 | i = -1; | ||
473 | /* First supplied X509_NAME */ | ||
474 | while((i = X509_NAME_get_index_by_NID(name, | ||
475 | NID_pkcs9_emailAddress, i)) > 0) { | ||
476 | ne = X509_NAME_get_entry(name, i); | ||
477 | email = X509_NAME_ENTRY_get_data(ne); | ||
478 | if(!append_ia5(&ret, email)) return NULL; | ||
479 | } | ||
480 | for(i = 0; i < sk_GENERAL_NAME_num(gens); i++) | ||
481 | { | ||
482 | gen = sk_GENERAL_NAME_value(gens, i); | ||
483 | if(gen->type != GEN_EMAIL) continue; | ||
484 | if(!append_ia5(&ret, gen->d.ia5)) return NULL; | ||
485 | } | ||
486 | return ret; | ||
487 | } | ||
488 | |||
489 | static void str_free(void *str) | ||
490 | { | ||
491 | OPENSSL_free(str); | ||
492 | } | ||
493 | |||
494 | static int append_ia5(STACK **sk, ASN1_IA5STRING *email) | ||
495 | { | ||
496 | char *emtmp; | ||
497 | /* First some sanity checks */ | ||
498 | if(email->type != V_ASN1_IA5STRING) return 1; | ||
499 | if(!email->data || !email->length) return 1; | ||
500 | if(!*sk) *sk = sk_new(sk_strcmp); | ||
501 | if(!*sk) return 0; | ||
502 | /* Don't add duplicates */ | ||
503 | if(sk_find(*sk, (char *)email->data) != -1) return 1; | ||
504 | emtmp = BUF_strdup((char *)email->data); | ||
505 | if(!emtmp || !sk_push(*sk, emtmp)) { | ||
506 | X509_email_free(*sk); | ||
507 | *sk = NULL; | ||
508 | return 0; | ||
509 | } | ||
510 | return 1; | ||
511 | } | ||
512 | |||
513 | void X509_email_free(STACK *sk) | ||
514 | { | ||
515 | sk_pop_free(sk, str_free); | ||
516 | } | ||
diff --git a/src/lib/libcrypto/x509v3/v3err.c b/src/lib/libcrypto/x509v3/v3err.c deleted file mode 100644 index aa4a605dc4..0000000000 --- a/src/lib/libcrypto/x509v3/v3err.c +++ /dev/null | |||
@@ -1,176 +0,0 @@ | |||
1 | /* crypto/x509v3/v3err.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/x509v3.h> | ||
64 | |||
65 | /* BEGIN ERROR CODES */ | ||
66 | #ifndef NO_ERR | ||
67 | static ERR_STRING_DATA X509V3_str_functs[]= | ||
68 | { | ||
69 | {ERR_PACK(0,X509V3_F_COPY_EMAIL,0), "COPY_EMAIL"}, | ||
70 | {ERR_PACK(0,X509V3_F_COPY_ISSUER,0), "COPY_ISSUER"}, | ||
71 | {ERR_PACK(0,X509V3_F_DO_EXT_CONF,0), "DO_EXT_CONF"}, | ||
72 | {ERR_PACK(0,X509V3_F_DO_EXT_I2D,0), "DO_EXT_I2D"}, | ||
73 | {ERR_PACK(0,X509V3_F_HEX_TO_STRING,0), "hex_to_string"}, | ||
74 | {ERR_PACK(0,X509V3_F_I2S_ASN1_ENUMERATED,0), "i2s_ASN1_ENUMERATED"}, | ||
75 | {ERR_PACK(0,X509V3_F_I2S_ASN1_INTEGER,0), "i2s_ASN1_INTEGER"}, | ||
76 | {ERR_PACK(0,X509V3_F_I2V_AUTHORITY_INFO_ACCESS,0), "I2V_AUTHORITY_INFO_ACCESS"}, | ||
77 | {ERR_PACK(0,X509V3_F_NOTICE_SECTION,0), "NOTICE_SECTION"}, | ||
78 | {ERR_PACK(0,X509V3_F_NREF_NOS,0), "NREF_NOS"}, | ||
79 | {ERR_PACK(0,X509V3_F_POLICY_SECTION,0), "POLICY_SECTION"}, | ||
80 | {ERR_PACK(0,X509V3_F_R2I_CERTPOL,0), "R2I_CERTPOL"}, | ||
81 | {ERR_PACK(0,X509V3_F_S2I_ASN1_IA5STRING,0), "S2I_ASN1_IA5STRING"}, | ||
82 | {ERR_PACK(0,X509V3_F_S2I_ASN1_INTEGER,0), "s2i_ASN1_INTEGER"}, | ||
83 | {ERR_PACK(0,X509V3_F_S2I_ASN1_OCTET_STRING,0), "s2i_ASN1_OCTET_STRING"}, | ||
84 | {ERR_PACK(0,X509V3_F_S2I_ASN1_SKEY_ID,0), "S2I_ASN1_SKEY_ID"}, | ||
85 | {ERR_PACK(0,X509V3_F_S2I_S2I_SKEY_ID,0), "S2I_S2I_SKEY_ID"}, | ||
86 | {ERR_PACK(0,X509V3_F_STRING_TO_HEX,0), "string_to_hex"}, | ||
87 | {ERR_PACK(0,X509V3_F_SXNET_ADD_ASC,0), "SXNET_ADD_ASC"}, | ||
88 | {ERR_PACK(0,X509V3_F_SXNET_ADD_ID_INTEGER,0), "SXNET_add_id_INTEGER"}, | ||
89 | {ERR_PACK(0,X509V3_F_SXNET_ADD_ID_ULONG,0), "SXNET_add_id_ulong"}, | ||
90 | {ERR_PACK(0,X509V3_F_SXNET_GET_ID_ASC,0), "SXNET_get_id_asc"}, | ||
91 | {ERR_PACK(0,X509V3_F_SXNET_GET_ID_ULONG,0), "SXNET_get_id_ulong"}, | ||
92 | {ERR_PACK(0,X509V3_F_V2I_ACCESS_DESCRIPTION,0), "V2I_ACCESS_DESCRIPTION"}, | ||
93 | {ERR_PACK(0,X509V3_F_V2I_ASN1_BIT_STRING,0), "V2I_ASN1_BIT_STRING"}, | ||
94 | {ERR_PACK(0,X509V3_F_V2I_AUTHORITY_KEYID,0), "V2I_AUTHORITY_KEYID"}, | ||
95 | {ERR_PACK(0,X509V3_F_V2I_BASIC_CONSTRAINTS,0), "V2I_BASIC_CONSTRAINTS"}, | ||
96 | {ERR_PACK(0,X509V3_F_V2I_CRLD,0), "V2I_CRLD"}, | ||
97 | {ERR_PACK(0,X509V3_F_V2I_EXT_KU,0), "V2I_EXT_KU"}, | ||
98 | {ERR_PACK(0,X509V3_F_V2I_GENERAL_NAME,0), "v2i_GENERAL_NAME"}, | ||
99 | {ERR_PACK(0,X509V3_F_V2I_GENERAL_NAMES,0), "v2i_GENERAL_NAMES"}, | ||
100 | {ERR_PACK(0,X509V3_F_V3_GENERIC_EXTENSION,0), "V3_GENERIC_EXTENSION"}, | ||
101 | {ERR_PACK(0,X509V3_F_X509V3_ADD_VALUE,0), "X509V3_add_value"}, | ||
102 | {ERR_PACK(0,X509V3_F_X509V3_EXT_ADD,0), "X509V3_EXT_add"}, | ||
103 | {ERR_PACK(0,X509V3_F_X509V3_EXT_ADD_ALIAS,0), "X509V3_EXT_add_alias"}, | ||
104 | {ERR_PACK(0,X509V3_F_X509V3_EXT_CONF,0), "X509V3_EXT_conf"}, | ||
105 | {ERR_PACK(0,X509V3_F_X509V3_EXT_I2D,0), "X509V3_EXT_i2d"}, | ||
106 | {ERR_PACK(0,X509V3_F_X509V3_GET_VALUE_BOOL,0), "X509V3_get_value_bool"}, | ||
107 | {ERR_PACK(0,X509V3_F_X509V3_PARSE_LIST,0), "X509V3_parse_list"}, | ||
108 | {ERR_PACK(0,X509V3_F_X509_PURPOSE_ADD,0), "X509_PURPOSE_add"}, | ||
109 | {0,NULL} | ||
110 | }; | ||
111 | |||
112 | static ERR_STRING_DATA X509V3_str_reasons[]= | ||
113 | { | ||
114 | {X509V3_R_BAD_IP_ADDRESS ,"bad ip address"}, | ||
115 | {X509V3_R_BAD_OBJECT ,"bad object"}, | ||
116 | {X509V3_R_BN_DEC2BN_ERROR ,"bn dec2bn error"}, | ||
117 | {X509V3_R_BN_TO_ASN1_INTEGER_ERROR ,"bn to asn1 integer error"}, | ||
118 | {X509V3_R_DUPLICATE_ZONE_ID ,"duplicate zone id"}, | ||
119 | {X509V3_R_ERROR_CONVERTING_ZONE ,"error converting zone"}, | ||
120 | {X509V3_R_ERROR_IN_EXTENSION ,"error in extension"}, | ||
121 | {X509V3_R_EXPECTED_A_SECTION_NAME ,"expected a section name"}, | ||
122 | {X509V3_R_EXTENSION_NAME_ERROR ,"extension name error"}, | ||
123 | {X509V3_R_EXTENSION_NOT_FOUND ,"extension not found"}, | ||
124 | {X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED,"extension setting not supported"}, | ||
125 | {X509V3_R_EXTENSION_VALUE_ERROR ,"extension value error"}, | ||
126 | {X509V3_R_ILLEGAL_HEX_DIGIT ,"illegal hex digit"}, | ||
127 | {X509V3_R_INVALID_BOOLEAN_STRING ,"invalid boolean string"}, | ||
128 | {X509V3_R_INVALID_EXTENSION_STRING ,"invalid extension string"}, | ||
129 | {X509V3_R_INVALID_NAME ,"invalid name"}, | ||
130 | {X509V3_R_INVALID_NULL_ARGUMENT ,"invalid null argument"}, | ||
131 | {X509V3_R_INVALID_NULL_NAME ,"invalid null name"}, | ||
132 | {X509V3_R_INVALID_NULL_VALUE ,"invalid null value"}, | ||
133 | {X509V3_R_INVALID_NUMBER ,"invalid number"}, | ||
134 | {X509V3_R_INVALID_NUMBERS ,"invalid numbers"}, | ||
135 | {X509V3_R_INVALID_OBJECT_IDENTIFIER ,"invalid object identifier"}, | ||
136 | {X509V3_R_INVALID_OPTION ,"invalid option"}, | ||
137 | {X509V3_R_INVALID_POLICY_IDENTIFIER ,"invalid policy identifier"}, | ||
138 | {X509V3_R_INVALID_SECTION ,"invalid section"}, | ||
139 | {X509V3_R_INVALID_SYNTAX ,"invalid syntax"}, | ||
140 | {X509V3_R_ISSUER_DECODE_ERROR ,"issuer decode error"}, | ||
141 | {X509V3_R_MISSING_VALUE ,"missing value"}, | ||
142 | {X509V3_R_NEED_ORGANIZATION_AND_NUMBERS ,"need organization and numbers"}, | ||
143 | {X509V3_R_NO_CONFIG_DATABASE ,"no config database"}, | ||
144 | {X509V3_R_NO_ISSUER_CERTIFICATE ,"no issuer certificate"}, | ||
145 | {X509V3_R_NO_ISSUER_DETAILS ,"no issuer details"}, | ||
146 | {X509V3_R_NO_POLICY_IDENTIFIER ,"no policy identifier"}, | ||
147 | {X509V3_R_NO_PUBLIC_KEY ,"no public key"}, | ||
148 | {X509V3_R_NO_SUBJECT_DETAILS ,"no subject details"}, | ||
149 | {X509V3_R_ODD_NUMBER_OF_DIGITS ,"odd number of digits"}, | ||
150 | {X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS ,"unable to get issuer details"}, | ||
151 | {X509V3_R_UNABLE_TO_GET_ISSUER_KEYID ,"unable to get issuer keyid"}, | ||
152 | {X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT ,"unknown bit string argument"}, | ||
153 | {X509V3_R_UNKNOWN_EXTENSION ,"unknown extension"}, | ||
154 | {X509V3_R_UNKNOWN_EXTENSION_NAME ,"unknown extension name"}, | ||
155 | {X509V3_R_UNKNOWN_OPTION ,"unknown option"}, | ||
156 | {X509V3_R_UNSUPPORTED_OPTION ,"unsupported option"}, | ||
157 | {X509V3_R_USER_TOO_LONG ,"user too long"}, | ||
158 | {0,NULL} | ||
159 | }; | ||
160 | |||
161 | #endif | ||
162 | |||
163 | void ERR_load_X509V3_strings(void) | ||
164 | { | ||
165 | static int init=1; | ||
166 | |||
167 | if (init) | ||
168 | { | ||
169 | init=0; | ||
170 | #ifndef NO_ERR | ||
171 | ERR_load_strings(ERR_LIB_X509V3,X509V3_str_functs); | ||
172 | ERR_load_strings(ERR_LIB_X509V3,X509V3_str_reasons); | ||
173 | #endif | ||
174 | |||
175 | } | ||
176 | } | ||
diff --git a/src/lib/libcrypto/x509v3/x509v3.h b/src/lib/libcrypto/x509v3/x509v3.h deleted file mode 100644 index 0453b12d63..0000000000 --- a/src/lib/libcrypto/x509v3/x509v3.h +++ /dev/null | |||
@@ -1,653 +0,0 @@ | |||
1 | /* x509v3.h */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 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 | #ifndef HEADER_X509V3_H | ||
59 | #define HEADER_X509V3_H | ||
60 | |||
61 | #include <openssl/bio.h> | ||
62 | #include <openssl/x509.h> | ||
63 | #include <openssl/conf.h> | ||
64 | |||
65 | #ifdef __cplusplus | ||
66 | extern "C" { | ||
67 | #endif | ||
68 | |||
69 | /* Forward reference */ | ||
70 | struct v3_ext_method; | ||
71 | struct v3_ext_ctx; | ||
72 | |||
73 | /* Useful typedefs */ | ||
74 | |||
75 | typedef void * (*X509V3_EXT_NEW)(void); | ||
76 | typedef void (*X509V3_EXT_FREE)(void *); | ||
77 | typedef void * (*X509V3_EXT_D2I)(void *, unsigned char ** , long); | ||
78 | typedef int (*X509V3_EXT_I2D)(void *, unsigned char **); | ||
79 | typedef STACK_OF(CONF_VALUE) * (*X509V3_EXT_I2V)(struct v3_ext_method *method, void *ext, STACK_OF(CONF_VALUE) *extlist); | ||
80 | typedef void * (*X509V3_EXT_V2I)(struct v3_ext_method *method, struct v3_ext_ctx *ctx, STACK_OF(CONF_VALUE) *values); | ||
81 | typedef char * (*X509V3_EXT_I2S)(struct v3_ext_method *method, void *ext); | ||
82 | typedef void * (*X509V3_EXT_S2I)(struct v3_ext_method *method, struct v3_ext_ctx *ctx, char *str); | ||
83 | typedef int (*X509V3_EXT_I2R)(struct v3_ext_method *method, void *ext, BIO *out, int indent); | ||
84 | typedef void * (*X509V3_EXT_R2I)(struct v3_ext_method *method, struct v3_ext_ctx *ctx, char *str); | ||
85 | |||
86 | /* V3 extension structure */ | ||
87 | |||
88 | struct v3_ext_method { | ||
89 | int ext_nid; | ||
90 | int ext_flags; | ||
91 | X509V3_EXT_NEW ext_new; | ||
92 | X509V3_EXT_FREE ext_free; | ||
93 | X509V3_EXT_D2I d2i; | ||
94 | X509V3_EXT_I2D i2d; | ||
95 | |||
96 | /* The following pair is used for string extensions */ | ||
97 | X509V3_EXT_I2S i2s; | ||
98 | X509V3_EXT_S2I s2i; | ||
99 | |||
100 | /* The following pair is used for multi-valued extensions */ | ||
101 | X509V3_EXT_I2V i2v; | ||
102 | X509V3_EXT_V2I v2i; | ||
103 | |||
104 | /* The following are used for raw extensions */ | ||
105 | X509V3_EXT_I2R i2r; | ||
106 | X509V3_EXT_R2I r2i; | ||
107 | |||
108 | void *usr_data; /* Any extension specific data */ | ||
109 | }; | ||
110 | |||
111 | typedef struct X509V3_CONF_METHOD_st { | ||
112 | char * (*get_string)(void *db, char *section, char *value); | ||
113 | STACK_OF(CONF_VALUE) * (*get_section)(void *db, char *section); | ||
114 | void (*free_string)(void *db, char * string); | ||
115 | void (*free_section)(void *db, STACK_OF(CONF_VALUE) *section); | ||
116 | } X509V3_CONF_METHOD; | ||
117 | |||
118 | /* Context specific info */ | ||
119 | struct v3_ext_ctx { | ||
120 | #define CTX_TEST 0x1 | ||
121 | int flags; | ||
122 | X509 *issuer_cert; | ||
123 | X509 *subject_cert; | ||
124 | X509_REQ *subject_req; | ||
125 | X509_CRL *crl; | ||
126 | X509V3_CONF_METHOD *db_meth; | ||
127 | void *db; | ||
128 | /* Maybe more here */ | ||
129 | }; | ||
130 | |||
131 | typedef struct v3_ext_method X509V3_EXT_METHOD; | ||
132 | typedef struct v3_ext_ctx X509V3_CTX; | ||
133 | |||
134 | DECLARE_STACK_OF(X509V3_EXT_METHOD) | ||
135 | |||
136 | /* ext_flags values */ | ||
137 | #define X509V3_EXT_DYNAMIC 0x1 | ||
138 | #define X509V3_EXT_CTX_DEP 0x2 | ||
139 | #define X509V3_EXT_MULTILINE 0x4 | ||
140 | |||
141 | typedef BIT_STRING_BITNAME ENUMERATED_NAMES; | ||
142 | |||
143 | typedef struct BASIC_CONSTRAINTS_st { | ||
144 | int ca; | ||
145 | ASN1_INTEGER *pathlen; | ||
146 | } BASIC_CONSTRAINTS; | ||
147 | |||
148 | |||
149 | typedef struct PKEY_USAGE_PERIOD_st { | ||
150 | ASN1_GENERALIZEDTIME *notBefore; | ||
151 | ASN1_GENERALIZEDTIME *notAfter; | ||
152 | } PKEY_USAGE_PERIOD; | ||
153 | |||
154 | typedef struct otherName_st { | ||
155 | ASN1_OBJECT *type_id; | ||
156 | ASN1_TYPE *value; | ||
157 | } OTHERNAME; | ||
158 | |||
159 | typedef struct GENERAL_NAME_st { | ||
160 | |||
161 | #define GEN_OTHERNAME (0|V_ASN1_CONTEXT_SPECIFIC) | ||
162 | #define GEN_EMAIL (1|V_ASN1_CONTEXT_SPECIFIC) | ||
163 | #define GEN_DNS (2|V_ASN1_CONTEXT_SPECIFIC) | ||
164 | #define GEN_X400 (3|V_ASN1_CONTEXT_SPECIFIC) | ||
165 | #define GEN_DIRNAME (4|V_ASN1_CONTEXT_SPECIFIC) | ||
166 | #define GEN_EDIPARTY (5|V_ASN1_CONTEXT_SPECIFIC) | ||
167 | #define GEN_URI (6|V_ASN1_CONTEXT_SPECIFIC) | ||
168 | #define GEN_IPADD (7|V_ASN1_CONTEXT_SPECIFIC) | ||
169 | #define GEN_RID (8|V_ASN1_CONTEXT_SPECIFIC) | ||
170 | |||
171 | int type; | ||
172 | union { | ||
173 | char *ptr; | ||
174 | ASN1_IA5STRING *ia5;/* rfc822Name, dNSName, uniformResourceIdentifier */ | ||
175 | ASN1_OCTET_STRING *ip; /* iPAddress */ | ||
176 | X509_NAME *dirn; /* dirn */ | ||
177 | ASN1_OBJECT *rid; /* registeredID */ | ||
178 | OTHERNAME *otherName; /* otherName */ | ||
179 | ASN1_TYPE *other; /* ediPartyName, x400Address */ | ||
180 | } d; | ||
181 | } GENERAL_NAME; | ||
182 | |||
183 | typedef struct ACCESS_DESCRIPTION_st { | ||
184 | ASN1_OBJECT *method; | ||
185 | GENERAL_NAME *location; | ||
186 | } ACCESS_DESCRIPTION; | ||
187 | |||
188 | DECLARE_STACK_OF(GENERAL_NAME) | ||
189 | DECLARE_ASN1_SET_OF(GENERAL_NAME) | ||
190 | |||
191 | DECLARE_STACK_OF(ACCESS_DESCRIPTION) | ||
192 | DECLARE_ASN1_SET_OF(ACCESS_DESCRIPTION) | ||
193 | |||
194 | typedef struct DIST_POINT_NAME_st { | ||
195 | /* NB: this is a CHOICE type and only one of these should be set */ | ||
196 | STACK_OF(GENERAL_NAME) *fullname; | ||
197 | STACK_OF(X509_NAME_ENTRY) *relativename; | ||
198 | } DIST_POINT_NAME; | ||
199 | |||
200 | typedef struct DIST_POINT_st { | ||
201 | DIST_POINT_NAME *distpoint; | ||
202 | ASN1_BIT_STRING *reasons; | ||
203 | STACK_OF(GENERAL_NAME) *CRLissuer; | ||
204 | } DIST_POINT; | ||
205 | |||
206 | DECLARE_STACK_OF(DIST_POINT) | ||
207 | DECLARE_ASN1_SET_OF(DIST_POINT) | ||
208 | |||
209 | typedef struct AUTHORITY_KEYID_st { | ||
210 | ASN1_OCTET_STRING *keyid; | ||
211 | STACK_OF(GENERAL_NAME) *issuer; | ||
212 | ASN1_INTEGER *serial; | ||
213 | } AUTHORITY_KEYID; | ||
214 | |||
215 | /* Strong extranet structures */ | ||
216 | |||
217 | typedef struct SXNET_ID_st { | ||
218 | ASN1_INTEGER *zone; | ||
219 | ASN1_OCTET_STRING *user; | ||
220 | } SXNETID; | ||
221 | |||
222 | DECLARE_STACK_OF(SXNETID) | ||
223 | DECLARE_ASN1_SET_OF(SXNETID) | ||
224 | |||
225 | typedef struct SXNET_st { | ||
226 | ASN1_INTEGER *version; | ||
227 | STACK_OF(SXNETID) *ids; | ||
228 | } SXNET; | ||
229 | |||
230 | typedef struct NOTICEREF_st { | ||
231 | ASN1_STRING *organization; | ||
232 | STACK_OF(ASN1_INTEGER) *noticenos; | ||
233 | } NOTICEREF; | ||
234 | |||
235 | typedef struct USERNOTICE_st { | ||
236 | NOTICEREF *noticeref; | ||
237 | ASN1_STRING *exptext; | ||
238 | } USERNOTICE; | ||
239 | |||
240 | typedef struct POLICYQUALINFO_st { | ||
241 | ASN1_OBJECT *pqualid; | ||
242 | union { | ||
243 | ASN1_IA5STRING *cpsuri; | ||
244 | USERNOTICE *usernotice; | ||
245 | ASN1_TYPE *other; | ||
246 | } d; | ||
247 | } POLICYQUALINFO; | ||
248 | |||
249 | DECLARE_STACK_OF(POLICYQUALINFO) | ||
250 | DECLARE_ASN1_SET_OF(POLICYQUALINFO) | ||
251 | |||
252 | typedef struct POLICYINFO_st { | ||
253 | ASN1_OBJECT *policyid; | ||
254 | STACK_OF(POLICYQUALINFO) *qualifiers; | ||
255 | } POLICYINFO; | ||
256 | |||
257 | DECLARE_STACK_OF(POLICYINFO) | ||
258 | DECLARE_ASN1_SET_OF(POLICYINFO) | ||
259 | |||
260 | #define X509V3_conf_err(val) ERR_add_error_data(6, "section:", val->section, \ | ||
261 | ",name:", val->name, ",value:", val->value); | ||
262 | |||
263 | #define X509V3_set_ctx_test(ctx) \ | ||
264 | X509V3_set_ctx(ctx, NULL, NULL, NULL, NULL, CTX_TEST) | ||
265 | #define X509V3_set_ctx_nodb(ctx) ctx->db = NULL; | ||
266 | |||
267 | #define EXT_BITSTRING(nid, table) { nid, 0, \ | ||
268 | (X509V3_EXT_NEW)ASN1_BIT_STRING_new, \ | ||
269 | (X509V3_EXT_FREE)ASN1_BIT_STRING_free, \ | ||
270 | (X509V3_EXT_D2I)d2i_ASN1_BIT_STRING, \ | ||
271 | (X509V3_EXT_I2D)i2d_ASN1_BIT_STRING, \ | ||
272 | NULL, NULL, \ | ||
273 | (X509V3_EXT_I2V)i2v_ASN1_BIT_STRING, \ | ||
274 | (X509V3_EXT_V2I)v2i_ASN1_BIT_STRING, \ | ||
275 | NULL, NULL, \ | ||
276 | (char *)table} | ||
277 | |||
278 | #define EXT_IA5STRING(nid) { nid, 0, \ | ||
279 | (X509V3_EXT_NEW)ASN1_IA5STRING_new, \ | ||
280 | (X509V3_EXT_FREE)ASN1_IA5STRING_free, \ | ||
281 | (X509V3_EXT_D2I)d2i_ASN1_IA5STRING, \ | ||
282 | (X509V3_EXT_I2D)i2d_ASN1_IA5STRING, \ | ||
283 | (X509V3_EXT_I2S)i2s_ASN1_IA5STRING, \ | ||
284 | (X509V3_EXT_S2I)s2i_ASN1_IA5STRING, \ | ||
285 | NULL, NULL, NULL, NULL, \ | ||
286 | NULL} | ||
287 | |||
288 | #define EXT_END { -1, 0, NULL, NULL, NULL, NULL, NULL, NULL, \ | ||
289 | NULL, NULL, NULL, NULL, \ | ||
290 | NULL} | ||
291 | |||
292 | |||
293 | /* X509_PURPOSE stuff */ | ||
294 | |||
295 | #define EXFLAG_BCONS 0x1 | ||
296 | #define EXFLAG_KUSAGE 0x2 | ||
297 | #define EXFLAG_XKUSAGE 0x4 | ||
298 | #define EXFLAG_NSCERT 0x8 | ||
299 | |||
300 | #define EXFLAG_CA 0x10 | ||
301 | #define EXFLAG_SS 0x20 | ||
302 | #define EXFLAG_V1 0x40 | ||
303 | #define EXFLAG_INVALID 0x80 | ||
304 | #define EXFLAG_SET 0x100 | ||
305 | |||
306 | #define KU_DIGITAL_SIGNATURE 0x0080 | ||
307 | #define KU_NON_REPUDIATION 0x0040 | ||
308 | #define KU_KEY_ENCIPHERMENT 0x0020 | ||
309 | #define KU_DATA_ENCIPHERMENT 0x0010 | ||
310 | #define KU_KEY_AGREEMENT 0x0008 | ||
311 | #define KU_KEY_CERT_SIGN 0x0004 | ||
312 | #define KU_CRL_SIGN 0x0002 | ||
313 | #define KU_ENCIPHER_ONLY 0x0001 | ||
314 | #define KU_DECIPHER_ONLY 0x8000 | ||
315 | |||
316 | #define NS_SSL_CLIENT 0x80 | ||
317 | #define NS_SSL_SERVER 0x40 | ||
318 | #define NS_SMIME 0x20 | ||
319 | #define NS_OBJSIGN 0x10 | ||
320 | #define NS_SSL_CA 0x04 | ||
321 | #define NS_SMIME_CA 0x02 | ||
322 | #define NS_OBJSIGN_CA 0x01 | ||
323 | |||
324 | #define XKU_SSL_SERVER 0x1 | ||
325 | #define XKU_SSL_CLIENT 0x2 | ||
326 | #define XKU_SMIME 0x4 | ||
327 | #define XKU_CODE_SIGN 0x8 | ||
328 | #define XKU_SGC 0x10 | ||
329 | |||
330 | #define X509_PURPOSE_DYNAMIC 0x1 | ||
331 | #define X509_PURPOSE_DYNAMIC_NAME 0x2 | ||
332 | |||
333 | typedef struct x509_purpose_st { | ||
334 | int purpose; | ||
335 | int trust; /* Default trust ID */ | ||
336 | int flags; | ||
337 | int (*check_purpose)(const struct x509_purpose_st *, | ||
338 | const X509 *, int); | ||
339 | char *name; | ||
340 | char *sname; | ||
341 | void *usr_data; | ||
342 | } X509_PURPOSE; | ||
343 | |||
344 | #define X509_PURPOSE_SSL_CLIENT 1 | ||
345 | #define X509_PURPOSE_SSL_SERVER 2 | ||
346 | #define X509_PURPOSE_NS_SSL_SERVER 3 | ||
347 | #define X509_PURPOSE_SMIME_SIGN 4 | ||
348 | #define X509_PURPOSE_SMIME_ENCRYPT 5 | ||
349 | #define X509_PURPOSE_CRL_SIGN 6 | ||
350 | #define X509_PURPOSE_ANY 7 | ||
351 | |||
352 | #define X509_PURPOSE_MIN 1 | ||
353 | #define X509_PURPOSE_MAX 7 | ||
354 | |||
355 | DECLARE_STACK_OF(X509_PURPOSE) | ||
356 | |||
357 | void ERR_load_X509V3_strings(void); | ||
358 | int i2d_BASIC_CONSTRAINTS(BASIC_CONSTRAINTS *a, unsigned char **pp); | ||
359 | BASIC_CONSTRAINTS *d2i_BASIC_CONSTRAINTS(BASIC_CONSTRAINTS **a, unsigned char **pp, long length); | ||
360 | BASIC_CONSTRAINTS *BASIC_CONSTRAINTS_new(void); | ||
361 | void BASIC_CONSTRAINTS_free(BASIC_CONSTRAINTS *a); | ||
362 | |||
363 | int i2d_GENERAL_NAME(GENERAL_NAME *a, unsigned char **pp); | ||
364 | GENERAL_NAME *d2i_GENERAL_NAME(GENERAL_NAME **a, unsigned char **pp, long length); | ||
365 | GENERAL_NAME *GENERAL_NAME_new(void); | ||
366 | void GENERAL_NAME_free(GENERAL_NAME *a); | ||
367 | STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method, GENERAL_NAME *gen, STACK_OF(CONF_VALUE) *ret); | ||
368 | |||
369 | int i2d_SXNET(SXNET *a, unsigned char **pp); | ||
370 | SXNET *d2i_SXNET(SXNET **a, unsigned char **pp, long length); | ||
371 | SXNET *SXNET_new(void); | ||
372 | void SXNET_free(SXNET *a); | ||
373 | |||
374 | int i2d_SXNETID(SXNETID *a, unsigned char **pp); | ||
375 | SXNETID *d2i_SXNETID(SXNETID **a, unsigned char **pp, long length); | ||
376 | SXNETID *SXNETID_new(void); | ||
377 | void SXNETID_free(SXNETID *a); | ||
378 | |||
379 | int SXNET_add_id_asc(SXNET **psx, char *zone, char *user, int userlen); | ||
380 | int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, char *user, int userlen); | ||
381 | int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *izone, char *user, int userlen); | ||
382 | |||
383 | ASN1_OCTET_STRING *SXNET_get_id_asc(SXNET *sx, char *zone); | ||
384 | ASN1_OCTET_STRING *SXNET_get_id_ulong(SXNET *sx, unsigned long lzone); | ||
385 | ASN1_OCTET_STRING *SXNET_get_id_INTEGER(SXNET *sx, ASN1_INTEGER *zone); | ||
386 | |||
387 | int i2d_AUTHORITY_KEYID(AUTHORITY_KEYID *a, unsigned char **pp); | ||
388 | AUTHORITY_KEYID *d2i_AUTHORITY_KEYID(AUTHORITY_KEYID **a, unsigned char **pp, long length); | ||
389 | AUTHORITY_KEYID *AUTHORITY_KEYID_new(void); | ||
390 | void AUTHORITY_KEYID_free(AUTHORITY_KEYID *a); | ||
391 | |||
392 | int i2d_PKEY_USAGE_PERIOD(PKEY_USAGE_PERIOD *a, unsigned char **pp); | ||
393 | PKEY_USAGE_PERIOD *d2i_PKEY_USAGE_PERIOD(PKEY_USAGE_PERIOD **a, unsigned char **pp, long length); | ||
394 | PKEY_USAGE_PERIOD *PKEY_USAGE_PERIOD_new(void); | ||
395 | void PKEY_USAGE_PERIOD_free(PKEY_USAGE_PERIOD *a); | ||
396 | |||
397 | STACK_OF(GENERAL_NAME) *GENERAL_NAMES_new(void); | ||
398 | void GENERAL_NAMES_free(STACK_OF(GENERAL_NAME) *a); | ||
399 | STACK_OF(GENERAL_NAME) *d2i_GENERAL_NAMES(STACK_OF(GENERAL_NAME) **a, unsigned char **pp, long length); | ||
400 | int i2d_GENERAL_NAMES(STACK_OF(GENERAL_NAME) *a, unsigned char **pp); | ||
401 | STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES(X509V3_EXT_METHOD *method, | ||
402 | STACK_OF(GENERAL_NAME) *gen, STACK_OF(CONF_VALUE) *extlist); | ||
403 | STACK_OF(GENERAL_NAME) *v2i_GENERAL_NAMES(X509V3_EXT_METHOD *method, | ||
404 | X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval); | ||
405 | |||
406 | int i2d_OTHERNAME(OTHERNAME *a, unsigned char **pp); | ||
407 | OTHERNAME *OTHERNAME_new(void); | ||
408 | OTHERNAME *d2i_OTHERNAME(OTHERNAME **a, unsigned char **pp, long length); | ||
409 | void OTHERNAME_free(OTHERNAME *a); | ||
410 | |||
411 | char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, ASN1_OCTET_STRING *ia5); | ||
412 | ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str); | ||
413 | |||
414 | int i2d_ext_ku(STACK_OF(ASN1_OBJECT) *a, unsigned char **pp); | ||
415 | STACK_OF(ASN1_OBJECT) *d2i_ext_ku(STACK_OF(ASN1_OBJECT) **a, | ||
416 | unsigned char **pp, long length); | ||
417 | void ext_ku_free(STACK_OF(ASN1_OBJECT) *a); | ||
418 | STACK_OF(ASN1_OBJECT) *ext_ku_new(void); | ||
419 | |||
420 | int i2d_CERTIFICATEPOLICIES(STACK_OF(POLICYINFO) *a, unsigned char **pp); | ||
421 | STACK_OF(POLICYINFO) *CERTIFICATEPOLICIES_new(void); | ||
422 | void CERTIFICATEPOLICIES_free(STACK_OF(POLICYINFO) *a); | ||
423 | STACK_OF(POLICYINFO) *d2i_CERTIFICATEPOLICIES(STACK_OF(POLICYINFO) **a, unsigned char **pp, long length); | ||
424 | |||
425 | int i2d_POLICYINFO(POLICYINFO *a, unsigned char **pp); | ||
426 | POLICYINFO *POLICYINFO_new(void); | ||
427 | POLICYINFO *d2i_POLICYINFO(POLICYINFO **a, unsigned char **pp, long length); | ||
428 | void POLICYINFO_free(POLICYINFO *a); | ||
429 | |||
430 | int i2d_POLICYQUALINFO(POLICYQUALINFO *a, unsigned char **pp); | ||
431 | POLICYQUALINFO *POLICYQUALINFO_new(void); | ||
432 | POLICYQUALINFO *d2i_POLICYQUALINFO(POLICYQUALINFO **a, unsigned char **pp, | ||
433 | long length); | ||
434 | void POLICYQUALINFO_free(POLICYQUALINFO *a); | ||
435 | |||
436 | int i2d_USERNOTICE(USERNOTICE *a, unsigned char **pp); | ||
437 | USERNOTICE *USERNOTICE_new(void); | ||
438 | USERNOTICE *d2i_USERNOTICE(USERNOTICE **a, unsigned char **pp, long length); | ||
439 | void USERNOTICE_free(USERNOTICE *a); | ||
440 | |||
441 | int i2d_NOTICEREF(NOTICEREF *a, unsigned char **pp); | ||
442 | NOTICEREF *NOTICEREF_new(void); | ||
443 | NOTICEREF *d2i_NOTICEREF(NOTICEREF **a, unsigned char **pp, long length); | ||
444 | void NOTICEREF_free(NOTICEREF *a); | ||
445 | |||
446 | int i2d_CRL_DIST_POINTS(STACK_OF(DIST_POINT) *a, unsigned char **pp); | ||
447 | STACK_OF(DIST_POINT) *CRL_DIST_POINTS_new(void); | ||
448 | void CRL_DIST_POINTS_free(STACK_OF(DIST_POINT) *a); | ||
449 | STACK_OF(DIST_POINT) *d2i_CRL_DIST_POINTS(STACK_OF(DIST_POINT) **a, | ||
450 | unsigned char **pp,long length); | ||
451 | |||
452 | int i2d_DIST_POINT(DIST_POINT *a, unsigned char **pp); | ||
453 | DIST_POINT *DIST_POINT_new(void); | ||
454 | DIST_POINT *d2i_DIST_POINT(DIST_POINT **a, unsigned char **pp, long length); | ||
455 | void DIST_POINT_free(DIST_POINT *a); | ||
456 | |||
457 | int i2d_DIST_POINT_NAME(DIST_POINT_NAME *a, unsigned char **pp); | ||
458 | DIST_POINT_NAME *DIST_POINT_NAME_new(void); | ||
459 | void DIST_POINT_NAME_free(DIST_POINT_NAME *a); | ||
460 | DIST_POINT_NAME *d2i_DIST_POINT_NAME(DIST_POINT_NAME **a, unsigned char **pp, | ||
461 | long length); | ||
462 | |||
463 | int i2d_ACCESS_DESCRIPTION(ACCESS_DESCRIPTION *a, unsigned char **pp); | ||
464 | ACCESS_DESCRIPTION *ACCESS_DESCRIPTION_new(void); | ||
465 | void ACCESS_DESCRIPTION_free(ACCESS_DESCRIPTION *a); | ||
466 | ACCESS_DESCRIPTION *d2i_ACCESS_DESCRIPTION(ACCESS_DESCRIPTION **a, unsigned char **pp, | ||
467 | long length); | ||
468 | |||
469 | STACK_OF(ACCESS_DESCRIPTION) *AUTHORITY_INFO_ACCESS_new(void); | ||
470 | void AUTHORITY_INFO_ACCESS_free(STACK_OF(ACCESS_DESCRIPTION) *a); | ||
471 | STACK_OF(ACCESS_DESCRIPTION) *d2i_AUTHORITY_INFO_ACCESS(STACK_OF(ACCESS_DESCRIPTION) **a, | ||
472 | unsigned char **pp, long length); | ||
473 | int i2d_AUTHORITY_INFO_ACCESS(STACK_OF(ACCESS_DESCRIPTION) *a, unsigned char **pp); | ||
474 | |||
475 | |||
476 | |||
477 | #ifdef HEADER_CONF_H | ||
478 | GENERAL_NAME *v2i_GENERAL_NAME(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, CONF_VALUE *cnf); | ||
479 | void X509V3_conf_free(CONF_VALUE *val); | ||
480 | X509_EXTENSION *X509V3_EXT_conf_nid(LHASH *conf, X509V3_CTX *ctx, int ext_nid, char *value); | ||
481 | X509_EXTENSION *X509V3_EXT_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value); | ||
482 | int X509V3_EXT_add_conf(LHASH *conf, X509V3_CTX *ctx, char *section, X509 *cert); | ||
483 | int X509V3_EXT_REQ_add_conf(LHASH *conf, X509V3_CTX *ctx, char *section, X509_REQ *req); | ||
484 | int X509V3_EXT_CRL_add_conf(LHASH *conf, X509V3_CTX *ctx, char *section, X509_CRL *crl); | ||
485 | int X509V3_add_value_bool_nf(char *name, int asn1_bool, | ||
486 | STACK_OF(CONF_VALUE) **extlist); | ||
487 | int X509V3_get_value_bool(CONF_VALUE *value, int *asn1_bool); | ||
488 | int X509V3_get_value_int(CONF_VALUE *value, ASN1_INTEGER **aint); | ||
489 | void X509V3_set_conf_lhash(X509V3_CTX *ctx, LHASH *lhash); | ||
490 | #endif | ||
491 | |||
492 | char * X509V3_get_string(X509V3_CTX *ctx, char *name, char *section); | ||
493 | STACK_OF(CONF_VALUE) * X509V3_get_section(X509V3_CTX *ctx, char *section); | ||
494 | void X509V3_string_free(X509V3_CTX *ctx, char *str); | ||
495 | void X509V3_section_free( X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *section); | ||
496 | void X509V3_set_ctx(X509V3_CTX *ctx, X509 *issuer, X509 *subject, | ||
497 | X509_REQ *req, X509_CRL *crl, int flags); | ||
498 | |||
499 | int X509V3_add_value(const char *name, const char *value, | ||
500 | STACK_OF(CONF_VALUE) **extlist); | ||
501 | int X509V3_add_value_uchar(const char *name, const unsigned char *value, | ||
502 | STACK_OF(CONF_VALUE) **extlist); | ||
503 | int X509V3_add_value_bool(const char *name, int asn1_bool, | ||
504 | STACK_OF(CONF_VALUE) **extlist); | ||
505 | int X509V3_add_value_int(const char *name, ASN1_INTEGER *aint, | ||
506 | STACK_OF(CONF_VALUE) **extlist); | ||
507 | char * i2s_ASN1_INTEGER(X509V3_EXT_METHOD *meth, ASN1_INTEGER *aint); | ||
508 | ASN1_INTEGER * s2i_ASN1_INTEGER(X509V3_EXT_METHOD *meth, char *value); | ||
509 | char * i2s_ASN1_ENUMERATED(X509V3_EXT_METHOD *meth, ASN1_ENUMERATED *aint); | ||
510 | char * i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *meth, ASN1_ENUMERATED *aint); | ||
511 | int X509V3_EXT_add(X509V3_EXT_METHOD *ext); | ||
512 | int X509V3_EXT_add_list(X509V3_EXT_METHOD *extlist); | ||
513 | int X509V3_EXT_add_alias(int nid_to, int nid_from); | ||
514 | void X509V3_EXT_cleanup(void); | ||
515 | |||
516 | X509V3_EXT_METHOD *X509V3_EXT_get(X509_EXTENSION *ext); | ||
517 | X509V3_EXT_METHOD *X509V3_EXT_get_nid(int nid); | ||
518 | int X509V3_add_standard_extensions(void); | ||
519 | STACK_OF(CONF_VALUE) *X509V3_parse_list(char *line); | ||
520 | void *X509V3_EXT_d2i(X509_EXTENSION *ext); | ||
521 | void *X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit, int *idx); | ||
522 | |||
523 | X509_EXTENSION *X509V3_EXT_i2d(int ext_nid, int crit, void *ext_struc); | ||
524 | |||
525 | char *hex_to_string(unsigned char *buffer, long len); | ||
526 | unsigned char *string_to_hex(char *str, long *len); | ||
527 | int name_cmp(const char *name, const char *cmp); | ||
528 | |||
529 | void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent, | ||
530 | int ml); | ||
531 | int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, int flag, int indent); | ||
532 | int X509V3_EXT_print_fp(FILE *out, X509_EXTENSION *ext, int flag, int indent); | ||
533 | |||
534 | int X509_check_purpose(X509 *x, int id, int ca); | ||
535 | int X509_check_issued(X509 *issuer, X509 *subject); | ||
536 | int X509_PURPOSE_get_count(void); | ||
537 | X509_PURPOSE * X509_PURPOSE_get0(int idx); | ||
538 | int X509_PURPOSE_get_by_sname(char *sname); | ||
539 | int X509_PURPOSE_get_by_id(int id); | ||
540 | int X509_PURPOSE_add(int id, int trust, int flags, | ||
541 | int (*ck)(const X509_PURPOSE *, const X509 *, int), | ||
542 | char *name, char *sname, void *arg); | ||
543 | char *X509_PURPOSE_get0_name(X509_PURPOSE *xp); | ||
544 | char *X509_PURPOSE_get0_sname(X509_PURPOSE *xp); | ||
545 | int X509_PURPOSE_get_trust(X509_PURPOSE *xp); | ||
546 | void X509_PURPOSE_cleanup(void); | ||
547 | int X509_PURPOSE_get_id(X509_PURPOSE *); | ||
548 | |||
549 | STACK *X509_get1_email(X509 *x); | ||
550 | STACK *X509_REQ_get1_email(X509_REQ *x); | ||
551 | void X509_email_free(STACK *sk); | ||
552 | |||
553 | |||
554 | /* BEGIN ERROR CODES */ | ||
555 | /* The following lines are auto generated by the script mkerr.pl. Any changes | ||
556 | * made after this point may be overwritten when the script is next run. | ||
557 | */ | ||
558 | |||
559 | /* Error codes for the X509V3 functions. */ | ||
560 | |||
561 | /* Function codes. */ | ||
562 | #define X509V3_F_COPY_EMAIL 122 | ||
563 | #define X509V3_F_COPY_ISSUER 123 | ||
564 | #define X509V3_F_DO_EXT_CONF 124 | ||
565 | #define X509V3_F_DO_EXT_I2D 135 | ||
566 | #define X509V3_F_HEX_TO_STRING 111 | ||
567 | #define X509V3_F_I2S_ASN1_ENUMERATED 121 | ||
568 | #define X509V3_F_I2S_ASN1_INTEGER 120 | ||
569 | #define X509V3_F_I2V_AUTHORITY_INFO_ACCESS 138 | ||
570 | #define X509V3_F_NOTICE_SECTION 132 | ||
571 | #define X509V3_F_NREF_NOS 133 | ||
572 | #define X509V3_F_POLICY_SECTION 131 | ||
573 | #define X509V3_F_R2I_CERTPOL 130 | ||
574 | #define X509V3_F_S2I_ASN1_IA5STRING 100 | ||
575 | #define X509V3_F_S2I_ASN1_INTEGER 108 | ||
576 | #define X509V3_F_S2I_ASN1_OCTET_STRING 112 | ||
577 | #define X509V3_F_S2I_ASN1_SKEY_ID 114 | ||
578 | #define X509V3_F_S2I_S2I_SKEY_ID 115 | ||
579 | #define X509V3_F_STRING_TO_HEX 113 | ||
580 | #define X509V3_F_SXNET_ADD_ASC 125 | ||
581 | #define X509V3_F_SXNET_ADD_ID_INTEGER 126 | ||
582 | #define X509V3_F_SXNET_ADD_ID_ULONG 127 | ||
583 | #define X509V3_F_SXNET_GET_ID_ASC 128 | ||
584 | #define X509V3_F_SXNET_GET_ID_ULONG 129 | ||
585 | #define X509V3_F_V2I_ACCESS_DESCRIPTION 139 | ||
586 | #define X509V3_F_V2I_ASN1_BIT_STRING 101 | ||
587 | #define X509V3_F_V2I_AUTHORITY_KEYID 119 | ||
588 | #define X509V3_F_V2I_BASIC_CONSTRAINTS 102 | ||
589 | #define X509V3_F_V2I_CRLD 134 | ||
590 | #define X509V3_F_V2I_EXT_KU 103 | ||
591 | #define X509V3_F_V2I_GENERAL_NAME 117 | ||
592 | #define X509V3_F_V2I_GENERAL_NAMES 118 | ||
593 | #define X509V3_F_V3_GENERIC_EXTENSION 116 | ||
594 | #define X509V3_F_X509V3_ADD_VALUE 105 | ||
595 | #define X509V3_F_X509V3_EXT_ADD 104 | ||
596 | #define X509V3_F_X509V3_EXT_ADD_ALIAS 106 | ||
597 | #define X509V3_F_X509V3_EXT_CONF 107 | ||
598 | #define X509V3_F_X509V3_EXT_I2D 136 | ||
599 | #define X509V3_F_X509V3_GET_VALUE_BOOL 110 | ||
600 | #define X509V3_F_X509V3_PARSE_LIST 109 | ||
601 | #define X509V3_F_X509_PURPOSE_ADD 137 | ||
602 | |||
603 | /* Reason codes. */ | ||
604 | #define X509V3_R_BAD_IP_ADDRESS 118 | ||
605 | #define X509V3_R_BAD_OBJECT 119 | ||
606 | #define X509V3_R_BN_DEC2BN_ERROR 100 | ||
607 | #define X509V3_R_BN_TO_ASN1_INTEGER_ERROR 101 | ||
608 | #define X509V3_R_DUPLICATE_ZONE_ID 133 | ||
609 | #define X509V3_R_ERROR_CONVERTING_ZONE 131 | ||
610 | #define X509V3_R_ERROR_IN_EXTENSION 128 | ||
611 | #define X509V3_R_EXPECTED_A_SECTION_NAME 137 | ||
612 | #define X509V3_R_EXTENSION_NAME_ERROR 115 | ||
613 | #define X509V3_R_EXTENSION_NOT_FOUND 102 | ||
614 | #define X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED 103 | ||
615 | #define X509V3_R_EXTENSION_VALUE_ERROR 116 | ||
616 | #define X509V3_R_ILLEGAL_HEX_DIGIT 113 | ||
617 | #define X509V3_R_INVALID_BOOLEAN_STRING 104 | ||
618 | #define X509V3_R_INVALID_EXTENSION_STRING 105 | ||
619 | #define X509V3_R_INVALID_NAME 106 | ||
620 | #define X509V3_R_INVALID_NULL_ARGUMENT 107 | ||
621 | #define X509V3_R_INVALID_NULL_NAME 108 | ||
622 | #define X509V3_R_INVALID_NULL_VALUE 109 | ||
623 | #define X509V3_R_INVALID_NUMBER 140 | ||
624 | #define X509V3_R_INVALID_NUMBERS 141 | ||
625 | #define X509V3_R_INVALID_OBJECT_IDENTIFIER 110 | ||
626 | #define X509V3_R_INVALID_OPTION 138 | ||
627 | #define X509V3_R_INVALID_POLICY_IDENTIFIER 134 | ||
628 | #define X509V3_R_INVALID_SECTION 135 | ||
629 | #define X509V3_R_INVALID_SYNTAX 143 | ||
630 | #define X509V3_R_ISSUER_DECODE_ERROR 126 | ||
631 | #define X509V3_R_MISSING_VALUE 124 | ||
632 | #define X509V3_R_NEED_ORGANIZATION_AND_NUMBERS 142 | ||
633 | #define X509V3_R_NO_CONFIG_DATABASE 136 | ||
634 | #define X509V3_R_NO_ISSUER_CERTIFICATE 121 | ||
635 | #define X509V3_R_NO_ISSUER_DETAILS 127 | ||
636 | #define X509V3_R_NO_POLICY_IDENTIFIER 139 | ||
637 | #define X509V3_R_NO_PUBLIC_KEY 114 | ||
638 | #define X509V3_R_NO_SUBJECT_DETAILS 125 | ||
639 | #define X509V3_R_ODD_NUMBER_OF_DIGITS 112 | ||
640 | #define X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS 122 | ||
641 | #define X509V3_R_UNABLE_TO_GET_ISSUER_KEYID 123 | ||
642 | #define X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT 111 | ||
643 | #define X509V3_R_UNKNOWN_EXTENSION 129 | ||
644 | #define X509V3_R_UNKNOWN_EXTENSION_NAME 130 | ||
645 | #define X509V3_R_UNKNOWN_OPTION 120 | ||
646 | #define X509V3_R_UNSUPPORTED_OPTION 117 | ||
647 | #define X509V3_R_USER_TOO_LONG 132 | ||
648 | |||
649 | #ifdef __cplusplus | ||
650 | } | ||
651 | #endif | ||
652 | #endif | ||
653 | |||