2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/evp/e_chacha20poly1305.c b/src/lib/libcrypto/evp/e_chacha20poly1305.c
index 47551c4578..2eb9ab8c0e 100644
--- a/src/lib/libcrypto/evp/e_chacha20poly1305.c
+++ b/src/lib/libcrypto/evp/e_chacha20poly1305.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_chacha20poly1305.c,v 1.11 2015/11/02 15:40:53 reyk Exp $ */
+/* $OpenBSD: e_chacha20poly1305.c,v 1.12 2015/11/02 15:43:55 reyk Exp $ */
 /*
 * Copyright (c) 2015 Reyk Floter <reyk@openbsd.org>
@@ -37,8 +37,8 @@
 /*
 * The informational RFC 7539, "ChaCha20 and Poly1305 for IETF Protocols",
 * introduced a modified AEAD construction that is incompatible with the
- * common style that that has been already used in TLS.  The IETF version
+ * common style that has been already used in TLS.  The IETF version also
- * also adds a constant (salt) that is prepended to the nonce.
+ * adds a constant (salt) that is prepended to the nonce.
 */
 #define CHACHA20_CONSTANT_LEN 4
 #define CHACHA20_IV_LEN 8
diff --git a/src/lib/libssl/src/crypto/evp/e_chacha20poly1305.c b/src/lib/libssl/src/crypto/evp/e_chacha20poly1305.c
index 47551c4578..2eb9ab8c0e 100644
--- a/src/lib/libssl/src/crypto/evp/e_chacha20poly1305.c
+++ b/src/lib/libssl/src/crypto/evp/e_chacha20poly1305.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_chacha20poly1305.c,v 1.11 2015/11/02 15:40:53 reyk Exp $ */
+/* $OpenBSD: e_chacha20poly1305.c,v 1.12 2015/11/02 15:43:55 reyk Exp $ */
 /*
 * Copyright (c) 2015 Reyk Floter <reyk@openbsd.org>
@@ -37,8 +37,8 @@
 /*
 * The informational RFC 7539, "ChaCha20 and Poly1305 for IETF Protocols",
 * introduced a modified AEAD construction that is incompatible with the
- * common style that that has been already used in TLS.  The IETF version
+ * common style that has been already used in TLS.  The IETF version also
- * also adds a constant (salt) that is prepended to the nonce.
+ * adds a constant (salt) that is prepended to the nonce.
 */
 #define CHACHA20_CONSTANT_LEN 4
 #define CHACHA20_IV_LEN 8

diff --git a/src/lib/libcrypto/evp/e_chacha20poly1305.c b/src/lib/libcrypto/evp/e_chacha20poly1305.c index 47551c4578..2eb9ab8c0e 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.11 2015/11/02 15:40:53 reyk Exp $ */	1	/* $OpenBSD: e_chacha20poly1305.c,v 1.12 2015/11/02 15:43:55 reyk Exp $ */
2		2
3	/*	3	/*
4	* Copyright (c) 2015 Reyk Floter <reyk@openbsd.org>	4	* Copyright (c) 2015 Reyk Floter <reyk@openbsd.org>
@@ -37,8 +37,8 @@
37	/*	37	/*
38	* The informational RFC 7539, "ChaCha20 and Poly1305 for IETF Protocols",	38	* The informational RFC 7539, "ChaCha20 and Poly1305 for IETF Protocols",
39	* introduced a modified AEAD construction that is incompatible with the	39	* introduced a modified AEAD construction that is incompatible with the
40	* common style that that has been already used in TLS. The IETF version	40	* common style that has been already used in TLS. The IETF version also
41	* also adds a constant (salt) that is prepended to the nonce.	41	* adds a constant (salt) that is prepended to the nonce.
42	*/	42	*/
43	#define CHACHA20_CONSTANT_LEN 4	43	#define CHACHA20_CONSTANT_LEN 4
44	#define CHACHA20_IV_LEN 8	44	#define CHACHA20_IV_LEN 8


diff --git a/src/lib/libssl/src/crypto/evp/e_chacha20poly1305.c b/src/lib/libssl/src/crypto/evp/e_chacha20poly1305.c index 47551c4578..2eb9ab8c0e 100644 --- a/src/lib/libssl/src/crypto/evp/e_chacha20poly1305.c +++ b/src/lib/libssl/src/crypto/evp/e_chacha20poly1305.c
@@ -1,4 +1,4 @@
1	/* $OpenBSD: e_chacha20poly1305.c,v 1.11 2015/11/02 15:40:53 reyk Exp $ */	1	/* $OpenBSD: e_chacha20poly1305.c,v 1.12 2015/11/02 15:43:55 reyk Exp $ */
2		2
3	/*	3	/*
4	* Copyright (c) 2015 Reyk Floter <reyk@openbsd.org>	4	* Copyright (c) 2015 Reyk Floter <reyk@openbsd.org>
@@ -37,8 +37,8 @@
37	/*	37	/*
38	* The informational RFC 7539, "ChaCha20 and Poly1305 for IETF Protocols",	38	* The informational RFC 7539, "ChaCha20 and Poly1305 for IETF Protocols",
39	* introduced a modified AEAD construction that is incompatible with the	39	* introduced a modified AEAD construction that is incompatible with the
40	* common style that that has been already used in TLS. The IETF version	40	* common style that has been already used in TLS. The IETF version also
41	* also adds a constant (salt) that is prepended to the nonce.	41	* adds a constant (salt) that is prepended to the nonce.
42	*/	42	*/
43	#define CHACHA20_CONSTANT_LEN 4	43	#define CHACHA20_CONSTANT_LEN 4
44	#define CHACHA20_IV_LEN 8	44	#define CHACHA20_IV_LEN 8