summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authortb <>2023-08-24 04:33:08 +0000
committertb <>2023-08-24 04:33:08 +0000
commit14e26ad5d225e7e7a8fdad4bd07c1850bb8669af (patch)
tree45fa3a8aee09dfb553e266f49e6783a3756b02f0 /src/lib
parent851839832e584adcccd0414ca001abedc4e7fbc1 (diff)
downloadopenbsd-14e26ad5d225e7e7a8fdad4bd07c1850bb8669af.tar.gz
openbsd-14e26ad5d225e7e7a8fdad4bd07c1850bb8669af.tar.bz2
openbsd-14e26ad5d225e7e7a8fdad4bd07c1850bb8669af.zip
Update references from RFC 7539 to RFC 8439
RFC 7539 was superseded by RFC 8439, incorporating errata and making editorial improvements. Very little of substance changed, in particular section numbers remain the same. Prompted by a question from schwarze
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/evp/e_chacha20poly1305.c6
-rw-r--r--src/lib/libcrypto/man/EVP_AEAD_CTX_init.38
-rw-r--r--src/lib/libcrypto/man/EVP_chacha20.36
3 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/libcrypto/evp/e_chacha20poly1305.c b/src/lib/libcrypto/evp/e_chacha20poly1305.c
index a17657899b..33d09315e0 100644
--- a/src/lib/libcrypto/evp/e_chacha20poly1305.c
+++ b/src/lib/libcrypto/evp/e_chacha20poly1305.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_chacha20poly1305.c,v 1.30 2023/07/07 19:37:53 beck Exp $ */ 1/* $OpenBSD: e_chacha20poly1305.c,v 1.31 2023/08/24 04:33:08 tb Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2022 Joel Sing <jsing@openbsd.org> 4 * Copyright (c) 2022 Joel Sing <jsing@openbsd.org>
@@ -106,7 +106,7 @@ poly1305_pad16(poly1305_state *poly1305, size_t data_len)
106 static const unsigned char zero_pad16[16]; 106 static const unsigned char zero_pad16[16];
107 size_t pad_len; 107 size_t pad_len;
108 108
109 /* pad16() is defined in RFC 7539 2.8.1. */ 109 /* pad16() is defined in RFC 8439 2.8.1. */
110 if ((pad_len = data_len % 16) == 0) 110 if ((pad_len = data_len % 16) == 0)
111 return; 111 return;
112 112
@@ -330,7 +330,7 @@ aead_xchacha20_poly1305_open(const EVP_AEAD_CTX *ctx, unsigned char *out,
330 return 1; 330 return 1;
331} 331}
332 332
333/* RFC 7539 */ 333/* RFC 8439 */
334static const EVP_AEAD aead_chacha20_poly1305 = { 334static const EVP_AEAD aead_chacha20_poly1305 = {
335 .key_len = 32, 335 .key_len = 32,
336 .nonce_len = CHACHA20_NONCE_LEN, 336 .nonce_len = CHACHA20_NONCE_LEN,
diff --git a/src/lib/libcrypto/man/EVP_AEAD_CTX_init.3 b/src/lib/libcrypto/man/EVP_AEAD_CTX_init.3
index fac1696d74..ad37842cc8 100644
--- a/src/lib/libcrypto/man/EVP_AEAD_CTX_init.3
+++ b/src/lib/libcrypto/man/EVP_AEAD_CTX_init.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: EVP_AEAD_CTX_init.3,v 1.12 2023/08/23 13:46:42 schwarze Exp $ 1.\" $OpenBSD: EVP_AEAD_CTX_init.3,v 1.13 2023/08/24 04:33:08 tb Exp $
2.\" 2.\"
3.\" Copyright (c) 2014, Google Inc. 3.\" Copyright (c) 2014, Google Inc.
4.\" Parts of the text were written by Adam Langley and David Benjamin. 4.\" Parts of the text were written by Adam Langley and David Benjamin.
@@ -16,7 +16,7 @@
16.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 16.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
17.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 17.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18.\" 18.\"
19.Dd $Mdocdate: August 23 2023 $ 19.Dd $Mdocdate: August 24 2023 $
20.Dt EVP_AEAD_CTX_INIT 3 20.Dt EVP_AEAD_CTX_INIT 3
21.Os 21.Os
22.Sh NAME 22.Sh NAME
@@ -383,8 +383,8 @@ style used by AEAD in TLS and incompatible with RFC 7905:
383.Rs 383.Rs
384.%A Y. Nir 384.%A Y. Nir
385.%A A. Langley 385.%A A. Langley
386.%D May 2015 386.%D June 2018
387.%R RFC 7539 387.%R RFC 8439
388.%T ChaCha20 and Poly1305 for IETF Protocols 388.%T ChaCha20 and Poly1305 for IETF Protocols
389.Re 389.Re
390.Pp 390.Pp
diff --git a/src/lib/libcrypto/man/EVP_chacha20.3 b/src/lib/libcrypto/man/EVP_chacha20.3
index 55e730ec9c..14a26b3043 100644
--- a/src/lib/libcrypto/man/EVP_chacha20.3
+++ b/src/lib/libcrypto/man/EVP_chacha20.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: EVP_chacha20.3,v 1.5 2023/08/24 04:23:30 tb Exp $ 1.\" $OpenBSD: EVP_chacha20.3,v 1.6 2023/08/24 04:33:08 tb Exp $
2.\" full merge up to: OpenSSL 35fd9953 May 28 14:49:38 2019 +0200 2.\" full merge up to: OpenSSL 35fd9953 May 28 14:49:38 2019 +0200
3.\" 3.\"
4.\" This file is a derived work. 4.\" This file is a derived work.
@@ -281,8 +281,8 @@ style used by AEAD in TLS and incompatible with RFC 7905:
281.Rs 281.Rs
282.%A Y. Nir 282.%A Y. Nir
283.%A A. Langley 283.%A A. Langley
284.%D May 2015 284.%D May 2018
285.%R RFC 7539 285.%R RFC 8439
286.%T ChaCha20 and Poly1305 for IETF Protocols 286.%T ChaCha20 and Poly1305 for IETF Protocols
287.Re 287.Re
288.Pp 288.Pp