summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-02-08 16:44:26 +0000
committerMatt Caswell <matt@openssl.org>2016-02-09 15:11:38 +0000
commit7fa792d14d06cdaca18f225b1d2d8daf8ed24fd7 (patch)
tree468e165201a7d2077e8843548b5c3d025a8adfd9 /include
parent7b9f8f7f03eda2faa1cdd42ed29a0b70e60eaf59 (diff)
Auto init/de-init libssl
Building on the pervious commit to auto initialise and de-initialise libssl Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'include')
-rw-r--r--include/openssl/ssl.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index ac61ccbdbb..51e5f991bc 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -1443,7 +1443,10 @@ __owur int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
const char *dir);
-void SSL_load_error_strings(void);
+#define SSL_load_error_strings() \
+ OPENSSL_INIT_ssl_library_start(OPENSSL_INIT_LOAD_SSL_STRINGS \
+ | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
+
__owur const char *SSL_state_string(const SSL *s);
__owur const char *SSL_rstate_string(const SSL *s);
__owur const char *SSL_state_string_long(const SSL *s);
@@ -1673,7 +1676,7 @@ void SSL_set_accept_state(SSL *s);
__owur long SSL_get_default_timeout(const SSL *s);
-int SSL_library_init(void);
+#define SSL_library_init() OPENSSL_INIT_ssl_library_start(0, NULL)
__owur char *SSL_CIPHER_description(const SSL_CIPHER *, char *buf, int size);
__owur STACK_OF(X509_NAME) *SSL_dup_CA_list(STACK_OF(X509_NAME) *sk);