am 12addf8c: external/boringssl: fix |SSLeay|.

* commit '12addf8c': external/boringssl: fix |SSLeay|.

am 12addf8c: external/boringssl: fix |SSLeay|.
* commit '12addf8c': external/boringssl: fix |SSLeay|.
771d6ac9 · Adam Langley · Android Git Automerger · 30598360 · 12addf8c · 771d6ac9
Commit 771d6ac9 authored 10 years ago by Adam Langley Committed by Android Git Automerger 10 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

src/crypto/crypto.c src/crypto/crypto.c +3 -3

src/include/openssl/crypto.h src/include/openssl/crypto.h +3 -2

No files found.
--- 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;
 }
--- 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)