From: Richard Levitte <levitte@openssl.org>
Date: Fri, 23 Mar 2018 00:05:41 +0000 (+0100)
Subject: test/shlibloadtest.c: fix various errors
X-Git-Tag: OpenSSL_1_1_1-pre4~63
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cfaad1713e0dd71851aa281c2f1882d9832c90c4;p=oweals%2Fopenssl.git

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)
---

diff --git a/test/shlibloadtest.c b/test/shlibloadtest.c
index ea5044e642..07ed40dc6f 100644
--- a/test/shlibloadtest.c
+++ b/test/shlibloadtest.c
@@ -163,10 +163,10 @@ static int test_lib(void)
 # 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 @@ static int test_lib(void)
         {
             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 */
     }