mirror of
https://github.com/openssl/openssl.git
synced 2025-01-24 13:55:42 +08:00
852c2ed260
... and only *define* them in the source files that need them.
Use DEFINE_OR_DECLARE which is set appropriately for internal builds
and not non-deprecated builds.
Deprecate stack-of-block
Better documentation
Move some ASN1 struct typedefs to types.h
Update ParseC to handle this. Most of all, ParseC needed to be more
consistent. The handlers are "recursive", in so far that they are called
again and again until they terminate, which depends entirely on what the
"massager" returns. There's a comment at the beginning of ParseC that
explains how that works. {Richard Levtte}
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10669)
107 lines
3.3 KiB
C
107 lines
3.3 KiB
C
/*
|
|
* Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include "internal/cryptlib.h"
|
|
#include <openssl/asn1t.h>
|
|
#include <openssl/conf.h>
|
|
#include <openssl/x509v3.h>
|
|
#include "ext_dat.h"
|
|
|
|
DEFINE_STACK_OF(ASN1_OBJECT)
|
|
DEFINE_STACK_OF(CONF_VALUE)
|
|
|
|
static void *v2i_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method,
|
|
X509V3_CTX *ctx,
|
|
STACK_OF(CONF_VALUE) *nval);
|
|
static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD
|
|
*method, void *eku, STACK_OF(CONF_VALUE)
|
|
*extlist);
|
|
|
|
const X509V3_EXT_METHOD v3_ext_ku = {
|
|
NID_ext_key_usage, 0,
|
|
ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
|
|
0, 0, 0, 0,
|
|
0, 0,
|
|
i2v_EXTENDED_KEY_USAGE,
|
|
v2i_EXTENDED_KEY_USAGE,
|
|
0, 0,
|
|
NULL
|
|
};
|
|
|
|
/* NB OCSP acceptable responses also is a SEQUENCE OF OBJECT */
|
|
const X509V3_EXT_METHOD v3_ocsp_accresp = {
|
|
NID_id_pkix_OCSP_acceptableResponses, 0,
|
|
ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
|
|
0, 0, 0, 0,
|
|
0, 0,
|
|
i2v_EXTENDED_KEY_USAGE,
|
|
v2i_EXTENDED_KEY_USAGE,
|
|
0, 0,
|
|
NULL
|
|
};
|
|
|
|
ASN1_ITEM_TEMPLATE(EXTENDED_KEY_USAGE) =
|
|
ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, EXTENDED_KEY_USAGE, ASN1_OBJECT)
|
|
ASN1_ITEM_TEMPLATE_END(EXTENDED_KEY_USAGE)
|
|
|
|
IMPLEMENT_ASN1_FUNCTIONS(EXTENDED_KEY_USAGE)
|
|
|
|
static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD
|
|
*method, void *a, STACK_OF(CONF_VALUE)
|
|
*ext_list)
|
|
{
|
|
EXTENDED_KEY_USAGE *eku = a;
|
|
int i;
|
|
ASN1_OBJECT *obj;
|
|
char obj_tmp[80];
|
|
for (i = 0; i < sk_ASN1_OBJECT_num(eku); i++) {
|
|
obj = sk_ASN1_OBJECT_value(eku, i);
|
|
i2t_ASN1_OBJECT(obj_tmp, 80, obj);
|
|
X509V3_add_value(NULL, obj_tmp, &ext_list);
|
|
}
|
|
return ext_list;
|
|
}
|
|
|
|
static void *v2i_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method,
|
|
X509V3_CTX *ctx,
|
|
STACK_OF(CONF_VALUE) *nval)
|
|
{
|
|
EXTENDED_KEY_USAGE *extku;
|
|
char *extval;
|
|
ASN1_OBJECT *objtmp;
|
|
CONF_VALUE *val;
|
|
const int num = sk_CONF_VALUE_num(nval);
|
|
int i;
|
|
|
|
extku = sk_ASN1_OBJECT_new_reserve(NULL, num);
|
|
if (extku == NULL) {
|
|
X509V3err(X509V3_F_V2I_EXTENDED_KEY_USAGE, ERR_R_MALLOC_FAILURE);
|
|
sk_ASN1_OBJECT_free(extku);
|
|
return NULL;
|
|
}
|
|
|
|
for (i = 0; i < num; i++) {
|
|
val = sk_CONF_VALUE_value(nval, i);
|
|
if (val->value)
|
|
extval = val->value;
|
|
else
|
|
extval = val->name;
|
|
if ((objtmp = OBJ_txt2obj(extval, 0)) == NULL) {
|
|
sk_ASN1_OBJECT_pop_free(extku, ASN1_OBJECT_free);
|
|
X509V3err(X509V3_F_V2I_EXTENDED_KEY_USAGE,
|
|
X509V3_R_INVALID_OBJECT_IDENTIFIER);
|
|
X509V3_conf_err(val);
|
|
return NULL;
|
|
}
|
|
sk_ASN1_OBJECT_push(extku, objtmp); /* no failure as it was reserved */
|
|
}
|
|
return extku;
|
|
}
|