summaryrefslogtreecommitdiffstats
path: root/src/include/openssl/aes.h
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2015-03-24 18:25:20 -0700
committerAdam Langley <agl@google.com>2015-03-24 18:28:00 -0700
commitf40f42df67fffec64967b000e4fdad4b435611a5 (patch)
tree086deea6861fc4705bb472a41a0f3aa62c4c38da /src/include/openssl/aes.h
parentb051df5cb1e83aa9ffdfe28406b6d9e33321912a (diff)
downloadexternal_boringssl-f40f42df67fffec64967b000e4fdad4b435611a5.zip
external_boringssl-f40f42df67fffec64967b000e4fdad4b435611a5.tar.gz
external_boringssl-f40f42df67fffec64967b000e4fdad4b435611a5.tar.bz2
Changes to work with OpenSSH and wpa_supplicant.
Change-Id: I19ed78acc67bd0ad8b905ce0ac628b39da8bb161
Diffstat (limited to 'src/include/openssl/aes.h')
-rw-r--r--src/include/openssl/aes.h12
1 files changed, 12 insertions, 0 deletions
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