1 | /*
|
---|
2 | * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
|
---|
3 | *
|
---|
4 | * Licensed under the OpenSSL license (the "License"). You may not use
|
---|
5 | * this file except in compliance with the License. You can obtain a copy
|
---|
6 | * in the file LICENSE in the source distribution or at
|
---|
7 | * https://www.openssl.org/source/license.html
|
---|
8 | */
|
---|
9 |
|
---|
10 | #include <stdio.h>
|
---|
11 | #include "internal/cryptlib.h"
|
---|
12 | #include <openssl/conf.h>
|
---|
13 | #include <openssl/x509v3.h>
|
---|
14 | #include "ext_dat.h"
|
---|
15 |
|
---|
16 | static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method,
|
---|
17 | X509V3_CTX *ctx,
|
---|
18 | STACK_OF(CONF_VALUE) *nval);
|
---|
19 | static GENERAL_NAMES *v2i_issuer_alt(X509V3_EXT_METHOD *method,
|
---|
20 | X509V3_CTX *ctx,
|
---|
21 | STACK_OF(CONF_VALUE) *nval);
|
---|
22 | static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p);
|
---|
23 | static int copy_issuer(X509V3_CTX *ctx, GENERAL_NAMES *gens);
|
---|
24 | static int do_othername(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx);
|
---|
25 | static int do_dirname(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx);
|
---|
26 |
|
---|
27 | const X509V3_EXT_METHOD v3_alt[3] = {
|
---|
28 | {NID_subject_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES),
|
---|
29 | 0, 0, 0, 0,
|
---|
30 | 0, 0,
|
---|
31 | (X509V3_EXT_I2V) i2v_GENERAL_NAMES,
|
---|
32 | (X509V3_EXT_V2I)v2i_subject_alt,
|
---|
33 | NULL, NULL, NULL},
|
---|
34 |
|
---|
35 | {NID_issuer_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES),
|
---|
36 | 0, 0, 0, 0,
|
---|
37 | 0, 0,
|
---|
38 | (X509V3_EXT_I2V) i2v_GENERAL_NAMES,
|
---|
39 | (X509V3_EXT_V2I)v2i_issuer_alt,
|
---|
40 | NULL, NULL, NULL},
|
---|
41 |
|
---|
42 | {NID_certificate_issuer, 0, ASN1_ITEM_ref(GENERAL_NAMES),
|
---|
43 | 0, 0, 0, 0,
|
---|
44 | 0, 0,
|
---|
45 | (X509V3_EXT_I2V) i2v_GENERAL_NAMES,
|
---|
46 | NULL, NULL, NULL, NULL},
|
---|
47 | };
|
---|
48 |
|
---|
49 | STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES(X509V3_EXT_METHOD *method,
|
---|
50 | GENERAL_NAMES *gens,
|
---|
51 | STACK_OF(CONF_VALUE) *ret)
|
---|
52 | {
|
---|
53 | int i;
|
---|
54 | GENERAL_NAME *gen;
|
---|
55 | for (i = 0; i < sk_GENERAL_NAME_num(gens); i++) {
|
---|
56 | gen = sk_GENERAL_NAME_value(gens, i);
|
---|
57 | ret = i2v_GENERAL_NAME(method, gen, ret);
|
---|
58 | }
|
---|
59 | if (!ret)
|
---|
60 | return sk_CONF_VALUE_new_null();
|
---|
61 | return ret;
|
---|
62 | }
|
---|
63 |
|
---|
64 | STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method,
|
---|
65 | GENERAL_NAME *gen,
|
---|
66 | STACK_OF(CONF_VALUE) *ret)
|
---|
67 | {
|
---|
68 | unsigned char *p;
|
---|
69 | char oline[256], htmp[5];
|
---|
70 | int i;
|
---|
71 | switch (gen->type) {
|
---|
72 | case GEN_OTHERNAME:
|
---|
73 | if (!X509V3_add_value("othername", "<unsupported>", &ret))
|
---|
74 | return NULL;
|
---|
75 | break;
|
---|
76 |
|
---|
77 | case GEN_X400:
|
---|
78 | if (!X509V3_add_value("X400Name", "<unsupported>", &ret))
|
---|
79 | return NULL;
|
---|
80 | break;
|
---|
81 |
|
---|
82 | case GEN_EDIPARTY:
|
---|
83 | if (!X509V3_add_value("EdiPartyName", "<unsupported>", &ret))
|
---|
84 | return NULL;
|
---|
85 | break;
|
---|
86 |
|
---|
87 | case GEN_EMAIL:
|
---|
88 | if (!X509V3_add_value_uchar("email", gen->d.ia5->data, &ret))
|
---|
89 | return NULL;
|
---|
90 | break;
|
---|
91 |
|
---|
92 | case GEN_DNS:
|
---|
93 | if (!X509V3_add_value_uchar("DNS", gen->d.ia5->data, &ret))
|
---|
94 | return NULL;
|
---|
95 | break;
|
---|
96 |
|
---|
97 | case GEN_URI:
|
---|
98 | if (!X509V3_add_value_uchar("URI", gen->d.ia5->data, &ret))
|
---|
99 | return NULL;
|
---|
100 | break;
|
---|
101 |
|
---|
102 | case GEN_DIRNAME:
|
---|
103 | if (X509_NAME_oneline(gen->d.dirn, oline, 256) == NULL
|
---|
104 | || !X509V3_add_value("DirName", oline, &ret))
|
---|
105 | return NULL;
|
---|
106 | break;
|
---|
107 |
|
---|
108 | case GEN_IPADD:
|
---|
109 | p = gen->d.ip->data;
|
---|
110 | if (gen->d.ip->length == 4)
|
---|
111 | BIO_snprintf(oline, sizeof oline,
|
---|
112 | "%d.%d.%d.%d", p[0], p[1], p[2], p[3]);
|
---|
113 | else if (gen->d.ip->length == 16) {
|
---|
114 | oline[0] = 0;
|
---|
115 | for (i = 0; i < 8; i++) {
|
---|
116 | BIO_snprintf(htmp, sizeof htmp, "%X", p[0] << 8 | p[1]);
|
---|
117 | p += 2;
|
---|
118 | strcat(oline, htmp);
|
---|
119 | if (i != 7)
|
---|
120 | strcat(oline, ":");
|
---|
121 | }
|
---|
122 | } else {
|
---|
123 | if (!X509V3_add_value("IP Address", "<invalid>", &ret))
|
---|
124 | return NULL;
|
---|
125 | break;
|
---|
126 | }
|
---|
127 | if (!X509V3_add_value("IP Address", oline, &ret))
|
---|
128 | return NULL;
|
---|
129 | break;
|
---|
130 |
|
---|
131 | case GEN_RID:
|
---|
132 | i2t_ASN1_OBJECT(oline, 256, gen->d.rid);
|
---|
133 | if (!X509V3_add_value("Registered ID", oline, &ret))
|
---|
134 | return NULL;
|
---|
135 | break;
|
---|
136 | }
|
---|
137 | return ret;
|
---|
138 | }
|
---|
139 |
|
---|
140 | int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen)
|
---|
141 | {
|
---|
142 | unsigned char *p;
|
---|
143 | int i;
|
---|
144 | switch (gen->type) {
|
---|
145 | case GEN_OTHERNAME:
|
---|
146 | BIO_printf(out, "othername:<unsupported>");
|
---|
147 | break;
|
---|
148 |
|
---|
149 | case GEN_X400:
|
---|
150 | BIO_printf(out, "X400Name:<unsupported>");
|
---|
151 | break;
|
---|
152 |
|
---|
153 | case GEN_EDIPARTY:
|
---|
154 | /* Maybe fix this: it is supported now */
|
---|
155 | BIO_printf(out, "EdiPartyName:<unsupported>");
|
---|
156 | break;
|
---|
157 |
|
---|
158 | case GEN_EMAIL:
|
---|
159 | BIO_printf(out, "email:%s", gen->d.ia5->data);
|
---|
160 | break;
|
---|
161 |
|
---|
162 | case GEN_DNS:
|
---|
163 | BIO_printf(out, "DNS:%s", gen->d.ia5->data);
|
---|
164 | break;
|
---|
165 |
|
---|
166 | case GEN_URI:
|
---|
167 | BIO_printf(out, "URI:%s", gen->d.ia5->data);
|
---|
168 | break;
|
---|
169 |
|
---|
170 | case GEN_DIRNAME:
|
---|
171 | BIO_printf(out, "DirName:");
|
---|
172 | X509_NAME_print_ex(out, gen->d.dirn, 0, XN_FLAG_ONELINE);
|
---|
173 | break;
|
---|
174 |
|
---|
175 | case GEN_IPADD:
|
---|
176 | p = gen->d.ip->data;
|
---|
177 | if (gen->d.ip->length == 4)
|
---|
178 | BIO_printf(out, "IP Address:%d.%d.%d.%d", p[0], p[1], p[2], p[3]);
|
---|
179 | else if (gen->d.ip->length == 16) {
|
---|
180 | BIO_printf(out, "IP Address");
|
---|
181 | for (i = 0; i < 8; i++) {
|
---|
182 | BIO_printf(out, ":%X", p[0] << 8 | p[1]);
|
---|
183 | p += 2;
|
---|
184 | }
|
---|
185 | BIO_puts(out, "\n");
|
---|
186 | } else {
|
---|
187 | BIO_printf(out, "IP Address:<invalid>");
|
---|
188 | break;
|
---|
189 | }
|
---|
190 | break;
|
---|
191 |
|
---|
192 | case GEN_RID:
|
---|
193 | BIO_printf(out, "Registered ID:");
|
---|
194 | i2a_ASN1_OBJECT(out, gen->d.rid);
|
---|
195 | break;
|
---|
196 | }
|
---|
197 | return 1;
|
---|
198 | }
|
---|
199 |
|
---|
200 | static GENERAL_NAMES *v2i_issuer_alt(X509V3_EXT_METHOD *method,
|
---|
201 | X509V3_CTX *ctx,
|
---|
202 | STACK_OF(CONF_VALUE) *nval)
|
---|
203 | {
|
---|
204 | GENERAL_NAMES *gens = NULL;
|
---|
205 | CONF_VALUE *cnf;
|
---|
206 | int i;
|
---|
207 |
|
---|
208 | if ((gens = sk_GENERAL_NAME_new_null()) == NULL) {
|
---|
209 | X509V3err(X509V3_F_V2I_ISSUER_ALT, ERR_R_MALLOC_FAILURE);
|
---|
210 | return NULL;
|
---|
211 | }
|
---|
212 | for (i = 0; i < sk_CONF_VALUE_num(nval); i++) {
|
---|
213 | cnf = sk_CONF_VALUE_value(nval, i);
|
---|
214 | if (!name_cmp(cnf->name, "issuer")
|
---|
215 | && cnf->value && strcmp(cnf->value, "copy") == 0) {
|
---|
216 | if (!copy_issuer(ctx, gens))
|
---|
217 | goto err;
|
---|
218 | } else {
|
---|
219 | GENERAL_NAME *gen;
|
---|
220 | if ((gen = v2i_GENERAL_NAME(method, ctx, cnf)) == NULL)
|
---|
221 | goto err;
|
---|
222 | sk_GENERAL_NAME_push(gens, gen);
|
---|
223 | }
|
---|
224 | }
|
---|
225 | return gens;
|
---|
226 | err:
|
---|
227 | sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
|
---|
228 | return NULL;
|
---|
229 | }
|
---|
230 |
|
---|
231 | /* Append subject altname of issuer to issuer alt name of subject */
|
---|
232 |
|
---|
233 | static int copy_issuer(X509V3_CTX *ctx, GENERAL_NAMES *gens)
|
---|
234 | {
|
---|
235 | GENERAL_NAMES *ialt;
|
---|
236 | GENERAL_NAME *gen;
|
---|
237 | X509_EXTENSION *ext;
|
---|
238 | int i;
|
---|
239 |
|
---|
240 | if (ctx && (ctx->flags == CTX_TEST))
|
---|
241 | return 1;
|
---|
242 | if (!ctx || !ctx->issuer_cert) {
|
---|
243 | X509V3err(X509V3_F_COPY_ISSUER, X509V3_R_NO_ISSUER_DETAILS);
|
---|
244 | goto err;
|
---|
245 | }
|
---|
246 | i = X509_get_ext_by_NID(ctx->issuer_cert, NID_subject_alt_name, -1);
|
---|
247 | if (i < 0)
|
---|
248 | return 1;
|
---|
249 | if ((ext = X509_get_ext(ctx->issuer_cert, i)) == NULL
|
---|
250 | || (ialt = X509V3_EXT_d2i(ext)) == NULL) {
|
---|
251 | X509V3err(X509V3_F_COPY_ISSUER, X509V3_R_ISSUER_DECODE_ERROR);
|
---|
252 | goto err;
|
---|
253 | }
|
---|
254 |
|
---|
255 | for (i = 0; i < sk_GENERAL_NAME_num(ialt); i++) {
|
---|
256 | gen = sk_GENERAL_NAME_value(ialt, i);
|
---|
257 | if (!sk_GENERAL_NAME_push(gens, gen)) {
|
---|
258 | X509V3err(X509V3_F_COPY_ISSUER, ERR_R_MALLOC_FAILURE);
|
---|
259 | goto err;
|
---|
260 | }
|
---|
261 | }
|
---|
262 | sk_GENERAL_NAME_free(ialt);
|
---|
263 |
|
---|
264 | return 1;
|
---|
265 |
|
---|
266 | err:
|
---|
267 | return 0;
|
---|
268 |
|
---|
269 | }
|
---|
270 |
|
---|
271 | static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method,
|
---|
272 | X509V3_CTX *ctx,
|
---|
273 | STACK_OF(CONF_VALUE) *nval)
|
---|
274 | {
|
---|
275 | GENERAL_NAMES *gens = NULL;
|
---|
276 | CONF_VALUE *cnf;
|
---|
277 | int i;
|
---|
278 |
|
---|
279 | if ((gens = sk_GENERAL_NAME_new_null()) == NULL) {
|
---|
280 | X509V3err(X509V3_F_V2I_SUBJECT_ALT, ERR_R_MALLOC_FAILURE);
|
---|
281 | return NULL;
|
---|
282 | }
|
---|
283 | for (i = 0; i < sk_CONF_VALUE_num(nval); i++) {
|
---|
284 | cnf = sk_CONF_VALUE_value(nval, i);
|
---|
285 | if (!name_cmp(cnf->name, "email")
|
---|
286 | && cnf->value && strcmp(cnf->value, "copy") == 0) {
|
---|
287 | if (!copy_email(ctx, gens, 0))
|
---|
288 | goto err;
|
---|
289 | } else if (!name_cmp(cnf->name, "email")
|
---|
290 | && cnf->value && strcmp(cnf->value, "move") == 0) {
|
---|
291 | if (!copy_email(ctx, gens, 1))
|
---|
292 | goto err;
|
---|
293 | } else {
|
---|
294 | GENERAL_NAME *gen;
|
---|
295 | if ((gen = v2i_GENERAL_NAME(method, ctx, cnf)) == NULL)
|
---|
296 | goto err;
|
---|
297 | sk_GENERAL_NAME_push(gens, gen);
|
---|
298 | }
|
---|
299 | }
|
---|
300 | return gens;
|
---|
301 | err:
|
---|
302 | sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
|
---|
303 | return NULL;
|
---|
304 | }
|
---|
305 |
|
---|
306 | /*
|
---|
307 | * Copy any email addresses in a certificate or request to GENERAL_NAMES
|
---|
308 | */
|
---|
309 |
|
---|
310 | static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p)
|
---|
311 | {
|
---|
312 | X509_NAME *nm;
|
---|
313 | ASN1_IA5STRING *email = NULL;
|
---|
314 | X509_NAME_ENTRY *ne;
|
---|
315 | GENERAL_NAME *gen = NULL;
|
---|
316 | int i;
|
---|
317 | if (ctx != NULL && ctx->flags == CTX_TEST)
|
---|
318 | return 1;
|
---|
319 | if (!ctx || (!ctx->subject_cert && !ctx->subject_req)) {
|
---|
320 | X509V3err(X509V3_F_COPY_EMAIL, X509V3_R_NO_SUBJECT_DETAILS);
|
---|
321 | goto err;
|
---|
322 | }
|
---|
323 | /* Find the subject name */
|
---|
324 | if (ctx->subject_cert)
|
---|
325 | nm = X509_get_subject_name(ctx->subject_cert);
|
---|
326 | else
|
---|
327 | nm = X509_REQ_get_subject_name(ctx->subject_req);
|
---|
328 |
|
---|
329 | /* Now add any email address(es) to STACK */
|
---|
330 | i = -1;
|
---|
331 | while ((i = X509_NAME_get_index_by_NID(nm,
|
---|
332 | NID_pkcs9_emailAddress, i)) >= 0) {
|
---|
333 | ne = X509_NAME_get_entry(nm, i);
|
---|
334 | email = ASN1_STRING_dup(X509_NAME_ENTRY_get_data(ne));
|
---|
335 | if (move_p) {
|
---|
336 | X509_NAME_delete_entry(nm, i);
|
---|
337 | X509_NAME_ENTRY_free(ne);
|
---|
338 | i--;
|
---|
339 | }
|
---|
340 | if (email == NULL || (gen = GENERAL_NAME_new()) == NULL) {
|
---|
341 | X509V3err(X509V3_F_COPY_EMAIL, ERR_R_MALLOC_FAILURE);
|
---|
342 | goto err;
|
---|
343 | }
|
---|
344 | gen->d.ia5 = email;
|
---|
345 | email = NULL;
|
---|
346 | gen->type = GEN_EMAIL;
|
---|
347 | if (!sk_GENERAL_NAME_push(gens, gen)) {
|
---|
348 | X509V3err(X509V3_F_COPY_EMAIL, ERR_R_MALLOC_FAILURE);
|
---|
349 | goto err;
|
---|
350 | }
|
---|
351 | gen = NULL;
|
---|
352 | }
|
---|
353 |
|
---|
354 | return 1;
|
---|
355 |
|
---|
356 | err:
|
---|
357 | GENERAL_NAME_free(gen);
|
---|
358 | ASN1_IA5STRING_free(email);
|
---|
359 | return 0;
|
---|
360 |
|
---|
361 | }
|
---|
362 |
|
---|
363 | GENERAL_NAMES *v2i_GENERAL_NAMES(const X509V3_EXT_METHOD *method,
|
---|
364 | X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
|
---|
365 | {
|
---|
366 | GENERAL_NAME *gen;
|
---|
367 | GENERAL_NAMES *gens = NULL;
|
---|
368 | CONF_VALUE *cnf;
|
---|
369 | int i;
|
---|
370 |
|
---|
371 | if ((gens = sk_GENERAL_NAME_new_null()) == NULL) {
|
---|
372 | X509V3err(X509V3_F_V2I_GENERAL_NAMES, ERR_R_MALLOC_FAILURE);
|
---|
373 | return NULL;
|
---|
374 | }
|
---|
375 | for (i = 0; i < sk_CONF_VALUE_num(nval); i++) {
|
---|
376 | cnf = sk_CONF_VALUE_value(nval, i);
|
---|
377 | if ((gen = v2i_GENERAL_NAME(method, ctx, cnf)) == NULL)
|
---|
378 | goto err;
|
---|
379 | sk_GENERAL_NAME_push(gens, gen);
|
---|
380 | }
|
---|
381 | return gens;
|
---|
382 | err:
|
---|
383 | sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
|
---|
384 | return NULL;
|
---|
385 | }
|
---|
386 |
|
---|
387 | GENERAL_NAME *v2i_GENERAL_NAME(const X509V3_EXT_METHOD *method,
|
---|
388 | X509V3_CTX *ctx, CONF_VALUE *cnf)
|
---|
389 | {
|
---|
390 | return v2i_GENERAL_NAME_ex(NULL, method, ctx, cnf, 0);
|
---|
391 | }
|
---|
392 |
|
---|
393 | GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
|
---|
394 | const X509V3_EXT_METHOD *method,
|
---|
395 | X509V3_CTX *ctx, int gen_type, const char *value,
|
---|
396 | int is_nc)
|
---|
397 | {
|
---|
398 | char is_string = 0;
|
---|
399 | GENERAL_NAME *gen = NULL;
|
---|
400 |
|
---|
401 | if (!value) {
|
---|
402 | X509V3err(X509V3_F_A2I_GENERAL_NAME, X509V3_R_MISSING_VALUE);
|
---|
403 | return NULL;
|
---|
404 | }
|
---|
405 |
|
---|
406 | if (out)
|
---|
407 | gen = out;
|
---|
408 | else {
|
---|
409 | gen = GENERAL_NAME_new();
|
---|
410 | if (gen == NULL) {
|
---|
411 | X509V3err(X509V3_F_A2I_GENERAL_NAME, ERR_R_MALLOC_FAILURE);
|
---|
412 | return NULL;
|
---|
413 | }
|
---|
414 | }
|
---|
415 |
|
---|
416 | switch (gen_type) {
|
---|
417 | case GEN_URI:
|
---|
418 | case GEN_EMAIL:
|
---|
419 | case GEN_DNS:
|
---|
420 | is_string = 1;
|
---|
421 | break;
|
---|
422 |
|
---|
423 | case GEN_RID:
|
---|
424 | {
|
---|
425 | ASN1_OBJECT *obj;
|
---|
426 | if ((obj = OBJ_txt2obj(value, 0)) == NULL) {
|
---|
427 | X509V3err(X509V3_F_A2I_GENERAL_NAME, X509V3_R_BAD_OBJECT);
|
---|
428 | ERR_add_error_data(2, "value=", value);
|
---|
429 | goto err;
|
---|
430 | }
|
---|
431 | gen->d.rid = obj;
|
---|
432 | }
|
---|
433 | break;
|
---|
434 |
|
---|
435 | case GEN_IPADD:
|
---|
436 | if (is_nc)
|
---|
437 | gen->d.ip = a2i_IPADDRESS_NC(value);
|
---|
438 | else
|
---|
439 | gen->d.ip = a2i_IPADDRESS(value);
|
---|
440 | if (gen->d.ip == NULL) {
|
---|
441 | X509V3err(X509V3_F_A2I_GENERAL_NAME, X509V3_R_BAD_IP_ADDRESS);
|
---|
442 | ERR_add_error_data(2, "value=", value);
|
---|
443 | goto err;
|
---|
444 | }
|
---|
445 | break;
|
---|
446 |
|
---|
447 | case GEN_DIRNAME:
|
---|
448 | if (!do_dirname(gen, value, ctx)) {
|
---|
449 | X509V3err(X509V3_F_A2I_GENERAL_NAME, X509V3_R_DIRNAME_ERROR);
|
---|
450 | goto err;
|
---|
451 | }
|
---|
452 | break;
|
---|
453 |
|
---|
454 | case GEN_OTHERNAME:
|
---|
455 | if (!do_othername(gen, value, ctx)) {
|
---|
456 | X509V3err(X509V3_F_A2I_GENERAL_NAME, X509V3_R_OTHERNAME_ERROR);
|
---|
457 | goto err;
|
---|
458 | }
|
---|
459 | break;
|
---|
460 | default:
|
---|
461 | X509V3err(X509V3_F_A2I_GENERAL_NAME, X509V3_R_UNSUPPORTED_TYPE);
|
---|
462 | goto err;
|
---|
463 | }
|
---|
464 |
|
---|
465 | if (is_string) {
|
---|
466 | if ((gen->d.ia5 = ASN1_IA5STRING_new()) == NULL ||
|
---|
467 | !ASN1_STRING_set(gen->d.ia5, (unsigned char *)value,
|
---|
468 | strlen(value))) {
|
---|
469 | X509V3err(X509V3_F_A2I_GENERAL_NAME, ERR_R_MALLOC_FAILURE);
|
---|
470 | goto err;
|
---|
471 | }
|
---|
472 | }
|
---|
473 |
|
---|
474 | gen->type = gen_type;
|
---|
475 |
|
---|
476 | return gen;
|
---|
477 |
|
---|
478 | err:
|
---|
479 | if (!out)
|
---|
480 | GENERAL_NAME_free(gen);
|
---|
481 | return NULL;
|
---|
482 | }
|
---|
483 |
|
---|
484 | GENERAL_NAME *v2i_GENERAL_NAME_ex(GENERAL_NAME *out,
|
---|
485 | const X509V3_EXT_METHOD *method,
|
---|
486 | X509V3_CTX *ctx, CONF_VALUE *cnf, int is_nc)
|
---|
487 | {
|
---|
488 | int type;
|
---|
489 |
|
---|
490 | char *name, *value;
|
---|
491 |
|
---|
492 | name = cnf->name;
|
---|
493 | value = cnf->value;
|
---|
494 |
|
---|
495 | if (!value) {
|
---|
496 | X509V3err(X509V3_F_V2I_GENERAL_NAME_EX, X509V3_R_MISSING_VALUE);
|
---|
497 | return NULL;
|
---|
498 | }
|
---|
499 |
|
---|
500 | if (!name_cmp(name, "email"))
|
---|
501 | type = GEN_EMAIL;
|
---|
502 | else if (!name_cmp(name, "URI"))
|
---|
503 | type = GEN_URI;
|
---|
504 | else if (!name_cmp(name, "DNS"))
|
---|
505 | type = GEN_DNS;
|
---|
506 | else if (!name_cmp(name, "RID"))
|
---|
507 | type = GEN_RID;
|
---|
508 | else if (!name_cmp(name, "IP"))
|
---|
509 | type = GEN_IPADD;
|
---|
510 | else if (!name_cmp(name, "dirName"))
|
---|
511 | type = GEN_DIRNAME;
|
---|
512 | else if (!name_cmp(name, "otherName"))
|
---|
513 | type = GEN_OTHERNAME;
|
---|
514 | else {
|
---|
515 | X509V3err(X509V3_F_V2I_GENERAL_NAME_EX, X509V3_R_UNSUPPORTED_OPTION);
|
---|
516 | ERR_add_error_data(2, "name=", name);
|
---|
517 | return NULL;
|
---|
518 | }
|
---|
519 |
|
---|
520 | return a2i_GENERAL_NAME(out, method, ctx, type, value, is_nc);
|
---|
521 |
|
---|
522 | }
|
---|
523 |
|
---|
524 | static int do_othername(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx)
|
---|
525 | {
|
---|
526 | char *objtmp = NULL, *p;
|
---|
527 | int objlen;
|
---|
528 |
|
---|
529 | if ((p = strchr(value, ';')) == NULL)
|
---|
530 | return 0;
|
---|
531 | if ((gen->d.otherName = OTHERNAME_new()) == NULL)
|
---|
532 | return 0;
|
---|
533 | /*
|
---|
534 | * Free this up because we will overwrite it. no need to free type_id
|
---|
535 | * because it is static
|
---|
536 | */
|
---|
537 | ASN1_TYPE_free(gen->d.otherName->value);
|
---|
538 | if ((gen->d.otherName->value = ASN1_generate_v3(p + 1, ctx)) == NULL)
|
---|
539 | return 0;
|
---|
540 | objlen = p - value;
|
---|
541 | objtmp = OPENSSL_strndup(value, objlen);
|
---|
542 | if (objtmp == NULL)
|
---|
543 | return 0;
|
---|
544 | gen->d.otherName->type_id = OBJ_txt2obj(objtmp, 0);
|
---|
545 | OPENSSL_free(objtmp);
|
---|
546 | if (!gen->d.otherName->type_id)
|
---|
547 | return 0;
|
---|
548 | return 1;
|
---|
549 | }
|
---|
550 |
|
---|
551 | static int do_dirname(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx)
|
---|
552 | {
|
---|
553 | int ret = 0;
|
---|
554 | STACK_OF(CONF_VALUE) *sk = NULL;
|
---|
555 | X509_NAME *nm;
|
---|
556 |
|
---|
557 | if ((nm = X509_NAME_new()) == NULL)
|
---|
558 | goto err;
|
---|
559 | sk = X509V3_get_section(ctx, value);
|
---|
560 | if (!sk) {
|
---|
561 | X509V3err(X509V3_F_DO_DIRNAME, X509V3_R_SECTION_NOT_FOUND);
|
---|
562 | ERR_add_error_data(2, "section=", value);
|
---|
563 | goto err;
|
---|
564 | }
|
---|
565 | /* FIXME: should allow other character types... */
|
---|
566 | ret = X509V3_NAME_from_section(nm, sk, MBSTRING_ASC);
|
---|
567 | if (!ret)
|
---|
568 | goto err;
|
---|
569 | gen->d.dirn = nm;
|
---|
570 |
|
---|
571 | err:
|
---|
572 | if (ret == 0)
|
---|
573 | X509_NAME_free(nm);
|
---|
574 | X509V3_section_free(ctx, sk);
|
---|
575 | return ret;
|
---|
576 | }
|
---|