kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add an OPENSSL_malloc_init stub.

Browse Source 
OpenSSL 1.1.0 renamed that. Also clang-format wanted to smush it all
onto one line.

Change-Id: Icdaa0eefc503c4aab1b309ccb34625f5e811c537
Reviewed-on: https://boringssl-review.googlesource.com/27404
Commit-Queue: Steven Valdez <svaldez@google.com>
Reviewed-by: Steven Valdez <svaldez@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
This commit is contained in:
David Benjamin 2018-04-12 18:31:36 -04:00 committed by CQ bot account: commit-bot@chromium.org
parent de20810fb4
commit 27e4c3bab2
2 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
crypto/crypto.c
View File

@ -164,31 +164,21 @@ int CRYPTO_has_asm(void) {
#endif #endif
} }
const char *SSLeay_version(int unused) { const char *SSLeay_version(int unused) { return "BoringSSL"; }
return "BoringSSL";
}
const char *OpenSSL_version(int unused) { const char *OpenSSL_version(int unused) { return "BoringSSL"; }
return "BoringSSL";
}
unsigned long SSLeay(void) { unsigned long SSLeay(void) { return OPENSSL_VERSION_NUMBER; }
return OPENSSL_VERSION_NUMBER;
}
unsigned long OpenSSL_version_num(void) { unsigned long OpenSSL_version_num(void) { return OPENSSL_VERSION_NUMBER; }
return OPENSSL_VERSION_NUMBER;
}
int CRYPTO_malloc_init(void) { int CRYPTO_malloc_init(void) { return 1; }
return 1;
} int OPENSSL_malloc_init(void) { return 1; }
void ENGINE_load_builtin_engines(void) {} void ENGINE_load_builtin_engines(void) {}
int ENGINE_register_all_complete(void) { int ENGINE_register_all_complete(void) { return 1; }
return 1;
}
void OPENSSL_load_builtin_modules(void) {} void OPENSSL_load_builtin_modules(void) {}

3
include/openssl/crypto.h
View File

@ -92,6 +92,9 @@ OPENSSL_EXPORT unsigned long OpenSSL_version_num(void);
// CRYPTO_malloc_init returns one. // CRYPTO_malloc_init returns one.
OPENSSL_EXPORT int CRYPTO_malloc_init(void); OPENSSL_EXPORT int CRYPTO_malloc_init(void);
// OPENSSL_malloc_init returns one.
OPENSSL_EXPORT int OPENSSL_malloc_init(void);
// ENGINE_load_builtin_engines does nothing. // ENGINE_load_builtin_engines does nothing.
OPENSSL_EXPORT void ENGINE_load_builtin_engines(void); OPENSSL_EXPORT void ENGINE_load_builtin_engines(void);