summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2018-06-08 10:48:32 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2018-06-22 08:40:58 +0000
commite137c9085c31101b05adf68d9c7aee06b2584c04 (patch)
tree86dc8c308c65a7c1742e09cbdbb16e4d629ebd29
parent471618e557e0ec13f6339ac51bb4b632971fa1ba (diff)
downloadgnutls-e137c9085c31101b05adf68d9c7aee06b2584c04.tar.gz
extensions: corrected order of pre-shared-key and dumbfw
The pre-shared-key MUST always be last under TLS1.3 while the dumbfw extension should be last in order to do proper evaluation of extension size (gnutls requirement). As such the protocol requirement takes precedence. Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
-rw-r--r--lib/gnutls_int.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index d2d417ee67..b27fa01130 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -335,10 +335,9 @@ typedef enum extensions_t {
GNUTLS_EXTENSION_PSK_KE_MODES,
/*
* pre_shared_key and dumbfw must always be the last extensions,
- * in that order
- */
- GNUTLS_EXTENSION_PRE_SHARED_KEY,
+ * in that order */
GNUTLS_EXTENSION_DUMBFW,
+ GNUTLS_EXTENSION_PRE_SHARED_KEY,
GNUTLS_EXTENSION_MAX /* not real extension - used for iterators */
} extensions_t;