2016-05-17 18:24:46 +00:00
|
|
|
/*
|
2018-05-29 12:07:08 +00:00
|
|
|
* Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
|
I've always wanted to make the CONF library more adaptable. Here's
the result.
I have retained the old behavior of the CONF_* functions, and have
added a more "object oriented" interface through NCONF_* functions
(New CONF, you see :-)), working the same way as, for example, the
BIO interface. Really, the CONF_* are rewritten so they use the
NCONF_* functions internally.
In addition to that, I've split the old conf.c code into two files,
conf_def.c and conf_api.c. conf_def.c contains the default config
object that reads a configuration file the standard OpenSSL way, as
well as configuration file with Win32 registry file syntax (I'm not
sure I got that one right). conf_api.c provides an API to build other
configuration file readers around (can you see a configuraion file in
XML? I can :-)).
Finally, I've changed the name conf_lcl.h to conf_def.h, since it's
made specifically for that "class" and none others.
2000-04-09 12:04:35 +00:00
|
|
|
*
|
2016-05-17 18:24:46 +00:00
|
|
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
|
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
|
|
* in the file LICENSE in the source distribution or at
|
|
|
|
* https://www.openssl.org/source/license.html
|
I've always wanted to make the CONF library more adaptable. Here's
the result.
I have retained the old behavior of the CONF_* functions, and have
added a more "object oriented" interface through NCONF_* functions
(New CONF, you see :-)), working the same way as, for example, the
BIO interface. Really, the CONF_* are rewritten so they use the
NCONF_* functions internally.
In addition to that, I've split the old conf.c code into two files,
conf_def.c and conf_api.c. conf_def.c contains the default config
object that reads a configuration file the standard OpenSSL way, as
well as configuration file with Win32 registry file syntax (I'm not
sure I got that one right). conf_api.c provides an API to build other
configuration file readers around (can you see a configuraion file in
XML? I can :-)).
Finally, I've changed the name conf_lcl.h to conf_def.h, since it's
made specifically for that "class" and none others.
2000-04-09 12:04:35 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
/* Part of the code in here was originally in conf.c, which is now removed */
|
|
|
|
|
2017-08-23 23:05:07 +00:00
|
|
|
#include "e_os.h"
|
2018-09-24 01:21:18 +00:00
|
|
|
#include "internal/cryptlib.h"
|
2011-09-02 11:20:15 +00:00
|
|
|
#include <stdlib.h>
|
2000-09-09 18:05:27 +00:00
|
|
|
#include <string.h>
|
I've always wanted to make the CONF library more adaptable. Here's
the result.
I have retained the old behavior of the CONF_* functions, and have
added a more "object oriented" interface through NCONF_* functions
(New CONF, you see :-)), working the same way as, for example, the
BIO interface. Really, the CONF_* are rewritten so they use the
NCONF_* functions internally.
In addition to that, I've split the old conf.c code into two files,
conf_def.c and conf_api.c. conf_def.c contains the default config
object that reads a configuration file the standard OpenSSL way, as
well as configuration file with Win32 registry file syntax (I'm not
sure I got that one right). conf_api.c provides an API to build other
configuration file readers around (can you see a configuraion file in
XML? I can :-)).
Finally, I've changed the name conf_lcl.h to conf_def.h, since it's
made specifically for that "class" and none others.
2000-04-09 12:04:35 +00:00
|
|
|
#include <openssl/conf.h>
|
|
|
|
#include <openssl/conf_api.h>
|
|
|
|
|
2015-12-24 16:20:54 +00:00
|
|
|
static void value_free_hash(const CONF_VALUE *a, LHASH_OF(CONF_VALUE) *conf);
|
2008-06-04 11:01:43 +00:00
|
|
|
static void value_free_stack_doall(CONF_VALUE *a);
|
2000-12-04 03:02:44 +00:00
|
|
|
|
2000-04-26 12:13:19 +00:00
|
|
|
/* Up until OpenSSL 0.9.5a, this was get_section */
|
2002-01-18 16:51:05 +00:00
|
|
|
CONF_VALUE *_CONF_get_section(const CONF *conf, const char *section)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
CONF_VALUE *v, vv;
|
I've always wanted to make the CONF library more adaptable. Here's
the result.
I have retained the old behavior of the CONF_* functions, and have
added a more "object oriented" interface through NCONF_* functions
(New CONF, you see :-)), working the same way as, for example, the
BIO interface. Really, the CONF_* are rewritten so they use the
NCONF_* functions internally.
In addition to that, I've split the old conf.c code into two files,
conf_def.c and conf_api.c. conf_def.c contains the default config
object that reads a configuration file the standard OpenSSL way, as
well as configuration file with Win32 registry file syntax (I'm not
sure I got that one right). conf_api.c provides an API to build other
configuration file readers around (can you see a configuraion file in
XML? I can :-)).
Finally, I've changed the name conf_lcl.h to conf_def.h, since it's
made specifically for that "class" and none others.
2000-04-09 12:04:35 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
if ((conf == NULL) || (section == NULL))
|
2017-10-17 14:04:09 +00:00
|
|
|
return NULL;
|
2015-01-22 03:40:55 +00:00
|
|
|
vv.name = NULL;
|
|
|
|
vv.section = (char *)section;
|
|
|
|
v = lh_CONF_VALUE_retrieve(conf->data, &vv);
|
2017-10-17 14:04:09 +00:00
|
|
|
return v;
|
2015-01-22 03:40:55 +00: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 12:04:35 +00:00
|
|
|
|
2000-04-26 12:13:19 +00:00
|
|
|
/* Up until OpenSSL 0.9.5a, this was CONF_get_section */
|
2002-01-18 16:51:05 +00:00
|
|
|
STACK_OF(CONF_VALUE) *_CONF_get_section_values(const CONF *conf,
|
2015-01-22 03:40:55 +00:00
|
|
|
const char *section)
|
|
|
|
{
|
|
|
|
CONF_VALUE *v;
|
I've always wanted to make the CONF library more adaptable. Here's
the result.
I have retained the old behavior of the CONF_* functions, and have
added a more "object oriented" interface through NCONF_* functions
(New CONF, you see :-)), working the same way as, for example, the
BIO interface. Really, the CONF_* are rewritten so they use the
NCONF_* functions internally.
In addition to that, I've split the old conf.c code into two files,
conf_def.c and conf_api.c. conf_def.c contains the default config
object that reads a configuration file the standard OpenSSL way, as
well as configuration file with Win32 registry file syntax (I'm not
sure I got that one right). conf_api.c provides an API to build other
configuration file readers around (can you see a configuraion file in
XML? I can :-)).
Finally, I've changed the name conf_lcl.h to conf_def.h, since it's
made specifically for that "class" and none others.
2000-04-09 12:04:35 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
v = _CONF_get_section(conf, section);
|
|
|
|
if (v != NULL)
|
|
|
|
return ((STACK_OF(CONF_VALUE) *)v->value);
|
|
|
|
else
|
2017-10-17 14:04:09 +00:00
|
|
|
return NULL;
|
2015-01-22 03:40:55 +00: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 12:04:35 +00:00
|
|
|
|
|
|
|
int _CONF_add_string(CONF *conf, CONF_VALUE *section, CONF_VALUE *value)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
CONF_VALUE *v = NULL;
|
|
|
|
STACK_OF(CONF_VALUE) *ts;
|
|
|
|
|
|
|
|
ts = (STACK_OF(CONF_VALUE) *)section->value;
|
|
|
|
|
|
|
|
value->section = section->section;
|
|
|
|
if (!sk_CONF_VALUE_push(ts, value)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
v = lh_CONF_VALUE_insert(conf->data, value);
|
|
|
|
if (v != NULL) {
|
|
|
|
(void)sk_CONF_VALUE_delete_ptr(ts, v);
|
|
|
|
OPENSSL_free(v->name);
|
|
|
|
OPENSSL_free(v->value);
|
|
|
|
OPENSSL_free(v);
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
char *_CONF_get_string(const CONF *conf, const char *section,
|
|
|
|
const char *name)
|
|
|
|
{
|
|
|
|
CONF_VALUE *v, vv;
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
if (name == NULL)
|
2017-10-17 14:04:09 +00:00
|
|
|
return NULL;
|
2015-01-22 03:40:55 +00:00
|
|
|
if (conf != NULL) {
|
|
|
|
if (section != NULL) {
|
|
|
|
vv.name = (char *)name;
|
|
|
|
vv.section = (char *)section;
|
|
|
|
v = lh_CONF_VALUE_retrieve(conf->data, &vv);
|
|
|
|
if (v != NULL)
|
2017-10-17 14:04:09 +00:00
|
|
|
return v->value;
|
2015-01-22 03:40:55 +00:00
|
|
|
if (strcmp(section, "ENV") == 0) {
|
2018-09-24 01:21:18 +00:00
|
|
|
p = ossl_safe_getenv(name);
|
2015-01-22 03:40:55 +00:00
|
|
|
if (p != NULL)
|
2017-10-17 14:04:09 +00:00
|
|
|
return p;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
vv.section = "default";
|
|
|
|
vv.name = (char *)name;
|
|
|
|
v = lh_CONF_VALUE_retrieve(conf->data, &vv);
|
|
|
|
if (v != NULL)
|
2017-10-17 14:04:09 +00:00
|
|
|
return v->value;
|
2015-01-22 03:40:55 +00:00
|
|
|
else
|
2017-10-17 14:04:09 +00:00
|
|
|
return NULL;
|
2015-01-22 03:40:55 +00:00
|
|
|
} else
|
2018-09-24 01:21:18 +00:00
|
|
|
return ossl_safe_getenv(name);
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
|
|
|
|
2008-05-26 11:24:29 +00:00
|
|
|
static unsigned long conf_value_hash(const CONF_VALUE *v)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
2016-05-20 14:46:29 +00:00
|
|
|
return (OPENSSL_LH_strhash(v->section) << 2) ^ OPENSSL_LH_strhash(v->name);
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
|
|
|
|
2008-05-26 11:24:29 +00:00
|
|
|
static int conf_value_cmp(const CONF_VALUE *a, const CONF_VALUE *b)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (a->section != b->section) {
|
|
|
|
i = strcmp(a->section, b->section);
|
|
|
|
if (i)
|
2017-10-17 14:04:09 +00:00
|
|
|
return i;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if ((a->name != NULL) && (b->name != NULL)) {
|
|
|
|
i = strcmp(a->name, b->name);
|
2017-10-17 14:04:09 +00:00
|
|
|
return i;
|
2015-01-22 03:40:55 +00:00
|
|
|
} else if (a->name == b->name)
|
2017-10-17 14:04:09 +00:00
|
|
|
return 0;
|
2015-01-22 03:40:55 +00:00
|
|
|
else
|
|
|
|
return ((a->name == NULL) ? -1 : 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 12:04:35 +00:00
|
|
|
int _CONF_new_data(CONF *conf)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
if (conf == NULL) {
|
|
|
|
return 0;
|
|
|
|
}
|
2015-12-24 15:51:23 +00:00
|
|
|
if (conf->data == NULL) {
|
|
|
|
conf->data = lh_CONF_VALUE_new(conf_value_hash, conf_value_cmp);
|
|
|
|
if (conf->data == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
return 0;
|
2015-12-24 15:51:23 +00:00
|
|
|
}
|
2015-01-22 03:40:55 +00:00
|
|
|
return 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 12:04:35 +00:00
|
|
|
|
2015-12-24 16:20:54 +00:00
|
|
|
typedef LHASH_OF(CONF_VALUE) LH_CONF_VALUE;
|
|
|
|
|
|
|
|
IMPLEMENT_LHASH_DOALL_ARG_CONST(CONF_VALUE, LH_CONF_VALUE);
|
|
|
|
|
I've always wanted to make the CONF library more adaptable. Here's
the result.
I have retained the old behavior of the CONF_* functions, and have
added a more "object oriented" interface through NCONF_* functions
(New CONF, you see :-)), working the same way as, for example, the
BIO interface. Really, the CONF_* are rewritten so they use the
NCONF_* functions internally.
In addition to that, I've split the old conf.c code into two files,
conf_def.c and conf_api.c. conf_def.c contains the default config
object that reads a configuration file the standard OpenSSL way, as
well as configuration file with Win32 registry file syntax (I'm not
sure I got that one right). conf_api.c provides an API to build other
configuration file readers around (can you see a configuraion file in
XML? I can :-)).
Finally, I've changed the name conf_lcl.h to conf_def.h, since it's
made specifically for that "class" and none others.
2000-04-09 12:04:35 +00:00
|
|
|
void _CONF_free_data(CONF *conf)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
if (conf == NULL || conf->data == NULL)
|
|
|
|
return;
|
|
|
|
|
2016-01-11 14:11:13 +00:00
|
|
|
/* evil thing to make sure the 'OPENSSL_free()' works as expected */
|
|
|
|
lh_CONF_VALUE_set_down_load(conf->data, 0);
|
2015-12-24 16:20:54 +00:00
|
|
|
lh_CONF_VALUE_doall_LH_CONF_VALUE(conf->data, value_free_hash, conf->data);
|
2015-01-22 03:40:55 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* We now have only 'section' entries in the hash table. Due to problems
|
|
|
|
* with
|
|
|
|
*/
|
|
|
|
|
2015-12-24 16:07:21 +00:00
|
|
|
lh_CONF_VALUE_doall(conf->data, value_free_stack_doall);
|
2015-01-22 03:40:55 +00:00
|
|
|
lh_CONF_VALUE_free(conf->data);
|
|
|
|
}
|
I've always wanted to make the CONF library more adaptable. Here's
the result.
I have retained the old behavior of the CONF_* functions, and have
added a more "object oriented" interface through NCONF_* functions
(New CONF, you see :-)), working the same way as, for example, the
BIO interface. Really, the CONF_* are rewritten so they use the
NCONF_* functions internally.
In addition to that, I've split the old conf.c code into two files,
conf_def.c and conf_api.c. conf_def.c contains the default config
object that reads a configuration file the standard OpenSSL way, as
well as configuration file with Win32 registry file syntax (I'm not
sure I got that one right). conf_api.c provides an API to build other
configuration file readers around (can you see a configuraion file in
XML? I can :-)).
Finally, I've changed the name conf_lcl.h to conf_def.h, since it's
made specifically for that "class" and none others.
2000-04-09 12:04:35 +00:00
|
|
|
|
2015-12-24 16:20:54 +00:00
|
|
|
static void value_free_hash(const CONF_VALUE *a, LHASH_OF(CONF_VALUE) *conf)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
if (a->name != NULL)
|
|
|
|
(void)lh_CONF_VALUE_delete(conf, a);
|
|
|
|
}
|
I've always wanted to make the CONF library more adaptable. Here's
the result.
I have retained the old behavior of the CONF_* functions, and have
added a more "object oriented" interface through NCONF_* functions
(New CONF, you see :-)), working the same way as, for example, the
BIO interface. Really, the CONF_* are rewritten so they use the
NCONF_* functions internally.
In addition to that, I've split the old conf.c code into two files,
conf_def.c and conf_api.c. conf_def.c contains the default config
object that reads a configuration file the standard OpenSSL way, as
well as configuration file with Win32 registry file syntax (I'm not
sure I got that one right). conf_api.c provides an API to build other
configuration file readers around (can you see a configuraion file in
XML? I can :-)).
Finally, I've changed the name conf_lcl.h to conf_def.h, since it's
made specifically for that "class" and none others.
2000-04-09 12:04:35 +00:00
|
|
|
|
2008-06-04 11:01:43 +00:00
|
|
|
static void value_free_stack_doall(CONF_VALUE *a)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
CONF_VALUE *vv;
|
|
|
|
STACK_OF(CONF_VALUE) *sk;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (a->name != NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
sk = (STACK_OF(CONF_VALUE) *)a->value;
|
|
|
|
for (i = sk_CONF_VALUE_num(sk) - 1; i >= 0; i--) {
|
|
|
|
vv = sk_CONF_VALUE_value(sk, i);
|
|
|
|
OPENSSL_free(vv->value);
|
|
|
|
OPENSSL_free(vv->name);
|
|
|
|
OPENSSL_free(vv);
|
|
|
|
}
|
2015-05-01 14:15:18 +00:00
|
|
|
sk_CONF_VALUE_free(sk);
|
2015-01-22 03:40:55 +00:00
|
|
|
OPENSSL_free(a->section);
|
|
|
|
OPENSSL_free(a);
|
|
|
|
}
|
I've always wanted to make the CONF library more adaptable. Here's
the result.
I have retained the old behavior of the CONF_* functions, and have
added a more "object oriented" interface through NCONF_* functions
(New CONF, you see :-)), working the same way as, for example, the
BIO interface. Really, the CONF_* are rewritten so they use the
NCONF_* functions internally.
In addition to that, I've split the old conf.c code into two files,
conf_def.c and conf_api.c. conf_def.c contains the default config
object that reads a configuration file the standard OpenSSL way, as
well as configuration file with Win32 registry file syntax (I'm not
sure I got that one right). conf_api.c provides an API to build other
configuration file readers around (can you see a configuraion file in
XML? I can :-)).
Finally, I've changed the name conf_lcl.h to conf_def.h, since it's
made specifically for that "class" and none others.
2000-04-09 12:04:35 +00:00
|
|
|
|
2000-04-26 12:13:19 +00:00
|
|
|
/* Up until OpenSSL 0.9.5a, this was new_section */
|
2002-01-18 16:51:05 +00:00
|
|
|
CONF_VALUE *_CONF_new_section(CONF *conf, const char *section)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
STACK_OF(CONF_VALUE) *sk = NULL;
|
2015-05-01 14:15:18 +00:00
|
|
|
int i;
|
2015-01-22 03:40:55 +00:00
|
|
|
CONF_VALUE *v = NULL, *vv;
|
|
|
|
|
|
|
|
if ((sk = sk_CONF_VALUE_new_null()) == NULL)
|
|
|
|
goto err;
|
2015-05-02 03:10:31 +00:00
|
|
|
if ((v = OPENSSL_malloc(sizeof(*v))) == NULL)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
|
|
|
i = strlen(section) + 1;
|
|
|
|
if ((v->section = OPENSSL_malloc(i)) == NULL)
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
memcpy(v->section, section, i);
|
|
|
|
v->name = NULL;
|
|
|
|
v->value = (char *)sk;
|
|
|
|
|
|
|
|
vv = lh_CONF_VALUE_insert(conf->data, v);
|
2017-11-03 15:18:59 +00:00
|
|
|
if (vv != NULL || lh_CONF_VALUE_error(conf->data) > 0)
|
2017-06-21 14:54:25 +00:00
|
|
|
goto err;
|
2015-05-01 14:15:18 +00:00
|
|
|
return v;
|
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
err:
|
2015-05-01 14:15:18 +00:00
|
|
|
sk_CONF_VALUE_free(sk);
|
2017-11-03 15:18:59 +00:00
|
|
|
if (v != NULL)
|
|
|
|
OPENSSL_free(v->section);
|
2015-05-01 14:15:18 +00:00
|
|
|
OPENSSL_free(v);
|
|
|
|
return NULL;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|