From: Bodo Möller <bodo@openssl.org>
Date: Tue, 20 Feb 2007 13:25:36 +0000 (+0000)
Subject: fix a typo in the new ciphersuite ordering code
X-Git-Tag: OpenSSL_0_9_8k^2~966
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e041863905bc2222214d1f0503a560ef2f43b2f8;p=oweals%2Fopenssl.git

fix a typo in the new ciphersuite ordering code
---

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 787aec1e31..a9d11ca474 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -1134,10 +1134,11 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method,
 	 * authenticated ciphers.) */
 	ssl_cipher_apply_rule(0, 0, SSL_aNULL, 0, 0, 0, 0, CIPHER_ORD, -1, &head, &tail);
 
-	/* Move ciphers without forward secrecy to then end */
+	/* Move ciphers without forward secrecy to the end */
 	ssl_cipher_apply_rule(0, 0, SSL_aECDH, 0, 0, 0, 0, CIPHER_ORD, -1, &head, &tail);
+	/* ssl_cipher_apply_rule(0, 0, SSL_aDH, 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);
-	ssl_cipher_apply_rule(0, 0, SSL_kPSK, 0, 0, 0, 0, CIPHER_ORD, -1, &head, &tail);
+	ssl_cipher_apply_rule(0, SSL_kPSK, 0,0, 0, 0, 0, CIPHER_ORD, -1, &head, &tail);
 
 	/* RC4 is sort-of broken -- move the the end */
 	ssl_cipher_apply_rule(0, 0, 0, SSL_RC4, 0, 0, 0, CIPHER_ORD, -1, &head, &tail);