mirror of
https://github.com/openssl/openssl.git
synced 2024-12-09 05:51:54 +08:00
a1df06b363
return true for characters > 127. I.e. they are allowing extended ASCII characters through which then cause problems. E.g. marking superscript '2' as a number then causes the common (ch - '0') conversion to number to fail miserably. Likewise letters with diacritical marks can also cause problems. If a non-ASCII character set is being used (currently only EBCDIC), it is adjusted for. The implementation uses a single table with a bit for each of the defined classes. These functions accept an int argument and fail for values out of range or for characters outside of the ASCII set. They will work for both signed and unsigned character inputs. Reviewed-by: Andy Polyakov <appro@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4102)
114 lines
3.4 KiB
C
114 lines
3.4 KiB
C
/*
|
|
* Copyright 2012-2017 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the OpenSSL license (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 <openssl/crypto.h>
|
|
#include "internal/cryptlib.h"
|
|
#include <openssl/conf.h>
|
|
#include <openssl/x509v3.h>
|
|
|
|
/* Multi string module: add table entries from a given section */
|
|
|
|
static int do_tcreate(const char *value, const char *name);
|
|
|
|
static int stbl_module_init(CONF_IMODULE *md, const CONF *cnf)
|
|
{
|
|
int i;
|
|
const char *stbl_section;
|
|
STACK_OF(CONF_VALUE) *sktmp;
|
|
CONF_VALUE *mval;
|
|
|
|
stbl_section = CONF_imodule_get_value(md);
|
|
if ((sktmp = NCONF_get_section(cnf, stbl_section)) == NULL) {
|
|
ASN1err(ASN1_F_STBL_MODULE_INIT, ASN1_R_ERROR_LOADING_SECTION);
|
|
return 0;
|
|
}
|
|
for (i = 0; i < sk_CONF_VALUE_num(sktmp); i++) {
|
|
mval = sk_CONF_VALUE_value(sktmp, i);
|
|
if (!do_tcreate(mval->value, mval->name)) {
|
|
ASN1err(ASN1_F_STBL_MODULE_INIT, ASN1_R_INVALID_VALUE);
|
|
return 0;
|
|
}
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static void stbl_module_finish(CONF_IMODULE *md)
|
|
{
|
|
ASN1_STRING_TABLE_cleanup();
|
|
}
|
|
|
|
void ASN1_add_stable_module(void)
|
|
{
|
|
CONF_module_add("stbl_section", stbl_module_init, stbl_module_finish);
|
|
}
|
|
|
|
/*
|
|
* Create an table entry based on a name value pair. format is oid_name =
|
|
* n1:v1, n2:v2,... where name is "min", "max", "mask" or "flags".
|
|
*/
|
|
|
|
static int do_tcreate(const char *value, const char *name)
|
|
{
|
|
char *eptr;
|
|
int nid, i, rv = 0;
|
|
long tbl_min = -1, tbl_max = -1;
|
|
unsigned long tbl_mask = 0, tbl_flags = 0;
|
|
STACK_OF(CONF_VALUE) *lst = NULL;
|
|
CONF_VALUE *cnf = NULL;
|
|
nid = OBJ_sn2nid(name);
|
|
if (nid == NID_undef)
|
|
nid = OBJ_ln2nid(name);
|
|
if (nid == NID_undef)
|
|
goto err;
|
|
lst = X509V3_parse_list(value);
|
|
if (!lst)
|
|
goto err;
|
|
for (i = 0; i < sk_CONF_VALUE_num(lst); i++) {
|
|
cnf = sk_CONF_VALUE_value(lst, i);
|
|
if (strcmp(cnf->name, "min") == 0) {
|
|
tbl_min = strtoul(cnf->value, &eptr, 0);
|
|
if (*eptr)
|
|
goto err;
|
|
} else if (strcmp(cnf->name, "max") == 0) {
|
|
tbl_max = strtoul(cnf->value, &eptr, 0);
|
|
if (*eptr)
|
|
goto err;
|
|
} else if (strcmp(cnf->name, "mask") == 0) {
|
|
if (!ASN1_str2mask(cnf->value, &tbl_mask) || !tbl_mask)
|
|
goto err;
|
|
} else if (strcmp(cnf->name, "flags") == 0) {
|
|
if (strcmp(cnf->value, "nomask") == 0)
|
|
tbl_flags = STABLE_NO_MASK;
|
|
else if (strcmp(cnf->value, "none") == 0)
|
|
tbl_flags = STABLE_FLAGS_CLEAR;
|
|
else
|
|
goto err;
|
|
} else
|
|
goto err;
|
|
}
|
|
rv = 1;
|
|
err:
|
|
if (rv == 0) {
|
|
ASN1err(ASN1_F_DO_TCREATE, ASN1_R_INVALID_STRING_TABLE_VALUE);
|
|
if (cnf)
|
|
ERR_add_error_data(4, "field=", cnf->name,
|
|
", value=", cnf->value);
|
|
else
|
|
ERR_add_error_data(4, "name=", name, ", value=", value);
|
|
} else {
|
|
rv = ASN1_STRING_TABLE_add(nid, tbl_min, tbl_max,
|
|
tbl_mask, tbl_flags);
|
|
if (!rv)
|
|
ASN1err(ASN1_F_DO_TCREATE, ERR_R_MALLOC_FAILURE);
|
|
}
|
|
sk_CONF_VALUE_pop_free(lst, X509V3_conf_free);
|
|
return rv;
|
|
}
|