diff options
| author | Adam Langley <agl@google.com> | 2015-05-20 03:03:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-20 03:03:20 +0000 |
| commit | 771d6ac93662f1e1c83df5087ff5ce54fe794d80 (patch) | |
| tree | 0d2b57963c91e7abe6deb571d2322402df9c82c0 | |
| parent | 305983601d04892887603b9a14695f58d9bc2481 (diff) | |
| parent | 12addf8c63e77091bece8ad715f30cfd957a5332 (diff) | |
| download | external_boringssl-771d6ac93662f1e1c83df5087ff5ce54fe794d80.zip external_boringssl-771d6ac93662f1e1c83df5087ff5ce54fe794d80.tar.gz external_boringssl-771d6ac93662f1e1c83df5087ff5ce54fe794d80.tar.bz2 | |
am 12addf8c: external/boringssl: fix |SSLeay|.
* commit '12addf8c63e77091bece8ad715f30cfd957a5332':
external/boringssl: fix |SSLeay|.
| -rw-r--r-- | src/crypto/crypto.c | 6 | ||||
| -rw-r--r-- | src/include/openssl/crypto.h | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/crypto/crypto.c b/src/crypto/crypto.c index 64e55f4..d9bb07e 100644 --- a/src/crypto/crypto.c +++ b/src/crypto/crypto.c @@ -104,9 +104,9 @@ void CRYPTO_library_init(void) { } const char *SSLeay_version(int unused) { - return SSLeay(); + return "BoringSSL"; } -const char *SSLeay(void) { - return "BoringSSL"; +unsigned long SSLeay(void) { + return OPENSSL_VERSION_NUMBER; } diff --git a/src/include/openssl/crypto.h b/src/include/openssl/crypto.h index 5c974f8..3af1547 100644 --- a/src/include/openssl/crypto.h +++ b/src/include/openssl/crypto.h @@ -46,8 +46,9 @@ OPENSSL_EXPORT void CRYPTO_library_init(void); * "BoringSSL". */ OPENSSL_EXPORT const char *SSLeay_version(int unused); -/* SSLeay is a compatibility function that returns the string "BoringSSL". */ -OPENSSL_EXPORT const char *SSLeay(void); +/* SSLeay is a compatibility function that returns OPENSSL_VERSION_NUMBER from + * base.h. */ +OPENSSL_EXPORT unsigned long SSLeay(void); #if defined(__cplusplus) |