1998-12-21 18:52:47 +08:00
|
|
|
/* crypto/conf/conf.c */
|
1998-12-21 18:56:39 +08:00
|
|
|
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
1998-12-21 18:52:47 +08:00
|
|
|
* 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.]
|
|
|
|
*/
|
|
|
|
|
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 20:04:35 +08:00
|
|
|
/* Part of the code in here was originally in conf.c, which is now removed */
|
|
|
|
|
1998-12-21 18:52:47 +08:00
|
|
|
#include <stdio.h>
|
1999-04-24 06:13:45 +08:00
|
|
|
#include <openssl/stack.h>
|
|
|
|
#include <openssl/lhash.h>
|
|
|
|
#include <openssl/conf.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 20:04:35 +08:00
|
|
|
#include <openssl/conf_api.h>
|
|
|
|
#include "conf_def.h"
|
1999-04-24 06:13:45 +08:00
|
|
|
#include <openssl/buffer.h>
|
|
|
|
#include <openssl/err.h>
|
1998-12-21 18:52:47 +08:00
|
|
|
|
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 20:04:35 +08:00
|
|
|
static char *eat_ws(CONF *conf, char *p);
|
|
|
|
static char *eat_alpha_numeric(CONF *conf, char *p);
|
|
|
|
static void clear_comments(CONF *conf, char *p);
|
|
|
|
static int str_copy(CONF *conf,char *section,char **to, char *from);
|
|
|
|
static char *scan_quote(CONF *conf, char *p);
|
|
|
|
static char *scan_dquote(CONF *conf, char *p);
|
|
|
|
#define scan_esc(p) (((IS_EOF((conf),(p)[1]))?(p+=1):(p+=2)))
|
|
|
|
|
|
|
|
static CONF *def_create(CONF_METHOD *meth);
|
|
|
|
static int def_init_default(CONF *conf);
|
|
|
|
static int def_init_WIN32(CONF *conf);
|
|
|
|
static int def_destroy(CONF *conf);
|
|
|
|
static int def_destroy_data(CONF *conf);
|
|
|
|
static int def_load(CONF *conf, BIO *bp, long *eline);
|
|
|
|
static int def_dump(CONF *conf, BIO *bp);
|
|
|
|
static int def_is_number(CONF *conf, char c);
|
|
|
|
static int def_to_int(CONF *conf, char c);
|
|
|
|
|
|
|
|
const char *CONF_def_version="CONF_def" OPENSSL_VERSION_PTEXT;
|
|
|
|
|
|
|
|
static CONF_METHOD default_method = {
|
|
|
|
"OpenSSL default",
|
|
|
|
def_create,
|
|
|
|
def_init_default,
|
|
|
|
def_destroy,
|
|
|
|
def_destroy_data,
|
|
|
|
def_load,
|
|
|
|
def_dump,
|
|
|
|
def_is_number,
|
|
|
|
def_to_int
|
|
|
|
};
|
|
|
|
|
|
|
|
static CONF_METHOD WIN32_method = {
|
|
|
|
"WIN32",
|
|
|
|
def_create,
|
|
|
|
def_init_WIN32,
|
|
|
|
def_destroy,
|
|
|
|
def_destroy_data,
|
|
|
|
def_load,
|
|
|
|
def_dump,
|
|
|
|
def_is_number,
|
|
|
|
def_to_int
|
|
|
|
};
|
|
|
|
|
|
|
|
CONF_METHOD *NCONF_default()
|
|
|
|
{
|
|
|
|
return &default_method;
|
|
|
|
}
|
|
|
|
CONF_METHOD *NCONF_WIN32()
|
|
|
|
{
|
|
|
|
return &WIN32_method;
|
|
|
|
}
|
1998-12-21 18:52:47 +08:00
|
|
|
|
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 20:04:35 +08:00
|
|
|
static CONF *def_create(CONF_METHOD *meth)
|
|
|
|
{
|
|
|
|
CONF *ret;
|
1998-12-21 18:52:47 +08:00
|
|
|
|
2000-06-02 06:19:21 +08:00
|
|
|
ret = (CONF *)OPENSSL_malloc(sizeof(CONF) + sizeof(unsigned short *));
|
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 20:04:35 +08:00
|
|
|
if (ret)
|
|
|
|
if (meth->init(ret) == 0)
|
|
|
|
{
|
2000-06-02 06:19:21 +08:00
|
|
|
OPENSSL_free(ret);
|
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 20:04:35 +08:00
|
|
|
ret = NULL;
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int def_init_default(CONF *conf)
|
|
|
|
{
|
|
|
|
if (conf == NULL)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
conf->meth = &default_method;
|
|
|
|
conf->meth_data = (void *)CONF_type_default;
|
|
|
|
conf->data = NULL;
|
1998-12-21 18:52:47 +08:00
|
|
|
|
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 20:04:35 +08:00
|
|
|
return 1;
|
|
|
|
}
|
1999-06-21 01:36:11 +08:00
|
|
|
|
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 20:04:35 +08:00
|
|
|
static int def_init_WIN32(CONF *conf)
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
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 20:04:35 +08:00
|
|
|
if (conf == NULL)
|
|
|
|
return 0;
|
1999-06-21 01:36:11 +08:00
|
|
|
|
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 20:04:35 +08:00
|
|
|
conf->meth = &WIN32_method;
|
|
|
|
conf->meth_data = (void *)CONF_type_win32;
|
|
|
|
conf->data = NULL;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int def_destroy(CONF *conf)
|
|
|
|
{
|
|
|
|
if (def_destroy_data(conf))
|
1999-06-21 01:36:11 +08:00
|
|
|
{
|
2000-06-02 06:19:21 +08:00
|
|
|
OPENSSL_free(conf);
|
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 20:04:35 +08:00
|
|
|
return 1;
|
1999-06-21 01:36:11 +08:00
|
|
|
}
|
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 20:04:35 +08:00
|
|
|
return 0;
|
|
|
|
}
|
1999-06-21 01:36:11 +08:00
|
|
|
|
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 20:04:35 +08:00
|
|
|
static int def_destroy_data(CONF *conf)
|
|
|
|
{
|
|
|
|
if (conf == NULL)
|
|
|
|
return 0;
|
|
|
|
_CONF_free_data(conf);
|
|
|
|
return 1;
|
1999-06-21 01:36:11 +08:00
|
|
|
}
|
|
|
|
|
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 20:04:35 +08:00
|
|
|
static int def_load(CONF *conf, BIO *in, long *line)
|
1999-06-21 01:36:11 +08:00
|
|
|
{
|
1998-12-21 18:52:47 +08:00
|
|
|
#define BUFSIZE 512
|
1998-12-21 19:00:56 +08:00
|
|
|
char btmp[16];
|
1998-12-21 18:52:47 +08:00
|
|
|
int bufnum=0,i,ii;
|
|
|
|
BUF_MEM *buff=NULL;
|
|
|
|
char *s,*p,*end;
|
1998-12-21 19:00:56 +08:00
|
|
|
int again,n;
|
|
|
|
long eline=0;
|
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 20:04:35 +08:00
|
|
|
CONF_VALUE *v=NULL,*tv;
|
1998-12-21 18:52:47 +08:00
|
|
|
CONF_VALUE *sv=NULL;
|
|
|
|
char *section=NULL,*buf;
|
1999-06-21 06:18:16 +08:00
|
|
|
STACK_OF(CONF_VALUE) *section_sk=NULL,*ts;
|
1998-12-21 18:52:47 +08:00
|
|
|
char *start,*psection,*pname;
|
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 20:04:35 +08:00
|
|
|
void *h = (void *)(conf->data);
|
1998-12-21 18:52:47 +08:00
|
|
|
|
|
|
|
if ((buff=BUF_MEM_new()) == NULL)
|
|
|
|
{
|
1999-06-21 01:36:11 +08:00
|
|
|
CONFerr(CONF_F_CONF_LOAD_BIO,ERR_R_BUF_LIB);
|
1998-12-21 18:52:47 +08:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2000-06-02 06:19:21 +08:00
|
|
|
section=(char *)OPENSSL_malloc(10);
|
1998-12-21 18:52:47 +08:00
|
|
|
if (section == NULL)
|
|
|
|
{
|
1999-06-21 01:36:11 +08:00
|
|
|
CONFerr(CONF_F_CONF_LOAD_BIO,ERR_R_MALLOC_FAILURE);
|
1998-12-21 18:52:47 +08:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
strcpy(section,"default");
|
|
|
|
|
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 20:04:35 +08:00
|
|
|
if (_CONF_new_data(conf) == 0)
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
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 20:04:35 +08:00
|
|
|
CONFerr(CONF_F_CONF_LOAD_BIO,ERR_R_MALLOC_FAILURE);
|
|
|
|
goto err;
|
1998-12-21 18:52:47 +08:00
|
|
|
}
|
|
|
|
|
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 20:04:35 +08:00
|
|
|
sv=_CONF_new_section(conf,section);
|
1998-12-21 18:52:47 +08:00
|
|
|
if (sv == NULL)
|
|
|
|
{
|
1999-06-21 01:36:11 +08:00
|
|
|
CONFerr(CONF_F_CONF_LOAD_BIO,
|
|
|
|
CONF_R_UNABLE_TO_CREATE_NEW_SECTION);
|
1998-12-21 18:52:47 +08:00
|
|
|
goto err;
|
|
|
|
}
|
1999-06-21 06:18:16 +08:00
|
|
|
section_sk=(STACK_OF(CONF_VALUE) *)sv->value;
|
1998-12-21 18:52:47 +08:00
|
|
|
|
|
|
|
bufnum=0;
|
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
again=0;
|
|
|
|
if (!BUF_MEM_grow(buff,bufnum+BUFSIZE))
|
|
|
|
{
|
1999-06-21 01:36:11 +08:00
|
|
|
CONFerr(CONF_F_CONF_LOAD_BIO,ERR_R_BUF_LIB);
|
1998-12-21 18:52:47 +08:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
p= &(buff->data[bufnum]);
|
|
|
|
*p='\0';
|
1999-06-21 01:36:11 +08:00
|
|
|
BIO_gets(in, p, BUFSIZE-1);
|
1998-12-21 18:52:47 +08:00
|
|
|
p[BUFSIZE-1]='\0';
|
|
|
|
ii=i=strlen(p);
|
|
|
|
if (i == 0) break;
|
|
|
|
while (i > 0)
|
|
|
|
{
|
|
|
|
if ((p[i-1] != '\r') && (p[i-1] != '\n'))
|
|
|
|
break;
|
|
|
|
else
|
|
|
|
i--;
|
|
|
|
}
|
|
|
|
/* we removed some trailing stuff so there is a new
|
|
|
|
* line on the end. */
|
|
|
|
if (i == ii)
|
|
|
|
again=1; /* long line */
|
|
|
|
else
|
|
|
|
{
|
|
|
|
p[i]='\0';
|
|
|
|
eline++; /* another input line */
|
|
|
|
}
|
|
|
|
|
|
|
|
/* we now have a line with trailing \r\n removed */
|
|
|
|
|
|
|
|
/* i is the number of bytes */
|
|
|
|
bufnum+=i;
|
|
|
|
|
|
|
|
v=NULL;
|
|
|
|
/* check for line continuation */
|
|
|
|
if (bufnum >= 1)
|
|
|
|
{
|
|
|
|
/* If we have bytes and the last char '\\' and
|
|
|
|
* second last char is not '\\' */
|
|
|
|
p= &(buff->data[bufnum-1]);
|
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 20:04:35 +08:00
|
|
|
if (IS_ESC(conf,p[0]) &&
|
|
|
|
((bufnum <= 1) || !IS_ESC(conf,p[-1])))
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
|
|
|
bufnum--;
|
|
|
|
again=1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (again) continue;
|
|
|
|
bufnum=0;
|
|
|
|
buf=buff->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 20:04:35 +08:00
|
|
|
clear_comments(conf, buf);
|
1998-12-21 18:52:47 +08:00
|
|
|
n=strlen(buf);
|
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 20:04:35 +08:00
|
|
|
s=eat_ws(conf, buf);
|
|
|
|
if (IS_EOF(conf,*s)) continue; /* blank line */
|
1998-12-21 18:52:47 +08:00
|
|
|
if (*s == '[')
|
|
|
|
{
|
1998-12-21 19:00:56 +08:00
|
|
|
char *ss;
|
|
|
|
|
1998-12-21 18:52:47 +08:00
|
|
|
s++;
|
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 20:04:35 +08:00
|
|
|
start=eat_ws(conf, s);
|
1998-12-21 19:00:56 +08:00
|
|
|
ss=start;
|
|
|
|
again:
|
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 20:04:35 +08:00
|
|
|
end=eat_alpha_numeric(conf, ss);
|
|
|
|
p=eat_ws(conf, end);
|
1998-12-21 18:52:47 +08:00
|
|
|
if (*p != ']')
|
|
|
|
{
|
1998-12-21 19:00:56 +08:00
|
|
|
if (*p != '\0')
|
|
|
|
{
|
|
|
|
ss=p;
|
|
|
|
goto again;
|
|
|
|
}
|
1999-06-21 01:36:11 +08:00
|
|
|
CONFerr(CONF_F_CONF_LOAD_BIO,
|
|
|
|
CONF_R_MISSING_CLOSE_SQUARE_BRACKET);
|
1998-12-21 18:52:47 +08:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
*end='\0';
|
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 20:04:35 +08:00
|
|
|
if (!str_copy(conf,NULL,§ion,start)) goto err;
|
|
|
|
if ((sv=_CONF_get_section(conf,section)) == NULL)
|
|
|
|
sv=_CONF_new_section(conf,section);
|
1998-12-21 18:52:47 +08:00
|
|
|
if (sv == NULL)
|
|
|
|
{
|
1999-06-21 01:36:11 +08:00
|
|
|
CONFerr(CONF_F_CONF_LOAD_BIO,
|
|
|
|
CONF_R_UNABLE_TO_CREATE_NEW_SECTION);
|
1998-12-21 18:52:47 +08:00
|
|
|
goto err;
|
|
|
|
}
|
1999-06-21 06:18:16 +08:00
|
|
|
section_sk=(STACK_OF(CONF_VALUE) *)sv->value;
|
1998-12-21 18:52:47 +08:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pname=s;
|
|
|
|
psection=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 20:04:35 +08:00
|
|
|
end=eat_alpha_numeric(conf, s);
|
1998-12-21 18:52:47 +08:00
|
|
|
if ((end[0] == ':') && (end[1] == ':'))
|
|
|
|
{
|
|
|
|
*end='\0';
|
|
|
|
end+=2;
|
|
|
|
psection=pname;
|
|
|
|
pname=end;
|
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 20:04:35 +08:00
|
|
|
end=eat_alpha_numeric(conf, end);
|
1998-12-21 18:52:47 +08:00
|
|
|
}
|
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 20:04:35 +08:00
|
|
|
p=eat_ws(conf, end);
|
1998-12-21 18:52:47 +08:00
|
|
|
if (*p != '=')
|
|
|
|
{
|
1999-06-21 01:36:11 +08:00
|
|
|
CONFerr(CONF_F_CONF_LOAD_BIO,
|
|
|
|
CONF_R_MISSING_EQUAL_SIGN);
|
1998-12-21 18:52:47 +08:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
*end='\0';
|
|
|
|
p++;
|
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 20:04:35 +08:00
|
|
|
start=eat_ws(conf, p);
|
|
|
|
while (!IS_EOF(conf,*p))
|
1998-12-21 18:52:47 +08:00
|
|
|
p++;
|
|
|
|
p--;
|
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 20:04:35 +08:00
|
|
|
while ((p != start) && (IS_WS(conf,*p)))
|
1998-12-21 18:52:47 +08:00
|
|
|
p--;
|
|
|
|
p++;
|
|
|
|
*p='\0';
|
|
|
|
|
2000-06-02 06:19:21 +08:00
|
|
|
if (!(v=(CONF_VALUE *)OPENSSL_malloc(sizeof(CONF_VALUE))))
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
1999-06-21 01:36:11 +08:00
|
|
|
CONFerr(CONF_F_CONF_LOAD_BIO,
|
|
|
|
ERR_R_MALLOC_FAILURE);
|
1998-12-21 18:52:47 +08:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (psection == NULL) psection=section;
|
2000-06-02 06:19:21 +08:00
|
|
|
v->name=(char *)OPENSSL_malloc(strlen(pname)+1);
|
1998-12-21 18:52:47 +08:00
|
|
|
v->value=NULL;
|
|
|
|
if (v->name == NULL)
|
|
|
|
{
|
1999-06-21 01:36:11 +08:00
|
|
|
CONFerr(CONF_F_CONF_LOAD_BIO,
|
|
|
|
ERR_R_MALLOC_FAILURE);
|
1998-12-21 18:52:47 +08:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
strcpy(v->name,pname);
|
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 20:04:35 +08:00
|
|
|
if (!str_copy(conf,psection,&(v->value),start)) goto err;
|
1998-12-21 18:52:47 +08:00
|
|
|
|
|
|
|
if (strcmp(psection,section) != 0)
|
|
|
|
{
|
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 20:04:35 +08:00
|
|
|
if ((tv=_CONF_get_section(conf,psection))
|
1998-12-21 18:52:47 +08:00
|
|
|
== 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 20:04:35 +08:00
|
|
|
tv=_CONF_new_section(conf,psection);
|
1998-12-21 18:52:47 +08:00
|
|
|
if (tv == NULL)
|
|
|
|
{
|
1999-06-21 01:36:11 +08:00
|
|
|
CONFerr(CONF_F_CONF_LOAD_BIO,
|
1999-06-21 06:18:16 +08:00
|
|
|
CONF_R_UNABLE_TO_CREATE_NEW_SECTION);
|
1998-12-21 18:52:47 +08:00
|
|
|
goto err;
|
|
|
|
}
|
1999-06-21 06:18:16 +08:00
|
|
|
ts=(STACK_OF(CONF_VALUE) *)tv->value;
|
1998-12-21 18:52:47 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
tv=sv;
|
|
|
|
ts=section_sk;
|
|
|
|
}
|
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 20:04:35 +08:00
|
|
|
#if 1
|
|
|
|
if (_CONF_add_string(conf, tv, v) == 0)
|
|
|
|
{
|
|
|
|
CONFerr(CONF_F_CONF_LOAD_BIO,
|
|
|
|
ERR_R_MALLOC_FAILURE);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
#else
|
1998-12-21 18:52:47 +08:00
|
|
|
v->section=tv->section;
|
1999-06-21 06:18:16 +08:00
|
|
|
if (!sk_CONF_VALUE_push(ts,v))
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
1999-06-21 01:36:11 +08:00
|
|
|
CONFerr(CONF_F_CONF_LOAD_BIO,
|
|
|
|
ERR_R_MALLOC_FAILURE);
|
1998-12-21 18:52:47 +08:00
|
|
|
goto err;
|
|
|
|
}
|
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 20:04:35 +08:00
|
|
|
vv=(CONF_VALUE *)lh_insert(conf->data,v);
|
1998-12-21 18:52:47 +08:00
|
|
|
if (vv != NULL)
|
|
|
|
{
|
1999-06-21 06:18:16 +08:00
|
|
|
sk_CONF_VALUE_delete_ptr(ts,vv);
|
2000-06-02 06:19:21 +08:00
|
|
|
OPENSSL_free(vv->name);
|
|
|
|
OPENSSL_free(vv->value);
|
|
|
|
OPENSSL_free(vv);
|
1998-12-21 18:52:47 +08:00
|
|
|
}
|
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 20:04:35 +08:00
|
|
|
#endif
|
1998-12-21 18:52:47 +08:00
|
|
|
v=NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (buff != NULL) BUF_MEM_free(buff);
|
2000-06-02 06:19:21 +08:00
|
|
|
if (section != NULL) OPENSSL_free(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 20:04:35 +08:00
|
|
|
return(1);
|
1998-12-21 18:52:47 +08:00
|
|
|
err:
|
|
|
|
if (buff != NULL) BUF_MEM_free(buff);
|
2000-06-02 06:19:21 +08:00
|
|
|
if (section != NULL) OPENSSL_free(section);
|
1998-12-21 18:52:47 +08:00
|
|
|
if (line != NULL) *line=eline;
|
1998-12-21 19:00:56 +08:00
|
|
|
sprintf(btmp,"%ld",eline);
|
|
|
|
ERR_add_error_data(2,"line ",btmp);
|
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 20:04:35 +08:00
|
|
|
if ((h != conf->data) && (conf->data != NULL)) CONF_free(conf->data);
|
1998-12-21 18:52:47 +08:00
|
|
|
if (v != NULL)
|
|
|
|
{
|
2000-06-02 06:19:21 +08:00
|
|
|
if (v->name != NULL) OPENSSL_free(v->name);
|
|
|
|
if (v->value != NULL) OPENSSL_free(v->value);
|
|
|
|
if (v != NULL) OPENSSL_free(v);
|
1998-12-21 18:52:47 +08:00
|
|
|
}
|
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 20:04:35 +08:00
|
|
|
return(0);
|
1998-12-21 18:52:47 +08:00
|
|
|
}
|
1999-06-21 01:36:11 +08:00
|
|
|
|
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 20:04:35 +08:00
|
|
|
static void clear_comments(CONF *conf, char *p)
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
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 20:04:35 +08:00
|
|
|
char *to;
|
1998-12-21 18:52:47 +08:00
|
|
|
|
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 20:04:35 +08:00
|
|
|
to=p;
|
|
|
|
for (;;)
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
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 20:04:35 +08:00
|
|
|
if (IS_FCOMMENT(conf,*p))
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
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 20:04:35 +08:00
|
|
|
*p='\0';
|
|
|
|
return;
|
1998-12-21 18:52:47 +08:00
|
|
|
}
|
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 20:04:35 +08:00
|
|
|
if (!IS_WS(conf,*p))
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
p++;
|
1998-12-21 18:52:47 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
for (;;)
|
|
|
|
{
|
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 20:04:35 +08:00
|
|
|
if (IS_COMMENT(conf,*p))
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
|
|
|
*p='\0';
|
|
|
|
return;
|
|
|
|
}
|
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 20:04:35 +08:00
|
|
|
if (IS_DQUOTE(conf,*p))
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
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 20:04:35 +08:00
|
|
|
p=scan_dquote(conf, p);
|
1998-12-21 18:52:47 +08:00
|
|
|
continue;
|
|
|
|
}
|
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 20:04:35 +08:00
|
|
|
if (IS_QUOTE(conf,*p))
|
|
|
|
{
|
|
|
|
p=scan_quote(conf, p);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (IS_ESC(conf,*p))
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
|
|
|
p=scan_esc(p);
|
|
|
|
continue;
|
|
|
|
}
|
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 20:04:35 +08:00
|
|
|
if (IS_EOF(conf,*p))
|
1998-12-21 18:52:47 +08:00
|
|
|
return;
|
|
|
|
else
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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 20:04:35 +08:00
|
|
|
static int str_copy(CONF *conf, char *section, char **pto, char *from)
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
|
|
|
int q,r,rr=0,to=0,len=0;
|
|
|
|
char *s,*e,*rp,*p,*rrp,*np,*cp,v;
|
|
|
|
BUF_MEM *buf;
|
|
|
|
|
|
|
|
if ((buf=BUF_MEM_new()) == NULL) return(0);
|
|
|
|
|
|
|
|
len=strlen(from)+1;
|
|
|
|
if (!BUF_MEM_grow(buf,len)) goto err;
|
|
|
|
|
|
|
|
for (;;)
|
|
|
|
{
|
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 20:04:35 +08:00
|
|
|
if (IS_QUOTE(conf,*from))
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
|
|
|
q= *from;
|
|
|
|
from++;
|
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 20:04:35 +08:00
|
|
|
while (!IS_EOF(conf,*from) && (*from != q))
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
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 20:04:35 +08:00
|
|
|
if (IS_ESC(conf,*from))
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
|
|
|
from++;
|
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 20:04:35 +08:00
|
|
|
if (IS_EOF(conf,*from)) break;
|
|
|
|
}
|
|
|
|
buf->data[to++]= *(from++);
|
|
|
|
}
|
|
|
|
if (*from == q) from++;
|
|
|
|
}
|
|
|
|
else if (IS_DQUOTE(conf,*from))
|
|
|
|
{
|
|
|
|
q= *from;
|
|
|
|
from++;
|
|
|
|
while (!IS_EOF(conf,*from))
|
|
|
|
{
|
|
|
|
if (*from == q)
|
|
|
|
{
|
|
|
|
if (*(from+1) == q)
|
|
|
|
{
|
|
|
|
from++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
1998-12-21 18:52:47 +08:00
|
|
|
}
|
|
|
|
buf->data[to++]= *(from++);
|
|
|
|
}
|
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 20:04:35 +08:00
|
|
|
if (*from == q) from++;
|
1998-12-21 18:52:47 +08:00
|
|
|
}
|
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 20:04:35 +08:00
|
|
|
else if (IS_ESC(conf,*from))
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
|
|
|
from++;
|
|
|
|
v= *(from++);
|
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 20:04:35 +08:00
|
|
|
if (IS_EOF(conf,v)) break;
|
1998-12-21 18:52:47 +08:00
|
|
|
else if (v == 'r') v='\r';
|
|
|
|
else if (v == 'n') v='\n';
|
|
|
|
else if (v == 'b') v='\b';
|
|
|
|
else if (v == 't') v='\t';
|
|
|
|
buf->data[to++]= 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 20:04:35 +08:00
|
|
|
else if (IS_EOF(conf,*from))
|
1998-12-21 18:52:47 +08:00
|
|
|
break;
|
|
|
|
else if (*from == '$')
|
|
|
|
{
|
|
|
|
/* try to expand it */
|
|
|
|
rrp=NULL;
|
|
|
|
s= &(from[1]);
|
|
|
|
if (*s == '{')
|
|
|
|
q='}';
|
|
|
|
else if (*s == '(')
|
|
|
|
q=')';
|
|
|
|
else q=0;
|
|
|
|
|
|
|
|
if (q) s++;
|
|
|
|
cp=section;
|
|
|
|
e=np=s;
|
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 20:04:35 +08:00
|
|
|
while (IS_ALPHA_NUMERIC(conf,*e))
|
1998-12-21 18:52:47 +08:00
|
|
|
e++;
|
|
|
|
if ((e[0] == ':') && (e[1] == ':'))
|
|
|
|
{
|
|
|
|
cp=np;
|
|
|
|
rrp=e;
|
|
|
|
rr= *e;
|
|
|
|
*rrp='\0';
|
|
|
|
e+=2;
|
|
|
|
np=e;
|
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 20:04:35 +08:00
|
|
|
while (IS_ALPHA_NUMERIC(conf,*e))
|
1998-12-21 18:52:47 +08:00
|
|
|
e++;
|
|
|
|
}
|
|
|
|
r= *e;
|
|
|
|
*e='\0';
|
|
|
|
rp=e;
|
|
|
|
if (q)
|
|
|
|
{
|
|
|
|
if (r != q)
|
|
|
|
{
|
|
|
|
CONFerr(CONF_F_STR_COPY,CONF_R_NO_CLOSE_BRACE);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
e++;
|
|
|
|
}
|
|
|
|
/* So at this point we have
|
|
|
|
* ns which is the start of the name string which is
|
|
|
|
* '\0' terminated.
|
|
|
|
* cs which is the start of the section string which is
|
|
|
|
* '\0' terminated.
|
|
|
|
* e is the 'next point after'.
|
|
|
|
* r and s are the chars replaced by the '\0'
|
|
|
|
* rp and sp is where 'r' and 's' came from.
|
|
|
|
*/
|
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 20:04:35 +08:00
|
|
|
p=_CONF_get_string(conf,cp,np);
|
1998-12-21 18:52:47 +08:00
|
|
|
if (rrp != NULL) *rrp=rr;
|
|
|
|
*rp=r;
|
|
|
|
if (p == NULL)
|
|
|
|
{
|
|
|
|
CONFerr(CONF_F_STR_COPY,CONF_R_VARIABLE_HAS_NO_VALUE);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
BUF_MEM_grow(buf,(strlen(p)+len-(e-from)));
|
|
|
|
while (*p)
|
|
|
|
buf->data[to++]= *(p++);
|
|
|
|
from=e;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
buf->data[to++]= *(from++);
|
|
|
|
}
|
|
|
|
buf->data[to]='\0';
|
2000-06-02 06:19:21 +08:00
|
|
|
if (*pto != NULL) OPENSSL_free(*pto);
|
1998-12-21 18:52:47 +08:00
|
|
|
*pto=buf->data;
|
2000-06-02 06:19:21 +08:00
|
|
|
OPENSSL_free(buf);
|
1998-12-21 18:52:47 +08:00
|
|
|
return(1);
|
|
|
|
err:
|
|
|
|
if (buf != NULL) BUF_MEM_free(buf);
|
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
|
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 20:04:35 +08:00
|
|
|
static char *eat_ws(CONF *conf, char *p)
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
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 20:04:35 +08:00
|
|
|
while (IS_WS(conf,*p) && (!IS_EOF(conf,*p)))
|
1998-12-21 18:52:47 +08:00
|
|
|
p++;
|
|
|
|
return(p);
|
|
|
|
}
|
|
|
|
|
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 20:04:35 +08:00
|
|
|
static char *eat_alpha_numeric(CONF *conf, char *p)
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
|
|
|
for (;;)
|
|
|
|
{
|
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 20:04:35 +08:00
|
|
|
if (IS_ESC(conf,*p))
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
|
|
|
p=scan_esc(p);
|
|
|
|
continue;
|
|
|
|
}
|
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 20:04:35 +08:00
|
|
|
if (!IS_ALPHA_NUMERIC_PUNCT(conf,*p))
|
1998-12-21 18:52:47 +08:00
|
|
|
return(p);
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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 20:04:35 +08:00
|
|
|
static char *scan_quote(CONF *conf, char *p)
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
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 20:04:35 +08:00
|
|
|
int q= *p;
|
1998-12-21 18:52:47 +08:00
|
|
|
|
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 20:04:35 +08:00
|
|
|
p++;
|
|
|
|
while (!(IS_EOF(conf,*p)) && (*p != q))
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
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 20:04:35 +08:00
|
|
|
if (IS_ESC(conf,*p))
|
|
|
|
{
|
|
|
|
p++;
|
|
|
|
if (IS_EOF(conf,*p)) return(p);
|
|
|
|
}
|
|
|
|
p++;
|
1998-12-21 18:52:47 +08:00
|
|
|
}
|
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 20:04:35 +08:00
|
|
|
if (*p == q) p++;
|
|
|
|
return(p);
|
1998-12-21 18:52:47 +08:00
|
|
|
}
|
|
|
|
|
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 20:04:35 +08:00
|
|
|
|
|
|
|
static char *scan_dquote(CONF *conf, char *p)
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
|
|
|
int q= *p;
|
|
|
|
|
|
|
|
p++;
|
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 20:04:35 +08:00
|
|
|
while (!(IS_EOF(conf,*p)))
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
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 20:04:35 +08:00
|
|
|
if (*p == q)
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
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 20:04:35 +08:00
|
|
|
if (*(p+1) == q)
|
|
|
|
{
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
1998-12-21 18:52:47 +08:00
|
|
|
}
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
if (*p == q) p++;
|
|
|
|
return(p);
|
|
|
|
}
|
|
|
|
|
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 20:04:35 +08:00
|
|
|
static void dump_value(CONF_VALUE *a, BIO *out)
|
|
|
|
{
|
|
|
|
if (a->name)
|
|
|
|
BIO_printf(out, "[%s] %s=%s\n", a->section, a->name, a->value);
|
|
|
|
else
|
|
|
|
BIO_printf(out, "[[%s]]\n", a->section);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int def_dump(CONF *conf, BIO *out)
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
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 20:04:35 +08:00
|
|
|
lh_doall_arg(conf->data, (void (*)())dump_value, out);
|
|
|
|
return 1;
|
|
|
|
}
|
1998-12-21 18:52:47 +08:00
|
|
|
|
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 20:04:35 +08:00
|
|
|
static int def_is_number(CONF *conf, char c)
|
|
|
|
{
|
|
|
|
return IS_NUMBER(conf,c);
|
|
|
|
}
|
1998-12-21 18:52:47 +08:00
|
|
|
|
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 20:04:35 +08:00
|
|
|
static int def_to_int(CONF *conf, char c)
|
|
|
|
{
|
|
|
|
return c - '0';
|
1998-12-21 18:52:47 +08:00
|
|
|
}
|
1999-06-21 06:18:16 +08:00
|
|
|
|