aboutsummaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2000-10-19 08:29:27 +0000
committerRichard Levitte <levitte@openssl.org>2000-10-19 08:29:27 +0000
commitc8cda405e7332f51ef224811bb8e63a92a6d8d5d (patch)
treec4005b286d414c80b7b0576a27254d4b988671d9 /crypto
parentbefb3e7a4de7af6039ae2d37e995675e8f5fddc5 (diff)
downloadopenssl-c8cda405e7332f51ef224811bb8e63a92a6d8d5d.tar.gz
Keep binary backward compatibility by putting new method function
pointers at the end of the structure.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/conf/conf.h2
-rw-r--r--crypto/conf/conf_def.c8
-rw-r--r--crypto/conf/conf_err.c2
3 files changed, 7 insertions, 5 deletions
diff --git a/crypto/conf/conf.h b/crypto/conf/conf.h
index 9f039391c9..ae7d05f3bc 100644
--- 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 7cf14316d5..6825d96455 100644
--- 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 c3766d2886..89e220f3ff 100644
--- 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}