From fe3af0a26497234bbae83a25fadf81a78cf2cf66 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sun, 25 May 2008 22:46:27 +0000 Subject: update for new blacklisted_key interface --- auth-rh-rsa.c | 2 +- auth-rsa.c | 2 +- auth2-hostbased.c | 2 +- auth2-pubkey.c | 2 +- sshd.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/auth-rh-rsa.c b/auth-rh-rsa.c index 093461e83..77a043998 100644 --- a/auth-rh-rsa.c +++ b/auth-rh-rsa.c @@ -47,7 +47,7 @@ auth_rhosts_rsa_key_allowed(struct passwd *pw, char *cuser, char *chost, char *fp; HostStatus host_status; - if (blacklisted_key(client_host_key)) { + if (blacklisted_key(client_host_key) == 1) { fp = key_fingerprint(client_host_key, SSH_FP_MD5, SSH_FP_HEX); if (options.permit_blacklisted_keys) logit("Public key %s blacklisted (see " diff --git a/auth-rsa.c b/auth-rsa.c index 1d277f92a..87e1fbf59 100644 --- a/auth-rsa.c +++ b/auth-rsa.c @@ -267,7 +267,7 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey) "actual %d vs. announced %d.", file, linenum, BN_num_bits(key->rsa->n), bits); - if (blacklisted_key(key)) { + if (blacklisted_key(key) == 1) { fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); if (options.permit_blacklisted_keys) logit("Public key %s blacklisted (see " diff --git a/auth2-hostbased.c b/auth2-hostbased.c index a0ee3060a..8e3d5f530 100644 --- a/auth2-hostbased.c +++ b/auth2-hostbased.c @@ -147,7 +147,7 @@ hostbased_key_allowed(struct passwd *pw, const char *cuser, char *chost, HostStatus host_status; int len; - if (blacklisted_key(key)) { + if (blacklisted_key(key) == 1) { fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); if (options.permit_blacklisted_keys) logit("Public key %s blacklisted (see " diff --git a/auth2-pubkey.c b/auth2-pubkey.c index cf911968a..4976a5a8a 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c @@ -274,7 +274,7 @@ user_key_allowed(struct passwd *pw, Key *key) int success; char *file; - if (blacklisted_key(key)) { + if (blacklisted_key(key) == 1) { fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); if (options.permit_blacklisted_keys) logit("Public key %s blacklisted (see " diff --git a/sshd.c b/sshd.c index 1d2769a56..df025906f 100644 --- a/sshd.c +++ b/sshd.c @@ -1496,7 +1496,7 @@ 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)) { + if (key && blacklisted_key(key) == 1) { char *fp; fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); if (options.permit_blacklisted_keys) -- cgit v1.2.3