RIJNDAEL ciphersuites were renamed to AES.

10 files changed, 71 insertions, 70 deletions

diff --git a/NEWS b/NEWS
index bd093fe609..b95806396b 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Version 0.9.8
   (draft-ietf-tls-srp-05).
 - Improved the gnutls-cli behaviour in error handling.
 - Use versioned symbols in the library (where available).
+- RIJNDAEL ciphersuites were renamed to AES.
 
 Version 0.9.7 (25/08/2003)
 - The tex files are now included in the distribution.
diff --git a/lib/gnutls.h.in.in b/lib/gnutls.h.in.in
index e4b74f6205..953af83b38 100644
--- a/lib/gnutls.h.in.in
+++ b/lib/gnutls.h.in.in
@@ -45,14 +45,14 @@ extern "C" {
 @DEFINE_SIZE_T@
 @DEFINE_TIME_T@
 
-#define GNUTLS_CIPHER_AES_128_CBC GNUTLS_CIPHER_RIJNDAEL_128_CBC
-#define GNUTLS_CIPHER_AES_256_CBC GNUTLS_CIPHER_RIJNDAEL_256_CBC
-#define GNUTLS_CIPHER_RIJNDAEL_CBC GNUTLS_CIPHER_RIJNDAEL_128_CBC
+#define GNUTLS_CIPHER_RIJNDAEL_128_CBC GNUTLS_CIPHER_AES_128_CBC
+#define GNUTLS_CIPHER_RIJNDAEL_256_CBC GNUTLS_CIPHER_AES_256_CBC
+#define GNUTLS_CIPHER_RIJNDAEL_CBC GNUTLS_CIPHER_AES_128_CBC
 #define GNUTLS_CIPHER_ARCFOUR GNUTLS_CIPHER_ARCFOUR_128
 
 typedef enum gnutls_cipher_algorithm { GNUTLS_CIPHER_NULL=1, 
-	GNUTLS_CIPHER_ARCFOUR_128, GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_RIJNDAEL_128_CBC, 
-	GNUTLS_CIPHER_TWOFISH_128_CBC, GNUTLS_CIPHER_RIJNDAEL_256_CBC,
+	GNUTLS_CIPHER_ARCFOUR_128, GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_AES_128_CBC, 
+	GNUTLS_CIPHER_TWOFISH_128_CBC, GNUTLS_CIPHER_AES_256_CBC,
 	GNUTLS_CIPHER_ARCFOUR_40
 } gnutls_cipher_algorithm;
 
diff --git a/lib/gnutls_algorithms.c b/lib/gnutls_algorithms.c
index ecbe4c5a65..796922ab08 100644
--- a/lib/gnutls_algorithms.c
+++ b/lib/gnutls_algorithms.c
@@ -134,8 +134,8 @@ typedef struct gnutls_cipher_entry gnutls_cipher_entry;
  */
 static const gnutls_cipher_entry algorithms[] = {
 	{"3DES 168 CBC", GNUTLS_CIPHER_3DES_CBC, 8, 24, CIPHER_BLOCK, 8, 0 },
-	{"RIJNDAEL 128 CBC", GNUTLS_CIPHER_RIJNDAEL_128_CBC, 16, 16, CIPHER_BLOCK, 16, 0 },
-	{"RIJNDAEL 256 CBC", GNUTLS_CIPHER_RIJNDAEL_256_CBC, 16, 32, CIPHER_BLOCK, 16, 0 },
+	{"AES 128 CBC", GNUTLS_CIPHER_AES_128_CBC, 16, 16, CIPHER_BLOCK, 16, 0 },
+	{"AES 256 CBC", GNUTLS_CIPHER_AES_256_CBC, 16, 32, CIPHER_BLOCK, 16, 0 },
 	{"TWOFISH 128 CBC", GNUTLS_CIPHER_TWOFISH_128_CBC, 16, 16, CIPHER_BLOCK, 16, 0 },
 	{"ARCFOUR 128", GNUTLS_CIPHER_ARCFOUR_128, 1, 16, CIPHER_STREAM, 0, 0 },
 	{"ARCFOUR 40", GNUTLS_CIPHER_ARCFOUR_40, 1, 5, CIPHER_STREAM, 0, 1 },
@@ -268,8 +268,8 @@ typedef struct {
 #define GNUTLS_ANON_DH_ARCFOUR_MD5 { 0x00, 0x18 }
 
  /* rfc3268: */
-#define GNUTLS_ANON_DH_RIJNDAEL_128_CBC_SHA { 0x00, 0x34 }
-#define GNUTLS_ANON_DH_RIJNDAEL_256_CBC_SHA { 0x00, 0x3A }
+#define GNUTLS_ANON_DH_AES_128_CBC_SHA { 0x00, 0x34 }
+#define GNUTLS_ANON_DH_AES_256_CBC_SHA { 0x00, 0x3A }
 /* gnutls private extensions: */
 #define GNUTLS_ANON_DH_TWOFISH_128_CBC_SHA { 0xFF, 0x50 } /* gnutls */
 
@@ -278,17 +278,17 @@ typedef struct {
  ** draft-ietf-tls-srp-02:
  **/
 #define GNUTLS_SRP_SHA_3DES_EDE_CBC_SHA { 0x00, 0x50 }
-#define GNUTLS_SRP_SHA_RIJNDAEL_128_CBC_SHA { 0x00, 0x53 }
-#define GNUTLS_SRP_SHA_RIJNDAEL_256_CBC_SHA { 0x00, 0x56 }
+#define GNUTLS_SRP_SHA_AES_128_CBC_SHA { 0x00, 0x53 }
+#define GNUTLS_SRP_SHA_AES_256_CBC_SHA { 0x00, 0x56 }
 
 #define GNUTLS_SRP_SHA_RSA_3DES_EDE_CBC_SHA { 0x00, 0x51 }
 #define GNUTLS_SRP_SHA_DSS_3DES_EDE_CBC_SHA { 0x00, 0x52 }
 
-#define GNUTLS_SRP_SHA_RSA_RIJNDAEL_128_CBC_SHA { 0x00, 0x54 }
-#define GNUTLS_SRP_SHA_DSS_RIJNDAEL_128_CBC_SHA { 0x00, 0x55 }
+#define GNUTLS_SRP_SHA_RSA_AES_128_CBC_SHA { 0x00, 0x54 }
+#define GNUTLS_SRP_SHA_DSS_AES_128_CBC_SHA { 0x00, 0x55 }
 
-#define GNUTLS_SRP_SHA_RSA_RIJNDAEL_256_CBC_SHA { 0x00, 0x57 }
-#define GNUTLS_SRP_SHA_DSS_RIJNDAEL_256_CBC_SHA { 0x00, 0x58 }
+#define GNUTLS_SRP_SHA_RSA_AES_256_CBC_SHA { 0x00, 0x57 }
+#define GNUTLS_SRP_SHA_DSS_AES_256_CBC_SHA { 0x00, 0x58 }
 
 /** RSA 
  **/
@@ -300,8 +300,8 @@ typedef struct {
 
 /* rfc3268: 
  */
-#define GNUTLS_RSA_RIJNDAEL_128_CBC_SHA { 0x00, 0x2F }
-#define GNUTLS_RSA_RIJNDAEL_256_CBC_SHA { 0x00, 0x35 }
+#define GNUTLS_RSA_AES_128_CBC_SHA { 0x00, 0x2F }
+#define GNUTLS_RSA_AES_256_CBC_SHA { 0x00, 0x35 }
 
 /* gnutls private extensions: 
  */
@@ -323,8 +323,8 @@ typedef struct {
 
 /* rfc3268: 
  */
-#define GNUTLS_DHE_DSS_RIJNDAEL_256_CBC_SHA { 0x00, 0x38 }
-#define GNUTLS_DHE_DSS_RIJNDAEL_128_CBC_SHA { 0x00, 0x32 }
+#define GNUTLS_DHE_DSS_AES_256_CBC_SHA { 0x00, 0x38 }
+#define GNUTLS_DHE_DSS_AES_128_CBC_SHA { 0x00, 0x32 }
 
 
 /** DHE RSA 
@@ -337,8 +337,8 @@ typedef struct {
 
 /* rfc3268: 
  */
-#define GNUTLS_DHE_RSA_RIJNDAEL_128_CBC_SHA { 0x00, 0x33 }
-#define GNUTLS_DHE_RSA_RIJNDAEL_256_CBC_SHA { 0x00, 0x39 }
+#define GNUTLS_DHE_RSA_AES_128_CBC_SHA { 0x00, 0x33 }
+#define GNUTLS_DHE_RSA_AES_256_CBC_SHA { 0x00, 0x39 }
 
 #define CIPHER_SUITES_COUNT sizeof(cs_algorithms)/sizeof(gnutls_cipher_suite_entry)-1
 
@@ -350,11 +350,11 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
 	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_ANON_DH_3DES_EDE_CBC_SHA,
 				  GNUTLS_CIPHER_3DES_CBC, GNUTLS_KX_ANON_DH,
 				  GNUTLS_MAC_SHA, GNUTLS_SSL3),
-	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_ANON_DH_RIJNDAEL_128_CBC_SHA,
-				  GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_KX_ANON_DH,
+	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_ANON_DH_AES_128_CBC_SHA,
+				  GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_ANON_DH,
 				  GNUTLS_MAC_SHA, GNUTLS_SSL3),
-	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_ANON_DH_RIJNDAEL_256_CBC_SHA,
-				  GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_KX_ANON_DH,
+	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_ANON_DH_AES_256_CBC_SHA,
+				  GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_ANON_DH,
 				  GNUTLS_MAC_SHA, GNUTLS_SSL3),
 	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_ANON_DH_TWOFISH_128_CBC_SHA,
 				  GNUTLS_CIPHER_TWOFISH_128_CBC, GNUTLS_KX_ANON_DH,
@@ -364,11 +364,11 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
 	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_SRP_SHA_3DES_EDE_CBC_SHA,
 				  GNUTLS_CIPHER_3DES_CBC, GNUTLS_KX_SRP,
 				  GNUTLS_MAC_SHA, GNUTLS_TLS1),
-	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_SRP_SHA_RIJNDAEL_128_CBC_SHA,
-				  GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_KX_SRP,
+	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_SRP_SHA_AES_128_CBC_SHA,
+				  GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_SRP,
 				  GNUTLS_MAC_SHA, GNUTLS_TLS1),
-	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_SRP_SHA_RIJNDAEL_256_CBC_SHA,
-				  GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_KX_SRP,
+	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_SRP_SHA_AES_256_CBC_SHA,
+				  GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_SRP,
 				  GNUTLS_MAC_SHA, GNUTLS_TLS1),
 
 	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_SRP_SHA_DSS_3DES_EDE_CBC_SHA,
@@ -379,20 +379,20 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
 				  GNUTLS_CIPHER_3DES_CBC, GNUTLS_KX_SRP_RSA,
 				  GNUTLS_MAC_SHA, GNUTLS_TLS1),
 
-	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_SRP_SHA_DSS_RIJNDAEL_128_CBC_SHA,
-				  GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_KX_SRP_DSS,
+	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_SRP_SHA_DSS_AES_128_CBC_SHA,
+				  GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_SRP_DSS,
 				  GNUTLS_MAC_SHA, GNUTLS_TLS1),
 
-	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_SRP_SHA_RSA_RIJNDAEL_128_CBC_SHA,
-				  GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_KX_SRP_RSA,
+	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_SRP_SHA_RSA_AES_128_CBC_SHA,
+				  GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_SRP_RSA,
 				  GNUTLS_MAC_SHA, GNUTLS_TLS1),
 
-	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_SRP_SHA_DSS_RIJNDAEL_256_CBC_SHA,
-				  GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_KX_SRP_DSS,
+	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_SRP_SHA_DSS_AES_256_CBC_SHA,
+				  GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_SRP_DSS,
 				  GNUTLS_MAC_SHA, GNUTLS_TLS1),
 
-	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_SRP_SHA_RSA_RIJNDAEL_256_CBC_SHA,
-				  GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_KX_SRP_RSA,
+	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_SRP_SHA_RSA_AES_256_CBC_SHA,
+				  GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_SRP_RSA,
 				  GNUTLS_MAC_SHA, GNUTLS_TLS1),
 
 	/* DHE_DSS */
@@ -405,11 +405,11 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
 	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_DHE_DSS_3DES_EDE_CBC_SHA,
 				  GNUTLS_CIPHER_3DES_CBC, GNUTLS_KX_DHE_DSS,
 				  GNUTLS_MAC_SHA, GNUTLS_SSL3),
-	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_DHE_DSS_RIJNDAEL_128_CBC_SHA,
-				  GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_KX_DHE_DSS,
+	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_DHE_DSS_AES_128_CBC_SHA,
+				  GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_DHE_DSS,
 				  GNUTLS_MAC_SHA, GNUTLS_SSL3),
-	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_DHE_DSS_RIJNDAEL_256_CBC_SHA,
-				  GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_KX_DHE_DSS,
+	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_DHE_DSS_AES_256_CBC_SHA,
+				  GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_DHE_DSS,
 				  GNUTLS_MAC_SHA, GNUTLS_SSL3),
 
 	/* DHE_RSA */
@@ -419,11 +419,11 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
 	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_DHE_RSA_3DES_EDE_CBC_SHA,
 				  GNUTLS_CIPHER_3DES_CBC, GNUTLS_KX_DHE_RSA,
 				  GNUTLS_MAC_SHA, GNUTLS_SSL3),
-	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_DHE_RSA_RIJNDAEL_128_CBC_SHA,
-				  GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_KX_DHE_RSA,
+	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_DHE_RSA_AES_128_CBC_SHA,
+				  GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_DHE_RSA,
 				  GNUTLS_MAC_SHA, GNUTLS_SSL3),
-	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_DHE_RSA_RIJNDAEL_256_CBC_SHA,
-				  GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_KX_DHE_RSA,
+	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_DHE_RSA_AES_256_CBC_SHA,
+				  GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_DHE_RSA,
 				  GNUTLS_MAC_SHA, GNUTLS_SSL3),
 
 	/* RSA */
@@ -444,11 +444,11 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
 	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_RSA_3DES_EDE_CBC_SHA,
 				  GNUTLS_CIPHER_3DES_CBC,
 				  GNUTLS_KX_RSA, GNUTLS_MAC_SHA, GNUTLS_SSL3),
-	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_RSA_RIJNDAEL_128_CBC_SHA,
-				  GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_KX_RSA,
+	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_RSA_AES_128_CBC_SHA,
+				  GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_RSA,
 				  GNUTLS_MAC_SHA, GNUTLS_SSL3),
-	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_RSA_RIJNDAEL_256_CBC_SHA,
-				  GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_KX_RSA,
+	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_RSA_AES_256_CBC_SHA,
+				  GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_RSA,
 				  GNUTLS_MAC_SHA, GNUTLS_SSL3),
 	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_RSA_TWOFISH_128_CBC_SHA,
 				  GNUTLS_CIPHER_TWOFISH_128_CBC, GNUTLS_KX_RSA,
diff --git a/lib/gnutls_cipher_int.c b/lib/gnutls_cipher_int.c
index 459c25ffc8..9e649d65a6 100644
--- a/lib/gnutls_cipher_int.c
+++ b/lib/gnutls_cipher_int.c
@@ -34,10 +34,10 @@ gcry_error_t err = GPG_ERR_GENERAL; /* doesn't matter */
 
 
 	switch (cipher) {
-	case GNUTLS_CIPHER_RIJNDAEL_128_CBC:
+	case GNUTLS_CIPHER_AES_128_CBC:
 		err = gcry_cipher_open(&ret, GCRY_CIPHER_RIJNDAEL, GCRY_CIPHER_MODE_CBC, 0);
 		break;
-	case GNUTLS_CIPHER_RIJNDAEL_256_CBC:
+	case GNUTLS_CIPHER_AES_256_CBC:
 		err = gcry_cipher_open(&ret, GCRY_CIPHER_RIJNDAEL256, GCRY_CIPHER_MODE_CBC, 0);
 		break;
 	case GNUTLS_CIPHER_TWOFISH_128_CBC:
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index a46426f44b..0f7ab3f3bc 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -155,8 +155,8 @@ typedef struct {
 /* STATE */
 
 typedef enum gnutls_cipher_algorithm { GNUTLS_CIPHER_NULL=1, 
-	GNUTLS_CIPHER_ARCFOUR_128, GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_RIJNDAEL_128_CBC, 
-	GNUTLS_CIPHER_TWOFISH_128_CBC, GNUTLS_CIPHER_RIJNDAEL_256_CBC,
+	GNUTLS_CIPHER_ARCFOUR_128, GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_AES_128_CBC, 
+	GNUTLS_CIPHER_TWOFISH_128_CBC, GNUTLS_CIPHER_AES_256_CBC,
 	GNUTLS_CIPHER_ARCFOUR_40, 
 	
 	GNUTLS_CIPHER_RC2_40_CBC=90, GNUTLS_CIPHER_DES_CBC
diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index fefbcedb99..c5f8fd3986 100644
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -225,8 +225,8 @@ int gnutls_certificate_type_set_priority(gnutls_session session,
   * GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA for key exchange 
   * algorithms.
   * GNUTLS_MAC_SHA, GNUTLS_MAC_MD5 for MAC algorithms.
-  * GNUTLS_CIPHER_RIJNDAEL_256_CBC, 
-  * GNUTLS_CIPHER_RIJNDAEL_128_CBC, 
+  * GNUTLS_CIPHER_AES_256_CBC, 
+  * GNUTLS_CIPHER_AES_128_CBC, 
   * and GNUTLS_CIPHER_3DES_CBC, 
   * GNUTLS_CIPHER_ARCFOUR_128 for ciphers.
   *
@@ -238,7 +238,7 @@ int gnutls_set_default_priority(gnutls_session session)
 	static const int kx_priority[] =
 	    { GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, 0 };
 	static const int cipher_priority[] = {
-	  GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_CIPHER_RIJNDAEL_128_CBC,
+	  GNUTLS_CIPHER_AES_256_CBC, GNUTLS_CIPHER_AES_128_CBC,
 	  GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR_128, 0
 	};
 	static const int comp_priority[] = { GNUTLS_COMP_NULL, 0 };
@@ -264,7 +264,7 @@ int gnutls_set_default_priority(gnutls_session session)
   * The order is TLS1, SSL3 for protocols,  GNUTLS_KX_DHE_DSS, GNUTLS_KX_RSA, 
   * GNUTLS_KX_DHE_RSA, GNUTLS_KX_RSA_EXPORT for key exchange algorithms.
   * GNUTLS_MAC_SHA, GNUTLS_MAC_MD5 for MAC algorithms,
-  * GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_CIPHER_RIJNDAEL_128_CBC, 
+  * GNUTLS_CIPHER_AES_256_CBC, GNUTLS_CIPHER_AES_128_CBC, 
   * and GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR_128, 
   * GNUTLS_CIPHER_ARCFOUR_40 for ciphers.
   *
@@ -279,7 +279,7 @@ int gnutls_set_default_export_priority(gnutls_session session)
             GNUTLS_KX_RSA_EXPORT, 0 
         };
 	static const int cipher_priority[] = {
-	   GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_CIPHER_RIJNDAEL_128_CBC,
+	   GNUTLS_CIPHER_AES_256_CBC, GNUTLS_CIPHER_AES_128_CBC,
 	   GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR_128,
 	   GNUTLS_CIPHER_ARCFOUR_40, 0
 	};
diff --git a/libextra/gnutls_openssl.c b/libextra/gnutls_openssl.c
index 23f20e62a9..1c6449cc1c 100644
--- a/libextra/gnutls_openssl.c
+++ b/libextra/gnutls_openssl.c
@@ -477,9 +477,9 @@ SSL_METHOD *SSLv23_client_method(void)
     m->protocol_priority[1] = GNUTLS_SSL3;
     m->protocol_priority[2] = 0;
 
-    m->cipher_priority[0] = GNUTLS_CIPHER_RIJNDAEL_128_CBC;
+    m->cipher_priority[0] = GNUTLS_CIPHER_AES_128_CBC;
     m->cipher_priority[1] = GNUTLS_CIPHER_3DES_CBC;
-    m->cipher_priority[2] = GNUTLS_CIPHER_RIJNDAEL_256_CBC;
+    m->cipher_priority[2] = GNUTLS_CIPHER_AES_256_CBC;
     m->cipher_priority[3] = GNUTLS_CIPHER_ARCFOUR_128;
     m->cipher_priority[4] = 0;
 
@@ -512,9 +512,9 @@ SSL_METHOD *SSLv23_server_method(void)
     m->protocol_priority[1] = GNUTLS_SSL3;
     m->protocol_priority[2] = 0;
 
-    m->cipher_priority[0] = GNUTLS_CIPHER_RIJNDAEL_128_CBC;
+    m->cipher_priority[0] = GNUTLS_CIPHER_AES_128_CBC;
     m->cipher_priority[1] = GNUTLS_CIPHER_3DES_CBC;
-    m->cipher_priority[2] = GNUTLS_CIPHER_RIJNDAEL_256_CBC;
+    m->cipher_priority[2] = GNUTLS_CIPHER_AES_256_CBC;
     m->cipher_priority[3] = GNUTLS_CIPHER_ARCFOUR_128;
     m->cipher_priority[4] = 0;
 
@@ -610,9 +610,9 @@ SSL_METHOD *TLSv1_client_method(void)
     m->protocol_priority[0] = GNUTLS_TLS1;
     m->protocol_priority[1] = 0;
 
-    m->cipher_priority[0] = GNUTLS_CIPHER_RIJNDAEL_128_CBC;
+    m->cipher_priority[0] = GNUTLS_CIPHER_AES_128_CBC;
     m->cipher_priority[1] = GNUTLS_CIPHER_3DES_CBC;
-    m->cipher_priority[2] = GNUTLS_CIPHER_RIJNDAEL_256_CBC;
+    m->cipher_priority[2] = GNUTLS_CIPHER_AES_256_CBC;
     m->cipher_priority[3] = GNUTLS_CIPHER_ARCFOUR_128;
     m->cipher_priority[4] = 0;
 
@@ -644,9 +644,9 @@ SSL_METHOD *TLSv1_server_method(void)
     m->protocol_priority[0] = GNUTLS_TLS1;
     m->protocol_priority[1] = 0;
 
-    m->cipher_priority[0] = GNUTLS_CIPHER_RIJNDAEL_128_CBC;
+    m->cipher_priority[0] = GNUTLS_CIPHER_AES_128_CBC;
     m->cipher_priority[1] = GNUTLS_CIPHER_3DES_CBC;
-    m->cipher_priority[2] = GNUTLS_CIPHER_RIJNDAEL_256_CBC;
+    m->cipher_priority[2] = GNUTLS_CIPHER_AES_256_CBC;
     m->cipher_priority[3] = GNUTLS_CIPHER_ARCFOUR_128;
     m->cipher_priority[4] = 0;
 
diff --git a/src/cli.c b/src/cli.c
index c44785bea7..aefa580c44 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -85,7 +85,7 @@ int kx_priority[16] =
 	GNUTLS_KX_ANON_DH, GNUTLS_KX_RSA_EXPORT, 0
 };
 int cipher_priority[16] =
-    { GNUTLS_CIPHER_ARCFOUR_128, GNUTLS_CIPHER_RIJNDAEL_128_CBC,
+    { GNUTLS_CIPHER_ARCFOUR_128, GNUTLS_CIPHER_AES_128_CBC,
 	GNUTLS_CIPHER_3DES_CBC,
 	GNUTLS_CIPHER_ARCFOUR_40, 0
 };
diff --git a/src/serv.c b/src/serv.c
index bf44bee527..44971e6fb5 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -252,7 +252,7 @@ int kx_priority[16] =
    GNUTLS_KX_ANON_DH, GNUTLS_KX_RSA_EXPORT, 0
 };
 int cipher_priority[16] =
-    { GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_CIPHER_3DES_CBC,
+    { GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_3DES_CBC,
    GNUTLS_CIPHER_ARCFOUR_128, GNUTLS_CIPHER_ARCFOUR_40, 0
 };
 
diff --git a/src/tests.c b/src/tests.c
index b5c8495573..7b4f3d1976 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -289,7 +289,7 @@ int old;
 
 int test_aes( gnutls_session session) {
 int ret;
-	ADD_CIPHER(session, GNUTLS_CIPHER_RIJNDAEL_128_CBC);
+	ADD_CIPHER(session, GNUTLS_CIPHER_AES_128_CBC);
 	ADD_ALL_COMP(session);
 	ADD_ALL_CERTTYPES(session);
 	ADD_ALL_PROTOCOLS(session);
@@ -322,7 +322,7 @@ int ret;
 
 int test_unknown_ciphersuites( gnutls_session session) {
 int ret;
-	ADD_CIPHER3(session, GNUTLS_CIPHER_RIJNDAEL_128_CBC,
+	ADD_CIPHER3(session, GNUTLS_CIPHER_AES_128_CBC,
 		GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR_128);
 	ADD_ALL_COMP(session);
 	ADD_ALL_CERTTYPES(session);