I've always wanted to make the CONF library more adaptable. Here's
the result. I have retained the old behavior of the CONF_* functions, and have added a more "object oriented" interface through NCONF_* functions (New CONF, you see :-)), working the same way as, for example, the BIO interface. Really, the CONF_* are rewritten so they use the NCONF_* functions internally. In addition to that, I've split the old conf.c code into two files, conf_def.c and conf_api.c. conf_def.c contains the default config object that reads a configuration file the standard OpenSSL way, as well as configuration file with Win32 registry file syntax (I'm not sure I got that one right). conf_api.c provides an API to build other configuration file readers around (can you see a configuraion file in XML? I can :-)). Finally, I've changed the name conf_lcl.h to conf_def.h, since it's made specifically for that "class" and none others.
This commit is contained in:
Richard Levitte
352
crypto/conf/conf_lib.c
Normal file
352
crypto/conf/conf_lib.c
Normal file
@@ -0,0 +1,352 @@
|
||||
/* 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;
|
||||
|
||||
/* 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 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 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;
|
||||
|
||||
if (default_CONF_method == NULL)
|
||||
default_CONF_method = NCONF_default();
|
||||
|
||||
default_CONF_method->init(&ctmp);
|
||||
ctmp.data = 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)
|
||||
{
|
||||
CONF ctmp;
|
||||
|
||||
if (default_CONF_method == NULL)
|
||||
default_CONF_method = NCONF_default();
|
||||
|
||||
default_CONF_method->init(&ctmp);
|
||||
ctmp.data = conf;
|
||||
return NCONF_get_section(&ctmp, section);
|
||||
}
|
||||
|
||||
char *CONF_get_string(LHASH *conf,char *group,char *name)
|
||||
{
|
||||
CONF ctmp;
|
||||
|
||||
if (default_CONF_method == NULL)
|
||||
default_CONF_method = NCONF_default();
|
||||
|
||||
default_CONF_method->init(&ctmp);
|
||||
ctmp.data = conf;
|
||||
return NCONF_get_string(&ctmp, group, name);
|
||||
}
|
||||
|
||||
long CONF_get_number(LHASH *conf,char *group,char *name)
|
||||
{
|
||||
CONF ctmp;
|
||||
|
||||
if (default_CONF_method == NULL)
|
||||
default_CONF_method = NCONF_default();
|
||||
|
||||
default_CONF_method->init(&ctmp);
|
||||
ctmp.data = conf;
|
||||
return NCONF_get_number(&ctmp, group, name);
|
||||
}
|
||||
|
||||
void CONF_free(LHASH *conf)
|
||||
{
|
||||
CONF ctmp;
|
||||
|
||||
if (default_CONF_method == NULL)
|
||||
default_CONF_method = NCONF_default();
|
||||
|
||||
default_CONF_method->init(&ctmp);
|
||||
ctmp.data = conf;
|
||||
NCONF_free_data(&ctmp);
|
||||
}
|
||||
|
||||
#ifndef 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;
|
||||
|
||||
if (default_CONF_method == NULL)
|
||||
default_CONF_method = NCONF_default();
|
||||
|
||||
default_CONF_method->init(&ctmp);
|
||||
ctmp.data = 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)
|
||||
{
|
||||
RSAerr(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)
|
||||
{
|
||||
int ret;
|
||||
BIO *in=NULL;
|
||||
|
||||
#ifdef 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 0;
|
||||
}
|
||||
|
||||
ret = NCONF_load_bio(conf, in, eline);
|
||||
BIO_free(in);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
#ifndef 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_CONF_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(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;
|
||||
}
|
||||
|
||||
return _CONF_get_section_values(conf, section);
|
||||
}
|
||||
|
||||
char *NCONF_get_string(CONF *conf,char *group,char *name)
|
||||
{
|
||||
if (conf == NULL)
|
||||
{
|
||||
CONFerr(CONF_F_NCONF_GET_STRING,CONF_R_NO_CONF);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return _CONF_get_string(conf, group, name);
|
||||
}
|
||||
|
||||
long NCONF_get_number(CONF *conf,char *group,char *name)
|
||||
{
|
||||
if (conf == NULL)
|
||||
{
|
||||
CONFerr(CONF_F_NCONF_GET_NUMBER,CONF_R_NO_CONF);
|
||||
return 0;
|
||||
}
|
||||
|
||||
return _CONF_get_number(conf, group, name);
|
||||
}
|
||||
|
||||
#ifndef 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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user