- (stevesk) [Makefile.in ssh-rand-helper.c]

[openssh.git] / ssh-rsa.c

diff --git a/ssh-rsa.c b/ssh-rsa.c
index a2153bd1ad5ffcfcc1af176cb7e43d6f93a20f41..27522ef687d1ab61b493dd4d19e0252e91e0c14d 100644 (file)
--- a/ssh-rsa.c
+++ b/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.14 2001/12/05 10:06:12 deraadt 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,11 @@ ssh_rsa_sign(
                error("ssh_rsa_sign: no RSA key");
                return -1;
        }
-       nid = NID_sha1;
+       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);
                return -1;
@@ -102,7 +107,6 @@ ssh_rsa_sign(
                *lenp = len;
        if (sigp != NULL)
                *sigp = ret;
-       debug2("ssh_rsa_sign: done");
        return 0;
 }
 
@@ -124,13 +128,17 @@ 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) < 768) {
                error("ssh_rsa_verify: n too small: %d bits",
                    BN_num_bits(key->rsa->n));
                return -1;
        }
        buffer_init(&b);
-       buffer_append(&b, (char *) signature, signaturelen);
+       buffer_append(&b, signature, signaturelen);
        ktype = buffer_get_string(&b, NULL);
        if (strcmp("ssh-rsa", ktype) != 0) {
                error("ssh_rsa_verify: cannot handle type %s", ktype);
@@ -139,18 +147,18 @@ ssh_rsa_verify(
                return -1;
        }
        xfree(ktype);
-       sigblob = (u_char *)buffer_get_string(&b, &len);
+       sigblob = buffer_get_string(&b, &len);
        rlen = buffer_len(&b);
        buffer_free(&b);
-       if(rlen != 0) {
-               xfree(sigblob);
+       if (rlen != 0) {
                error("ssh_rsa_verify: remaining bytes in signature %d", rlen);
+               xfree(sigblob);
                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);
+               xfree(sigblob);
                return -1;
        }
        dlen = evp_md->md_size;