===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-rsa.c,v
retrieving revision 1.32.2.1
retrieving revision 1.33
diff -u -r1.32.2.1 -r1.33
--- src/usr.bin/ssh/ssh-rsa.c	2006/10/06 03:19:33	1.32.2.1
+++ src/usr.bin/ssh/ssh-rsa.c	2006/03/19 18:51:18	1.33
@@ -1,4 +1,3 @@
-/* $OpenBSD: ssh-rsa.c,v 1.32.2.1 2006/10/06 03:19:33 brad Exp $ */
 /*
  * Copyright (c) 2000, 2003 Markus Friedl <markus@openbsd.org>
  *
@@ -14,17 +13,15 @@
  * 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"
 
-#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"
@@ -64,7 +61,6 @@
 
 	if (ok != 1) {
 		int ecode = ERR_get_error();
-
 		error("ssh_rsa_sign: RSA_sign failed: %s",
 		    ERR_error_string(ecode, NULL));
 		xfree(sig);
@@ -147,7 +143,7 @@
 		u_int diff = modlen - len;
 		debug("ssh_rsa_verify: add padding: modlen %u > len %u",
 		    modlen, len);
-		sigblob = xrealloc(sigblob, 1, modlen);
+		sigblob = xrealloc(sigblob, modlen);
 		memmove(sigblob + diff, sigblob, len);
 		memset(sigblob, 0, diff);
 		len = modlen;
@@ -223,6 +219,7 @@
 		break;
 	default:
 		goto done;
+		break;
 	}
 	if (hashlen != hlen) {
 		error("bad hashlen");