From 00c8f1b05cd5e815d21e51737505e901d572e09c Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 14 Mar 2018 17:31:20 +0100 Subject: [PATCH] Stop test/shlibloadtest.c from failing in a regression test When doing a regression test, it's obvious that the version test/shlibloadtest is built for will not be the same as the library version. So we change the test to check for assumed compatibility. Reviewed-by: Andy Polyakov (Merged from https://github.com/openssl/openssl/pull/5619) --- test/shlibloadtest.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/test/shlibloadtest.c b/test/shlibloadtest.c index 5f8ec55af2..0bf24eee07 100644 --- a/test/shlibloadtest.c +++ b/test/shlibloadtest.c @@ -141,8 +141,20 @@ static int test_lib(void) myERR_get_error = (ERR_get_error_t)symbols[0].func; if (!TEST_int_eq(myERR_get_error(), 0)) goto end; + + /* + * The bits that COMPATIBILITY_MASK lets through MUST be the same in + * the library and in the application. + * The bits that are masked away MUST be a larger or equal number in + * the library compared to the application. + */ +# define COMPATIBILITY_MASK 0xfff00000L myOpenSSL_version_num = (OpenSSL_version_num_t)symbols[1].func; - if (!TEST_int_eq(myOpenSSL_version_num(), OPENSSL_VERSION_NUMBER)) + if (!TEST_int_eq(myOpenSSL_version_num() & COMPATIBILITY_MASK, + OPENSSL_VERSION_NUMBER & COMPATIBILITY_MASK) + goto end; + if (!TEST_int_ge(myOpenSSL_version_num() & ~COMPATIBILITY_MASK, + OPENSSL_VERSION_NUMBER & ~COMPATIBILITY_MASK) goto end; switch (test_type) { -- GitLab