Keep binary backward compatibility by putting new method function

pointers at the end of the structure.

diff --git a/crypto/conf/conf.h b/crypto/conf/conf.h
index 9f039391c995acda7b66aa7ee31e7580b5d7d8b9..ae7d05f3bc595efcf336937785972625b186a18c 100644 (file)
--- a/crypto/conf/conf.h
+++ b/crypto/conf/conf.h
@@ -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 *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)(CONF *conf, const char *name, long *eline);
        };
 
 int CONF_set_default_method(CONF_METHOD *meth);

diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c
index 7cf14316d5c2c926bbf5bb87ff66867ca10a5bcc..6825d9645587dd7ed1361a17e2a06fd8aaeb5640 100644 (file)
--- a/crypto/conf/conf_def.c
+++ b/crypto/conf/conf_def.c
@@ -95,11 +95,11 @@ static CONF_METHOD default_method = {
        def_init_default,
        def_destroy,
        def_destroy_data,
-       def_load,
        def_load_bio,
        def_dump,
        def_is_number,
-       def_to_int
+       def_to_int,
+       def_load
        };
 
 static CONF_METHOD WIN32_method = {
@@ -108,11 +108,11 @@ static CONF_METHOD WIN32_method = {
        def_init_WIN32,
        def_destroy,
        def_destroy_data,
-       def_load,
        def_load_bio,
        def_dump,
        def_is_number,
-       def_to_int
+       def_to_int,
+       def_load
        };
 
 CONF_METHOD *NCONF_default()

diff --git a/crypto/conf/conf_err.c b/crypto/conf/conf_err.c
index c3766d2886d27407500654bfe6861a29d7ee2236..89e220f3ffc060f9422a1dadbcf9728a2dd4914f 100644 (file)
--- a/crypto/conf/conf_err.c
+++ b/crypto/conf/conf_err.c
@@ -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_LOAD,0),      "NCONF_load"},
 {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}