diff options
Diffstat (limited to 'include/openssl')
-rw-r--r-- | include/openssl/aead.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/include/openssl/aead.h b/include/openssl/aead.h index 4f822e8c..092d2f62 100644 --- a/include/openssl/aead.h +++ b/include/openssl/aead.h @@ -98,23 +98,15 @@ OPENSSL_EXPORT const EVP_AEAD *EVP_aead_aes_128_gcm(void); /* EVP_aead_aes_256_gcm is AES-256 in Galois Counter Mode. */ OPENSSL_EXPORT const EVP_AEAD *EVP_aead_aes_256_gcm(void); +/* EVP_aead_chacha20_poly1305 is the AEAD built from ChaCha20 and + * Poly1305 as described in RFC 7539. */ +OPENSSL_EXPORT const EVP_AEAD *EVP_aead_chacha20_poly1305(void); + /* EVP_aead_chacha20_poly1305_old is an AEAD built from ChaCha20 and * Poly1305 that is used in the experimental ChaCha20-Poly1305 TLS cipher * suites. */ OPENSSL_EXPORT const EVP_AEAD *EVP_aead_chacha20_poly1305_old(void); -/* EVP_aead_chacha20_poly1305 is currently an alias for - * |EVP_aead_chacha20_poly1305_old|. In the future, the RFC 7539 version will - * take this name. */ -OPENSSL_EXPORT const EVP_AEAD *EVP_aead_chacha20_poly1305(void); - -/* EVP_aead_chacha20_poly1305_rfc7539 is the AEAD built from ChaCha20 and - * Poly1305 as described in RFC 7539. - * - * WARNING: this function is not ready yet. It will be renamed in the future to - * drop the “_rfc7539” suffix. */ -OPENSSL_EXPORT const EVP_AEAD *EVP_aead_chacha20_poly1305_rfc7539(void); - /* EVP_aead_aes_128_key_wrap is AES-128 Key Wrap mode. This should never be * used except to interoperate with existing systems that use this mode. * @@ -339,6 +331,14 @@ OPENSSL_EXPORT int EVP_AEAD_CTX_get_iv(const EVP_AEAD_CTX *ctx, const uint8_t **out_iv, size_t *out_len); +/* Deprecated functions. */ + +/* EVP_aead_chacha20_poly1305_rfc7539 calls |EVP_aead_chacha20_poly1305|. + * + * TODO(davidben): Remove this. */ +OPENSSL_EXPORT const EVP_AEAD *EVP_aead_chacha20_poly1305_rfc7539(void); + + #if defined(__cplusplus) } /* extern C */ #endif |