sync with OpenBSD -current
This commit is contained in:
parent
99745de747
commit
efaa6fdefb
GPG key ID:
F42C07F07E2E35B7
23 changed files with 168 additions and 270 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: x509_bitst.c,v 1.4 2023/04/21 06:11:56 tb Exp $ */
|
||||
/* $OpenBSD: x509_bitst.c,v 1.5 2024/06/18 08:29:40 tb Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project 1999.
|
||||
*/
|
||||
|
|
@ -157,7 +157,7 @@ STACK_OF(CONF_VALUE) *
|
|||
i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, ASN1_BIT_STRING *bits,
|
||||
STACK_OF(CONF_VALUE) *ret)
|
||||
{
|
||||
BIT_STRING_BITNAME *bnam;
|
||||
const BIT_STRING_BITNAME *bnam;
|
||||
STACK_OF(CONF_VALUE) *free_ret = NULL;
|
||||
|
||||
if (ret == NULL) {
|
||||
|
|
@ -188,7 +188,7 @@ v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
|
|||
CONF_VALUE *val;
|
||||
ASN1_BIT_STRING *bs;
|
||||
int i;
|
||||
BIT_STRING_BITNAME *bnam;
|
||||
const BIT_STRING_BITNAME *bnam;
|
||||
|
||||
if (!(bs = ASN1_BIT_STRING_new())) {
|
||||
X509V3error(ERR_R_MALLOC_FAILURE);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: x509_conf.c,v 1.5 2023/02/16 08:38:17 tb Exp $ */
|
||||
/* $OpenBSD: x509_conf.c,v 1.17 2024/06/18 09:47:03 tb Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project 1999.
|
||||
*/
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
|
||||
static int v3_check_critical(const char **value);
|
||||
static int v3_check_generic(const char **value);
|
||||
static X509_EXTENSION *do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid,
|
||||
static X509_EXTENSION *do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int nid,
|
||||
int crit, const char *value);
|
||||
static X509_EXTENSION *v3_generic_extension(const char *ext, const char *value,
|
||||
int crit, int type, X509V3_CTX *ctx);
|
||||
|
|
@ -78,8 +78,8 @@ static char *conf_lhash_get_string(void *db, const char *section,
|
|||
const char *value);
|
||||
static STACK_OF(CONF_VALUE) *conf_lhash_get_section(void *db,
|
||||
const char *section);
|
||||
static X509_EXTENSION *do_ext_i2d(const X509V3_EXT_METHOD *method, int ext_nid,
|
||||
int crit, void *ext_struc);
|
||||
static X509_EXTENSION *do_ext_i2d(const X509V3_EXT_METHOD *method, int nid,
|
||||
int crit, void *ext_struct);
|
||||
static unsigned char *generic_asn1(const char *value, X509V3_CTX *ctx,
|
||||
long *ext_len);
|
||||
|
||||
|
|
@ -109,7 +109,7 @@ LCRYPTO_ALIAS(X509V3_EXT_nconf);
|
|||
/* CONF *conf: Config file */
|
||||
/* char *value: Value */
|
||||
X509_EXTENSION *
|
||||
X509V3_EXT_nconf_nid(CONF *conf, X509V3_CTX *ctx, int ext_nid,
|
||||
X509V3_EXT_nconf_nid(CONF *conf, X509V3_CTX *ctx, int nid,
|
||||
const char *value)
|
||||
{
|
||||
int crit;
|
||||
|
|
@ -117,27 +117,27 @@ X509V3_EXT_nconf_nid(CONF *conf, X509V3_CTX *ctx, int ext_nid,
|
|||
|
||||
crit = v3_check_critical(&value);
|
||||
if ((ext_type = v3_check_generic(&value)))
|
||||
return v3_generic_extension(OBJ_nid2sn(ext_nid),
|
||||
return v3_generic_extension(OBJ_nid2sn(nid),
|
||||
value, crit, ext_type, ctx);
|
||||
return do_ext_nconf(conf, ctx, ext_nid, crit, value);
|
||||
return do_ext_nconf(conf, ctx, nid, crit, value);
|
||||
}
|
||||
LCRYPTO_ALIAS(X509V3_EXT_nconf_nid);
|
||||
|
||||
/* CONF *conf: Config file */
|
||||
/* char *value: Value */
|
||||
static X509_EXTENSION *
|
||||
do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid, int crit,
|
||||
do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int nid, int crit,
|
||||
const char *value)
|
||||
{
|
||||
const X509V3_EXT_METHOD *method;
|
||||
X509_EXTENSION *ext;
|
||||
void *ext_struc;
|
||||
void *ext_struct;
|
||||
|
||||
if (ext_nid == NID_undef) {
|
||||
if (nid == NID_undef) {
|
||||
X509V3error(X509V3_R_UNKNOWN_EXTENSION_NAME);
|
||||
return NULL;
|
||||
}
|
||||
if (!(method = X509V3_EXT_get_nid(ext_nid))) {
|
||||
if (!(method = X509V3_EXT_get_nid(nid))) {
|
||||
X509V3error(X509V3_R_UNKNOWN_EXTENSION);
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -152,93 +152,97 @@ do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid, int crit,
|
|||
if (sk_CONF_VALUE_num(nval) <= 0) {
|
||||
X509V3error(X509V3_R_INVALID_EXTENSION_STRING);
|
||||
ERR_asprintf_error_data("name=%s,section=%s",
|
||||
OBJ_nid2sn(ext_nid), value);
|
||||
OBJ_nid2sn(nid), value);
|
||||
if (*value != '@')
|
||||
sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
|
||||
return NULL;
|
||||
}
|
||||
ext_struc = method->v2i(method, ctx, nval);
|
||||
ext_struct = method->v2i(method, ctx, nval);
|
||||
if (*value != '@')
|
||||
sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
|
||||
} else if (method->s2i) {
|
||||
ext_struc = method->s2i(method, ctx, value);
|
||||
ext_struct = method->s2i(method, ctx, value);
|
||||
} else if (method->r2i) {
|
||||
if (!ctx->db || !ctx->db_meth) {
|
||||
X509V3error(X509V3_R_NO_CONFIG_DATABASE);
|
||||
return NULL;
|
||||
}
|
||||
ext_struc = method->r2i(method, ctx, value);
|
||||
ext_struct = method->r2i(method, ctx, value);
|
||||
} else {
|
||||
X509V3error(X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED);
|
||||
ERR_asprintf_error_data("name=%s", OBJ_nid2sn(ext_nid));
|
||||
ERR_asprintf_error_data("name=%s", OBJ_nid2sn(nid));
|
||||
return NULL;
|
||||
}
|
||||
if (ext_struc == NULL)
|
||||
if (ext_struct == NULL)
|
||||
return NULL;
|
||||
|
||||
ext = do_ext_i2d(method, ext_nid, crit, ext_struc);
|
||||
ext = do_ext_i2d(method, nid, crit, ext_struct);
|
||||
if (method->it)
|
||||
ASN1_item_free(ext_struc, method->it);
|
||||
ASN1_item_free(ext_struct, method->it);
|
||||
else
|
||||
method->ext_free(ext_struc);
|
||||
method->ext_free(ext_struct);
|
||||
return ext;
|
||||
}
|
||||
|
||||
static X509_EXTENSION *
|
||||
do_ext_i2d(const X509V3_EXT_METHOD *method, int ext_nid, int crit,
|
||||
void *ext_struc)
|
||||
do_ext_i2d(const X509V3_EXT_METHOD *method, int nid, int crit,
|
||||
void *ext_struct)
|
||||
{
|
||||
unsigned char *ext_der;
|
||||
unsigned char *ext_der = NULL;
|
||||
int ext_len;
|
||||
ASN1_OCTET_STRING *ext_oct = NULL;
|
||||
X509_EXTENSION *ext;
|
||||
|
||||
/* Convert internal representation to DER */
|
||||
if (method->it) {
|
||||
if (method->it != NULL) {
|
||||
ext_der = NULL;
|
||||
ext_len = ASN1_item_i2d(ext_struc, &ext_der,
|
||||
method->it);
|
||||
ext_len = ASN1_item_i2d(ext_struct, &ext_der, method->it);
|
||||
if (ext_len < 0)
|
||||
goto merr;
|
||||
} else {
|
||||
unsigned char *p;
|
||||
ext_len = method->i2d(ext_struc, NULL);
|
||||
if (!(ext_der = malloc(ext_len)))
|
||||
|
||||
if ((ext_len = method->i2d(ext_struct, NULL)) <= 0)
|
||||
goto merr;
|
||||
if ((ext_der = calloc(1, ext_len)) == NULL)
|
||||
goto merr;
|
||||
p = ext_der;
|
||||
method->i2d(ext_struc, &p);
|
||||
if (method->i2d(ext_struct, &p) != ext_len)
|
||||
goto merr;
|
||||
}
|
||||
if (!(ext_oct = ASN1_OCTET_STRING_new()))
|
||||
if ((ext_oct = ASN1_OCTET_STRING_new()) == NULL)
|
||||
goto merr;
|
||||
ext_oct->data = ext_der;
|
||||
ext_oct->length = ext_len;
|
||||
ASN1_STRING_set0(ext_oct, ext_der, ext_len);
|
||||
ext_der = NULL;
|
||||
ext_len = 0;
|
||||
|
||||
ext = X509_EXTENSION_create_by_NID(NULL, ext_nid, crit, ext_oct);
|
||||
if (!ext)
|
||||
ext = X509_EXTENSION_create_by_NID(NULL, nid, crit, ext_oct);
|
||||
if (ext == NULL)
|
||||
goto merr;
|
||||
ASN1_OCTET_STRING_free(ext_oct);
|
||||
|
||||
return ext;
|
||||
|
||||
merr:
|
||||
merr:
|
||||
free(ext_der);
|
||||
ASN1_OCTET_STRING_free(ext_oct);
|
||||
X509V3error(ERR_R_MALLOC_FAILURE);
|
||||
return NULL;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Given an internal structure, nid and critical flag create an extension */
|
||||
|
||||
X509_EXTENSION *
|
||||
X509V3_EXT_i2d(int ext_nid, int crit, void *ext_struc)
|
||||
X509V3_EXT_i2d(int nid, int crit, void *ext_struct)
|
||||
{
|
||||
const X509V3_EXT_METHOD *method;
|
||||
|
||||
if (!(method = X509V3_EXT_get_nid(ext_nid))) {
|
||||
if (!(method = X509V3_EXT_get_nid(nid))) {
|
||||
X509V3error(X509V3_R_UNKNOWN_EXTENSION);
|
||||
return NULL;
|
||||
}
|
||||
return do_ext_i2d(method, ext_nid, crit, ext_struc);
|
||||
return do_ext_i2d(method, nid, crit, ext_struct);
|
||||
}
|
||||
LCRYPTO_ALIAS(X509V3_EXT_i2d);
|
||||
|
||||
|
|
@ -280,18 +284,18 @@ v3_check_generic(const char **value)
|
|||
|
||||
/* Create a generic extension: for now just handle DER type */
|
||||
static X509_EXTENSION *
|
||||
v3_generic_extension(const char *ext, const char *value, int crit, int gen_type,
|
||||
v3_generic_extension(const char *name, const char *value, int crit, int gen_type,
|
||||
X509V3_CTX *ctx)
|
||||
{
|
||||
unsigned char *ext_der = NULL;
|
||||
long ext_len = 0;
|
||||
ASN1_OBJECT *obj = NULL;
|
||||
ASN1_OCTET_STRING *oct = NULL;
|
||||
X509_EXTENSION *extension = NULL;
|
||||
X509_EXTENSION *ext = NULL;
|
||||
|
||||
if (!(obj = OBJ_txt2obj(ext, 0))) {
|
||||
if ((obj = OBJ_txt2obj(name, 0)) == NULL) {
|
||||
X509V3error(X509V3_R_EXTENSION_NAME_ERROR);
|
||||
ERR_asprintf_error_data("name=%s", ext);
|
||||
ERR_asprintf_error_data("name=%s", name);
|
||||
goto err;
|
||||
}
|
||||
|
||||
|
|
@ -310,22 +314,23 @@ v3_generic_extension(const char *ext, const char *value, int crit, int gen_type,
|
|||
goto err;
|
||||
}
|
||||
|
||||
if (!(oct = ASN1_OCTET_STRING_new())) {
|
||||
if ((oct = ASN1_OCTET_STRING_new()) == NULL) {
|
||||
X509V3error(ERR_R_MALLOC_FAILURE);
|
||||
goto err;
|
||||
}
|
||||
|
||||
oct->data = ext_der;
|
||||
oct->length = ext_len;
|
||||
ASN1_STRING_set0(oct, ext_der, ext_len);
|
||||
ext_der = NULL;
|
||||
ext_len = 0;
|
||||
|
||||
extension = X509_EXTENSION_create_by_OBJ(NULL, obj, crit, oct);
|
||||
ext = X509_EXTENSION_create_by_OBJ(NULL, obj, crit, oct);
|
||||
|
||||
err:
|
||||
err:
|
||||
ASN1_OBJECT_free(obj);
|
||||
ASN1_OCTET_STRING_free(oct);
|
||||
free(ext_der);
|
||||
return extension;
|
||||
|
||||
return ext;
|
||||
}
|
||||
|
||||
static unsigned char *
|
||||
|
|
@ -516,13 +521,13 @@ LCRYPTO_ALIAS(X509V3_EXT_conf);
|
|||
/* LHASH *conf: Config file */
|
||||
/* char *value: Value */
|
||||
X509_EXTENSION *
|
||||
X509V3_EXT_conf_nid(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, int ext_nid,
|
||||
X509V3_EXT_conf_nid(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, int nid,
|
||||
const char *value)
|
||||
{
|
||||
CONF ctmp;
|
||||
|
||||
CONF_set_nconf(&ctmp, conf);
|
||||
return X509V3_EXT_nconf_nid(&ctmp, ctx, ext_nid, value);
|
||||
return X509V3_EXT_nconf_nid(&ctmp, ctx, nid, value);
|
||||
}
|
||||
LCRYPTO_ALIAS(X509V3_EXT_conf_nid);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: x509_utl.c,v 1.17 2023/05/12 19:02:10 tb Exp $ */
|
||||
/* $OpenBSD: x509_utl.c,v 1.18 2024/06/18 08:29:40 tb Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project.
|
||||
*/
|
||||
|
|
@ -210,7 +210,7 @@ LCRYPTO_ALIAS(i2s_ASN1_ENUMERATED);
|
|||
char *
|
||||
i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *method, const ASN1_ENUMERATED *e)
|
||||
{
|
||||
BIT_STRING_BITNAME *enam;
|
||||
const BIT_STRING_BITNAME *enam;
|
||||
long strval;
|
||||
|
||||
strval = ASN1_ENUMERATED_get(e);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: x_all.c,v 1.31 2024/03/27 01:22:30 tb Exp $ */
|
||||
/* $OpenBSD: x_all.c,v 1.32 2024/06/19 08:00:53 tb Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -401,24 +401,24 @@ X509_verify(X509 *a, EVP_PKEY *r)
|
|||
{
|
||||
if (X509_ALGOR_cmp(a->sig_alg, a->cert_info->signature))
|
||||
return 0;
|
||||
return (ASN1_item_verify(&X509_CINF_it, a->sig_alg,
|
||||
a->signature, a->cert_info, r));
|
||||
return ASN1_item_verify(&X509_CINF_it, a->sig_alg,
|
||||
a->signature, a->cert_info, r);
|
||||
}
|
||||
LCRYPTO_ALIAS(X509_verify);
|
||||
|
||||
int
|
||||
X509_REQ_verify(X509_REQ *a, EVP_PKEY *r)
|
||||
{
|
||||
return (ASN1_item_verify(&X509_REQ_INFO_it,
|
||||
a->sig_alg, a->signature, a->req_info, r));
|
||||
return ASN1_item_verify(&X509_REQ_INFO_it,
|
||||
a->sig_alg, a->signature, a->req_info, r);
|
||||
}
|
||||
LCRYPTO_ALIAS(X509_REQ_verify);
|
||||
|
||||
int
|
||||
NETSCAPE_SPKI_verify(NETSCAPE_SPKI *a, EVP_PKEY *r)
|
||||
{
|
||||
return (ASN1_item_verify(&NETSCAPE_SPKAC_it,
|
||||
a->sig_algor, a->signature, a->spkac, r));
|
||||
return ASN1_item_verify(&NETSCAPE_SPKAC_it,
|
||||
a->sig_algor, a->signature, a->spkac, r);
|
||||
}
|
||||
LCRYPTO_ALIAS(NETSCAPE_SPKI_verify);
|
||||
|
||||
|
|
@ -426,9 +426,9 @@ int
|
|||
X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
|
||||
{
|
||||
x->cert_info->enc.modified = 1;
|
||||
return (ASN1_item_sign(&X509_CINF_it,
|
||||
return ASN1_item_sign(&X509_CINF_it,
|
||||
x->cert_info->signature, x->sig_alg, x->signature,
|
||||
x->cert_info, pkey, md));
|
||||
x->cert_info, pkey, md);
|
||||
}
|
||||
LCRYPTO_ALIAS(X509_sign);
|
||||
|
||||
|
|
@ -445,8 +445,8 @@ LCRYPTO_ALIAS(X509_sign_ctx);
|
|||
int
|
||||
X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md)
|
||||
{
|
||||
return (ASN1_item_sign(&X509_REQ_INFO_it,
|
||||
x->sig_alg, NULL, x->signature, x->req_info, pkey, md));
|
||||
return ASN1_item_sign(&X509_REQ_INFO_it,
|
||||
x->sig_alg, NULL, x->signature, x->req_info, pkey, md);
|
||||
}
|
||||
LCRYPTO_ALIAS(X509_REQ_sign);
|
||||
|
||||
|
|
@ -462,8 +462,8 @@ int
|
|||
X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md)
|
||||
{
|
||||
x->crl->enc.modified = 1;
|
||||
return(ASN1_item_sign(&X509_CRL_INFO_it, x->crl->sig_alg,
|
||||
x->sig_alg, x->signature, x->crl, pkey, md));
|
||||
return ASN1_item_sign(&X509_CRL_INFO_it, x->crl->sig_alg,
|
||||
x->sig_alg, x->signature, x->crl, pkey, md);
|
||||
}
|
||||
LCRYPTO_ALIAS(X509_CRL_sign);
|
||||
|
||||
|
|
@ -479,8 +479,8 @@ LCRYPTO_ALIAS(X509_CRL_sign_ctx);
|
|||
int
|
||||
NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md)
|
||||
{
|
||||
return (ASN1_item_sign(&NETSCAPE_SPKAC_it,
|
||||
x->sig_algor, NULL, x->signature, x->spkac, pkey, md));
|
||||
return ASN1_item_sign(&NETSCAPE_SPKAC_it,
|
||||
x->sig_algor, NULL, x->signature, x->spkac, pkey, md);
|
||||
}
|
||||
LCRYPTO_ALIAS(NETSCAPE_SPKI_sign);
|
||||
|
||||
|
|
@ -500,8 +500,7 @@ int
|
|||
X509_digest(const X509 *data, const EVP_MD *type, unsigned char *md,
|
||||
unsigned int *len)
|
||||
{
|
||||
return (ASN1_item_digest(&X509_it, type, (char *)data,
|
||||
md, len));
|
||||
return ASN1_item_digest(&X509_it, type, (void *)data, md, len);
|
||||
}
|
||||
LCRYPTO_ALIAS(X509_digest);
|
||||
|
||||
|
|
@ -509,8 +508,7 @@ int
|
|||
X509_CRL_digest(const X509_CRL *data, const EVP_MD *type, unsigned char *md,
|
||||
unsigned int *len)
|
||||
{
|
||||
return (ASN1_item_digest(&X509_CRL_it, type, (char *)data,
|
||||
md, len));
|
||||
return ASN1_item_digest(&X509_CRL_it, type, (void *)data, md, len);
|
||||
}
|
||||
LCRYPTO_ALIAS(X509_CRL_digest);
|
||||
|
||||
|
|
@ -518,8 +516,7 @@ int
|
|||
X509_REQ_digest(const X509_REQ *data, const EVP_MD *type, unsigned char *md,
|
||||
unsigned int *len)
|
||||
{
|
||||
return (ASN1_item_digest(&X509_REQ_it, type, (char *)data,
|
||||
md, len));
|
||||
return ASN1_item_digest(&X509_REQ_it, type, (void *)data, md, len);
|
||||
}
|
||||
LCRYPTO_ALIAS(X509_REQ_digest);
|
||||
|
||||
|
|
@ -527,8 +524,7 @@ int
|
|||
X509_NAME_digest(const X509_NAME *data, const EVP_MD *type, unsigned char *md,
|
||||
unsigned int *len)
|
||||
{
|
||||
return (ASN1_item_digest(&X509_NAME_it, type, (char *)data,
|
||||
md, len));
|
||||
return ASN1_item_digest(&X509_NAME_it, type, (void *)data, md, len);
|
||||
}
|
||||
LCRYPTO_ALIAS(X509_NAME_digest);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue