yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add no-op functions |CRYPTO_malloc_init| and |ENGINE_load_builtin_engines|.

Browse Source 
This reduces the impact on Netty. See
904b84ce41 (commitcomment-12159877)

Change-Id: I22f9e1edaeb9e721326867ae2b4f3da2c5441437
Reviewed-on: https://boringssl-review.googlesource.com/5535
Reviewed-by: Adam Langley <alangley@gmail.com>
This commit is contained in:
Adam Langley 2015-08-02 09:35:44 -07:00
parent 2e3c978d14
commit 05ee4fda1c
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/crypto.c
View File

@ -130,3 +130,9 @@ const char *SSLeay_version(int unused) {
unsigned long SSLeay(void) {
return OPENSSL_VERSION_NUMBER;
}
int CRYPTO_malloc_init(void) {
return 1;
}
void ENGINE_load_builtin_engines(void) {}

6
include/openssl/crypto.h
View File

@ -54,6 +54,12 @@ OPENSSL_EXPORT const char *SSLeay_version(int unused);
* 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 */