Refactor rejection of blacklisted user keys into a single

reject_blacklisted_key function in auth.c (thanks, Dmitry V. Levin).

1 files changed, 3 insertions, 14 deletions

diff --git a/sshd.c b/sshd.c
index df025906f..80cfd56d8 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1496,20 +1496,9 @@ main(int ac, char **av)
 
         for (i = 0; i < options.num_host_key_files; i++) {
                 key = key_load_private(options.host_key_files[i], "", NULL);
-                if (key && blacklisted_key(key) == 1) {
-                        char *fp;
-                        fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX);
-                        if (options.permit_blacklisted_keys)
-                                error("Host key %s blacklisted (see "
-                                    "ssh-vulnkey(1)); continuing anyway", fp);
-                        else
-                                error("Host key %s blacklisted (see "
-                                    "ssh-vulnkey(1))", fp);
-                        xfree(fp);
-                        if (!options.permit_blacklisted_keys) {
-                                sensitive_data.host_keys[i] = NULL;
-                                continue;
-                        }
+                if (key && reject_blacklisted_key(key, 1) == 1) {
+                        sensitive_data.host_keys[i] = NULL;
+                        continue;
                 }
                 sensitive_data.host_keys[i] = key;
                 if (key == NULL) {