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.
2000-04-09 12:04:35 +00:00
|
|
|
/* conf_api.c */
|
|
|
|
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* This package is an SSL implementation written
|
|
|
|
* by Eric Young (eay@cryptsoft.com).
|
|
|
|
* The implementation was written so as to conform with Netscapes SSL.
|
|
|
|
*
|
|
|
|
* This library is free for commercial and non-commercial use as long as
|
|
|
|
* the following conditions are aheared to. The following conditions
|
|
|
|
* apply to all code found in this distribution, be it the RC4, RSA,
|
|
|
|
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
|
|
|
|
* included with this distribution is covered by the same copyright terms
|
|
|
|
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
|
|
|
|
*
|
|
|
|
* Copyright remains Eric Young's, and as such any Copyright notices in
|
|
|
|
* the code are not to be removed.
|
|
|
|
* If this package is used in a product, Eric Young should be given attribution
|
|
|
|
* as the author of the parts of the library used.
|
|
|
|
* This can be in the form of a textual message at program startup or
|
|
|
|
* in documentation (online or textual) provided with the package.
|
|
|
|
*
|
|
|
|
* 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 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 acknowledgement:
|
|
|
|
* "This product includes cryptographic software written by
|
|
|
|
* Eric Young (eay@cryptsoft.com)"
|
|
|
|
* The word 'cryptographic' can be left out if the rouines from the library
|
|
|
|
* being used are not cryptographic related :-).
|
|
|
|
* 4. If you include any Windows specific code (or a derivative thereof) from
|
|
|
|
* the apps directory (application code) you must include an acknowledgement:
|
|
|
|
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
|
|
|
|
* ANY EXPRESS 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 AUTHOR OR 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.
|
|
|
|
*
|
|
|
|
* The licence and distribution terms for any publically available version or
|
|
|
|
* derivative of this code cannot be changed. i.e. this code cannot simply be
|
|
|
|
* copied and put under another distribution licence
|
|
|
|
* [including the GNU Public Licence.]
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Part of the code in here was originally in conf.c, which is now removed */
|
|
|
|
|
2000-09-04 15:34:43 +00:00
|
|
|
#ifndef CONF_DEBUG
|
|
|
|
# undef NDEBUG /* avoid conflicting definitions */
|
|
|
|
# define NDEBUG
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <assert.h>
|
2000-09-09 18:05:27 +00:00
|
|
|
#include <string.h>
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
#include <openssl/conf.h>
|
|
|
|
#include <openssl/conf_api.h>
|
2001-02-22 17:59:55 +00:00
|
|
|
#include "e_os.h"
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
|
|
|
|
static void value_free_hash(CONF_VALUE *a, LHASH *conf);
|
|
|
|
static void value_free_stack(CONF_VALUE *a,LHASH *conf);
|
2001-01-09 00:24:38 +00:00
|
|
|
static IMPLEMENT_LHASH_DOALL_ARG_FN(value_free_hash, CONF_VALUE *, LHASH *)
|
|
|
|
static IMPLEMENT_LHASH_DOALL_ARG_FN(value_free_stack, CONF_VALUE *, LHASH *)
|
2000-12-08 20:02:01 +00:00
|
|
|
/* We don't use function pointer casting or wrapper functions - but cast each
|
|
|
|
* callback parameter inside the callback functions. */
|
|
|
|
/* static unsigned long hash(CONF_VALUE *v); */
|
2000-12-13 17:15:03 +00:00
|
|
|
static unsigned long hash(const void *v_void);
|
2000-12-08 20:02:01 +00:00
|
|
|
/* static int cmp_conf(CONF_VALUE *a,CONF_VALUE *b); */
|
2000-12-13 17:15:03 +00:00
|
|
|
static int cmp_conf(const void *a_void,const void *b_void);
|
2000-12-04 03:02:44 +00:00
|
|
|
|
2000-04-26 12:13:19 +00:00
|
|
|
/* Up until OpenSSL 0.9.5a, this was get_section */
|
2002-01-18 16:51:05 +00:00
|
|
|
CONF_VALUE *_CONF_get_section(const CONF *conf, const char *section)
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
{
|
|
|
|
CONF_VALUE *v,vv;
|
|
|
|
|
|
|
|
if ((conf == NULL) || (section == NULL)) return(NULL);
|
|
|
|
vv.name=NULL;
|
2002-01-18 16:51:05 +00:00
|
|
|
vv.section=(char *)section;
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
v=(CONF_VALUE *)lh_retrieve(conf->data,&vv);
|
|
|
|
return(v);
|
|
|
|
}
|
|
|
|
|
2000-04-26 12:13:19 +00:00
|
|
|
/* Up until OpenSSL 0.9.5a, this was CONF_get_section */
|
2002-01-18 16:51:05 +00:00
|
|
|
STACK_OF(CONF_VALUE) *_CONF_get_section_values(const CONF *conf,
|
|
|
|
const char *section)
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
{
|
|
|
|
CONF_VALUE *v;
|
|
|
|
|
|
|
|
v=_CONF_get_section(conf,section);
|
|
|
|
if (v != NULL)
|
|
|
|
return((STACK_OF(CONF_VALUE) *)v->value);
|
|
|
|
else
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
int _CONF_add_string(CONF *conf, CONF_VALUE *section, CONF_VALUE *value)
|
|
|
|
{
|
|
|
|
CONF_VALUE *v = NULL;
|
|
|
|
STACK_OF(CONF_VALUE) *ts;
|
|
|
|
|
|
|
|
ts = (STACK_OF(CONF_VALUE) *)section->value;
|
|
|
|
|
|
|
|
value->section=section->section;
|
|
|
|
if (!sk_CONF_VALUE_push(ts,value))
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
v = (CONF_VALUE *)lh_insert(conf->data, value);
|
|
|
|
if (v != NULL)
|
|
|
|
{
|
|
|
|
sk_CONF_VALUE_delete_ptr(ts,v);
|
2000-06-01 22:19:21 +00:00
|
|
|
OPENSSL_free(v->name);
|
|
|
|
OPENSSL_free(v->value);
|
|
|
|
OPENSSL_free(v);
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2002-01-18 16:51:05 +00:00
|
|
|
char *_CONF_get_string(const CONF *conf, const char *section, const char *name)
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
{
|
|
|
|
CONF_VALUE *v,vv;
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
if (name == NULL) return(NULL);
|
|
|
|
if (conf != NULL)
|
|
|
|
{
|
|
|
|
if (section != NULL)
|
|
|
|
{
|
2002-01-18 16:51:05 +00:00
|
|
|
vv.name=(char *)name;
|
|
|
|
vv.section=(char *)section;
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
v=(CONF_VALUE *)lh_retrieve(conf->data,&vv);
|
|
|
|
if (v != NULL) return(v->value);
|
|
|
|
if (strcmp(section,"ENV") == 0)
|
|
|
|
{
|
|
|
|
p=Getenv(name);
|
|
|
|
if (p != NULL) return(p);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
vv.section="default";
|
2002-01-18 16:51:05 +00:00
|
|
|
vv.name=(char *)name;
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
v=(CONF_VALUE *)lh_retrieve(conf->data,&vv);
|
|
|
|
if (v != NULL)
|
|
|
|
return(v->value);
|
|
|
|
else
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return(Getenv(name));
|
|
|
|
}
|
|
|
|
|
2000-10-19 08:03:14 +00:00
|
|
|
#if 0 /* There's no way to provide error checking with this function, so
|
|
|
|
force implementors of the higher levels to get a string and read
|
|
|
|
the number themselves. */
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
long _CONF_get_number(CONF *conf, char *section, char *name)
|
|
|
|
{
|
|
|
|
char *str;
|
|
|
|
long ret=0;
|
|
|
|
|
|
|
|
str=_CONF_get_string(conf,section,name);
|
|
|
|
if (str == NULL) return(0);
|
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
if (conf->meth->is_number(conf, *str))
|
|
|
|
ret=ret*10+conf->meth->to_int(conf, *str);
|
|
|
|
else
|
|
|
|
return(ret);
|
|
|
|
str++;
|
|
|
|
}
|
|
|
|
}
|
2000-10-19 08:03:14 +00:00
|
|
|
#endif
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
|
|
|
|
int _CONF_new_data(CONF *conf)
|
|
|
|
{
|
|
|
|
if (conf == NULL)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (conf->data == NULL)
|
2000-12-08 20:02:01 +00:00
|
|
|
if ((conf->data = lh_new(hash, cmp_conf)) == NULL)
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
void _CONF_free_data(CONF *conf)
|
|
|
|
{
|
|
|
|
if (conf == NULL || conf->data == NULL) return;
|
|
|
|
|
2000-06-01 22:19:21 +00:00
|
|
|
conf->data->down_load=0; /* evil thing to make sure the 'OPENSSL_free()'
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
* works as expected */
|
2001-01-09 00:24:38 +00:00
|
|
|
lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(value_free_hash),
|
2000-12-01 20:31:52 +00:00
|
|
|
conf->data);
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
|
|
|
|
/* We now have only 'section' entries in the hash table.
|
|
|
|
* Due to problems with */
|
|
|
|
|
2001-01-09 00:24:38 +00:00
|
|
|
lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(value_free_stack),
|
2000-12-01 20:31:52 +00:00
|
|
|
conf->data);
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
lh_free(conf->data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void value_free_hash(CONF_VALUE *a, LHASH *conf)
|
|
|
|
{
|
|
|
|
if (a->name != NULL)
|
|
|
|
{
|
|
|
|
a=(CONF_VALUE *)lh_delete(conf,a);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void value_free_stack(CONF_VALUE *a, LHASH *conf)
|
|
|
|
{
|
|
|
|
CONF_VALUE *vv;
|
|
|
|
STACK *sk;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (a->name != NULL) return;
|
|
|
|
|
|
|
|
sk=(STACK *)a->value;
|
|
|
|
for (i=sk_num(sk)-1; i>=0; i--)
|
|
|
|
{
|
|
|
|
vv=(CONF_VALUE *)sk_value(sk,i);
|
2000-06-01 22:19:21 +00:00
|
|
|
OPENSSL_free(vv->value);
|
|
|
|
OPENSSL_free(vv->name);
|
|
|
|
OPENSSL_free(vv);
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
}
|
|
|
|
if (sk != NULL) sk_free(sk);
|
2000-06-01 22:19:21 +00:00
|
|
|
OPENSSL_free(a->section);
|
|
|
|
OPENSSL_free(a);
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
}
|
|
|
|
|
2000-12-08 20:02:01 +00:00
|
|
|
/* static unsigned long hash(CONF_VALUE *v) */
|
2000-12-13 17:15:03 +00:00
|
|
|
static unsigned long hash(const void *v_void)
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
{
|
2000-12-08 20:02:01 +00:00
|
|
|
CONF_VALUE *v = (CONF_VALUE *)v_void;
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
return((lh_strhash(v->section)<<2)^lh_strhash(v->name));
|
|
|
|
}
|
|
|
|
|
2000-12-08 20:02:01 +00:00
|
|
|
/* static int cmp_conf(CONF_VALUE *a, CONF_VALUE *b) */
|
2000-12-13 17:15:03 +00:00
|
|
|
static int cmp_conf(const void *a_void,const void *b_void)
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
{
|
|
|
|
int i;
|
2000-12-08 20:02:01 +00:00
|
|
|
CONF_VALUE *a = (CONF_VALUE *)a_void;
|
|
|
|
CONF_VALUE *b = (CONF_VALUE *)b_void;
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
|
|
|
|
if (a->section != b->section)
|
|
|
|
{
|
|
|
|
i=strcmp(a->section,b->section);
|
|
|
|
if (i) return(i);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((a->name != NULL) && (b->name != NULL))
|
|
|
|
{
|
|
|
|
i=strcmp(a->name,b->name);
|
|
|
|
return(i);
|
|
|
|
}
|
|
|
|
else if (a->name == b->name)
|
|
|
|
return(0);
|
|
|
|
else
|
|
|
|
return((a->name == NULL)?-1:1);
|
|
|
|
}
|
|
|
|
|
2000-04-26 12:13:19 +00:00
|
|
|
/* Up until OpenSSL 0.9.5a, this was new_section */
|
2002-01-18 16:51:05 +00:00
|
|
|
CONF_VALUE *_CONF_new_section(CONF *conf, const char *section)
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
{
|
|
|
|
STACK *sk=NULL;
|
|
|
|
int ok=0,i;
|
|
|
|
CONF_VALUE *v=NULL,*vv;
|
|
|
|
|
|
|
|
if ((sk=sk_new_null()) == NULL)
|
|
|
|
goto err;
|
2000-06-01 22:19:21 +00:00
|
|
|
if ((v=(CONF_VALUE *)OPENSSL_malloc(sizeof(CONF_VALUE))) == NULL)
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
goto err;
|
|
|
|
i=strlen(section)+1;
|
2000-06-01 22:19:21 +00:00
|
|
|
if ((v->section=(char *)OPENSSL_malloc(i)) == NULL)
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
goto err;
|
|
|
|
|
|
|
|
memcpy(v->section,section,i);
|
|
|
|
v->name=NULL;
|
|
|
|
v->value=(char *)sk;
|
|
|
|
|
|
|
|
vv=(CONF_VALUE *)lh_insert(conf->data,v);
|
2000-09-04 15:34:43 +00:00
|
|
|
assert(vv == NULL);
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
ok=1;
|
|
|
|
err:
|
|
|
|
if (!ok)
|
|
|
|
{
|
|
|
|
if (sk != NULL) sk_free(sk);
|
2000-06-01 22:19:21 +00:00
|
|
|
if (v != NULL) OPENSSL_free(v);
|
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.
2000-04-09 12:04:35 +00:00
|
|
|
v=NULL;
|
|
|
|
}
|
|
|
|
return(v);
|
|
|
|
}
|
|
|
|
|
|
|
|
IMPLEMENT_STACK_OF(CONF_VALUE)
|