diff options
author | David Benjamin <davidben@chromium.org> | 2015-12-01 02:48:18 +0300 |
---|---|---|
committer | Adam Langley <agl@google.com> | 2015-12-17 00:22:11 +0300 |
commit | 8ffab7268380fd97236a323ccbf992642861a8e2 (patch) | |
tree | d16eb1ff8d9b8a41c563746e75556040ad07ecc3 /include/openssl | |
parent | fef6fb592bb8277a555818c4152c9ebfcf9e5533 (diff) |
Point EVP_aead_chacha20_poly1305 at the standardized version.
The consumers have all been updated, so we can move EVP_aead_chacha20_poly1305
to its final state. Unfortunately, the _rfc7539-suffixed version will need to
stick around for just a hair longer. Also the tls1.h macros, but the remaining
consumers are okay with that changing underneath them.
Change-Id: Ibbb70ec1860d6ac6a7e1d7b45e70fe692bf5ebe5
Reviewed-on: https://boringssl-review.googlesource.com/6600
Reviewed-by: Adam Langley <agl@google.com>
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 |