commit 4838d8aa904fccf47eb4a122f97f60e2e29eabbd
author Matt Braithwaite <mab@google.com> Thu Aug 20 13:20:03 2015 -0700
committer Adam Langley <agl@google.com> Thu Aug 20 21:33:50 2015 +0000
tree ab76801edded2e9b0e8e773f967d1be5c6c00f66
parent d82a7b24be3bc4e14817d383b71b62000bb469cf

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 <agl@google.com>

include/openssl/ssl.h

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 8397b74..d6e352e 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -2506,6 +2506,7 @@
                                             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

ssl/ssl_lib.c

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 988b3a1..5e322d9 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -2877,3 +2877,4 @@
 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) {}