decipher comment. ok bcook@

author: mmcc <> 2015-12-12 22:04:10 +0000
committer: mmcc <> 2015-12-12 22:04:10 +0000
commit: 1197feaebb5690a6c587583722f70d3cd81c32c4 (patch)
tree: 6116f4b22c9919eb40b102ebbc6ebca6df4efda3
parent: e6761699f79ff2c2ab346ed4e641f83964fe8f31 (diff)
download: openbsd-1197feaebb5690a6c587583722f70d3cd81c32c4.tar.gz
openbsd-1197feaebb5690a6c587583722f70d3cd81c32c4.tar.bz2
openbsd-1197feaebb5690a6c587583722f70d3cd81c32c4.zip
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/src/ssl/ssl_ciph.c b/src/lib/libssl/src/ssl/ssl_ciph.c
index 46f1697fec..05bfc47c1e 100644
--- a/src/lib/libssl/src/ssl/ssl_ciph.c
+++ b/src/lib/libssl/src/ssl/ssl_ciph.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_ciph.c,v 1.83 2015/09/13 12:34:02 jsing Exp $ */
+/* $OpenBSD: ssl_ciph.c,v 1.84 2015/12/12 22:04:10 mmcc Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -1451,7 +1451,7 @@ ssl_create_cipher_list(const SSL_METHOD *ssl_method,
        ssl_cipher_apply_rule(0, 0, SSL_aECDH, 0, 0, 0, 0, CIPHER_ORD, -1, &head, &tail);
        ssl_cipher_apply_rule(0, SSL_kRSA, 0, 0, 0, 0, 0, CIPHER_ORD, -1, &head, &tail);
-        /* RC4 is sort-of broken -- move the the end */
+        /* RC4 is sort of broken - move it to the end */
        ssl_cipher_apply_rule(0, 0, 0, SSL_RC4, 0, 0, 0, CIPHER_ORD, -1, &head, &tail);
        /* Now sort by symmetric encryption strength.  The above ordering remains
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index 46f1697fec..05bfc47c1e 100644
--- a/src/lib/libssl/ssl_ciph.c
+++ b/src/lib/libssl/ssl_ciph.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_ciph.c,v 1.83 2015/09/13 12:34:02 jsing Exp $ */
+/* $OpenBSD: ssl_ciph.c,v 1.84 2015/12/12 22:04:10 mmcc Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -1451,7 +1451,7 @@ ssl_create_cipher_list(const SSL_METHOD *ssl_method,
        ssl_cipher_apply_rule(0, 0, SSL_aECDH, 0, 0, 0, 0, CIPHER_ORD, -1, &head, &tail);
        ssl_cipher_apply_rule(0, SSL_kRSA, 0, 0, 0, 0, 0, CIPHER_ORD, -1, &head, &tail);
-        /* RC4 is sort-of broken -- move the the end */
+        /* RC4 is sort of broken - move it to the end */
        ssl_cipher_apply_rule(0, 0, 0, SSL_RC4, 0, 0, 0, CIPHER_ORD, -1, &head, &tail);
        /* Now sort by symmetric encryption strength.  The above ordering remains
author	mmcc <>	2015-12-12 22:04:10 +0000
committer	mmcc <>	2015-12-12 22:04:10 +0000
commit	1197feaebb5690a6c587583722f70d3cd81c32c4 (patch)
tree	6116f4b22c9919eb40b102ebbc6ebca6df4efda3
parent	e6761699f79ff2c2ab346ed4e641f83964fe8f31 (diff)
download	openbsd-1197feaebb5690a6c587583722f70d3cd81c32c4.tar.gz openbsd-1197feaebb5690a6c587583722f70d3cd81c32c4.tar.bz2 openbsd-1197feaebb5690a6c587583722f70d3cd81c32c4.zip

diff --git a/src/lib/libssl/src/ssl/ssl_ciph.c b/src/lib/libssl/src/ssl/ssl_ciph.c index 46f1697fec..05bfc47c1e 100644 --- a/src/lib/libssl/src/ssl/ssl_ciph.c +++ b/src/lib/libssl/src/ssl/ssl_ciph.c
@@ -1,4 +1,4 @@
1	/* $OpenBSD: ssl_ciph.c,v 1.83 2015/09/13 12:34:02 jsing Exp $ */	1	/* $OpenBSD: ssl_ciph.c,v 1.84 2015/12/12 22:04:10 mmcc 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	*
@@ -1451,7 +1451,7 @@ ssl_create_cipher_list(const SSL_METHOD *ssl_method,
1451	ssl_cipher_apply_rule(0, 0, SSL_aECDH, 0, 0, 0, 0, CIPHER_ORD, -1, &head, &tail);	1451	ssl_cipher_apply_rule(0, 0, SSL_aECDH, 0, 0, 0, 0, CIPHER_ORD, -1, &head, &tail);
1452	ssl_cipher_apply_rule(0, SSL_kRSA, 0, 0, 0, 0, 0, CIPHER_ORD, -1, &head, &tail);	1452	ssl_cipher_apply_rule(0, SSL_kRSA, 0, 0, 0, 0, 0, CIPHER_ORD, -1, &head, &tail);
1453		1453
1454	/* RC4 is sort-of broken -- move the the end */	1454	/* RC4 is sort of broken - move it to the end */
1455	ssl_cipher_apply_rule(0, 0, 0, SSL_RC4, 0, 0, 0, CIPHER_ORD, -1, &head, &tail);	1455	ssl_cipher_apply_rule(0, 0, 0, SSL_RC4, 0, 0, 0, CIPHER_ORD, -1, &head, &tail);
1456		1456
1457	/* Now sort by symmetric encryption strength. The above ordering remains	1457	/* Now sort by symmetric encryption strength. The above ordering remains


diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c index 46f1697fec..05bfc47c1e 100644 --- a/src/lib/libssl/ssl_ciph.c +++ b/src/lib/libssl/ssl_ciph.c
@@ -1,4 +1,4 @@
1	/* $OpenBSD: ssl_ciph.c,v 1.83 2015/09/13 12:34:02 jsing Exp $ */	1	/* $OpenBSD: ssl_ciph.c,v 1.84 2015/12/12 22:04:10 mmcc 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	*
@@ -1451,7 +1451,7 @@ ssl_create_cipher_list(const SSL_METHOD *ssl_method,
1451	ssl_cipher_apply_rule(0, 0, SSL_aECDH, 0, 0, 0, 0, CIPHER_ORD, -1, &head, &tail);	1451	ssl_cipher_apply_rule(0, 0, SSL_aECDH, 0, 0, 0, 0, CIPHER_ORD, -1, &head, &tail);
1452	ssl_cipher_apply_rule(0, SSL_kRSA, 0, 0, 0, 0, 0, CIPHER_ORD, -1, &head, &tail);	1452	ssl_cipher_apply_rule(0, SSL_kRSA, 0, 0, 0, 0, 0, CIPHER_ORD, -1, &head, &tail);
1453		1453
1454	/* RC4 is sort-of broken -- move the the end */	1454	/* RC4 is sort of broken - move it to the end */
1455	ssl_cipher_apply_rule(0, 0, 0, SSL_RC4, 0, 0, 0, CIPHER_ORD, -1, &head, &tail);	1455	ssl_cipher_apply_rule(0, 0, 0, SSL_RC4, 0, 0, 0, CIPHER_ORD, -1, &head, &tail);
1456		1456
1457	/* Now sort by symmetric encryption strength. The above ordering remains	1457	/* Now sort by symmetric encryption strength. The above ordering remains