- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / ssh-rsa.c

diff --git a/ssh-rsa.c b/ssh-rsa.c
index eb422d07e9c70d701b08de043610991625688dac..0e16ff85f1d6f024273e22db89e04dbac6e52f1c 100644 (file)
--- a/ssh-rsa.c
+++ b/ssh-rsa.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ssh-rsa.c,v 1.39 2006/08/03 03:34:42 deraadt Exp $ */
 /*
  * Copyright (c) 2000, 2003 Markus Friedl <markus@openbsd.org>
  *
@@ -13,16 +14,20 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+
 #include "includes.h"
-RCSID("$OpenBSD: ssh-rsa.c,v 1.32 2005/06/17 02:44:33 djm Exp $");
+
+#include <sys/types.h>
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
 
+#include <stdarg.h>
+#include <string.h>
+
 #include "xmalloc.h"
 #include "log.h"
 #include "buffer.h"
-#include "bufaux.h"
 #include "key.h"
 #include "compat.h"
 #include "ssh.h"
@@ -62,6 +67,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
 
        if (ok != 1) {
                int ecode = ERR_get_error();
+
                error("ssh_rsa_sign: RSA_sign failed: %s",
                    ERR_error_string(ecode, NULL));
                xfree(sig);
@@ -144,7 +150,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
                u_int diff = modlen - len;
                debug("ssh_rsa_verify: add padding: modlen %u > len %u",
                    modlen, len);
-               sigblob = xrealloc(sigblob, modlen);
+               sigblob = xrealloc(sigblob, 1, modlen);
                memmove(sigblob + diff, sigblob, len);
                memset(sigblob, 0, diff);
                len = modlen;
@@ -220,7 +226,6 @@ openssh_RSA_verify(int type, u_char *hash, u_int hashlen,
                break;
        default:
                goto done;
-               break;
        }
        if (hashlen != hlen) {
                error("bad hashlen");