Add a "_up" -> "_up_ref" change to libeay.num that was missing from the recent changes. Also, do the same change to the DSO_up() function.
diff --git a/crypto/dso/dso.h b/crypto/dso/dso.h index 8c495b1..9ceeb2b 100644 --- a/crypto/dso/dso.h +++ b/crypto/dso/dso.h
@@ -187,7 +187,7 @@ DSO * DSO_new_method(DSO_METHOD *method); int DSO_free(DSO *dso); int DSO_flags(DSO *dso); -int DSO_up(DSO *dso); +int DSO_up_ref(DSO *dso); long DSO_ctrl(DSO *dso, int cmd, long larg, void *parg); /* This function sets the DSO's name_converter callback. If it is non-NULL, @@ -293,7 +293,7 @@ #define DSO_F_DSO_NEW_METHOD 113 #define DSO_F_DSO_SET_FILENAME 129 #define DSO_F_DSO_SET_NAME_CONVERTER 122 -#define DSO_F_DSO_UP 114 +#define DSO_F_DSO_UP_REF 114 #define DSO_F_VMS_BIND_VAR 115 #define DSO_F_VMS_LOAD 116 #define DSO_F_VMS_UNLOAD 117
diff --git a/crypto/dso/dso_err.c b/crypto/dso/dso_err.c index b614240..cf452de 100644 --- a/crypto/dso/dso_err.c +++ b/crypto/dso/dso_err.c
@@ -87,7 +87,7 @@ {ERR_PACK(0,DSO_F_DSO_NEW_METHOD,0), "DSO_new_method"}, {ERR_PACK(0,DSO_F_DSO_SET_FILENAME,0), "DSO_set_filename"}, {ERR_PACK(0,DSO_F_DSO_SET_NAME_CONVERTER,0), "DSO_set_name_converter"}, -{ERR_PACK(0,DSO_F_DSO_UP,0), "DSO_up"}, +{ERR_PACK(0,DSO_F_DSO_UP_REF,0), "DSO_up_ref"}, {ERR_PACK(0,DSO_F_VMS_BIND_VAR,0), "VMS_BIND_VAR"}, {ERR_PACK(0,DSO_F_VMS_LOAD,0), "VMS_LOAD"}, {ERR_PACK(0,DSO_F_VMS_UNLOAD,0), "VMS_UNLOAD"},
diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c index ef39a52..ba1b196 100644 --- a/crypto/dso/dso_lib.c +++ b/crypto/dso/dso_lib.c
@@ -179,11 +179,11 @@ } -int DSO_up(DSO *dso) +int DSO_up_ref(DSO *dso) { if (dso == NULL) { - DSOerr(DSO_F_DSO_UP,ERR_R_PASSED_NULL_PARAMETER); + DSOerr(DSO_F_DSO_UP_REF,ERR_R_PASSED_NULL_PARAMETER); return(0); }
diff --git a/util/libeay.num b/util/libeay.num index 6469927..ed65999 100755 --- a/util/libeay.num +++ b/util/libeay.num
@@ -1767,7 +1767,7 @@ DSO_new_method 2260 EXIST::FUNCTION: DSO_free 2261 EXIST::FUNCTION: DSO_flags 2262 EXIST::FUNCTION: -DSO_up 2263 EXIST::FUNCTION: +DSO_up_ref 2263 EXIST::FUNCTION: DSO_set_default_method 2264 EXIST::FUNCTION: DSO_get_default_method 2265 EXIST::FUNCTION: DSO_get_method 2266 EXIST::FUNCTION: @@ -2638,7 +2638,7 @@ X509_REVOKED_set_revocationDate 3087 EXIST::FUNCTION: EVP_dev_crypto_md5 3088 EXIST::FUNCTION:DES X509_CRL_set_issuer_name 3089 EXIST::FUNCTION: -DSA_up 3090 EXIST::FUNCTION:DSA +DSA_up_ref 3090 EXIST::FUNCTION:DSA ENGINE_get_cipher 3091 EXIST::FUNCTION: ENGINE_add_cipher 3092 EXIST::FUNCTION: X509_CRL_set_nextUpdate 3093 EXIST::FUNCTION: