| commit | 05ee4fda1c90612e9669dcc8b171fb0038c1728d | [log] [tgz] |
|---|---|---|
| author | Adam Langley <alangley@gmail.com> | Sun Aug 02 09:35:44 2015 -0700 |
| committer | Adam Langley <alangley@gmail.com> | Tue Oct 27 16:41:40 2015 +0000 |
| tree | faa627238d670a6970a5e526d1c9ce546284f964 | |
| parent | 2e3c978d14398d8234e55025d8644407274dc740 [diff] |
Add no-op functions |CRYPTO_malloc_init| and |ENGINE_load_builtin_engines|. This reduces the impact on Netty. See https://github.com/Scottmitch/netty-tcnative/commit/904b84ce41fc44dd1d3955df69912d91906c9877#commitcomment-12159877 Change-Id: I22f9e1edaeb9e721326867ae2b4f3da2c5441437 Reviewed-on: https://boringssl-review.googlesource.com/5535 Reviewed-by: Adam Langley <alangley@gmail.com>
diff --git a/crypto/crypto.c b/crypto/crypto.c index 26fbd70..d70c8c7 100644 --- a/crypto/crypto.c +++ b/crypto/crypto.c
@@ -130,3 +130,9 @@ unsigned long SSLeay(void) { return OPENSSL_VERSION_NUMBER; } + +int CRYPTO_malloc_init(void) { + return 1; +} + +void ENGINE_load_builtin_engines(void) {}
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index 5207a12..b421884 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h
@@ -54,6 +54,12 @@ * base.h. */ OPENSSL_EXPORT unsigned long SSLeay(void); +/* CRYPTO_malloc_init returns one. */ +OPENSSL_EXPORT int CRYPTO_malloc_init(void); + +/* ENGINE_load_builtin_engines does nothing. */ +OPENSSL_EXPORT void ENGINE_load_builtin_engines(void); + #if defined(__cplusplus) } /* extern C */