|
|
|
/* v3_alt.c */
|
|
|
|
/*
|
|
|
|
* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
|
|
|
* project.
|
|
|
|
*/
|
|
|
|
/* ====================================================================
|
|
|
|
* Copyright (c) 1999-2003 The OpenSSL Project. All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
*
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
*
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in
|
|
|
|
* the documentation and/or other materials provided with the
|
|
|
|
* distribution.
|
|
|
|
*
|
|
|
|
* 3. All advertising materials mentioning features or use of this
|
|
|
|
* software must display the following acknowledgment:
|
|
|
|
* "This product includes software developed by the OpenSSL Project
|
|
|
|
* for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
|
|
|
|
*
|
|
|
|
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
|
|
|
|
* endorse or promote products derived from this software without
|
|
|
|
* prior written permission. For written permission, please contact
|
|
|
|
* licensing@OpenSSL.org.
|
|
|
|
*
|
|
|
|
* 5. Products derived from this software may not be called "OpenSSL"
|
|
|
|
* nor may "OpenSSL" appear in their names without prior written
|
|
|
|
* permission of the OpenSSL Project.
|
|
|
|
*
|
|
|
|
* 6. Redistributions of any form whatsoever must retain the following
|
|
|
|
* acknowledgment:
|
|
|
|
* "This product includes software developed by the OpenSSL Project
|
|
|
|
* for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
|
|
|
|
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
|
|
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
|
|
|
|
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
|
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
|
|
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
|
|
|
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
* ====================================================================
|
|
|
|
*
|
|
|
|
* This product includes cryptographic software written by Eric Young
|
|
|
|
* (eay@cryptsoft.com). This product includes software written by Tim
|
|
|
|
* Hudson (tjh@cryptsoft.com). */
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#include <openssl/conf.h>
|
|
|
|
#include <openssl/err.h>
|
|
|
|
#include <openssl/mem.h>
|
|
|
|
#include <openssl/obj.h>
|
|
|
|
#include <openssl/x509v3.h>
|
|
|
|
|
|
|
|
#include "../x509/internal.h"
|
|
|
|
#include "internal.h"
|
|
|
|
|
|
|
|
|
|
|
|
static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method,
|
|
|
|
X509V3_CTX *ctx,
|
|
|
|
STACK_OF(CONF_VALUE) *nval);
|
|
|
|
static GENERAL_NAMES *v2i_issuer_alt(X509V3_EXT_METHOD *method,
|
|
|
|
X509V3_CTX *ctx,
|
|
|
|
STACK_OF(CONF_VALUE) *nval);
|
|
|
|
static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p);
|
|
|
|
static int copy_issuer(X509V3_CTX *ctx, GENERAL_NAMES *gens);
|
|
|
|
static int do_othername(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx);
|
|
|
|
static int do_dirname(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx);
|
|
|
|
|
|
|
|
const X509V3_EXT_METHOD v3_alt[] = {
|
|
|
|
{NID_subject_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES),
|
|
|
|
0, 0, 0, 0,
|
|
|
|
0, 0,
|
|
|
|
(X509V3_EXT_I2V) i2v_GENERAL_NAMES,
|
|
|
|
(X509V3_EXT_V2I)v2i_subject_alt,
|
|
|
|
NULL, NULL, NULL},
|
|
|
|
|
|
|
|
{NID_issuer_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES),
|
|
|
|
0, 0, 0, 0,
|
|
|
|
0, 0,
|
|
|
|
(X509V3_EXT_I2V) i2v_GENERAL_NAMES,
|
|
|
|
(X509V3_EXT_V2I)v2i_issuer_alt,
|
|
|
|
NULL, NULL, NULL},
|
|
|
|
|
|
|
|
{NID_certificate_issuer, 0, ASN1_ITEM_ref(GENERAL_NAMES),
|
|
|
|
0, 0, 0, 0,
|
|
|
|
0, 0,
|
|
|
|
(X509V3_EXT_I2V) i2v_GENERAL_NAMES,
|
|
|
|
NULL, NULL, NULL, NULL},
|
|
|
|
};
|
|
|
|
|
|
|
|
STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES(X509V3_EXT_METHOD *method,
|
|
|
|
GENERAL_NAMES *gens,
|
|
|
|
STACK_OF(CONF_VALUE) *ret)
|
|
|
|
{
|
|
|
|
int ret_was_null = ret == NULL;
|
|
|
|
for (size_t i = 0; i < sk_GENERAL_NAME_num(gens); i++) {
|
|
|
|
GENERAL_NAME *gen = sk_GENERAL_NAME_value(gens, i);
|
|
|
|
STACK_OF(CONF_VALUE) *tmp = i2v_GENERAL_NAME(method, gen, ret);
|
|
|
|
if (tmp == NULL) {
|
|
|
|
if (ret_was_null) {
|
|
|
|
sk_CONF_VALUE_pop_free(ret, X509V3_conf_free);
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
ret = tmp;
|
|
|
|
}
|
|
|
|
if (!ret)
|
|
|
|
return sk_CONF_VALUE_new_null();
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method,
|
|
|
|
GENERAL_NAME *gen,
|
|
|
|
STACK_OF(CONF_VALUE) *ret)
|
|
|
|
{
|
|
|
|
/* Note the error-handling for this function relies on there being at most
|
|
|
|
* one |X509V3_add_value| call. If there were two and the second failed, we
|
|
|
|
* would need to sometimes free the first call's result. */
|
|
|
|
unsigned char *p;
|
|
|
|
char oline[256], htmp[5];
|
|
|
|
int i;
|
|
|
|
switch (gen->type) {
|
|
|
|
case GEN_OTHERNAME:
|
|
|
|
if (!X509V3_add_value("othername", "<unsupported>", &ret))
|
|
|
|
return NULL;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GEN_X400:
|
|
|
|
if (!X509V3_add_value("X400Name", "<unsupported>", &ret))
|
|
|
|
return NULL;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GEN_EDIPARTY:
|
|
|
|
if (!X509V3_add_value("EdiPartyName", "<unsupported>", &ret))
|
|
|
|
return NULL;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GEN_EMAIL:
|
|
|
|
if (!x509V3_add_value_asn1_string("email", gen->d.ia5, &ret))
|
|
|
|
return NULL;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GEN_DNS:
|
|
|
|
if (!x509V3_add_value_asn1_string("DNS", gen->d.ia5, &ret))
|
|
|
|
return NULL;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GEN_URI:
|
|
|
|
if (!x509V3_add_value_asn1_string("URI", gen->d.ia5, &ret))
|
|
|
|
return NULL;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GEN_DIRNAME:
|
|
|
|
if (X509_NAME_oneline(gen->d.dirn, oline, 256) == NULL
|
|
|
|
|| !X509V3_add_value("DirName", oline, &ret))
|
|
|
|
return NULL;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GEN_IPADD:
|
|
|
|
p = gen->d.ip->data;
|
|
|
|
if (gen->d.ip->length == 4)
|
Fix the easy -Wformat-signedness errors.
GCC has a warning that complains about even more type mismatches in
printf. Some of these are a bit messy and will be fixed in separate CLs.
This covers the easy ones.
The .*s stuff is unfortunate, but printf has no size_t-clean string
printer. ALPN protocol lengths are bound by uint8_t, so it doesn't
really matter.
The IPv6 printing one is obnoxious and arguably a false positive. It's
really a C language flaw: all types smaller than int get converted to
int when you do arithmetic. So something like this first doesn't
overflow the shift because it computes over int, but then the result
overall is stored as an int.
uint8_t a, b;
(a << 8) | b
On the one hand, this fixes a "missing" cast to uint16_t before the
shift. At the same time, the incorrect final type means passing it to
%x, which expects unsigned int. The compiler has forgotten this value
actually fits in uint16_t and flags a warning. Mitigate this by storing
in a uint16_t first.
The story doesn't quite end here. Arguments passed to variadic functions
go through integer promotion[0], so the argument is still passed to
snprintf as an int! But then va_arg allows for a signedness mismatch[1],
provided the value is representable in both types. The combination means
that %x, though actually paired with unsigned, also accept uint8_t and
uint16_t, because those are guaranteed to promote to an int that meets
[1]. GCC recognizes [1] applies here.
(There's also PRI16x, but that's a bit tedious to use and, in glibc, is
defined as plain "x" anyway.)
[0] https://en.cppreference.com/w/c/language/conversion#Default_argument_promotions
[1] https://en.cppreference.com/w/c/variadic/va_arg
Bug: 450
Change-Id: Ic1d41356755a18ab922956dd2e07b560470341f4
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/50765
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: Adam Langley <agl@google.com>
3 years ago
|
|
|
BIO_snprintf(oline, sizeof(oline),
|
|
|
|
"%d.%d.%d.%d", p[0], p[1], p[2], p[3]);
|
|
|
|
else if (gen->d.ip->length == 16) {
|
|
|
|
oline[0] = 0;
|
|
|
|
for (i = 0; i < 8; i++) {
|
Fix the easy -Wformat-signedness errors.
GCC has a warning that complains about even more type mismatches in
printf. Some of these are a bit messy and will be fixed in separate CLs.
This covers the easy ones.
The .*s stuff is unfortunate, but printf has no size_t-clean string
printer. ALPN protocol lengths are bound by uint8_t, so it doesn't
really matter.
The IPv6 printing one is obnoxious and arguably a false positive. It's
really a C language flaw: all types smaller than int get converted to
int when you do arithmetic. So something like this first doesn't
overflow the shift because it computes over int, but then the result
overall is stored as an int.
uint8_t a, b;
(a << 8) | b
On the one hand, this fixes a "missing" cast to uint16_t before the
shift. At the same time, the incorrect final type means passing it to
%x, which expects unsigned int. The compiler has forgotten this value
actually fits in uint16_t and flags a warning. Mitigate this by storing
in a uint16_t first.
The story doesn't quite end here. Arguments passed to variadic functions
go through integer promotion[0], so the argument is still passed to
snprintf as an int! But then va_arg allows for a signedness mismatch[1],
provided the value is representable in both types. The combination means
that %x, though actually paired with unsigned, also accept uint8_t and
uint16_t, because those are guaranteed to promote to an int that meets
[1]. GCC recognizes [1] applies here.
(There's also PRI16x, but that's a bit tedious to use and, in glibc, is
defined as plain "x" anyway.)
[0] https://en.cppreference.com/w/c/language/conversion#Default_argument_promotions
[1] https://en.cppreference.com/w/c/variadic/va_arg
Bug: 450
Change-Id: Ic1d41356755a18ab922956dd2e07b560470341f4
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/50765
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: Adam Langley <agl@google.com>
3 years ago
|
|
|
uint16_t v = ((uint16_t)p[0] << 8) | p[1];
|
|
|
|
BIO_snprintf(htmp, sizeof(htmp), "%X", v);
|
|
|
|
p += 2;
|
|
|
|
OPENSSL_strlcat(oline, htmp, sizeof(oline));
|
|
|
|
if (i != 7)
|
|
|
|
OPENSSL_strlcat(oline, ":", sizeof(oline));
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (!X509V3_add_value("IP Address", "<invalid>", &ret))
|
|
|
|
return NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!X509V3_add_value("IP Address", oline, &ret))
|
|
|
|
return NULL;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GEN_RID:
|
|
|
|
i2t_ASN1_OBJECT(oline, 256, gen->d.rid);
|
|
|
|
if (!X509V3_add_value("Registered ID", oline, &ret))
|
|
|
|
return NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen)
|
|
|
|
{
|
|
|
|
unsigned char *p;
|
|
|
|
int i;
|
|
|
|
switch (gen->type) {
|
|
|
|
case GEN_OTHERNAME:
|
|
|
|
BIO_printf(out, "othername:<unsupported>");
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GEN_X400:
|
|
|
|
BIO_printf(out, "X400Name:<unsupported>");
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GEN_EDIPARTY:
|
|
|
|
/* Maybe fix this: it is supported now */
|
|
|
|
BIO_printf(out, "EdiPartyName:<unsupported>");
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GEN_EMAIL:
|
|
|
|
BIO_printf(out, "email:");
|
|
|
|
ASN1_STRING_print(out, gen->d.ia5);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GEN_DNS:
|
|
|
|
BIO_printf(out, "DNS:");
|
|
|
|
ASN1_STRING_print(out, gen->d.ia5);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GEN_URI:
|
|
|
|
BIO_printf(out, "URI:");
|
|
|
|
ASN1_STRING_print(out, gen->d.ia5);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GEN_DIRNAME:
|
|
|
|
BIO_printf(out, "DirName: ");
|
|
|
|
X509_NAME_print_ex(out, gen->d.dirn, 0, XN_FLAG_ONELINE);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GEN_IPADD:
|
|
|
|
p = gen->d.ip->data;
|
|
|
|
if (gen->d.ip->length == 4)
|
|
|
|
BIO_printf(out, "IP Address:%d.%d.%d.%d", p[0], p[1], p[2], p[3]);
|
|
|
|
else if (gen->d.ip->length == 16) {
|
|
|
|
BIO_printf(out, "IP Address");
|
|
|
|
for (i = 0; i < 8; i++) {
|
Fix the easy -Wformat-signedness errors.
GCC has a warning that complains about even more type mismatches in
printf. Some of these are a bit messy and will be fixed in separate CLs.
This covers the easy ones.
The .*s stuff is unfortunate, but printf has no size_t-clean string
printer. ALPN protocol lengths are bound by uint8_t, so it doesn't
really matter.
The IPv6 printing one is obnoxious and arguably a false positive. It's
really a C language flaw: all types smaller than int get converted to
int when you do arithmetic. So something like this first doesn't
overflow the shift because it computes over int, but then the result
overall is stored as an int.
uint8_t a, b;
(a << 8) | b
On the one hand, this fixes a "missing" cast to uint16_t before the
shift. At the same time, the incorrect final type means passing it to
%x, which expects unsigned int. The compiler has forgotten this value
actually fits in uint16_t and flags a warning. Mitigate this by storing
in a uint16_t first.
The story doesn't quite end here. Arguments passed to variadic functions
go through integer promotion[0], so the argument is still passed to
snprintf as an int! But then va_arg allows for a signedness mismatch[1],
provided the value is representable in both types. The combination means
that %x, though actually paired with unsigned, also accept uint8_t and
uint16_t, because those are guaranteed to promote to an int that meets
[1]. GCC recognizes [1] applies here.
(There's also PRI16x, but that's a bit tedious to use and, in glibc, is
defined as plain "x" anyway.)
[0] https://en.cppreference.com/w/c/language/conversion#Default_argument_promotions
[1] https://en.cppreference.com/w/c/variadic/va_arg
Bug: 450
Change-Id: Ic1d41356755a18ab922956dd2e07b560470341f4
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/50765
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: Adam Langley <agl@google.com>
3 years ago
|
|
|
uint16_t v = ((uint16_t)p[0] << 8) | p[1];
|
|
|
|
BIO_printf(out, ":%X", v);
|
|
|
|
p += 2;
|
|
|
|
}
|
|
|
|
BIO_puts(out, "\n");
|
|
|
|
} else {
|
|
|
|
BIO_printf(out, "IP Address:<invalid>");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GEN_RID:
|
|
|
|
BIO_printf(out, "Registered ID");
|
|
|
|
i2a_ASN1_OBJECT(out, gen->d.rid);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static GENERAL_NAMES *v2i_issuer_alt(X509V3_EXT_METHOD *method,
|
|
|
|
X509V3_CTX *ctx,
|
|
|
|
STACK_OF(CONF_VALUE) *nval)
|
|
|
|
{
|
|
|
|
GENERAL_NAMES *gens = NULL;
|
|
|
|
CONF_VALUE *cnf;
|
|
|
|
size_t i;
|
|
|
|
if (!(gens = sk_GENERAL_NAME_new_null())) {
|
|
|
|
OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
for (i = 0; i < sk_CONF_VALUE_num(nval); i++) {
|
|
|
|
cnf = sk_CONF_VALUE_value(nval, i);
|
|
|
|
if (!x509v3_name_cmp(cnf->name, "issuer") && cnf->value &&
|
|
|
|
!strcmp(cnf->value, "copy")) {
|
|
|
|
if (!copy_issuer(ctx, gens))
|
|
|
|
goto err;
|
|
|
|
} else {
|
|
|
|
GENERAL_NAME *gen;
|
|
|
|
if (!(gen = v2i_GENERAL_NAME(method, ctx, cnf)))
|
|
|
|
goto err;
|
|
|
|
sk_GENERAL_NAME_push(gens, gen);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return gens;
|
|
|
|
err:
|
|
|
|
sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Append subject altname of issuer to issuer alt name of subject */
|
|
|
|
|
|
|
|
static int copy_issuer(X509V3_CTX *ctx, GENERAL_NAMES *gens)
|
|
|
|
{
|
|
|
|
if (ctx && (ctx->flags == CTX_TEST))
|
|
|
|
return 1;
|
|
|
|
if (!ctx || !ctx->issuer_cert) {
|
|
|
|
OPENSSL_PUT_ERROR(X509V3, X509V3_R_NO_ISSUER_DETAILS);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
int i = X509_get_ext_by_NID(ctx->issuer_cert, NID_subject_alt_name, -1);
|
|
|
|
if (i < 0)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
int ret = 0;
|
|
|
|
GENERAL_NAMES *ialt = NULL;
|
|
|
|
X509_EXTENSION *ext;
|
|
|
|
if (!(ext = X509_get_ext(ctx->issuer_cert, i)) ||
|
|
|
|
!(ialt = X509V3_EXT_d2i(ext))) {
|
|
|
|
OPENSSL_PUT_ERROR(X509V3, X509V3_R_ISSUER_DECODE_ERROR);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (size_t j = 0; j < sk_GENERAL_NAME_num(ialt); j++) {
|
|
|
|
GENERAL_NAME *gen = sk_GENERAL_NAME_value(ialt, j);
|
|
|
|
if (!sk_GENERAL_NAME_push(gens, gen)) {
|
|
|
|
OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
/* Ownership of |gen| has moved from |ialt| to |gens|. */
|
|
|
|
sk_GENERAL_NAME_set(ialt, j, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = 1;
|
|
|
|
|
|
|
|
err:
|
|
|
|
GENERAL_NAMES_free(ialt);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method,
|
|
|
|
X509V3_CTX *ctx,
|
|
|
|
STACK_OF(CONF_VALUE) *nval)
|
|
|
|
{
|
|
|
|
GENERAL_NAMES *gens = NULL;
|
|
|
|
CONF_VALUE *cnf;
|
|
|
|
size_t i;
|
|
|
|
if (!(gens = sk_GENERAL_NAME_new_null())) {
|
|
|
|
OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
for (i = 0; i < sk_CONF_VALUE_num(nval); i++) {
|
|
|
|
cnf = sk_CONF_VALUE_value(nval, i);
|
|
|
|
if (!x509v3_name_cmp(cnf->name, "email") && cnf->value &&
|
|
|
|
!strcmp(cnf->value, "copy")) {
|
|
|
|
if (!copy_email(ctx, gens, 0))
|
|
|
|
goto err;
|
|
|
|
} else if (!x509v3_name_cmp(cnf->name, "email") && cnf->value &&
|
|
|
|
!strcmp(cnf->value, "move")) {
|
|
|
|
if (!copy_email(ctx, gens, 1))
|
|
|
|
goto err;
|
|
|
|
} else {
|
|
|
|
GENERAL_NAME *gen;
|
|
|
|
if (!(gen = v2i_GENERAL_NAME(method, ctx, cnf)))
|
|
|
|
goto err;
|
|
|
|
sk_GENERAL_NAME_push(gens, gen);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return gens;
|
|
|
|
err:
|
|
|
|
sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Copy any email addresses in a certificate or request to GENERAL_NAMES
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p)
|
|
|
|
{
|
|
|
|
X509_NAME *nm;
|
|
|
|
ASN1_IA5STRING *email = NULL;
|
|
|
|
X509_NAME_ENTRY *ne;
|
|
|
|
GENERAL_NAME *gen = NULL;
|
|
|
|
int i;
|
|
|
|
if (ctx != NULL && ctx->flags == CTX_TEST)
|
|
|
|
return 1;
|
|
|
|
if (!ctx || (!ctx->subject_cert && !ctx->subject_req)) {
|
|
|
|
OPENSSL_PUT_ERROR(X509V3, X509V3_R_NO_SUBJECT_DETAILS);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
/* Find the subject name */
|
|
|
|
if (ctx->subject_cert)
|
|
|
|
nm = X509_get_subject_name(ctx->subject_cert);
|
|
|
|
else
|
|
|
|
nm = X509_REQ_get_subject_name(ctx->subject_req);
|
|
|
|
|
|
|
|
/* Now add any email address(es) to STACK */
|
|
|
|
i = -1;
|
|
|
|
while ((i = X509_NAME_get_index_by_NID(nm,
|
|
|
|
NID_pkcs9_emailAddress, i)) >= 0) {
|
|
|
|
ne = X509_NAME_get_entry(nm, i);
|
Unwind M_ASN1_* macros for primitive types.
At one point in the SSLeay days, all the ASN1_STRING typedefs were
separate structs (but only in debug builds) and the M_ASN1_* macros
included type casts to handle this.
This is long gone, but we still have the M_ASN1_* macros. Remove the
casts and switch code within the library to call the macros. Some
subtleties:
- The "MSTRING" types (what OpenSSL calls its built-in CHOICEs
containing some set of string types) are weird because the M_FOO_new()
macro and the tasn_new.c FOO_new() function behave differently. I've
split those into a separate CL.
- ASN1_STRING_type, etc., call into the macro, which accesses the field
directly. This CL inverts the dependency.
- ASN1_INTEGER_new and ASN1_INTEGER_free, etc., are generated via
IMPLEMENT_ASN1_STRING_FUNCTIONS in tasn_typ.c. I've pointed
M_ASN1_INTEGER_new and M_ASN1_INTEGER_free to these fields. (The free
function is a no-op, but consistent.)
- The other macros like M_ASN1_BIT_STRING_dup largely do not have
corresponding functions. I've aligned with OpenSSL in just using the
generic ASN1_STRING_dup function. But some others, like
M_ASN1_OCTET_STRING_dup have a corresponding ASN1_OCTET_STRING_dup
function. OpenSSL retained these, so I have too.
Update-Note: Some external code uses the M_ASN1_* macros. This should
remain compatible, but some type errors may have gotten through
unnoticed. This CL restores type-checking.
Change-Id: I8656abc7d0f179192e05a852c97483c021ad9b20
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/44045
Reviewed-by: Adam Langley <agl@google.com>
4 years ago
|
|
|
email = ASN1_STRING_dup(X509_NAME_ENTRY_get_data(ne));
|
|
|
|
if (move_p) {
|
|
|
|
X509_NAME_delete_entry(nm, i);
|
|
|
|
X509_NAME_ENTRY_free(ne);
|
|
|
|
i--;
|
|
|
|
}
|
|
|
|
if (!email || !(gen = GENERAL_NAME_new())) {
|
|
|
|
OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
gen->d.ia5 = email;
|
|
|
|
email = NULL;
|
|
|
|
gen->type = GEN_EMAIL;
|
|
|
|
if (!sk_GENERAL_NAME_push(gens, gen)) {
|
|
|
|
OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
gen = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
err:
|
|
|
|
GENERAL_NAME_free(gen);
|
Unwind M_ASN1_* macros for primitive types.
At one point in the SSLeay days, all the ASN1_STRING typedefs were
separate structs (but only in debug builds) and the M_ASN1_* macros
included type casts to handle this.
This is long gone, but we still have the M_ASN1_* macros. Remove the
casts and switch code within the library to call the macros. Some
subtleties:
- The "MSTRING" types (what OpenSSL calls its built-in CHOICEs
containing some set of string types) are weird because the M_FOO_new()
macro and the tasn_new.c FOO_new() function behave differently. I've
split those into a separate CL.
- ASN1_STRING_type, etc., call into the macro, which accesses the field
directly. This CL inverts the dependency.
- ASN1_INTEGER_new and ASN1_INTEGER_free, etc., are generated via
IMPLEMENT_ASN1_STRING_FUNCTIONS in tasn_typ.c. I've pointed
M_ASN1_INTEGER_new and M_ASN1_INTEGER_free to these fields. (The free
function is a no-op, but consistent.)
- The other macros like M_ASN1_BIT_STRING_dup largely do not have
corresponding functions. I've aligned with OpenSSL in just using the
generic ASN1_STRING_dup function. But some others, like
M_ASN1_OCTET_STRING_dup have a corresponding ASN1_OCTET_STRING_dup
function. OpenSSL retained these, so I have too.
Update-Note: Some external code uses the M_ASN1_* macros. This should
remain compatible, but some type errors may have gotten through
unnoticed. This CL restores type-checking.
Change-Id: I8656abc7d0f179192e05a852c97483c021ad9b20
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/44045
Reviewed-by: Adam Langley <agl@google.com>
4 years ago
|
|
|
ASN1_IA5STRING_free(email);
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
GENERAL_NAMES *v2i_GENERAL_NAMES(const X509V3_EXT_METHOD *method,
|
|
|
|
X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
|
|
|
|
{
|
|
|
|
GENERAL_NAME *gen;
|
|
|
|
GENERAL_NAMES *gens = NULL;
|
|
|
|
CONF_VALUE *cnf;
|
|
|
|
size_t i;
|
|
|
|
if (!(gens = sk_GENERAL_NAME_new_null())) {
|
|
|
|
OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
for (i = 0; i < sk_CONF_VALUE_num(nval); i++) {
|
|
|
|
cnf = sk_CONF_VALUE_value(nval, i);
|
|
|
|
if (!(gen = v2i_GENERAL_NAME(method, ctx, cnf)))
|
|
|
|
goto err;
|
|
|
|
sk_GENERAL_NAME_push(gens, gen);
|
|
|
|
}
|
|
|
|
return gens;
|
|
|
|
err:
|
|
|
|
sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
GENERAL_NAME *v2i_GENERAL_NAME(const X509V3_EXT_METHOD *method,
|
|
|
|
X509V3_CTX *ctx, CONF_VALUE *cnf)
|
|
|
|
{
|
|
|
|
return v2i_GENERAL_NAME_ex(NULL, method, ctx, cnf, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
|
|
|
|
const X509V3_EXT_METHOD *method,
|
|
|
|
X509V3_CTX *ctx, int gen_type,
|
|
|
|
const char *value, int is_nc)
|
|
|
|
{
|
|
|
|
char is_string = 0;
|
|
|
|
GENERAL_NAME *gen = NULL;
|
|
|
|
|
|
|
|
if (!value) {
|
|
|
|
OPENSSL_PUT_ERROR(X509V3, X509V3_R_MISSING_VALUE);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (out)
|
|
|
|
gen = out;
|
|
|
|
else {
|
|
|
|
gen = GENERAL_NAME_new();
|
|
|
|
if (gen == NULL) {
|
|
|
|
OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (gen_type) {
|
|
|
|
case GEN_URI:
|
|
|
|
case GEN_EMAIL:
|
|
|
|
case GEN_DNS:
|
|
|
|
is_string = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GEN_RID:
|
|
|
|
{
|
|
|
|
ASN1_OBJECT *obj;
|
|
|
|
if (!(obj = OBJ_txt2obj(value, 0))) {
|
|
|
|
OPENSSL_PUT_ERROR(X509V3, X509V3_R_BAD_OBJECT);
|
|
|
|
ERR_add_error_data(2, "value=", value);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
gen->d.rid = obj;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GEN_IPADD:
|
|
|
|
if (is_nc)
|
|
|
|
gen->d.ip = a2i_IPADDRESS_NC(value);
|
|
|
|
else
|
|
|
|
gen->d.ip = a2i_IPADDRESS(value);
|
|
|
|
if (gen->d.ip == NULL) {
|
|
|
|
OPENSSL_PUT_ERROR(X509V3, X509V3_R_BAD_IP_ADDRESS);
|
|
|
|
ERR_add_error_data(2, "value=", value);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GEN_DIRNAME:
|
|
|
|
if (!do_dirname(gen, value, ctx)) {
|
|
|
|
OPENSSL_PUT_ERROR(X509V3, X509V3_R_DIRNAME_ERROR);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GEN_OTHERNAME:
|
|
|
|
if (!do_othername(gen, value, ctx)) {
|
|
|
|
OPENSSL_PUT_ERROR(X509V3, X509V3_R_OTHERNAME_ERROR);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
OPENSSL_PUT_ERROR(X509V3, X509V3_R_UNSUPPORTED_TYPE);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (is_string) {
|
Unwind M_ASN1_* macros for primitive types.
At one point in the SSLeay days, all the ASN1_STRING typedefs were
separate structs (but only in debug builds) and the M_ASN1_* macros
included type casts to handle this.
This is long gone, but we still have the M_ASN1_* macros. Remove the
casts and switch code within the library to call the macros. Some
subtleties:
- The "MSTRING" types (what OpenSSL calls its built-in CHOICEs
containing some set of string types) are weird because the M_FOO_new()
macro and the tasn_new.c FOO_new() function behave differently. I've
split those into a separate CL.
- ASN1_STRING_type, etc., call into the macro, which accesses the field
directly. This CL inverts the dependency.
- ASN1_INTEGER_new and ASN1_INTEGER_free, etc., are generated via
IMPLEMENT_ASN1_STRING_FUNCTIONS in tasn_typ.c. I've pointed
M_ASN1_INTEGER_new and M_ASN1_INTEGER_free to these fields. (The free
function is a no-op, but consistent.)
- The other macros like M_ASN1_BIT_STRING_dup largely do not have
corresponding functions. I've aligned with OpenSSL in just using the
generic ASN1_STRING_dup function. But some others, like
M_ASN1_OCTET_STRING_dup have a corresponding ASN1_OCTET_STRING_dup
function. OpenSSL retained these, so I have too.
Update-Note: Some external code uses the M_ASN1_* macros. This should
remain compatible, but some type errors may have gotten through
unnoticed. This CL restores type-checking.
Change-Id: I8656abc7d0f179192e05a852c97483c021ad9b20
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/44045
Reviewed-by: Adam Langley <agl@google.com>
4 years ago
|
|
|
if (!(gen->d.ia5 = ASN1_IA5STRING_new()) ||
|
|
|
|
!ASN1_STRING_set(gen->d.ia5, (unsigned char *)value,
|
|
|
|
strlen(value))) {
|
|
|
|
OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
gen->type = gen_type;
|
|
|
|
|
|
|
|
return gen;
|
|
|
|
|
|
|
|
err:
|
|
|
|
if (!out)
|
|
|
|
GENERAL_NAME_free(gen);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
GENERAL_NAME *v2i_GENERAL_NAME_ex(GENERAL_NAME *out,
|
|
|
|
const X509V3_EXT_METHOD *method,
|
|
|
|
X509V3_CTX *ctx, CONF_VALUE *cnf, int is_nc)
|
|
|
|
{
|
|
|
|
int type;
|
|
|
|
|
|
|
|
char *name, *value;
|
|
|
|
|
|
|
|
name = cnf->name;
|
|
|
|
value = cnf->value;
|
|
|
|
|
|
|
|
if (!value) {
|
|
|
|
OPENSSL_PUT_ERROR(X509V3, X509V3_R_MISSING_VALUE);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!x509v3_name_cmp(name, "email"))
|
|
|
|
type = GEN_EMAIL;
|
|
|
|
else if (!x509v3_name_cmp(name, "URI"))
|
|
|
|
type = GEN_URI;
|
|
|
|
else if (!x509v3_name_cmp(name, "DNS"))
|
|
|
|
type = GEN_DNS;
|
|
|
|
else if (!x509v3_name_cmp(name, "RID"))
|
|
|
|
type = GEN_RID;
|
|
|
|
else if (!x509v3_name_cmp(name, "IP"))
|
|
|
|
type = GEN_IPADD;
|
|
|
|
else if (!x509v3_name_cmp(name, "dirName"))
|
|
|
|
type = GEN_DIRNAME;
|
|
|
|
else if (!x509v3_name_cmp(name, "otherName"))
|
|
|
|
type = GEN_OTHERNAME;
|
|
|
|
else {
|
|
|
|
OPENSSL_PUT_ERROR(X509V3, X509V3_R_UNSUPPORTED_OPTION);
|
|
|
|
ERR_add_error_data(2, "name=", name);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return a2i_GENERAL_NAME(out, method, ctx, type, value, is_nc);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static int do_othername(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx)
|
|
|
|
{
|
|
|
|
char *objtmp = NULL;
|
|
|
|
const char *p;
|
|
|
|
int objlen;
|
|
|
|
if (!(p = strchr(value, ';')))
|
|
|
|
return 0;
|
|
|
|
if (!(gen->d.otherName = OTHERNAME_new()))
|
|
|
|
return 0;
|
|
|
|
/*
|
|
|
|
* Free this up because we will overwrite it. no need to free type_id
|
|
|
|
* because it is static
|
|
|
|
*/
|
|
|
|
ASN1_TYPE_free(gen->d.otherName->value);
|
|
|
|
if (!(gen->d.otherName->value = ASN1_generate_v3(p + 1, ctx)))
|
|
|
|
return 0;
|
|
|
|
objlen = p - value;
|
|
|
|
objtmp = OPENSSL_malloc(objlen + 1);
|
|
|
|
if (objtmp == NULL)
|
|
|
|
return 0;
|
|
|
|
OPENSSL_strlcpy(objtmp, value, objlen + 1);
|
|
|
|
gen->d.otherName->type_id = OBJ_txt2obj(objtmp, 0);
|
|
|
|
OPENSSL_free(objtmp);
|
|
|
|
if (!gen->d.otherName->type_id)
|
|
|
|
return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int do_dirname(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
STACK_OF(CONF_VALUE) *sk = NULL;
|
|
|
|
X509_NAME *nm = X509_NAME_new();
|
|
|
|
if (nm == NULL)
|
|
|
|
goto err;
|
|
|
|
sk = X509V3_get_section(ctx, value);
|
|
|
|
if (sk == NULL) {
|
|
|
|
OPENSSL_PUT_ERROR(X509V3, X509V3_R_SECTION_NOT_FOUND);
|
|
|
|
ERR_add_error_data(2, "section=", value);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
/* FIXME: should allow other character types... */
|
|
|
|
if (!X509V3_NAME_from_section(nm, sk, MBSTRING_ASC))
|
|
|
|
goto err;
|
|
|
|
gen->d.dirn = nm;
|
|
|
|
ret = 1;
|
|
|
|
|
|
|
|
err:
|
|
|
|
if (!ret)
|
|
|
|
X509_NAME_free(nm);
|
|
|
|
X509V3_section_free(ctx, sk);
|
|
|
|
return ret;
|
|
|
|
}
|