yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reference the newer ChaCha20-Poly1305 RFC.

Browse Source 
Just some errata applied, otherwise the same.
https://tools.ietf.org/rfcdiff?url2=rfc8439&url1=rfc7539

Change-Id: I0cf5d50eeca7840d0ab99c54e06f1008ac423211
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/47264
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2021-04-29 15:30:25 -04:00 committed by Adam Langley
parent 1cf78cd290
commit d4f877ea3c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/cipher_extra/test/chacha20_poly1305_tests.txt
View File

@ -1,4 +1,4 @@
# Test vector from RFC 7539 Section 2.8.1. # Test vector from RFC 8439 Section 2.8.1.
KEY: 808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f KEY: 808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f
NONCE: 070000004041424344454647 NONCE: 070000004041424344454647

4
crypto/poly1305/poly1305_tests.txt
View File

@ -1,11 +1,11 @@
# RFC 7539, section 2.5.2. # RFC 8439, section 2.5.2.
Key = 85d6be7857556d337f4452fe42d506a80103808afb0db2fd4abff6af4149f51b Key = 85d6be7857556d337f4452fe42d506a80103808afb0db2fd4abff6af4149f51b
Input = "Cryptographic Forum Research Group" Input = "Cryptographic Forum Research Group"
MAC = a8061dc1305136c6c22b8baf0c0127a9 MAC = a8061dc1305136c6c22b8baf0c0127a9
# RFC 7539, section A.3. # RFC 8439, section A.3.
Key = 0000000000000000000000000000000000000000000000000000000000000000 Key = 0000000000000000000000000000000000000000000000000000000000000000
Input = 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 Input = 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000

2
include/openssl/aead.h
View File

@ -122,7 +122,7 @@ OPENSSL_EXPORT const EVP_AEAD *EVP_aead_aes_192_gcm(void);
OPENSSL_EXPORT const EVP_AEAD *EVP_aead_aes_256_gcm(void); OPENSSL_EXPORT const EVP_AEAD *EVP_aead_aes_256_gcm(void);
// EVP_aead_chacha20_poly1305 is the AEAD built from ChaCha20 and // EVP_aead_chacha20_poly1305 is the AEAD built from ChaCha20 and
// Poly1305 as described in RFC 7539. // Poly1305 as described in RFC 8439.
OPENSSL_EXPORT const EVP_AEAD *EVP_aead_chacha20_poly1305(void); OPENSSL_EXPORT const EVP_AEAD *EVP_aead_chacha20_poly1305(void);
// EVP_aead_xchacha20_poly1305 is ChaCha20-Poly1305 with an extended nonce that // EVP_aead_xchacha20_poly1305 is ChaCha20-Poly1305 with an extended nonce that

2
include/openssl/chacha.h
View File

@ -23,7 +23,7 @@ extern "C" {
// ChaCha20. // ChaCha20.
// //
// ChaCha20 is a stream cipher. See https://tools.ietf.org/html/rfc7539. // ChaCha20 is a stream cipher. See https://tools.ietf.org/html/rfc8439.
// CRYPTO_chacha_20 encrypts |in_len| bytes from |in| with the given key and // CRYPTO_chacha_20 encrypts |in_len| bytes from |in| with the given key and