summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-04-03 03:03:04 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-04-03 03:03:04 +0000
commit07739fe305472f6755a42d2ab4cd442adf44c8a0 (patch)
tree475920063146178eaa6a52f5b40477430143d3c6
parent2f3d52a2d67b547c5f06676c52396fd8133df32b (diff)
downloadopenssh-git-07739fe305472f6755a42d2ab4cd442adf44c8a0.tar.gz
- markus@cvs.openbsd.org 2002/04/02 20:11:38
[ssh-rsa.c] ignore SSH_BUG_SIGBLOB for ssh-rsa; #187
-rw-r--r--ChangeLog5
-rw-r--r--ssh-rsa.c10
2 files changed, 5 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index ce933846..8cdb416a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,9 @@
- markus@cvs.openbsd.org 2002/04/02 17:37:48
[sftp.c]
always call log_init()
+ - markus@cvs.openbsd.org 2002/04/02 20:11:38
+ [ssh-rsa.c]
+ ignore SSH_BUG_SIGBLOB for ssh-rsa; #187
20020401
- (stevesk) [monitor.c] PAM should work again; will *not* work with
@@ -8143,4 +8146,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.2018 2002/04/02 21:06:18 mouring Exp $
+$Id: ChangeLog,v 1.2019 2002/04/03 03:03:04 mouring Exp $
diff --git a/ssh-rsa.c b/ssh-rsa.c
index b2fcc340..fe4dc1f8 100644
--- a/ssh-rsa.c
+++ b/ssh-rsa.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-rsa.c,v 1.17 2002/03/29 19:18:33 stevesk Exp $");
+RCSID("$OpenBSD: ssh-rsa.c,v 1.18 2002/04/02 20:11:38 markus Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>
@@ -55,10 +55,6 @@ ssh_rsa_sign(
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);
@@ -126,10 +122,6 @@ ssh_rsa_verify(
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) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
error("ssh_rsa_verify: n too small: %d bits",
BN_num_bits(key->rsa->n));