upstream commit

openssh_RSA_verify return type is int, so don't make it
 size_t within the function itself with only negative numbers or zero assigned
 to it. bz#2460

Upstream-ID: b6e794b0c7fc4f9f329509263c8668d35f83ea55

diff --git a/ssh-rsa.c b/ssh-rsa.c
index cdc18a4162c72d94e8a800070b43341940cabe3b..08090d14ee2d8d675a0e3a1421bea61feaa83522 100644 (file)
--- a/ssh-rsa.c
+++ b/ssh-rsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-rsa.c,v 1.53 2015/06/15 01:32:50 djm Exp $ */
+/* $OpenBSD: ssh-rsa.c,v 1.54 2015/09/09 00:52:44 djm Exp $ */
 /*
  * Copyright (c) 2000, 2003 Markus Friedl <markus@openbsd.org>
  *
@@ -213,8 +213,8 @@ static int
 openssh_RSA_verify(int hash_alg, u_char *hash, size_t hashlen,
     u_char *sigbuf, size_t siglen, RSA *rsa)
 {
-       size_t ret, rsasize = 0, oidlen = 0, hlen = 0;
-       int len, oidmatch, hashmatch;
+       size_t rsasize = 0, oidlen = 0, hlen = 0;
+       int ret, len, oidmatch, hashmatch;
        const u_char *oid = NULL;
        u_char *decrypted = NULL;