Introduce negotiation for Diffie--Hellman groups.

[secnet] / magic.h

diff --git a/magic.h b/magic.h
index 15d84985299f79156344b0045b9f0600bd7dd42b..9c071c0d3d07896a703c15f5545d76ffa895b27d 100644 (file)
--- a/magic.h
+++ b/magic.h
@@ -75,6 +75,7 @@
 #define LABEL_MSG2     MSGCODE(     2, 0)
 #define LABEL_MSG3     MSGCODE(     3, 0)
 #define LABEL_MSG3BIS  MSGCODE(     3, 1)
 #define LABEL_MSG2     MSGCODE(     2, 0)
 #define LABEL_MSG3     MSGCODE(     3, 0)
 #define LABEL_MSG3BIS  MSGCODE(     3, 1)

+#define LABEL_MSG3TER  MSGCODE(     3, 2)

 #define LABEL_MSG4     MSGCODE(     4, 0)
 #define LABEL_MSG5     MSGCODE(     5, 0)
 #define LABEL_MSG6     MSGCODE(     6, 0)
 #define LABEL_MSG4     MSGCODE(     4, 0)
 #define LABEL_MSG5     MSGCODE(     5, 0)
 #define LABEL_MSG6     MSGCODE(     6, 0)


@@ -99,7 +100,8 @@
  */
 
 /* uses of the 32-bit capability bitmap */
  */
 
 /* uses of the 32-bit capability bitmap */

-#define CAPAB_TRANSFORM_MASK  0x0000ffff
+#define CAPAB_INEXPLICIT_TRANSFORM_MASK  0x0000ffff /* DH group implicit */
+#define CAPAB_EXPLICIT_TRANSFORM_DH 0x00008000 /* Explicit xform and DH */

 #define CAPAB_PRIORITY_MOBILE 0x80000000 /* mobile site has MSG1 priority */
 /* remaining bits are unused */
 
 #define CAPAB_PRIORITY_MOBILE 0x80000000 /* mobile site has MSG1 priority */
 /* remaining bits are unused */
 


@@ -108,7 +110,9 @@
 #define CAPAB_BIT_USER_MAX              7
 #define CAPAB_BIT_SERPENT256CBC         8
 #define CAPAB_BIT_EAXSERPENT            9
 #define CAPAB_BIT_USER_MAX              7
 #define CAPAB_BIT_SERPENT256CBC         8
 #define CAPAB_BIT_EAXSERPENT            9

-#define CAPAB_BIT_MAX                  15
+#define CAPAB_BIT_TRADZP              10
+#define CAPAB_BIT_EXPLICIT_TRANSFORM_DH 15
+#define CAPAB_BIT_MAX                  31

 
 #define CAPAB_BIT_ANCIENTTRANSFORM CAPAB_BIT_SERPENT256CBC
 
 
 #define CAPAB_BIT_ANCIENTTRANSFORM CAPAB_BIT_SERPENT256CBC