b7a26e6daf
Add new extension functions which work with NCONF. Tidy up extension config routines and remove redundant code. Fix NCONF_get_number(). Todo: more testing of apps to see they still work...
398 lines
8.9 KiB
C
398 lines
8.9 KiB
C
/* 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).
|
|
*
|
|
*/
|
|
|
|
#include <stdio.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;
|
|
|
|
static CONF_METHOD *default_CONF_method=NULL;
|
|
|
|
/* Init a 'CONF' structure from an old LHASH */
|
|
|
|
void CONF_set_nconf(CONF *conf, LHASH *hash)
|
|
{
|
|
if (default_CONF_method == NULL)
|
|
default_CONF_method = NCONF_default();
|
|
|
|
default_CONF_method->init(conf);
|
|
conf->data = hash;
|
|
}
|
|
|
|
/* The following section contains the "CONF classic" functions,
|
|
rewritten in terms of the new CONF interface. */
|
|
|
|
int CONF_set_default_method(CONF_METHOD *meth)
|
|
{
|
|
default_CONF_method = meth;
|
|
return 1;
|
|
}
|
|
|
|
LHASH *CONF_load(LHASH *conf, const char *file, long *eline)
|
|
{
|
|
LHASH *ltmp;
|
|
BIO *in=NULL;
|
|
|
|
#ifdef OPENSSL_SYS_VMS
|
|
in=BIO_new_file(file, "r");
|
|
#else
|
|
in=BIO_new_file(file, "rb");
|
|
#endif
|
|
if (in == NULL)
|
|
{
|
|
CONFerr(CONF_F_CONF_LOAD,ERR_R_SYS_LIB);
|
|
return NULL;
|
|
}
|
|
|
|
ltmp = CONF_load_bio(conf, in, eline);
|
|
BIO_free(in);
|
|
|
|
return ltmp;
|
|
}
|
|
|
|
#ifndef OPENSSL_NO_FP_API
|
|
LHASH *CONF_load_fp(LHASH *conf, FILE *fp,long *eline)
|
|
{
|
|
BIO *btmp;
|
|
LHASH *ltmp;
|
|
if(!(btmp = BIO_new_fp(fp, BIO_NOCLOSE))) {
|
|
CONFerr(CONF_F_CONF_LOAD_FP,ERR_R_BUF_LIB);
|
|
return NULL;
|
|
}
|
|
ltmp = CONF_load_bio(conf, btmp, eline);
|
|
BIO_free(btmp);
|
|
return ltmp;
|
|
}
|
|
#endif
|
|
|
|
LHASH *CONF_load_bio(LHASH *conf, BIO *bp,long *eline)
|
|
{
|
|
CONF ctmp;
|
|
int ret;
|
|
|
|
CONF_set_nconf(&ctmp, conf);
|
|
|
|
ret = NCONF_load_bio(&ctmp, bp, eline);
|
|
if (ret)
|
|
return ctmp.data;
|
|
return NULL;
|
|
}
|
|
|
|
STACK_OF(CONF_VALUE) *CONF_get_section(LHASH *conf,char *section)
|
|
{
|
|
if (conf == NULL)
|
|
{
|
|
return NULL;
|
|
}
|
|
else
|
|
{
|
|
CONF ctmp;
|
|
CONF_set_nconf(&ctmp, conf);
|
|
return NCONF_get_section(&ctmp, section);
|
|
}
|
|
}
|
|
|
|
char *CONF_get_string(LHASH *conf,char *group,char *name)
|
|
{
|
|
if (conf == NULL)
|
|
{
|
|
return NCONF_get_string(NULL, group, name);
|
|
}
|
|
else
|
|
{
|
|
CONF ctmp;
|
|
CONF_set_nconf(&ctmp, conf);
|
|
return NCONF_get_string(&ctmp, group, name);
|
|
}
|
|
}
|
|
|
|
long CONF_get_number(LHASH *conf,char *group,char *name)
|
|
{
|
|
int status;
|
|
long result = 0;
|
|
|
|
if (conf == NULL)
|
|
{
|
|
status = NCONF_get_number_e(NULL, group, name, &result);
|
|
}
|
|
else
|
|
{
|
|
CONF ctmp;
|
|
CONF_set_nconf(&ctmp, conf);
|
|
status = NCONF_get_number_e(&ctmp, group, name, &result);
|
|
}
|
|
|
|
if (status == 0)
|
|
{
|
|
/* This function does not believe in errors... */
|
|
ERR_get_error();
|
|
}
|
|
return result;
|
|
}
|
|
|
|
void CONF_free(LHASH *conf)
|
|
{
|
|
CONF ctmp;
|
|
CONF_set_nconf(&ctmp, conf);
|
|
NCONF_free_data(&ctmp);
|
|
}
|
|
|
|
#ifndef OPENSSL_NO_FP_API
|
|
int CONF_dump_fp(LHASH *conf, FILE *out)
|
|
{
|
|
BIO *btmp;
|
|
int ret;
|
|
|
|
if(!(btmp = BIO_new_fp(out, BIO_NOCLOSE))) {
|
|
CONFerr(CONF_F_CONF_DUMP_FP,ERR_R_BUF_LIB);
|
|
return 0;
|
|
}
|
|
ret = CONF_dump_bio(conf, btmp);
|
|
BIO_free(btmp);
|
|
return ret;
|
|
}
|
|
#endif
|
|
|
|
int CONF_dump_bio(LHASH *conf, BIO *out)
|
|
{
|
|
CONF ctmp;
|
|
CONF_set_nconf(&ctmp, conf);
|
|
return NCONF_dump_bio(&ctmp, out);
|
|
}
|
|
|
|
/* The following section contains the "New CONF" functions. They are
|
|
completely centralised around a new CONF structure that may contain
|
|
basically anything, but at least a method pointer and a table of data.
|
|
These functions are also written in terms of the bridge functions used
|
|
by the "CONF classic" functions, for consistency. */
|
|
|
|
CONF *NCONF_new(CONF_METHOD *meth)
|
|
{
|
|
CONF *ret;
|
|
|
|
if (meth == NULL)
|
|
meth = NCONF_default();
|
|
|
|
ret = meth->create(meth);
|
|
if (ret == NULL)
|
|
{
|
|
CONFerr(CONF_F_NCONF_NEW,ERR_R_MALLOC_FAILURE);
|
|
return(NULL);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
void NCONF_free(CONF *conf)
|
|
{
|
|
if (conf == NULL)
|
|
return;
|
|
conf->meth->destroy(conf);
|
|
}
|
|
|
|
void NCONF_free_data(CONF *conf)
|
|
{
|
|
if (conf == NULL)
|
|
return;
|
|
conf->meth->destroy_data(conf);
|
|
}
|
|
|
|
int NCONF_load(CONF *conf, const char *file, long *eline)
|
|
{
|
|
if (conf == NULL)
|
|
{
|
|
CONFerr(CONF_F_NCONF_LOAD,CONF_R_NO_CONF);
|
|
return 0;
|
|
}
|
|
|
|
return conf->meth->load(conf, file, eline);
|
|
}
|
|
|
|
#ifndef OPENSSL_NO_FP_API
|
|
int NCONF_load_fp(CONF *conf, FILE *fp,long *eline)
|
|
{
|
|
BIO *btmp;
|
|
int ret;
|
|
if(!(btmp = BIO_new_fp(fp, BIO_NOCLOSE)))
|
|
{
|
|
CONFerr(CONF_F_NCONF_LOAD_FP,ERR_R_BUF_LIB);
|
|
return 0;
|
|
}
|
|
ret = NCONF_load_bio(conf, btmp, eline);
|
|
BIO_free(btmp);
|
|
return ret;
|
|
}
|
|
#endif
|
|
|
|
int NCONF_load_bio(CONF *conf, BIO *bp,long *eline)
|
|
{
|
|
if (conf == NULL)
|
|
{
|
|
CONFerr(CONF_F_NCONF_LOAD_BIO,CONF_R_NO_CONF);
|
|
return 0;
|
|
}
|
|
|
|
return conf->meth->load_bio(conf, bp, eline);
|
|
}
|
|
|
|
STACK_OF(CONF_VALUE) *NCONF_get_section(CONF *conf,char *section)
|
|
{
|
|
if (conf == NULL)
|
|
{
|
|
CONFerr(CONF_F_NCONF_GET_SECTION,CONF_R_NO_CONF);
|
|
return NULL;
|
|
}
|
|
|
|
if (section == NULL)
|
|
{
|
|
CONFerr(CONF_F_NCONF_GET_SECTION,CONF_R_NO_SECTION);
|
|
return NULL;
|
|
}
|
|
|
|
return _CONF_get_section_values(conf, section);
|
|
}
|
|
|
|
char *NCONF_get_string(CONF *conf,char *group,char *name)
|
|
{
|
|
char *s = _CONF_get_string(conf, group, name);
|
|
|
|
/* Since we may get a value from an environment variable even
|
|
if conf is NULL, let's check the value first */
|
|
if (s) return s;
|
|
|
|
if (conf == NULL)
|
|
{
|
|
CONFerr(CONF_F_NCONF_GET_STRING,
|
|
CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE);
|
|
return NULL;
|
|
}
|
|
CONFerr(CONF_F_NCONF_GET_STRING,
|
|
CONF_R_NO_VALUE);
|
|
return NULL;
|
|
}
|
|
|
|
int NCONF_get_number_e(CONF *conf,char *group,char *name,long *result)
|
|
{
|
|
char *str;
|
|
|
|
if (result == NULL)
|
|
{
|
|
CONFerr(CONF_F_NCONF_GET_NUMBER_E,ERR_R_PASSED_NULL_PARAMETER);
|
|
return 0;
|
|
}
|
|
|
|
str = NCONF_get_string(conf,group,name);
|
|
|
|
if (str == NULL)
|
|
return 0;
|
|
|
|
for (*result = 0;conf->meth->is_number(conf, *str);)
|
|
{
|
|
*result = (*result)*10 + conf->meth->to_int(conf, *str);
|
|
str++;
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
#ifndef OPENSSL_NO_FP_API
|
|
int NCONF_dump_fp(CONF *conf, FILE *out)
|
|
{
|
|
BIO *btmp;
|
|
int ret;
|
|
if(!(btmp = BIO_new_fp(out, BIO_NOCLOSE))) {
|
|
CONFerr(CONF_F_NCONF_DUMP_FP,ERR_R_BUF_LIB);
|
|
return 0;
|
|
}
|
|
ret = NCONF_dump_bio(conf, btmp);
|
|
BIO_free(btmp);
|
|
return ret;
|
|
}
|
|
#endif
|
|
|
|
int NCONF_dump_bio(CONF *conf, BIO *out)
|
|
{
|
|
if (conf == NULL)
|
|
{
|
|
CONFerr(CONF_F_NCONF_DUMP_BIO,CONF_R_NO_CONF);
|
|
return 0;
|
|
}
|
|
|
|
return conf->meth->dump(conf, out);
|
|
}
|
|
|
|
/* This function should be avoided */
|
|
#undef NCONF_get_number
|
|
long NCONF_get_number(CONF *conf,char *group,char *name)
|
|
{
|
|
int status;
|
|
long ret=0;
|
|
|
|
status = NCONF_get_number_e(conf, group, name, &ret);
|
|
if (status == 0)
|
|
{
|
|
/* This function does not believe in errors... */
|
|
ERR_get_error();
|
|
}
|
|
return ret;
|
|
}
|
|
|