=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-rsa.c,v retrieving revision 1.8.2.3 retrieving revision 1.8.2.4 diff -u -r1.8.2.3 -r1.8.2.4 --- src/usr.bin/ssh/ssh-rsa.c 2002/03/09 00:20:45 1.8.2.3 +++ src/usr.bin/ssh/ssh-rsa.c 2002/06/02 22:56:11 1.8.2.4 @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-rsa.c,v 1.8.2.3 2002/03/09 00:20:45 miod Exp $"); +RCSID("$OpenBSD: ssh-rsa.c,v 1.8.2.4 2002/06/02 22:56:11 miod Exp $"); #include #include @@ -35,6 +35,7 @@ #include "key.h" #include "ssh-rsa.h" #include "compat.h" +#include "ssh.h" /* RSASSA-PKCS1-v1_5 (PKCS #1 v2.0 signature) with SHA1 */ int @@ -54,10 +55,6 @@ error("ssh_rsa_sign: no RSA key"); return -1; } - if (datafellows & SSH_BUG_SIGBLOB) { - error("ssh_rsa_sign: SSH_BUG_SIGBLOB not supported"); - return -1; - } 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); @@ -125,11 +122,7 @@ error("ssh_rsa_verify: no RSA key"); return -1; } - if (datafellows & SSH_BUG_SIGBLOB) { - error("ssh_rsa_verify: SSH_BUG_SIGBLOB not supported"); - return -1; - } - if (BN_num_bits(key->rsa->n) < 768) { + if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) { error("ssh_rsa_verify: n too small: %d bits", BN_num_bits(key->rsa->n)); return -1;