Keep binary backward compatibility by putting new method function
authorRichard Levitte <levitte@openssl.org>
Thu, 19 Oct 2000 08:29:27 +0000 (08:29 +0000)
committerRichard Levitte <levitte@openssl.org>
Thu, 19 Oct 2000 08:29:27 +0000 (08:29 +0000)
pointers at the end of the structure.

crypto/conf/conf.h
crypto/conf/conf_def.c
crypto/conf/conf_err.c

index 9f03939..ae7d05f 100644 (file)
@@ -90,11 +90,11 @@ struct conf_method_st
        int (MS_FAR *init)(CONF *conf);
        int (MS_FAR *destroy)(CONF *conf);
        int (MS_FAR *destroy_data)(CONF *conf);
        int (MS_FAR *init)(CONF *conf);
        int (MS_FAR *destroy)(CONF *conf);
        int (MS_FAR *destroy_data)(CONF *conf);
-       int (MS_FAR *load)(CONF *conf, const char *name, long *eline);
        int (MS_FAR *load_bio)(CONF *conf, BIO *bp, long *eline);
        int (MS_FAR *dump)(CONF *conf, BIO *bp);
        int (MS_FAR *is_number)(CONF *conf, char c);
        int (MS_FAR *to_int)(CONF *conf, char c);
        int (MS_FAR *load_bio)(CONF *conf, BIO *bp, long *eline);
        int (MS_FAR *dump)(CONF *conf, BIO *bp);
        int (MS_FAR *is_number)(CONF *conf, char c);
        int (MS_FAR *to_int)(CONF *conf, char c);
+       int (MS_FAR *load)(CONF *conf, const char *name, long *eline);
        };
 
 int CONF_set_default_method(CONF_METHOD *meth);
        };
 
 int CONF_set_default_method(CONF_METHOD *meth);
index 7cf1431..6825d96 100644 (file)
@@ -95,11 +95,11 @@ static CONF_METHOD default_method = {
        def_init_default,
        def_destroy,
        def_destroy_data,
        def_init_default,
        def_destroy,
        def_destroy_data,
-       def_load,
        def_load_bio,
        def_dump,
        def_is_number,
        def_load_bio,
        def_dump,
        def_is_number,
-       def_to_int
+       def_to_int,
+       def_load
        };
 
 static CONF_METHOD WIN32_method = {
        };
 
 static CONF_METHOD WIN32_method = {
@@ -108,11 +108,11 @@ static CONF_METHOD WIN32_method = {
        def_init_WIN32,
        def_destroy,
        def_destroy_data,
        def_init_WIN32,
        def_destroy,
        def_destroy_data,
-       def_load,
        def_load_bio,
        def_dump,
        def_is_number,
        def_load_bio,
        def_dump,
        def_is_number,
-       def_to_int
+       def_to_int,
+       def_load
        };
 
 CONF_METHOD *NCONF_default()
        };
 
 CONF_METHOD *NCONF_default()
index c3766d2..89e220f 100644 (file)
@@ -76,7 +76,9 @@ static ERR_STRING_DATA CONF_str_functs[]=
 {ERR_PACK(0,CONF_F_NCONF_GET_NUMBER_E,0),      "NCONF_get_number_e"},
 {ERR_PACK(0,CONF_F_NCONF_GET_SECTION,0),       "NCONF_get_section"},
 {ERR_PACK(0,CONF_F_NCONF_GET_STRING,0),        "NCONF_get_string"},
 {ERR_PACK(0,CONF_F_NCONF_GET_NUMBER_E,0),      "NCONF_get_number_e"},
 {ERR_PACK(0,CONF_F_NCONF_GET_SECTION,0),       "NCONF_get_section"},
 {ERR_PACK(0,CONF_F_NCONF_GET_STRING,0),        "NCONF_get_string"},
+{ERR_PACK(0,CONF_F_NCONF_LOAD,0),      "NCONF_load"},
 {ERR_PACK(0,CONF_F_NCONF_LOAD_BIO,0),  "NCONF_load_bio"},
 {ERR_PACK(0,CONF_F_NCONF_LOAD_BIO,0),  "NCONF_load_bio"},
+{ERR_PACK(0,CONF_F_NCONF_LOAD_FP,0),   "NCONF_load_fp"},
 {ERR_PACK(0,CONF_F_NCONF_NEW,0),       "NCONF_new"},
 {ERR_PACK(0,CONF_F_STR_COPY,0),        "STR_COPY"},
 {0,NULL}
 {ERR_PACK(0,CONF_F_NCONF_NEW,0),       "NCONF_new"},
 {ERR_PACK(0,CONF_F_STR_COPY,0),        "STR_COPY"},
 {0,NULL}