merge updates from OPENSSH_4_4P1_SIMON_20061002_HPN to trunk

[gssapi-openssh.git] / openssh / kex.h

diff --git a/openssh/kex.h b/openssh/kex.h
index db6253adbb82e6cfc0702dd58a35ff33c7535b6e..c024402af2b94a3354ceca5496d35481726cf1df 100644 (file)
--- a/openssh/kex.h
+++ b/openssh/kex.h
@@ -62,9 +62,10 @@ enum kex_exchange {
        KEX_DH_GRP1_SHA1,
        KEX_DH_GRP14_SHA1,
        KEX_DH_GEX_SHA1,
+       KEX_DH_GEX_SHA256,
        KEX_GSS_GRP1_SHA1,
+       KEX_GSS_GRP14_SHA1,
        KEX_GSS_GEX_SHA1,
-       KEX_DH_GEX_SHA256,
        KEX_MAX
 };