summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/auth-rsa.c
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2010-03-04 10:36:04 +0000
committerDamien Miller <djm@cvs.openbsd.org>2010-03-04 10:36:04 +0000
commitc8134fe1bb941fca921afd4b74baf29d690607e8 (patch)
treede00bd5b87eafad54b43aad75afc3262b894094d /usr.bin/ssh/auth-rsa.c
parent17325e7478933056d32437401903f5e253bb92a7 (diff)
Add a TrustedUserCAKeys option to sshd_config to specify CA keys that
are trusted to authenticate users (in addition than doing it per-user in authorized_keys). Add a RevokedKeys option to sshd_config and a @revoked marker to known_hosts to allow keys to me revoked and banned for user or host authentication. feedback and ok markus@
Diffstat (limited to 'usr.bin/ssh/auth-rsa.c')
-rw-r--r--usr.bin/ssh/auth-rsa.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/ssh/auth-rsa.c b/usr.bin/ssh/auth-rsa.c
index 338ae7d5b68..f136e65961c 100644
--- a/usr.bin/ssh/auth-rsa.c
+++ b/usr.bin/ssh/auth-rsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-rsa.c,v 1.73 2008/07/02 12:03:51 dtucker Exp $ */
+/* $OpenBSD: auth-rsa.c,v 1.74 2010/03/04 10:36:03 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -91,6 +91,9 @@ auth_rsa_verify_response(Key *key, BIGNUM *challenge, u_char response[16])
MD5_CTX md;
int len;
+ if (auth_key_is_revoked(key))
+ return 0;
+
/* don't allow short keys */
if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
error("auth_rsa_verify_response: RSA modulus too small: %d < minimum %d bits",