Commit c8cda405 authored by Richard Levitte's avatar Richard Levitte
Browse files

Keep binary backward compatibility by putting new method function 

pointers at the end of the structure.
parent befb3e7a

crypto/conf/conf.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

crypto/conf/conf_def.c

+4 −4
Original line number Diff line number Diff line
@@ -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()

crypto/conf/conf_err.c

+2 −0
Original line number Diff line number Diff line
@@ -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}