diff options
| author | Adam Langley <agl@google.com> | 2015-04-08 11:18:53 -0700 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-04-08 11:18:53 -0700 |
| commit | 13d393edba74704aaa75af5a82c4e8ecea69d4ae (patch) | |
| tree | d08b58f6d5509fb34e1479e9c0a5e7aa0bd321a8 /src/include/openssl/cipher.h | |
| parent | f7e890d94bfb2ecad87621eed301e1897b5a6aef (diff) | |
| download | external_boringssl-13d393edba74704aaa75af5a82c4e8ecea69d4ae.zip external_boringssl-13d393edba74704aaa75af5a82c4e8ecea69d4ae.tar.gz external_boringssl-13d393edba74704aaa75af5a82c4e8ecea69d4ae.tar.bz2 | |
BoringSSL: support AES-192.
Keystore has added support for it so these functions are needed again.
Change-Id: Id3bf3dd10e182fe7a9b1c51bd3184ecac4cfde8b
Diffstat (limited to 'src/include/openssl/cipher.h')
| -rw-r--r-- | src/include/openssl/cipher.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/include/openssl/cipher.h b/src/include/openssl/cipher.h index b614333..adca5a9 100644 --- a/src/include/openssl/cipher.h +++ b/src/include/openssl/cipher.h @@ -90,6 +90,12 @@ OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_256_ctr(void); OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_128_gcm(void); OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_256_gcm(void); +/* Deprecated 192-bit version of AES. */ +OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_192_cbc(void); +OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_192_ctr(void); +OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_192_ecb(void); +OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_192_gcm(void); + /* EVP_enc_null returns a 'cipher' that passes plaintext through as * ciphertext. */ OPENSSL_EXPORT const EVP_CIPHER *EVP_enc_null(void); @@ -521,16 +527,6 @@ struct evp_cipher_st { }; -/* 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 const EVP_CIPHER *EVP_aes_192_ecb(void); -OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_192_cbc(void); - - #if defined(__cplusplus) } /* extern C */ #endif |