diff options
| author | Adam Langley <agl@google.com> | 2015-05-21 17:39:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-21 17:39:42 +0000 |
| commit | 16eeb4c77688e29b80a9edc981069be8e77d638b (patch) | |
| tree | afc9dd368c9923d7556fb7f42bd3075060563c2d | |
| parent | fa32bda8a343ff3d1fccbda3846e05f01f2746d6 (diff) | |
| parent | 58dc65d0b61c75c2d7ffcc942ec4e9f43b70b9cc (diff) | |
| download | external_boringssl-16eeb4c77688e29b80a9edc981069be8e77d638b.zip external_boringssl-16eeb4c77688e29b80a9edc981069be8e77d638b.tar.gz external_boringssl-16eeb4c77688e29b80a9edc981069be8e77d638b.tar.bz2 | |
am 58dc65d0: external/boringssl: fix |SSLeay|.
* commit '58dc65d0b61c75c2d7ffcc942ec4e9f43b70b9cc':
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) |