diff options
| author | des <des@FreeBSD.org> | 2010-03-08 11:19:52 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2010-03-08 11:19:52 +0000 |
| commit | 6c400d267598df48c6d17b86996c429cfa5792d7 (patch) | |
| tree | f3af5b582d9a7808774ea77df321abab26782ebf /ssh-rsa.c | |
| parent | 98b8242e22b0fc941b830dcec63d235b01bd46a2 (diff) | |
| download | FreeBSD-src-6c400d267598df48c6d17b86996c429cfa5792d7.zip FreeBSD-src-6c400d267598df48c6d17b86996c429cfa5792d7.tar.gz | |
Vendor import of OpenSSH 5.4p1
Diffstat (limited to 'ssh-rsa.c')
| -rw-r--r-- | ssh-rsa.c | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -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; } |
