From 4838d8aa904fccf47eb4a122f97f60e2e29eabbd Mon Sep 17 00:00:00 2001 From: Matt Braithwaite Date: Thu, 20 Aug 2015 13:20:03 -0700 Subject: [PATCH] Add do-nothing function |ERR_load_SSL_strings|. This benefits pyOpenSSL. Change-Id: Ie7a35d6f9e9a1f0c7fe42ba105c68c327f7d0b0e Reviewed-on: https://boringssl-review.googlesource.com/5740 Reviewed-by: Adam Langley --- include/openssl/ssl.h | 1 + ssl/ssl_lib.c | 1 + 2 files changed, 2 insertions(+) diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 8397b74c..d6e352ed 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -2506,6 +2506,7 @@ OPENSSL_EXPORT void SSL_get_structure_sizes(size_t *ssl_size, size_t *ssl_ctx_size, size_t *ssl_session_size); +/* ERR_load_SSL_strings does nothing. */ OPENSSL_EXPORT void ERR_load_SSL_strings(void); /* SSL_get_rc4_state sets |*read_key| and |*write_key| to the RC4 states for diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 988b3a14..5e322d92 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -2877,3 +2877,4 @@ int SSL_CTX_sess_cb_hits(const SSL_CTX *ctx) { return 0; } int SSL_CTX_sess_misses(const SSL_CTX *ctx) { return 0; } int SSL_CTX_sess_timeouts(const SSL_CTX *ctx) { return 0; } int SSL_CTX_sess_cache_full(const SSL_CTX *ctx) { return 0; } +void ERR_load_SSL_strings(void) {}