diff options
Diffstat (limited to 'auth-rsa.c')
-rw-r--r-- | auth-rsa.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/auth-rsa.c b/auth-rsa.c index 4876aad5d..250e9cf78 100644 --- a/auth-rsa.c +++ b/auth-rsa.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth-rsa.c,v 1.73 2008/07/02 12:03:51 dtucker Exp $ */ | 1 | /* $OpenBSD: auth-rsa.c,v 1.74 2010/03/04 10:36:03 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -94,6 +94,9 @@ auth_rsa_verify_response(Key *key, BIGNUM *challenge, u_char response[16]) | |||
94 | MD5_CTX md; | 94 | MD5_CTX md; |
95 | int len; | 95 | int len; |
96 | 96 | ||
97 | if (auth_key_is_revoked(key, 0)) | ||
98 | return 0; | ||
99 | |||
97 | /* don't allow short keys */ | 100 | /* don't allow short keys */ |
98 | if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) { | 101 | if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) { |
99 | error("auth_rsa_verify_response: RSA modulus too small: %d < minimum %d bits", | 102 | error("auth_rsa_verify_response: RSA modulus too small: %d < minimum %d bits", |
@@ -246,9 +249,6 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey) | |||
246 | "actual %d vs. announced %d.", | 249 | "actual %d vs. announced %d.", |
247 | file, linenum, BN_num_bits(key->rsa->n), bits); | 250 | file, linenum, BN_num_bits(key->rsa->n), bits); |
248 | 251 | ||
249 | if (reject_blacklisted_key(key, 0) == 1) | ||
250 | continue; | ||
251 | |||
252 | /* We have found the desired key. */ | 252 | /* We have found the desired key. */ |
253 | /* | 253 | /* |
254 | * If our options do not allow this key to be used, | 254 | * If our options do not allow this key to be used, |