Skip to content

Commit

Permalink
lib-ssl-iostream: Fixed OpenSSL module to be actually initialized.
Browse files Browse the repository at this point in the history
  • Loading branch information
sirainen committed Sep 18, 2016
1 parent 609bea0 commit ecc2fb3
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/lib-http/test-http-client.c
Expand Up @@ -343,7 +343,7 @@ int main(int argc, char *argv[])
struct ioloop *ioloop;

lib_init();
iostream_openssl_init();
ssl_iostream_openssl_init();

ioloop = io_loop_create();
io_loop_set_running(ioloop);
Expand Down Expand Up @@ -400,6 +400,6 @@ int main(int argc, char *argv[])
dns_client_deinit(&dns_client);

io_loop_destroy(&ioloop);
iostream_openssl_deinit();
ssl_iostream_openssl_deinit();
lib_deinit();
}
4 changes: 2 additions & 2 deletions src/lib-ssl-iostream/iostream-openssl.c
Expand Up @@ -743,12 +743,12 @@ static const struct iostream_ssl_vfuncs ssl_vfuncs = {
openssl_iostream_get_last_error
};

void iostream_openssl_init(void)
void ssl_iostream_openssl_init(void)
{
iostream_ssl_module_init(&ssl_vfuncs);
}

void iostream_openssl_deinit(void)
void ssl_iostream_openssl_deinit(void)
{
openssl_iostream_global_deinit();
}
4 changes: 2 additions & 2 deletions src/lib-ssl-iostream/iostream-openssl.h
Expand Up @@ -95,7 +95,7 @@ const char *
openssl_iostream_use_certificate_error(const char *cert, const char *set_name);
void openssl_iostream_clear_errors(void);

void iostream_openssl_init(void);
void iostream_openssl_deinit(void);
void ssl_iostream_openssl_init(void);
void ssl_iostream_openssl_deinit(void);

#endif
1 change: 1 addition & 0 deletions src/lib-ssl-iostream/iostream-ssl.c
Expand Up @@ -45,6 +45,7 @@ static int ssl_module_load(const char **error_r)
module_dir_unload(&ssl_module);
return -1;
}
module_dir_init(ssl_module);

/* Destroy SSL module after (most of) the others. Especially lib-fs
backends may still want to access SSL module in their own
Expand Down

0 comments on commit ecc2fb3

Please sign in to comment.