Support OpenSSH encrypt-then-MAC protocol extension.

[PuTTY.git] / ssh.h

diff --git a/ssh.h b/ssh.h
index 3bb8593b6ecdf15ea951ccc61dc31bc8d97a1d8a..7f4523993da71be63431e313e76477ae4bb0c59d 100644 (file)
--- a/ssh.h
+++ b/ssh.h
@@ -104,7 +104,7 @@ struct ec_curve;
 struct ec_point {
     const struct ec_curve *curve;
     Bignum x, y;
-    Bignum z;  // Jacobian denominator
+    Bignum z;  /* Jacobian denominator */
     unsigned char infinity;
 };
 
@@ -296,7 +296,7 @@ struct ssh_mac {
     void (*bytes) (void *, unsigned char const *, int);
     void (*genresult) (void *, unsigned char *);
     int (*verresult) (void *, unsigned char const *);
-    char *name;
+    char *name, *etm_name;
     int len;
     char *text_name;
 };
@@ -596,6 +596,7 @@ void *dh_setup_group(const struct ssh_kex *kex);
 void *dh_setup_gex(Bignum pval, Bignum gval);
 void dh_cleanup(void *);
 Bignum dh_create_e(void *, int nbits);
+const char *dh_validate_f(void *handle, Bignum f);
 Bignum dh_find_K(void *, Bignum f);
 
 int loadrsakey(const Filename *filename, struct RSAKey *key,
@@ -781,7 +782,8 @@ void platform_ssh_share_cleanup(const char *name);
 #define SSH2_MSG_NEWKEYS                          21   /* 0x15 */
 #define SSH2_MSG_KEXDH_INIT                       30   /* 0x1e */
 #define SSH2_MSG_KEXDH_REPLY                      31   /* 0x1f */
-#define SSH2_MSG_KEX_DH_GEX_REQUEST               30   /* 0x1e */
+#define SSH2_MSG_KEX_DH_GEX_REQUEST_OLD           30   /* 0x1e */
+#define SSH2_MSG_KEX_DH_GEX_REQUEST               34   /* 0x1e */
 #define SSH2_MSG_KEX_DH_GEX_GROUP                 31   /* 0x1f */
 #define SSH2_MSG_KEX_DH_GEX_INIT                  32   /* 0x20 */
 #define SSH2_MSG_KEX_DH_GEX_REPLY                 33   /* 0x21 */