diff options
Diffstat (limited to 'crypto/openssl/test/shlibloadtest.c')
| -rw-r--r-- | crypto/openssl/test/shlibloadtest.c | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/crypto/openssl/test/shlibloadtest.c b/crypto/openssl/test/shlibloadtest.c index 5dc42a039712..034780ea55ca 100644 --- a/crypto/openssl/test/shlibloadtest.c +++ b/crypto/openssl/test/shlibloadtest.c @@ -17,8 +17,8 @@ typedef void DSO; -typedef const SSL_METHOD * (*TLS_method_t)(void); -typedef SSL_CTX * (*SSL_CTX_new_t)(const SSL_METHOD *meth); +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 int (*OPENSSL_init_crypto_t)(uint64_t, void *); typedef int (*OPENSSL_atexit_t)(void (*handler)(void)); @@ -26,7 +26,7 @@ typedef unsigned long (*ERR_get_error_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 DSO *(*DSO_dsobyaddr_t)(void (*addr)(void), int flags); typedef int (*DSO_free_t)(DSO *dso); typedef enum test_types_en { @@ -119,11 +119,11 @@ static int test_lib(void) } if (test_type != JUST_CRYPTO - && test_type != DSO_REFTEST - && test_type != NO_ATEXIT) { + && test_type != DSO_REFTEST + && test_type != NO_ATEXIT) { if (!sd_sym(ssllib, "TLS_method", &symbols[0].sym) - || !sd_sym(ssllib, "SSL_CTX_new", &symbols[1].sym) - || !sd_sym(ssllib, "SSL_CTX_free", &symbols[2].sym)) { + || !sd_sym(ssllib, "SSL_CTX_new", &symbols[1].sym) + || !sd_sym(ssllib, "SSL_CTX_free", &symbols[2].sym)) { fprintf(stderr, "Failed to load libssl symbols\n"); goto end; } @@ -139,10 +139,10 @@ static int test_lib(void) } if (!sd_sym(cryptolib, "ERR_get_error", &symbols[0].sym) - || !sd_sym(cryptolib, "OPENSSL_version_major", &symbols[1].sym) - || !sd_sym(cryptolib, "OPENSSL_version_minor", &symbols[2].sym) - || !sd_sym(cryptolib, "OPENSSL_version_patch", &symbols[3].sym) - || !sd_sym(cryptolib, "OPENSSL_atexit", &symbols[4].sym)) { + || !sd_sym(cryptolib, "OPENSSL_version_major", &symbols[1].sym) + || !sd_sym(cryptolib, "OPENSSL_version_minor", &symbols[2].sym) + || !sd_sym(cryptolib, "OPENSSL_version_patch", &symbols[3].sym) + || !sd_sym(cryptolib, "OPENSSL_atexit", &symbols[4].sym)) { fprintf(stderr, "Failed to load libcrypto symbols\n"); goto end; } @@ -157,8 +157,8 @@ static int test_lib(void) myOPENSSL_version_minor = (OPENSSL_version_minor_t)symbols[2].func; myOPENSSL_version_patch = (OPENSSL_version_patch_t)symbols[3].func; if (myOPENSSL_version_major() != OPENSSL_VERSION_MAJOR - || myOPENSSL_version_minor() != OPENSSL_VERSION_MINOR - || myOPENSSL_version_patch() != OPENSSL_VERSION_PATCH) { + || myOPENSSL_version_minor() != OPENSSL_VERSION_MINOR + || myOPENSSL_version_patch() != OPENSSL_VERSION_PATCH) { fprintf(stderr, "Invalid library version number\n"); goto end; } @@ -170,7 +170,7 @@ static int test_lib(void) } if (test_type == DSO_REFTEST) { -# ifdef DSO_DLFCN +#ifdef DSO_DLFCN DSO_dsobyaddr_t myDSO_dsobyaddr; DSO_free_t myDSO_free; @@ -183,7 +183,7 @@ static int test_lib(void) * implemented there. */ if (!sd_sym(cryptolib, "DSO_dsobyaddr", &symbols[0].sym) - || !sd_sym(cryptolib, "DSO_free", &symbols[1].sym)) { + || !sd_sym(cryptolib, "DSO_free", &symbols[1].sym)) { fprintf(stderr, "Unable to load DSO symbols\n"); goto end; } @@ -201,7 +201,7 @@ static int test_lib(void) } myDSO_free(hndl); } -# endif /* DSO_DLFCN */ +#endif /* DSO_DLFCN */ } if (!sd_close(cryptolib)) { @@ -218,11 +218,11 @@ static int test_lib(void) ssllib = SD_INIT; } -# if defined(OPENSSL_NO_PINSHARED) \ - && defined(__GLIBC__) \ - && defined(__GLIBC_PREREQ) \ +#if defined(OPENSSL_NO_PINSHARED) \ + && defined(__GLIBC__) \ + && defined(__GLIBC_PREREQ) \ && defined(OPENSSL_SYS_LINUX) -# if __GLIBC_PREREQ(2, 3) +#if __GLIBC_PREREQ(2, 3) /* * If we didn't pin the so then we are hopefully on a platform that supports * running atexit() on so unload. If not we might crash. We know this is @@ -232,8 +232,8 @@ static int test_lib(void) fprintf(stderr, "atexit() handler did not run\n"); goto end; } -# endif -# endif +#endif +#endif result = 1; end: @@ -245,7 +245,6 @@ end: } #endif - /* * shlibloadtest should not use the normal test framework because we don't want * it to link against libcrypto (which the framework uses). The point of the |