On 05/04/18 20:13, Salz, Rich wrote: > I thought someone else would beat me to it. Like, maybe, the person who > broke things :) > > But the fix is part of 5886 which you approved and I am merging now ...
Oops! Sorry :-) The fix needs to go into 1.1.0 too to keep the numbers consistent: https://github.com/openssl/openssl/pull/5892 Matt > > On 4/5/18, 3:12 PM, "Richard Levitte" <[email protected]> wrote: > > So, uhmmm, why didn't you make a PR from this? > > In message <[email protected]> on Thu, 5 > Apr 2018 17:18:13 +0000, "Salz, Rich" <[email protected]> said: > > rsalz> Making update > rsalz> CONF function code 122 collision at CONF_F_SSL_MODULE_INIT > rsalz> > rsalz> diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt > rsalz> index d1cc039..de3dacc 100644 > rsalz> --- a/crypto/err/openssl.txt > rsalz> +++ b/crypto/err/openssl.txt > rsalz> @@ -335,7 +335,7 @@ CONF_F_NCONF_LOAD_BIO:110:NCONF_load_bio > rsalz> CONF_F_NCONF_LOAD_FP:114:NCONF_load_fp > rsalz> CONF_F_NCONF_NEW:111:NCONF_new > rsalz> CONF_F_PROCESS_INCLUDE:116:process_include > rsalz> -CONF_F_SSL_MODULE_INIT:122:ssl_module_init > rsalz> +CONF_F_SSL_MODULE_INIT:123:ssl_module_init > rsalz> CONF_F_STR_COPY:101:str_copy > rsalz> CRYPTO_F_CRYPTO_DUP_EX_DATA:110:CRYPTO_dup_ex_data > rsalz> CRYPTO_F_CRYPTO_FREE_EX_DATA:111:CRYPTO_free_ex_data > _______________________________________________ > openssl-project mailing list > [email protected] > https://mta.openssl.org/mailman/listinfo/openssl-project > > > _______________________________________________ > openssl-project mailing list > [email protected] > https://mta.openssl.org/mailman/listinfo/openssl-project > _______________________________________________ openssl-project mailing list [email protected] https://mta.openssl.org/mailman/listinfo/openssl-project
