aboutsummaryrefslogtreecommitdiff
path: root/src/config.c
diff options
context:
space:
mode:
authorJakub Jelen <jjelen@redhat.com>2017-11-23 14:33:28 +0100
committerAndreas Schneider <asn@cryptomilk.org>2017-12-15 12:00:49 +0100
commit2e31dffdb75c14b50bb586da438e2e1c743985b8 (patch)
tree38e5d56cf0a4a2e3349b5b0f0a3a25a4faa827e3 /src/config.c
parent88e43d250220b4da3746f010420772f8abb5cedd (diff)
downloadlibssh-2e31dffdb75c14b50bb586da438e2e1c743985b8.tar.gz
libssh-2e31dffdb75c14b50bb586da438e2e1c743985b8.tar.xz
libssh-2e31dffdb75c14b50bb586da438e2e1c743985b8.zip
config: Remove MAC option (SSHv1)
Signed-off-by: Jakub Jelen <jjelen@redhat.com> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
Diffstat (limited to 'src/config.c')
-rw-r--r--src/config.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/config.c b/src/config.c
index bf20f6d3..7fe23ec9 100644
--- a/src/config.c
+++ b/src/config.c
@@ -64,7 +64,6 @@ enum ssh_config_opcode_e {
SOC_LOGLEVEL,
SOC_HOSTKEYALGORITHMS,
SOC_KEXALGORITHMS,
- SOC_MAC,
SOC_GSSAPIAUTHENTICATION,
SOC_KBDINTERACTIVEAUTHENTICATION,
SOC_PASSWORDAUTHENTICATION,
@@ -101,7 +100,7 @@ static struct ssh_config_keyword_table_s ssh_config_keyword_table[] = {
{ "loglevel", SOC_LOGLEVEL},
{ "hostkeyalgorithms", SOC_HOSTKEYALGORITHMS},
{ "kexalgorithms", SOC_KEXALGORITHMS},
- { "mac", SOC_MAC},
+ { "mac", SOC_UNSUPPORTED}, /* SSHv1 */
{ "gssapiauthentication", SOC_GSSAPIAUTHENTICATION},
{ "kbdinteractiveauthentication", SOC_KBDINTERACTIVEAUTHENTICATION},
{ "passwordauthentication", SOC_PASSWORDAUTHENTICATION},
@@ -548,13 +547,6 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
ssh_options_set(session, SSH_OPTIONS_KEY_EXCHANGE, p);
}
break;
- case SOC_MAC:
- p = ssh_config_get_str_tok(&s, NULL);
- if (p && *parsing) {
- ssh_options_set(session, SSH_OPTIONS_HMAC_C_S, p);
- ssh_options_set(session, SSH_OPTIONS_HMAC_S_C, p);
- }
- break;
case SOC_GSSAPIAUTHENTICATION:
case SOC_KBDINTERACTIVEAUTHENTICATION:
case SOC_PASSWORDAUTHENTICATION: