NEW_PADDING has been removed.

This extension did not get accepted by IETF so it is
now being removed. The gnutls_range API is kept in case
length hiding is implemented in a different way at some
point.

3 files changed, 2 insertions, 24 deletions

diff --git a/tests/mini-record-2.c b/tests/mini-record-2.c
index 3c7cebbc6e..1b2f65c555 100644
--- a/tests/mini-record-2.c
+++ b/tests/mini-record-2.c
@@ -419,16 +419,9 @@ static void start(const char *prio, int ign)
 
 #define NULL_SHA1 "NONE:+VERS-TLS1.0:-CIPHER-ALL:+NULL:+SHA1:+SIGN-ALL:+COMP-NULL:+ANON-ECDH:+RSA:+CURVE-ALL"
 
-#define NEW_AES_CBC "NONE:+VERS-TLS1.0:-CIPHER-ALL:+AES-128-CBC:+SHA1:+SIGN-ALL:+COMP-NULL:+ANON-ECDH:+CURVE-ALL:%NEW_PADDING"
-#define NEW_ARCFOUR_SHA1 "NONE:+VERS-TLS1.0:-CIPHER-ALL:+ARCFOUR-128:+SHA1:+SIGN-ALL:+COMP-NULL:+ANON-ECDH:+CURVE-ALL:%NEW_PADDING"
-#define NEW_AES_CBC_SHA256 "NONE:+VERS-TLS1.2:-CIPHER-ALL:+RSA:+AES-128-CBC:+AES-256-CBC:+SHA256:+SIGN-ALL:+COMP-NULL:+ANON-ECDH:+CURVE-ALL:%NEW_PADDING"
-#define NEW_AES_GCM "NONE:+VERS-TLS1.2:-CIPHER-ALL:+RSA:+AES-128-GCM:+MAC-ALL:+SIGN-ALL:+COMP-NULL:+ANON-ECDH:+CURVE-ALL:%NEW_PADDING"
-
 #define ARCFOUR_SHA1_ZLIB "NONE:+VERS-TLS1.0:-CIPHER-ALL:+ARCFOUR-128:+SHA1:+SIGN-ALL:+COMP-DEFLATE:+ANON-ECDH:+CURVE-ALL"
-#define NEW_ARCFOUR_SHA1_ZLIB "NONE:+VERS-TLS1.0:-CIPHER-ALL:+ARCFOUR-128:+SHA1:+SIGN-ALL:+COMP-DEFLATE:+ANON-ECDH:+CURVE-ALL:%NEW_PADDING"
 
 #define AES_GCM_ZLIB "NONE:+VERS-TLS1.2:-CIPHER-ALL:+AES-128-GCM:+AEAD:+SIGN-ALL:+COMP-DEFLATE:+RSA:+CURVE-ALL"
-#define NEW_AES_GCM_ZLIB "NONE:+VERS-TLS1.2:-CIPHER-ALL:+AES-128-GCM:+AEAD:+SIGN-ALL:+COMP-DEFLATE:+RSA:+CURVE-ALL:%NEW_PADDING"
 
 static void ch_handler(int sig)
 {
@@ -450,30 +443,23 @@ void doit(void)
 {
 	signal(SIGCHLD, ch_handler);
 
-	start(NEW_AES_CBC, 1);
-	start(NEW_AES_CBC_SHA256, 1);
-	start(NEW_AES_GCM, 1);
-
 	start(AES_CBC, 1);
 	start(AES_CBC_SHA256, 1);
 	start(AES_GCM, 0);
 
 #ifndef ENABLE_FIPS140
 	start(NULL_SHA1, 0);
-	start(NEW_ARCFOUR_SHA1, 1);
 
 	start(ARCFOUR_SHA1, 0);
 	start(ARCFOUR_MD5, 0);
 
 # ifdef HAVE_LIBZ
 	start(ARCFOUR_SHA1_ZLIB, 0);
-	start(NEW_ARCFOUR_SHA1_ZLIB, 1);
 # endif
 #endif
 
 #ifdef HAVE_LIBZ
 	start(AES_GCM_ZLIB, 0);
-	start(NEW_AES_GCM_ZLIB, 1);
 #endif
 }
 
diff --git a/tests/mini-record-range.c b/tests/mini-record-range.c
index 10b793737a..7d35b9303c 100644
--- a/tests/mini-record-range.c
+++ b/tests/mini-record-range.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#if defined(_WIN32)
+#if 1
 
 int main()
 {
@@ -358,7 +358,7 @@ static void start(const char *prio)
 	}
 }
 
-#define AES_CBC "NORMAL:+ANON-ECDH:+CURVE-ALL:%NEW_PADDING"
+#define AES_CBC "NORMAL:+ANON-ECDH:+CURVE-ALL"
 
 static void ch_handler(int sig)
 {
diff --git a/tests/mini-record.c b/tests/mini-record.c
index 001c1eabf5..71b2236b3d 100644
--- a/tests/mini-record.c
+++ b/tests/mini-record.c
@@ -382,10 +382,6 @@ static void start(const char *prio)
 #define AES_CBC_SHA256 "NONE:+VERS-DTLS1.0:-CIPHER-ALL:+RSA:+AES-128-CBC:+AES-256-CBC:+SHA256:+SIGN-ALL:+COMP-ALL:+ANON-ECDH:+CURVE-ALL"
 #define AES_GCM "NONE:+VERS-DTLS1.0:-CIPHER-ALL:+RSA:+AES-128-GCM:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-ECDH:+CURVE-ALL"
 
-#define NEW_AES_CBC "NONE:+VERS-DTLS1.0:-CIPHER-ALL:+AES-128-CBC:+SHA1:+SIGN-ALL:+COMP-ALL:+ANON-ECDH:+CURVE-ALL:%NEW_PADDING"
-#define NEW_AES_CBC_SHA256 "NONE:+VERS-DTLS1.0:-CIPHER-ALL:+RSA:+AES-128-CBC:+AES-256-CBC:+SHA256:+SIGN-ALL:+COMP-ALL:+ANON-ECDH:+CURVE-ALL:%NEW_PADDING"
-#define NEW_AES_GCM "NONE:+VERS-DTLS1.0:-CIPHER-ALL:+RSA:+AES-128-GCM:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-ECDH:+CURVE-ALL:%NEW_PADDING"
-
 static void ch_handler(int sig)
 {
 	int status;
@@ -406,10 +402,6 @@ void doit(void)
 {
 	signal(SIGCHLD, ch_handler);
 
-	start(NEW_AES_CBC);
-	start(NEW_AES_CBC_SHA256);
-	start(NEW_AES_GCM);
-
 	start(AES_CBC);
 	start(AES_CBC_SHA256);
 	start(AES_GCM);