Re: [openssl-project] build broken?
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"wrote: > > So, uhmmm, why didn't you make a PR from this? > > In message on Thu, 5 > Apr 2018 17:18:13 +, "Salz, Rich" 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 > openssl-project@openssl.org > https://mta.openssl.org/mailman/listinfo/openssl-project > > > ___ > openssl-project mailing list > openssl-project@openssl.org > https://mta.openssl.org/mailman/listinfo/openssl-project > ___ openssl-project mailing list openssl-project@openssl.org https://mta.openssl.org/mailman/listinfo/openssl-project
Re: [openssl-project] build broken?
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 ... On 4/5/18, 3:12 PM, "Richard Levitte"wrote: So, uhmmm, why didn't you make a PR from this? In message on Thu, 5 Apr 2018 17:18:13 +, "Salz, Rich" 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 openssl-project@openssl.org https://mta.openssl.org/mailman/listinfo/openssl-project ___ openssl-project mailing list openssl-project@openssl.org https://mta.openssl.org/mailman/listinfo/openssl-project
[openssl-project] build broken?
Making update CONF function code 122 collision at CONF_F_SSL_MODULE_INIT diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index d1cc039..de3dacc 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -335,7 +335,7 @@ CONF_F_NCONF_LOAD_BIO:110:NCONF_load_bio CONF_F_NCONF_LOAD_FP:114:NCONF_load_fp CONF_F_NCONF_NEW:111:NCONF_new CONF_F_PROCESS_INCLUDE:116:process_include -CONF_F_SSL_MODULE_INIT:122:ssl_module_init +CONF_F_SSL_MODULE_INIT:123:ssl_module_init CONF_F_STR_COPY:101:str_copy CRYPTO_F_CRYPTO_DUP_EX_DATA:110:CRYPTO_dup_ex_data CRYPTO_F_CRYPTO_FREE_EX_DATA:111:CRYPTO_free_ex_data ___ openssl-project mailing list openssl-project@openssl.org https://mta.openssl.org/mailman/listinfo/openssl-project