Additionally, rename des_encrypt to des_encrypt1 in files that are

[oweals/openssl.git] / crypto / conf / conf_lib.c

diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c
index 6a650f18e7eb1f703764ac9a9cf2a55bdb518ca0..11ec6397324db82875174a9a21f6d83ae9555d8b 100644 (file)
--- a/crypto/conf/conf_lib.c
+++ b/crypto/conf/conf_lib.c
@@ -131,38 +131,59 @@ LHASH *CONF_load_bio(LHASH *conf, BIO *bp,long *eline)
 
 STACK_OF(CONF_VALUE) *CONF_get_section(LHASH *conf,char *section)
        {
-       CONF ctmp;
+       if (conf == NULL)
+               {
+               return NULL;
+               }
+       else
+               {
+               CONF ctmp;
 
-       if (default_CONF_method == NULL)
-               default_CONF_method = NCONF_default();
+               if (default_CONF_method == NULL)
+                       default_CONF_method = NCONF_default();
 
-       default_CONF_method->init(&ctmp);
-       ctmp.data = conf;
-       return NCONF_get_section(&ctmp, section);
+               default_CONF_method->init(&ctmp);
+               ctmp.data = conf;
+               return NCONF_get_section(&ctmp, section);
+               }
        }
 
 char *CONF_get_string(LHASH *conf,char *group,char *name)
        {
-       CONF ctmp;
+       if (conf == NULL)
+               {
+               return NCONF_get_string(NULL, group, name);
+               }
+       else
+               {
+               CONF ctmp;
 
-       if (default_CONF_method == NULL)
-               default_CONF_method = NCONF_default();
+               if (default_CONF_method == NULL)
+                       default_CONF_method = NCONF_default();
 
-       default_CONF_method->init(&ctmp);
-       ctmp.data = conf;
-       return NCONF_get_string(&ctmp, group, name);
+               default_CONF_method->init(&ctmp);
+               ctmp.data = conf;
+               return NCONF_get_string(&ctmp, group, name);
+               }
        }
 
 long CONF_get_number(LHASH *conf,char *group,char *name)
        {
-       CONF ctmp;
+       if (conf == NULL)
+               {
+               return NCONF_get_number(NULL, group, name);
+               }
+       else
+               {
+               CONF ctmp;
 
-       if (default_CONF_method == NULL)
-               default_CONF_method = NCONF_default();
+               if (default_CONF_method == NULL)
+                       default_CONF_method = NCONF_default();
 
-       default_CONF_method->init(&ctmp);
-       ctmp.data = conf;
-       return NCONF_get_number(&ctmp, group, name);
+               default_CONF_method->init(&ctmp);
+               ctmp.data = conf;
+               return NCONF_get_number(&ctmp, group, name);
+               }
        }
 
 void CONF_free(LHASH *conf)
@@ -322,7 +343,7 @@ char *NCONF_get_string(CONF *conf,char *group,char *name)
                         CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE);
                return NULL;
                }
-
+       return NULL;
        }
 
 long NCONF_get_number(CONF *conf,char *group,char *name)