diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-01-06 03:41:58 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-01-30 11:05:18 +1100 |
commit | f89b928534c9e77f608806a217d39a2960cc7fd0 (patch) | |
tree | 3c92b809a59d11ffeeed1dea2ad905e67de42887 /ssh-keyscan.c | |
parent | 0999533014784579aa6f01c2d3a06e3e8804b680 (diff) |
upstream commit
Avoid confusing error message when attempting to use
ssh-keyscan built without SSH protocol v.1 to scan for v.1 keys; bz#2583
Upstream-ID: 5d214abd3a21337d67c6dcc5aa6f313298d0d165
Diffstat (limited to 'ssh-keyscan.c')
-rw-r--r-- | ssh-keyscan.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c index c30d54e62..eea8d0a0a 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keyscan.c,v 1.106 2016/05/02 10:26:04 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keyscan.c,v 1.107 2017/01/06 03:41:58 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. | 3 | * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. |
4 | * | 4 | * |
@@ -752,10 +752,13 @@ main(int argc, char **argv) | |||
752 | tname = strtok(optarg, ","); | 752 | tname = strtok(optarg, ","); |
753 | while (tname) { | 753 | while (tname) { |
754 | int type = sshkey_type_from_name(tname); | 754 | int type = sshkey_type_from_name(tname); |
755 | |||
755 | switch (type) { | 756 | switch (type) { |
757 | #ifdef WITH_SSH1 | ||
756 | case KEY_RSA1: | 758 | case KEY_RSA1: |
757 | get_keytypes |= KT_RSA1; | 759 | get_keytypes |= KT_RSA1; |
758 | break; | 760 | break; |
761 | #endif | ||
759 | case KEY_DSA: | 762 | case KEY_DSA: |
760 | get_keytypes |= KT_DSA; | 763 | get_keytypes |= KT_DSA; |
761 | break; | 764 | break; |
@@ -769,7 +772,8 @@ main(int argc, char **argv) | |||
769 | get_keytypes |= KT_ED25519; | 772 | get_keytypes |= KT_ED25519; |
770 | break; | 773 | break; |
771 | case KEY_UNSPEC: | 774 | case KEY_UNSPEC: |
772 | fatal("unknown key type %s", tname); | 775 | default: |
776 | fatal("Unknown key type \"%s\"", tname); | ||
773 | } | 777 | } |
774 | tname = strtok(NULL, ","); | 778 | tname = strtok(NULL, ","); |
775 | } | 779 | } |