diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/recipes/80-test_cipherlist.t | 2 | ||||
| -rw-r--r-- | test/recipes/90-test_shlibload.t | 3 | ||||
| -rw-r--r-- | test/shlibloadtest.c | 39 | ||||
| -rw-r--r-- | test/versions.c | 5 |
4 files changed, 27 insertions, 22 deletions
diff --git a/test/recipes/80-test_cipherlist.t b/test/recipes/80-test_cipherlist.t index 5c1b1d4545..bf6abc7739 100644 --- a/test/recipes/80-test_cipherlist.t +++ b/test/recipes/80-test_cipherlist.t @@ -20,7 +20,7 @@ setup("test_cipherlist"); my ($build_version, $library_version) = openssl_versions(); plan skip_all => "This test recipe isn't supported when doing regression testing" - if $build_version != $library_version; + if $build_version ne $library_version; my $no_anytls = alldisabled(available_protocols("tls")); diff --git a/test/recipes/90-test_shlibload.t b/test/recipes/90-test_shlibload.t index 2761d58502..82800a7814 100644 --- a/test/recipes/90-test_shlibload.t +++ b/test/recipes/90-test_shlibload.t @@ -46,7 +46,6 @@ sub shlib { $lib = $unified_info{sharednames}->{$lib} . ($target{shlib_variant} || "") . ($target{shared_extension} || ".so"); - $lib =~ s|\.\$\(SHLIB_VERSION_NUMBER\) - |.$config{shlib_version_number}|x; + $lib =~ s|\.\$\(SHLIB_VERSION_NUMBER\)|.$config{shlib_version}|; return $lib; } diff --git a/test/shlibloadtest.c b/test/shlibloadtest.c index 53714aa125..417fbfd6c0 100644 --- a/test/shlibloadtest.c +++ b/test/shlibloadtest.c @@ -22,7 +22,9 @@ typedef const SSL_METHOD * (*TLS_method_t)(void); typedef SSL_CTX * (*SSL_CTX_new_t)(const SSL_METHOD *meth); typedef void (*SSL_CTX_free_t)(SSL_CTX *); typedef unsigned long (*ERR_get_error_t)(void); -typedef unsigned long (*OpenSSL_version_num_t)(void); +typedef unsigned long (*OPENSSL_version_major_t)(void); +typedef unsigned long (*OPENSSL_version_minor_t)(void); +typedef unsigned long (*OPENSSL_version_patch_t)(void); typedef DSO * (*DSO_dsobyaddr_t)(void (*addr)(void), int flags); typedef int (*DSO_free_t)(DSO *dso); @@ -107,12 +109,14 @@ static int test_lib(void) union { void (*func)(void); SHLIB_SYM sym; - } symbols[3]; + } symbols[4]; TLS_method_t myTLS_method; SSL_CTX_new_t mySSL_CTX_new; SSL_CTX_free_t mySSL_CTX_free; ERR_get_error_t myERR_get_error; - OpenSSL_version_num_t myOpenSSL_version_num; + OPENSSL_version_major_t myOPENSSL_version_major; + OPENSSL_version_minor_t myOPENSSL_version_minor; + OPENSSL_version_patch_t myOPENSSL_version_patch; int result = 0; switch (test_type) { @@ -150,26 +154,27 @@ static int test_lib(void) } if (!TEST_true(shlib_sym(cryptolib, "ERR_get_error", &symbols[0].sym)) - || !TEST_true(shlib_sym(cryptolib, "OpenSSL_version_num", - &symbols[1].sym))) + || !TEST_true(shlib_sym(cryptolib, "OPENSSL_version_major", + &symbols[1].sym)) + || !TEST_true(shlib_sym(cryptolib, "OPENSSL_version_minor", + &symbols[2].sym)) + || !TEST_true(shlib_sym(cryptolib, "OPENSSL_version_patch", + &symbols[3].sym))) goto end; 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() & COMPATIBILITY_MASK, - OPENSSL_VERSION_NUMBER & COMPATIBILITY_MASK)) + /* Make sure the libraries are a compatible version */ + myOPENSSL_version_major = (OPENSSL_version_major_t)symbols[1].func; + myOPENSSL_version_minor = (OPENSSL_version_minor_t)symbols[2].func; + myOPENSSL_version_patch = (OPENSSL_version_patch_t)symbols[3].func; + if (!TEST_int_eq(myOPENSSL_version_major(), OPENSSL_VERSION_MAJOR)) goto end; - if (!TEST_int_ge(myOpenSSL_version_num() & ~COMPATIBILITY_MASK, - OPENSSL_VERSION_NUMBER & ~COMPATIBILITY_MASK)) + if (!TEST_int_ge(myOPENSSL_version_minor(), OPENSSL_VERSION_MINOR)) + goto end; + if (myOPENSSL_version_minor() == OPENSSL_VERSION_MINOR + && !TEST_int_ge(myOPENSSL_version_patch(), OPENSSL_VERSION_PATCH)) goto end; if (test_type == DSO_REFTEST) { diff --git a/test/versions.c b/test/versions.c index 3ab05ec35d..309670937a 100644 --- a/test/versions.c +++ b/test/versions.c @@ -14,7 +14,8 @@ /* A simple helper for the perl function OpenSSL::Test::openssl_versions */ int main(void) { - printf("Build version: 0x%08lX\n", OPENSSL_VERSION_NUMBER); - printf("Library version: 0x%08lX\n", OpenSSL_version_num()); + printf("Build version: %s\n", OPENSSL_FULL_VERSION_STR); + printf("Library version: %s\n", + OpenSSL_version(OPENSSL_FULL_VERSION_STRING)); return 0; } |