Changes to work with OpenSSH and wpa_supplicant.

Change-Id: I19ed78acc67bd0ad8b905ce0ac628b39da8bb161

7 files changed, 72 insertions, 37 deletions

diff --git a/src/crypto/cipher/internal.h b/src/crypto/cipher/internal.h
index 2b8fb05..bc1e2de 100644
--- a/src/crypto/cipher/internal.h
+++ b/src/crypto/cipher/internal.h
@@ -66,42 +66,6 @@ extern "C" {
 #endif
 
 
-struct evp_cipher_st {
-  /* type contains a NID identifing the cipher. (For example, NID_rc4.) */
-  int nid;
-
-  /* block_size contains the block size, in bytes, of the cipher, or 1 for a
-   * stream cipher. */
-  unsigned block_size;
-
-  /* key_len contains the key size, in bytes, for the cipher. If the cipher
-   * takes a variable key size then this contains the default size. */
-  unsigned key_len;
-
-  /* iv_len contains the IV size, in bytes, or zero if inapplicable. */
-  unsigned iv_len;
-
-  /* ctx_size contains the size, in bytes, of the per-key context for this
-   * cipher. */
-  unsigned ctx_size;
-
-  /* flags contains the OR of a number of flags. See |EVP_CIPH_*|. */
-  uint32_t flags;
-
-  /* app_data is a pointer to opaque, user data. */
-  void *app_data;
-
-  int (*init)(EVP_CIPHER_CTX *ctx, const uint8_t *key, const uint8_t *iv,
-              int enc);
-
-  int (*cipher)(EVP_CIPHER_CTX *ctx, uint8_t *out, const uint8_t *in,
-                size_t inl);
-
-  int (*cleanup)(EVP_CIPHER_CTX *);
-
-  int (*ctrl)(EVP_CIPHER_CTX *, int type, int arg, void *ptr);
-};
-
 /* EVP_CIPH_MODE_MASK contains the bits of |flags| that represent the mode. */
 #define EVP_CIPH_MODE_MASK 0x3f
 
diff --git a/src/crypto/crypto.c b/src/crypto/crypto.c
index c463d5e..64e55f4 100644
--- a/src/crypto/crypto.c
+++ b/src/crypto/crypto.c
@@ -102,3 +102,11 @@ void CRYPTO_library_init(void) {
   do_library_init();
 #endif
 }
+
+const char *SSLeay_version(int unused) {
+  return SSLeay();
+}
+
+const char *SSLeay(void) {
+  return "BoringSSL";
+}
diff --git a/src/include/openssl/aes.h b/src/include/openssl/aes.h
index 11d83bb..84cde41 100644
--- a/src/include/openssl/aes.h
+++ b/src/include/openssl/aes.h
@@ -139,6 +139,18 @@ OPENSSL_EXPORT void AES_cfb128_encrypt(const uint8_t *in, uint8_t *out,
                                        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, unsigned in_len);
+OPENSSL_EXPORT int AES_unwrap_key(AES_KEY *key, const uint8_t *iv, uint8_t *out,
+                                  const uint8_t *in, unsigned in_len);
+
+
 #if defined(__cplusplus)
 }  /* extern C */
 #endif
diff --git a/src/include/openssl/cipher.h b/src/include/openssl/cipher.h
index 0dfd97b..b614333 100644
--- a/src/include/openssl/cipher.h
+++ b/src/include/openssl/cipher.h
@@ -484,6 +484,42 @@ typedef struct evp_cipher_info_st {
   unsigned char iv[EVP_MAX_IV_LENGTH];
 } EVP_CIPHER_INFO;
 
+struct evp_cipher_st {
+  /* type contains a NID identifing the cipher. (For example, NID_rc4.) */
+  int nid;
+
+  /* block_size contains the block size, in bytes, of the cipher, or 1 for a
+   * stream cipher. */
+  unsigned block_size;
+
+  /* key_len contains the key size, in bytes, for the cipher. If the cipher
+   * takes a variable key size then this contains the default size. */
+  unsigned key_len;
+
+  /* iv_len contains the IV size, in bytes, or zero if inapplicable. */
+  unsigned iv_len;
+
+  /* ctx_size contains the size, in bytes, of the per-key context for this
+   * cipher. */
+  unsigned ctx_size;
+
+  /* flags contains the OR of a number of flags. See |EVP_CIPH_*|. */
+  uint32_t flags;
+
+  /* app_data is a pointer to opaque, user data. */
+  void *app_data;
+
+  int (*init)(EVP_CIPHER_CTX *ctx, const uint8_t *key, const uint8_t *iv,
+              int enc);
+
+  int (*cipher)(EVP_CIPHER_CTX *ctx, uint8_t *out, const uint8_t *in,
+                size_t inl);
+
+  int (*cleanup)(EVP_CIPHER_CTX *);
+
+  int (*ctrl)(EVP_CIPHER_CTX *, int type, int arg, void *ptr);
+};
+
 
 /* Android compatibility section.
  *
diff --git a/src/include/openssl/crypto.h b/src/include/openssl/crypto.h
index 112431e..e58d5f0 100644
--- a/src/include/openssl/crypto.h
+++ b/src/include/openssl/crypto.h
@@ -32,6 +32,17 @@ extern "C" {
  * nothing and a static initializer is used instead. */
 OPENSSL_EXPORT void CRYPTO_library_init(void);
 
+#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);
+
+/* SSLeay is a compatibility function that returns the string "BoringSSL". */
+OPENSSL_EXPORT const char *SSLeay(void);
+
 
 #if defined(__cplusplus)
 }  /* extern C */
diff --git a/src/include/openssl/opensslv.h b/src/include/openssl/opensslv.h
index c2b3fe7..a3555d4 100644
--- a/src/include/openssl/opensslv.h
+++ b/src/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 "crypto.h"
diff --git a/src/include/openssl/ssl.h b/src/include/openssl/ssl.h
index 649e38f..eb8cad0 100644
--- a/src/include/openssl/ssl.h
+++ b/src/include/openssl/ssl.h
@@ -155,6 +155,9 @@
 /* Some code expected to get the threading functions by including ssl.h. */
 #include <openssl/thread.h>
 
+/* wpa_supplicant expects to get the version functions from ssl.h */
+#include <openssl/crypto.h>
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
@@ -2192,6 +2195,7 @@ OPENSSL_EXPORT int SSL_set_session_ticket_ext(SSL *s, void *ext_data,
                                               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);
 
 
 #ifdef  __cplusplus