From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 10 Feb 2013 12:16:09 +0000 (+0100)
Subject: prefer plain RSA to DHE-RSA and DHE-DSS
X-Git-Tag: gnutls_3_1_9~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eff2ae1606c7fea45dd1178de60b5cbf5c1012f9;p=thirdparty%2Fgnutls.git

prefer plain RSA to DHE-RSA and DHE-DSS
---

diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index 33ed29442e..753787bcb1 100644
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -321,9 +321,13 @@ static const int kx_priority_secure[] = {
    */
   GNUTLS_KX_ECDHE_ECDSA,
   GNUTLS_KX_ECDHE_RSA,
+  GNUTLS_KX_RSA,
+  /* KX-RSA is now ahead of DHE-RSA and DHE-DSS due to the compatibility
+   * issues the DHE ciphersuites have. That is, one cannot enforce a specific
+   * security level without dropping the connection. 
+   */
   GNUTLS_KX_DHE_RSA,
   GNUTLS_KX_DHE_DSS,
-  GNUTLS_KX_RSA,
   /* GNUTLS_KX_ANON_DH: Man-in-the-middle prone, don't add!
    * GNUTLS_KX_RSA_EXPORT: Deprecated, don't add!
    */