diff options
Diffstat (limited to 'auth.c')
-rw-r--r-- | auth.c | 27 |
1 files changed, 1 insertions, 26 deletions
@@ -59,7 +59,6 @@ | |||
59 | #include "servconf.h" | 59 | #include "servconf.h" |
60 | #include "key.h" | 60 | #include "key.h" |
61 | #include "hostfile.h" | 61 | #include "hostfile.h" |
62 | #include "authfile.h" | ||
63 | #include "auth.h" | 62 | #include "auth.h" |
64 | #include "auth-options.h" | 63 | #include "auth-options.h" |
65 | #include "canohost.h" | 64 | #include "canohost.h" |
@@ -655,34 +654,10 @@ getpwnamallow(const char *user) | |||
655 | 654 | ||
656 | /* Returns 1 if key is revoked by revoked_keys_file, 0 otherwise */ | 655 | /* Returns 1 if key is revoked by revoked_keys_file, 0 otherwise */ |
657 | int | 656 | int |
658 | auth_key_is_revoked(Key *key, int hostkey) | 657 | auth_key_is_revoked(Key *key) |
659 | { | 658 | { |
660 | char *key_fp; | 659 | char *key_fp; |
661 | 660 | ||
662 | if (blacklisted_key(key, &key_fp) == 1) { | ||
663 | if (options.permit_blacklisted_keys) { | ||
664 | if (hostkey) | ||
665 | error("Host key %s blacklisted (see " | ||
666 | "ssh-vulnkey(1)); continuing anyway", | ||
667 | key_fp); | ||
668 | else | ||
669 | logit("Public key %s from %s blacklisted (see " | ||
670 | "ssh-vulnkey(1)); continuing anyway", | ||
671 | key_fp, get_remote_ipaddr()); | ||
672 | free(key_fp); | ||
673 | } else { | ||
674 | if (hostkey) | ||
675 | error("Host key %s blacklisted (see " | ||
676 | "ssh-vulnkey(1))", key_fp); | ||
677 | else | ||
678 | logit("Public key %s from %s blacklisted (see " | ||
679 | "ssh-vulnkey(1))", | ||
680 | key_fp, get_remote_ipaddr()); | ||
681 | free(key_fp); | ||
682 | return 1; | ||
683 | } | ||
684 | } | ||
685 | |||
686 | if (options.revoked_keys_file == NULL) | 661 | if (options.revoked_keys_file == NULL) |
687 | return 0; | 662 | return 0; |
688 | switch (ssh_krl_file_contains_key(options.revoked_keys_file, key)) { | 663 | switch (ssh_krl_file_contains_key(options.revoked_keys_file, key)) { |