mirror of
https://github.com/guanzhi/GmSSL.git
synced 2026-08-14 01:53:41 +08:00
Merge remote-tracking branch 'origin/master'
# Conflicts: # README.md
This commit is contained in:
Zhi Guan
@@ -1,70 +1,21 @@
|
||||
/* conf_lib.c */
|
||||
/*
|
||||
* Written by Richard Levitte (richard@levitte.org) for the OpenSSL project
|
||||
* 2000.
|
||||
*/
|
||||
/* ====================================================================
|
||||
* Copyright (c) 2000 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).
|
||||
* Copyright 2000-2016 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 <string.h>
|
||||
#include <internal/conf.h>
|
||||
#include <openssl/crypto.h>
|
||||
#include <openssl/err.h>
|
||||
#include <openssl/conf.h>
|
||||
#include <openssl/conf_api.h>
|
||||
#include <openssl/lhash.h>
|
||||
|
||||
const char CONF_version[] = "CONF" OPENSSL_VERSION_PTEXT;
|
||||
#include "e_os.h"
|
||||
|
||||
static CONF_METHOD *default_CONF_method = NULL;
|
||||
|
||||
@@ -112,13 +63,13 @@ LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,
|
||||
return ltmp;
|
||||
}
|
||||
|
||||
#ifndef OPENSSL_NO_FP_API
|
||||
#ifndef OPENSSL_NO_STDIO
|
||||
LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,
|
||||
long *eline)
|
||||
{
|
||||
BIO *btmp;
|
||||
LHASH_OF(CONF_VALUE) *ltmp;
|
||||
if (!(btmp = BIO_new_fp(fp, BIO_NOCLOSE))) {
|
||||
if ((btmp = BIO_new_fp(fp, BIO_NOCLOSE)) == NULL) {
|
||||
CONFerr(CONF_F_CONF_LOAD_FP, ERR_R_BUF_LIB);
|
||||
return NULL;
|
||||
}
|
||||
@@ -194,13 +145,13 @@ void CONF_free(LHASH_OF(CONF_VALUE) *conf)
|
||||
NCONF_free_data(&ctmp);
|
||||
}
|
||||
|
||||
#ifndef OPENSSL_NO_FP_API
|
||||
#ifndef OPENSSL_NO_STDIO
|
||||
int CONF_dump_fp(LHASH_OF(CONF_VALUE) *conf, FILE *out)
|
||||
{
|
||||
BIO *btmp;
|
||||
int ret;
|
||||
|
||||
if (!(btmp = BIO_new_fp(out, BIO_NOCLOSE))) {
|
||||
if ((btmp = BIO_new_fp(out, BIO_NOCLOSE)) == NULL) {
|
||||
CONFerr(CONF_F_CONF_DUMP_FP, ERR_R_BUF_LIB);
|
||||
return 0;
|
||||
}
|
||||
@@ -265,12 +216,12 @@ int NCONF_load(CONF *conf, const char *file, long *eline)
|
||||
return conf->meth->load(conf, file, eline);
|
||||
}
|
||||
|
||||
#ifndef OPENSSL_NO_FP_API
|
||||
#ifndef OPENSSL_NO_STDIO
|
||||
int NCONF_load_fp(CONF *conf, FILE *fp, long *eline)
|
||||
{
|
||||
BIO *btmp;
|
||||
int ret;
|
||||
if (!(btmp = BIO_new_fp(fp, BIO_NOCLOSE))) {
|
||||
if ((btmp = BIO_new_fp(fp, BIO_NOCLOSE)) == NULL) {
|
||||
CONFerr(CONF_F_NCONF_LOAD_FP, ERR_R_BUF_LIB);
|
||||
return 0;
|
||||
}
|
||||
@@ -349,12 +300,12 @@ int NCONF_get_number_e(const CONF *conf, const char *group, const char *name,
|
||||
return 1;
|
||||
}
|
||||
|
||||
#ifndef OPENSSL_NO_FP_API
|
||||
#ifndef OPENSSL_NO_STDIO
|
||||
int NCONF_dump_fp(const CONF *conf, FILE *out)
|
||||
{
|
||||
BIO *btmp;
|
||||
int ret;
|
||||
if (!(btmp = BIO_new_fp(out, BIO_NOCLOSE))) {
|
||||
if ((btmp = BIO_new_fp(out, BIO_NOCLOSE)) == NULL) {
|
||||
CONFerr(CONF_F_NCONF_DUMP_FP, ERR_R_BUF_LIB);
|
||||
return 0;
|
||||
}
|
||||
@@ -374,18 +325,41 @@ int NCONF_dump_bio(const CONF *conf, BIO *out)
|
||||
return conf->meth->dump(conf, out);
|
||||
}
|
||||
|
||||
/* This function should be avoided */
|
||||
#if 0
|
||||
long NCONF_get_number(CONF *conf, char *group, char *name)
|
||||
/*
|
||||
* These routines call the C malloc/free, to avoid intermixing with
|
||||
* OpenSSL function pointers before the library is initialized.
|
||||
*/
|
||||
OPENSSL_INIT_SETTINGS *OPENSSL_INIT_new(void)
|
||||
{
|
||||
int status;
|
||||
long ret = 0;
|
||||
OPENSSL_INIT_SETTINGS *ret = malloc(sizeof(*ret));
|
||||
|
||||
status = NCONF_get_number_e(conf, group, name, &ret);
|
||||
if (status == 0) {
|
||||
/* This function does not believe in errors... */
|
||||
ERR_get_error();
|
||||
}
|
||||
if (ret != NULL)
|
||||
memset(ret, 0, sizeof(*ret));
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
#ifndef OPENSSL_NO_STDIO
|
||||
int OPENSSL_INIT_set_config_appname(OPENSSL_INIT_SETTINGS *settings,
|
||||
const char *appname)
|
||||
{
|
||||
char *newappname = NULL;
|
||||
|
||||
if (appname != NULL) {
|
||||
newappname = strdup(appname);
|
||||
if (newappname == NULL)
|
||||
return 0;
|
||||
}
|
||||
|
||||
free(settings->appname);
|
||||
settings->appname = newappname;
|
||||
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
void OPENSSL_INIT_free(OPENSSL_INIT_SETTINGS *settings)
|
||||
{
|
||||
free(settings->appname);
|
||||
free(settings);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user