diff options
| author | reyk <> | 2015-11-02 15:40:53 +0000 |
|---|---|---|
| committer | reyk <> | 2015-11-02 15:40:53 +0000 |
| commit | 3e2680fbd9dc7657b729f24a677f5ec057643aa6 (patch) | |
| tree | 40446be7b959dce9252457817e67737c7606706c /src/lib/libcrypto/evp/evp.h | |
| parent | 7e3ae45186eaca587d36fb66eb7b7d50236f87da (diff) | |
| download | openbsd-3e2680fbd9dc7657b729f24a677f5ec057643aa6.tar.gz openbsd-3e2680fbd9dc7657b729f24a677f5ec057643aa6.tar.bz2 openbsd-3e2680fbd9dc7657b729f24a677f5ec057643aa6.zip | |
Add EVP_aead_chacha20_poly1305_ietf() - The informational RFC 7539,
"ChaCha20 and Poly1305 for IETF Protocols", introduced a modified AEAD
construction that is incompatible with the common style that has been
already used in TLS with EVP_aead_chacha20_poly1305(). The IETF
version also adds a constant (salt) that is prepended to the nonce.
OK mikeb@ jsing@
Diffstat (limited to 'src/lib/libcrypto/evp/evp.h')
| -rw-r--r-- | src/lib/libcrypto/evp/evp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h index 2ddbf6142e..1ec24879c0 100644 --- a/src/lib/libcrypto/evp/evp.h +++ b/src/lib/libcrypto/evp/evp.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: evp.h,v 1.48 2015/09/14 01:45:03 doug Exp $ */ | 1 | /* $OpenBSD: evp.h,v 1.49 2015/11/02 15:40:53 reyk Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -1215,6 +1215,7 @@ const EVP_AEAD *EVP_aead_aes_256_gcm(void); | |||
| 1215 | #if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305) | 1215 | #if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305) |
| 1216 | /* EVP_aead_chacha20_poly1305 is ChaCha20 with a Poly1305 authenticator. */ | 1216 | /* EVP_aead_chacha20_poly1305 is ChaCha20 with a Poly1305 authenticator. */ |
| 1217 | const EVP_AEAD *EVP_aead_chacha20_poly1305(void); | 1217 | const EVP_AEAD *EVP_aead_chacha20_poly1305(void); |
| 1218 | const EVP_AEAD *EVP_aead_chacha20_poly1305_ietf(void); | ||
| 1218 | #endif | 1219 | #endif |
| 1219 | 1220 | ||
| 1220 | /* EVP_AEAD_key_length returns the length of the keys used. */ | 1221 | /* EVP_AEAD_key_length returns the length of the keys used. */ |
