summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ssh-rsa.c5
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ce409160f..9a6eb9877 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,10 @@
31 [session.c] 31 [session.c]
32 send signal name (not signal number) in "exit-signal" message; noticed 32 send signal name (not signal number) in "exit-signal" message; noticed
33 by galb@vandyke.com 33 by galb@vandyke.com
34 - stevesk@cvs.openbsd.org 2002/08/27 17:13:56
35 [ssh-rsa.c]
36 RSA_public_decrypt() returns -1 on error so len must be signed;
37 ok markus@
34 38
3520020820 3920020820
36 - OpenBSD CVS Sync 40 - OpenBSD CVS Sync
@@ -1572,4 +1576,4 @@
1572 - (stevesk) entropy.c: typo in debug message 1576 - (stevesk) entropy.c: typo in debug message
1573 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1577 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1574 1578
1575$Id: ChangeLog,v 1.2435 2002/09/04 06:39:02 djm Exp $ 1579$Id: ChangeLog,v 1.2436 2002/09/04 06:39:48 djm Exp $
diff --git a/ssh-rsa.c b/ssh-rsa.c
index 44287fa26..d7b2918f9 100644
--- a/ssh-rsa.c
+++ b/ssh-rsa.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: ssh-rsa.c,v 1.25 2002/08/02 22:20:30 markus Exp $"); 26RCSID("$OpenBSD: ssh-rsa.c,v 1.26 2002/08/27 17:13:56 stevesk Exp $");
27 27
28#include <openssl/evp.h> 28#include <openssl/evp.h>
29#include <openssl/err.h> 29#include <openssl/err.h>
@@ -211,7 +211,8 @@ static int
211openssh_RSA_verify(int type, u_char *hash, u_int hashlen, 211openssh_RSA_verify(int type, u_char *hash, u_int hashlen,
212 u_char *sigbuf, u_int siglen, RSA *rsa) 212 u_char *sigbuf, u_int siglen, RSA *rsa)
213{ 213{
214 u_int ret, rsasize, len, oidlen = 0, hlen = 0; 214 u_int ret, rsasize, oidlen = 0, hlen = 0;
215 int len;
215 const u_char *oid = NULL; 216 const u_char *oid = NULL;
216 u_char *decrypted = NULL; 217 u_char *decrypted = NULL;
217 218