diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2001-06-28 11:41:50 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2001-06-28 11:41:50 +0000 |
| commit | b7a26e6dafdbf97513e968a45757a4d4e9843ba2 (patch) | |
| tree | dbfa985f73c77ab5048d5514bd83e1711768a475 /apps/openssl.c | |
| parent | ce16450a894b29ffda9e2a60bc62f89aa841d1ea (diff) | |
| download | openssl-b7a26e6dafdbf97513e968a45757a4d4e9843ba2.tar.gz | |
Modify apps to use NCONF code instead of old CONF code.
Add new extension functions which work with NCONF.
Tidy up extension config routines and remove redundant code.
Fix NCONF_get_number().
Todo: more testing of apps to see they still work...
Diffstat (limited to 'apps/openssl.c')
| -rw-r--r-- | apps/openssl.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/openssl.c b/apps/openssl.c index 22bd52ffed..f8d4ac69d6 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -138,7 +138,7 @@ static unsigned long MS_CALLBACK hash(const void *a_void); static int MS_CALLBACK cmp(const void *a_void,const void *b_void); static LHASH *prog_init(void ); static int do_cmd(LHASH *prog,int argc,char *argv[]); -LHASH *config=NULL; +CONF *config=NULL; char *default_config_file=NULL; /* Make sure there is only one when MONOLITH is defined */ @@ -269,8 +269,9 @@ int main(int Argc, char *Argv[]) default_config_file=p; - config=CONF_load(config,p,&errline); - if (config == NULL) ERR_clear_error(); + config=NCONF_new(NULL); + i=NCONF_load(config,p,&errline); + if (i == 0) ERR_clear_error(); prog=prog_init(); @@ -339,7 +340,7 @@ int main(int Argc, char *Argv[]) end: if (config != NULL) { - CONF_free(config); + NCONF_free(config); config=NULL; } if (prog != NULL) lh_free(prog); |