Skip to content

Commit

Permalink
test/shlibloadtest: small fixes
Browse files Browse the repository at this point in the history
- Make sure to initialise SHLIB variables
- Make sure to make local variables static

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from #1838)
(cherry picked from commit 3b0478f)
  • Loading branch information
levitte committed Nov 3, 2016
1 parent 22173a4 commit b754f9a
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions test/shlibloadtest.c
Expand Up @@ -28,12 +28,12 @@ typedef void (*SSL_CTX_free_t)(SSL_CTX *);
typedef unsigned long (*ERR_get_error_t)(void);
typedef unsigned long (*OpenSSL_version_num_t)(void);

TLS_method_t TLS_method;
SSL_CTX_new_t SSL_CTX_new;
SSL_CTX_free_t SSL_CTX_free;
static TLS_method_t TLS_method;
static SSL_CTX_new_t SSL_CTX_new;
static SSL_CTX_free_t SSL_CTX_free;

ERR_get_error_t ERR_get_error;
OpenSSL_version_num_t OpenSSL_version_num;
static ERR_get_error_t ERR_get_error;
static OpenSSL_version_num_t OpenSSL_version_num;


#ifdef DSO_DLFCN
Expand All @@ -42,6 +42,7 @@ OpenSSL_version_num_t OpenSSL_version_num;

typedef void * SHLIB;
typedef void * SHLIB_SYM;
# define SHLIB_INIT NULL

# define SHARED_LIBRARY_SUFFIX ".so"

Expand Down Expand Up @@ -87,6 +88,7 @@ static int shlib_close(SHLIB lib)

typedef HINSTANCE SHLIB;
typedef void * SHLIB_SYM;
# define SHLIB_INIT 0

static int shlib_load(char *filename, SHLIB *lib)
{
Expand Down Expand Up @@ -129,7 +131,7 @@ enum test_types_en {

int main(int argc, char **argv)
{
SHLIB ssllib, cryptolib;
SHLIB ssllib = SHLIB_INIT, cryptolib = SHLIB_INIT;
SSL_CTX *ctx;
union {
void (*func) (void);
Expand Down

0 comments on commit b754f9a

Please sign in to comment.