Add some more Android compatibility declarations.
Change-Id: Ia1de2b746dec680eb59dc614295a1da289c5741a
diff --git a/include/openssl/aes.h b/include/openssl/aes.h
index 11d83bb..166b61c 100644
--- a/include/openssl/aes.h
+++ b/include/openssl/aes.h
@@ -139,6 +139,18 @@
uint8_t *ivec, int *num, int enc);
+/* Android compatibility section.
+ *
+ * These functions are declared, temporarily, for Android because
+ * wpa_supplicant will take a little time to sync with upstream. Outside of
+ * Android they'll have no definition. */
+
+OPENSSL_EXPORT int AES_wrap_key(AES_KEY *key, const uint8_t *iv, uint8_t *out,
+ const uint8_t *in, size_t in_len);
+OPENSSL_EXPORT int AES_unwrap_key(AES_KEY *key, const uint8_t *iv, uint8_t *out,
+ const uint8_t *in, size_t in_len);
+
+
#if defined(__cplusplus)
} /* extern C */
#endif
diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
index c2b3fe7..22f7e25 100644
--- a/include/openssl/opensslv.h
+++ b/include/openssl/opensslv.h
@@ -15,4 +15,4 @@
/* This header is provided in order to make compiling against code that expects
OpenSSL easier. */
-#include "base.h"
+#include "ssl.h"
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 8a0d80d..c19211e 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -2276,6 +2276,15 @@
int ext_len);
OPENSSL_EXPORT int SSL_set_session_secret_cb(SSL *s, void *cb, void *arg);
OPENSSL_EXPORT int SSL_set_session_ticket_ext_cb(SSL *s, void *cb, void *arg);
+OPENSSL_EXPORT int SSL_set_ssl_method(SSL *s, const SSL_METHOD *method);
+
+#define OPENSSL_VERSION_TEXT "BoringSSL"
+
+#define SSLEAY_VERSION 0
+
+/* SSLeay_version is a compatibility function that returns the string
+ * "BoringSSL". */
+OPENSSL_EXPORT const char *SSLeay_version(int unused);
#ifdef __cplusplus
