AES-GCM is preferred always

diff --git a/lib/accelerated/x86/aes-x86.c b/lib/accelerated/x86/aes-x86.c
index 36e5cbe9420ec0a05738b6f1a91d96e8887cda98..f3738bcde5268eef898da845475a7a77e77ca5f5 100644 (file)
--- a/lib/accelerated/x86/aes-x86.c
+++ b/lib/accelerated/x86/aes-x86.c
@@ -215,9 +215,6 @@ register_x86_crypto (void)
             {
               gnutls_assert ();
             }
-          
-          if (ret >= 0)
-            _gnutls_priority_prefer_aes_gcm();
         }
 #endif
     }

diff --git a/lib/gnutls_global.h b/lib/gnutls_global.h
index 9132cfc01cea4f3d6ab66c017291ade26ea54482..a5f6b36b396d361970fd09fec74c59a957e8b0c1 100644 (file)
--- a/lib/gnutls_global.h
+++ b/lib/gnutls_global.h
@@ -43,6 +43,5 @@ extern gnutls_audit_log_func _gnutls_audit_log_func;
 extern int _gnutls_log_level;
 extern int gnutls_crypto_init (void);
 extern void gnutls_crypto_deinit (void);
-void _gnutls_priority_prefer_aes_gcm(void);
 
 #endif

diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index 407509f1c42a6a307e47d83fb0f04677b49281d9..29281a69d7bf82d4bc920017f7ad890de62e6e99 100644 (file)
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -350,22 +350,10 @@ static const int kx_priority_secure[] = {
   0
 };
 
-static const int cipher_priority_performance_sw[] = {
-  GNUTLS_CIPHER_ARCFOUR_128,
-  GNUTLS_CIPHER_AES_128_CBC,
-  GNUTLS_CIPHER_CAMELLIA_128_CBC,
-  GNUTLS_CIPHER_AES_256_CBC,
-  GNUTLS_CIPHER_CAMELLIA_256_CBC,
-  GNUTLS_CIPHER_3DES_CBC,
-  GNUTLS_CIPHER_AES_128_GCM,
-  GNUTLS_CIPHER_AES_256_GCM,
-  0
-};
-
 /* If GCM and AES acceleration is available then prefer
  * them over anything else.
  */
-static const int cipher_priority_performance_hw_aes[] = {
+static const int cipher_priority_performance[] = {
   GNUTLS_CIPHER_AES_128_GCM,
   GNUTLS_CIPHER_AES_128_CBC,
   GNUTLS_CIPHER_AES_256_GCM,
@@ -377,19 +365,7 @@ static const int cipher_priority_performance_hw_aes[] = {
   0
 };
 
-static const int cipher_priority_normal_sw[] = {
-  GNUTLS_CIPHER_AES_128_CBC,
-  GNUTLS_CIPHER_CAMELLIA_128_CBC,
-  GNUTLS_CIPHER_AES_128_GCM,
-  GNUTLS_CIPHER_AES_256_CBC,
-  GNUTLS_CIPHER_CAMELLIA_256_CBC,
-  GNUTLS_CIPHER_AES_256_GCM,
-  GNUTLS_CIPHER_3DES_CBC,
-  GNUTLS_CIPHER_ARCFOUR_128,
-  0
-};
-
-static const int cipher_priority_normal_hw_aes[] = {
+static const int cipher_priority_normal[] = {
   GNUTLS_CIPHER_AES_128_GCM,
   GNUTLS_CIPHER_AES_128_CBC,
   GNUTLS_CIPHER_AES_256_GCM,
@@ -401,10 +377,6 @@ static const int cipher_priority_normal_hw_aes[] = {
   0
 };
 
-static const int *cipher_priority_performance = cipher_priority_performance_sw;
-static const int *cipher_priority_normal = cipher_priority_normal_sw;
-
-
 static const int cipher_priority_suiteb128[] = {
   GNUTLS_CIPHER_AES_128_GCM,
   GNUTLS_CIPHER_AES_256_GCM,
@@ -1261,15 +1233,6 @@ gnutls_set_default_export_priority (gnutls_session_t session)
   return gnutls_priority_set_direct (session, "EXPORT", NULL);
 }
 
-/* Increases the priority of AES-GCM as it is much faster
- * than anything else if hardware support is there.
- */
-void _gnutls_priority_prefer_aes_gcm(void)
-{
-  cipher_priority_performance = cipher_priority_performance_hw_aes;
-  cipher_priority_normal = cipher_priority_normal_hw_aes;
-}
-
 /**
  * gnutls_priority_ecc_curve_list:
  * @pcache: is a #gnutls_prioritity_t structure.