summaryrefslogtreecommitdiffstats
path: root/auth-rsa.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-05-21 06:56:25 +0200
committerDamien Miller <djm@mindrot.org>2010-05-21 06:56:25 +0200
commit3b903827ebe16c97f705cb3b6ef6e9702d770087 (patch)
tree4c10236ed3ef5c75eba44e4e0586ca3634ff88cf /auth-rsa.c
parent - djm@cvs.openbsd.org 2010/05/07 11:31:26 (diff)
downloadopenssh-3b903827ebe16c97f705cb3b6ef6e9702d770087.tar.xz
openssh-3b903827ebe16c97f705cb3b6ef6e9702d770087.zip
- djm@cvs.openbsd.org 2010/05/11 02:58:04
[auth-rsa.c] don't accept certificates marked as "cert-authority" here; ok markus@
Diffstat (limited to 'auth-rsa.c')
-rw-r--r--auth-rsa.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/auth-rsa.c b/auth-rsa.c
index 326937ac0..ef6767bfb 100644
--- a/auth-rsa.c
+++ b/auth-rsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-rsa.c,v 1.75 2010/04/16 01:47:26 djm Exp $ */
+/* $OpenBSD: auth-rsa.c,v 1.76 2010/05/11 02:58:04 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -256,7 +256,8 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey)
*/
if (!auth_parse_options(pw, key_options, file, linenum))
continue;
-
+ if (key_is_cert_authority)
+ continue;
/* break out, this key is allowed */
allowed = 1;
break;