Clarifications and removal of double declaration...

diff --git a/crypto/conf/conf_api.c b/crypto/conf/conf_api.c
index 975d5c7abe5c0cdb256c22c0c9eb9ec272ccf90f..29989270ab2c5a7c777791a0050d6c8c38916d16 100644 (file)
--- a/crypto/conf/conf_api.c
+++ b/crypto/conf/conf_api.c
@@ -66,7 +66,7 @@ static void value_free_stack(CONF_VALUE *a,LHASH *conf);
 static unsigned long hash(CONF_VALUE *v);
 static int cmp_conf(CONF_VALUE *a,CONF_VALUE *b);
 
-/* This was get_section */
+/* Up until OpenSSL 0.9.5a, this was get_section */
 CONF_VALUE *_CONF_get_section(CONF *conf, char *section)
        {
        CONF_VALUE *v,vv;
@@ -78,7 +78,7 @@ CONF_VALUE *_CONF_get_section(CONF *conf, char *section)
        return(v);
        }
 
-/* This was CONF_get_section */
+/* Up until OpenSSL 0.9.5a, this was CONF_get_section */
 STACK_OF(CONF_VALUE) *_CONF_get_section_values(CONF *conf, char *section)
        {
        CONF_VALUE *v;
@@ -247,7 +247,7 @@ static int cmp_conf(CONF_VALUE *a, CONF_VALUE *b)
                return((a->name == NULL)?-1:1);
        }
 
-/* This was new_section */
+/* Up until OpenSSL 0.9.5a, this was new_section */
 CONF_VALUE *_CONF_new_section(CONF *conf, char *section)
        {
        STACK *sk=NULL;

diff --git a/crypto/conf/conf_api.h b/crypto/conf/conf_api.h
index 17642c966cbef6604e1479c45d92cd7ed8fc84b5..05be7d8fb7a5c80bc77e872a071f08302e3e7650 100644 (file)
--- a/crypto/conf/conf_api.h
+++ b/crypto/conf/conf_api.h
@@ -66,14 +66,13 @@ extern "C" {
 #include <openssl/lhash.h>
 #include <openssl/conf.h>
 
-/* This was new_section */
+/* Up until OpenSSL 0.9.5a, this was new_section */
 CONF_VALUE *_CONF_new_section(CONF *conf, char *section);
-/* This was get_section */
+/* Up until OpenSSL 0.9.5a, this was get_section */
 CONF_VALUE *_CONF_get_section(CONF *conf, char *section);
-/* This was CONF_get_section */
+/* Up until OpenSSL 0.9.5a, this was CONF_get_section */
 STACK_OF(CONF_VALUE) *_CONF_get_section_values(CONF *conf, char *section);
 
-STACK_OF(CONF_VALUE) *_CONF_get_section_values(CONF *conf, char *section);
 int _CONF_add_string(CONF *conf, CONF_VALUE *section, CONF_VALUE *value);
 char *_CONF_get_string(CONF *conf, char *section, char *name);
 long _CONF_get_number(CONF *conf, char *section, char *name);