===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-rsa.c,v
retrieving revision 1.32
retrieving revision 1.32.4.1
diff -u -r1.32 -r1.32.4.1
--- src/usr.bin/ssh/ssh-rsa.c	2005/06/17 02:44:33	1.32
+++ src/usr.bin/ssh/ssh-rsa.c	2006/09/30 04:06:51	1.32.4.1
@@ -1,3 +1,4 @@
+/* $OpenBSD: ssh-rsa.c,v 1.32.4.1 2006/09/30 04:06:51 brad Exp $ */
 /*
  * Copyright (c) 2000, 2003 Markus Friedl <markus@openbsd.org>
  *
@@ -13,16 +14,17 @@
  * 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 <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 +64,7 @@
 
 	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 +147,7 @@
 		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 +223,6 @@
 		break;
 	default:
 		goto done;
-		break;
 	}
 	if (hashlen != hlen) {
 		error("bad hashlen");