diff options
author | Colin Watson <cjwatson@debian.org> | 2008-05-25 22:46:27 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2008-05-25 22:46:27 +0000 |
commit | fe3af0a26497234bbae83a25fadf81a78cf2cf66 (patch) | |
tree | 3c5dfba54d90cae72f2a300922d13c3f33d5c930 | |
parent | 9794c51e6d579ba85cb04f0b720266b65b6ac297 (diff) |
update for new blacklisted_key interface
-rw-r--r-- | auth-rh-rsa.c | 2 | ||||
-rw-r--r-- | auth-rsa.c | 2 | ||||
-rw-r--r-- | auth2-hostbased.c | 2 | ||||
-rw-r--r-- | auth2-pubkey.c | 2 | ||||
-rw-r--r-- | 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, | |||
47 | char *fp; | 47 | char *fp; |
48 | HostStatus host_status; | 48 | HostStatus host_status; |
49 | 49 | ||
50 | if (blacklisted_key(client_host_key)) { | 50 | if (blacklisted_key(client_host_key) == 1) { |
51 | fp = key_fingerprint(client_host_key, SSH_FP_MD5, SSH_FP_HEX); | 51 | fp = key_fingerprint(client_host_key, SSH_FP_MD5, SSH_FP_HEX); |
52 | if (options.permit_blacklisted_keys) | 52 | if (options.permit_blacklisted_keys) |
53 | logit("Public key %s blacklisted (see " | 53 | 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) | |||
267 | "actual %d vs. announced %d.", | 267 | "actual %d vs. announced %d.", |
268 | file, linenum, BN_num_bits(key->rsa->n), bits); | 268 | file, linenum, BN_num_bits(key->rsa->n), bits); |
269 | 269 | ||
270 | if (blacklisted_key(key)) { | 270 | if (blacklisted_key(key) == 1) { |
271 | fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); | 271 | fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); |
272 | if (options.permit_blacklisted_keys) | 272 | if (options.permit_blacklisted_keys) |
273 | logit("Public key %s blacklisted (see " | 273 | 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, | |||
147 | HostStatus host_status; | 147 | HostStatus host_status; |
148 | int len; | 148 | int len; |
149 | 149 | ||
150 | if (blacklisted_key(key)) { | 150 | if (blacklisted_key(key) == 1) { |
151 | fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); | 151 | fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); |
152 | if (options.permit_blacklisted_keys) | 152 | if (options.permit_blacklisted_keys) |
153 | logit("Public key %s blacklisted (see " | 153 | 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) | |||
274 | int success; | 274 | int success; |
275 | char *file; | 275 | char *file; |
276 | 276 | ||
277 | if (blacklisted_key(key)) { | 277 | if (blacklisted_key(key) == 1) { |
278 | fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); | 278 | fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); |
279 | if (options.permit_blacklisted_keys) | 279 | if (options.permit_blacklisted_keys) |
280 | logit("Public key %s blacklisted (see " | 280 | logit("Public key %s blacklisted (see " |
@@ -1496,7 +1496,7 @@ main(int ac, char **av) | |||
1496 | 1496 | ||
1497 | for (i = 0; i < options.num_host_key_files; i++) { | 1497 | for (i = 0; i < options.num_host_key_files; i++) { |
1498 | key = key_load_private(options.host_key_files[i], "", NULL); | 1498 | key = key_load_private(options.host_key_files[i], "", NULL); |
1499 | if (key && blacklisted_key(key)) { | 1499 | if (key && blacklisted_key(key) == 1) { |
1500 | char *fp; | 1500 | char *fp; |
1501 | fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); | 1501 | fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); |
1502 | if (options.permit_blacklisted_keys) | 1502 | if (options.permit_blacklisted_keys) |