===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-rsa.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- src/usr.bin/ssh/ssh-rsa.c	2006/08/03 03:34:42	1.39
+++ src/usr.bin/ssh/ssh-rsa.c	2010/02/26 20:29:54	1.40
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-rsa.c,v 1.39 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: ssh-rsa.c,v 1.40 2010/02/26 20:29:54 djm Exp $ */
 /*
  * Copyright (c) 2000, 2003 Markus Friedl <markus@openbsd.org>
  *
@@ -43,7 +43,9 @@
 	int ok, nid;
 	Buffer b;
 
-	if (key == NULL || key->type != KEY_RSA || key->rsa == NULL) {
+	if (key == NULL ||
+	    (key->type != KEY_RSA && key->type != KEY_RSA_CERT) ||
+	    key->rsa == NULL) {
 		error("ssh_rsa_sign: no RSA key");
 		return -1;
 	}
@@ -110,7 +112,9 @@
 	u_int len, dlen, modlen;
 	int rlen, ret, nid;
 
-	if (key == NULL || key->type != KEY_RSA || key->rsa == NULL) {
+	if (key == NULL ||
+	    (key->type != KEY_RSA && key->type != KEY_RSA_CERT) ||
+	    key->rsa == NULL) {
 		error("ssh_rsa_verify: no RSA key");
 		return -1;
 	}