summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2015-05-19 15:56:28 -0700
committerChih-Hung Hsieh <chh@google.com>2015-05-21 10:24:06 -0700
commit58dc65d0b61c75c2d7ffcc942ec4e9f43b70b9cc (patch)
treeafc9dd368c9923d7556fb7f42bd3075060563c2d
parent21c70997ab3c62b97960fd66f02b619850e5d978 (diff)
downloadexternal_boringssl-58dc65d0b61c75c2d7ffcc942ec4e9f43b70b9cc.zip
external_boringssl-58dc65d0b61c75c2d7ffcc942ec4e9f43b70b9cc.tar.gz
external_boringssl-58dc65d0b61c75c2d7ffcc942ec4e9f43b70b9cc.tar.bz2
external/boringssl: fix |SSLeay|.
SSLeay is a compatibility function for OpenSSL, but I got it wrong. It doesn't return a string, it returns a number. This doesn't end up making any difference, but it fixes a warning when building OpenSSH. Bug: 21304170 Change-Id: I3e4bb0240b18647cfe2a3ce5869948a4527ff0f0 (cherry picked from commit 12addf8c63e77091bece8ad715f30cfd957a5332)
-rw-r--r--src/crypto/crypto.c6
-rw-r--r--src/include/openssl/crypto.h5
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)