commit cfaad1713e0dd71851aa281c2f1882d9832c90c4
author Richard Levitte <levitte@openssl.org> Fri Mar 23 01:05:41 2018 +0100
committer Richard Levitte <levitte@openssl.org> Fri Mar 23 01:05:41 2018 +0100
tree 4f6a58a3e54ee972bb910756e48c99d696b35563
parent b71fa7b32d0d80dc1fa5fedf7f0b9a991d746c41

test/shlibloadtest.c: fix various errors

These errors were hidden because compiling this file didn't get the
macros derived from the dso_scheme attribute, and therefore, some code
never got compiled.

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5733)

test/shlibloadtest.c

diff --git a/test/shlibloadtest.c b/test/shlibloadtest.c
index ea5044e..07ed40d 100644
--- a/test/shlibloadtest.c
+++ b/test/shlibloadtest.c
@@ -163,10 +163,10 @@
 # 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)
+                     OPENSSL_VERSION_NUMBER & COMPATIBILITY_MASK))
         goto end;
     if (!TEST_int_ge(myOpenSSL_version_num() & ~COMPATIBILITY_MASK,
-                     OPENSSL_VERSION_NUMBER & ~COMPATIBILITY_MASK)
+                     OPENSSL_VERSION_NUMBER & ~COMPATIBILITY_MASK))
         goto end;
 
     if (test_type == DSO_REFTEST) {
@@ -190,9 +190,9 @@
         {
             DSO *hndl;
             /* use known symbol from crypto module */
-            if (!TEST_ptr(hndl = DSO_dsobyaddr((void (*)())ERR_get_error, 0)))
+            if (!TEST_ptr(hndl = myDSO_dsobyaddr((void (*)())ERR_get_error, 0)))
                 goto end;
-            DSO_free(hndl);
+            myDSO_free(hndl);
         }
 # endif /* DSO_DLFCN */
     }