mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
Upgrade openssl from 1.1.0e to 1.1.1b, with source code. 4.0.78
This commit is contained in:
parent
8f1c992379
commit
96dbd7bced
1476 changed files with 616554 additions and 4 deletions
113
trunk/3rdparty/openssl-1.1-fit/crypto/asn1/asn_mstbl.c
vendored
Normal file
113
trunk/3rdparty/openssl-1.1-fit/crypto/asn1/asn_mstbl.c
vendored
Normal file
|
@ -0,0 +1,113 @@
|
|||
/*
|
||||
* 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;
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue