diff options
| author |   markus <markus@openbsd.org> | 2001-03-27 10:57:00 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2001-03-27 10:57:00 +0000 |
| commit | 6a9bca18b0b48d12ad4f4e97215dff62f834ddcb (patch) | |
| tree | a07d7d9bfad8f33d80d2d20cf709560a598873f3 /usr.bin/ssh/ssh-rsa.c | |
| parent | use EVP_get_digestbynid, reorder some calls and fix missing free. (diff) | |
| download | wireguard-openbsd-6a9bca18b0b48d12ad4f4e97215dff62f834ddcb.tar.xz wireguard-openbsd-6a9bca18b0b48d12ad4f4e97215dff62f834ddcb.zip | |
some older systems use NID_md5 instead of NID_sha1 for RSASSA-PKCS1-v1_5
signatures in SSH protocol 2, ok djm@
Diffstat (limited to 'usr.bin/ssh/ssh-rsa.c')
| -rw-r--r-- | usr.bin/ssh/ssh-rsa.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh-rsa.c b/usr.bin/ssh/ssh-rsa.c index a2153bd1ad5..b502ddb6e0d 100644 --- a/usr.bin/ssh/ssh-rsa.c +++ b/usr.bin/ssh/ssh-rsa.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-rsa.c,v 1.7 2001/03/27 10:34:08 markus Exp $"); +RCSID("$OpenBSD: ssh-rsa.c,v 1.8 2001/03/27 10:57:00 markus Exp $"); #include <openssl/evp.h> #include <openssl/err.h> @@ -34,6 +34,7 @@ RCSID("$OpenBSD: ssh-rsa.c,v 1.7 2001/03/27 10:34:08 markus Exp $"); #include "bufaux.h" #include "key.h" #include "ssh-rsa.h" +#include "compat.h" /* RSASSA-PKCS1-v1_5 (PKCS #1 v2.0 signature) with SHA1 */ int @@ -53,7 +54,7 @@ ssh_rsa_sign( error("ssh_rsa_sign: no RSA key"); return -1; } - nid = NID_sha1; + nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1; if ((evp_md = EVP_get_digestbynid(nid)) == NULL) { error("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid); return -1; @@ -147,7 +148,7 @@ ssh_rsa_verify( error("ssh_rsa_verify: remaining bytes in signature %d", rlen); return -1; } - nid = NID_sha1; + nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1; if ((evp_md = EVP_get_digestbynid(nid)) == NULL) { xfree(sigblob); error("ssh_rsa_verify: EVP_get_digestbynid %d failed", nid); |