replace C++ style comments with C style

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

diff --git a/openssh/kex.c b/openssh/kex.c
index b4685a694aff8717a60a788d7aca45efeb3cfb43..ac74079fcdd0060f45996ca022950ef54a72d188 100644 (file)
--- a/openssh/kex.c
+++ b/openssh/kex.c
@@ -322,20 +322,24 @@ choose_kex(Kex *k, char *client, char *server)
        } else if (strcmp(k->name, KEX_DHGEX_SHA1) == 0) {
                k->kex_type = KEX_DH_GEX_SHA1;
                k->evp_md = EVP_sha1();
+#if OPENSSL_VERSION_NUMBER >= 0x00907000L
+       } else if (strcmp(k->name, KEX_DHGEX_SHA256) == 0) {
+               k->kex_type = KEX_DH_GEX_SHA256;
+               k->evp_md = evp_ssh_sha256();
+#endif
 #ifdef GSSAPI
        } else if (strncmp(k->name, KEX_GSS_GEX_SHA1_ID,
-           sizeof(KEX_GSS_GEX_SHA1_ID)-1) == 0) {
+           sizeof(KEX_GSS_GEX_SHA1_ID) - 1) == 0) {
                k->kex_type = KEX_GSS_GEX_SHA1;
                k->evp_md = EVP_sha1();
        } else if (strncmp(k->name, KEX_GSS_GRP1_SHA1_ID,
-           sizeof(KEX_GSS_GRP1_SHA1_ID)-1) == 0) {
+           sizeof(KEX_GSS_GRP1_SHA1_ID) - 1) == 0) {
                k->kex_type = KEX_GSS_GRP1_SHA1;
                k->evp_md = EVP_sha1();
-#endif
-#if OPENSSL_VERSION_NUMBER >= 0x00907000L
-       } else if (strcmp(k->name, KEX_DHGEX_SHA256) == 0) {
-               k->kex_type = KEX_DH_GEX_SHA256;
-               k->evp_md = evp_ssh_sha256();
+       } else if (strncmp(k->name, KEX_GSS_GRP14_SHA1_ID,
+           sizeof(KEX_GSS_GRP14_SHA1_ID) - 1) == 0) {
+               k->kex_type = KEX_GSS_GRP14_SHA1;
+               k->evp_md = EVP_sha1();
 #endif
        } else
                fatal("bad kex alg %s", k->name);