1 files changed, 7 insertions, 3 deletions

diff --git a/ssh-rsa.c b/ssh-rsa.c
index 0e16ff85f..842857fee 100644
--- a/ssh-rsa.c
+++ b/ssh-rsa.c
@@ -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>
  *
@@ -46,7 +46,9 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
         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;
         }
@@ -113,7 +115,9 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
         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;
         }