summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-02-26 18:00:48 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-02-26 18:00:48 +0000
commit13c5d3b37095a990e6ab836ebe6facddc0ac9cff (patch)
tree219b633d3cc4d49ecba2d7913a16c90a6af46f30
parent14519086e4d04acec0e0f83e1d31ffdce4419d52 (diff)
- stevesk@cvs.openbsd.org 2002/02/24 16:09:52
[sshd.c] use u_char* here; ok markus@
-rw-r--r--ChangeLog5
-rw-r--r--sshd.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index fdd857292..05592977c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,9 @@
26 - markus@cvs.openbsd.org 2002/02/23 17:59:02 26 - markus@cvs.openbsd.org 2002/02/23 17:59:02
27 [kex.c kexdh.c kexgex.c] 27 [kex.c kexdh.c kexgex.c]
28 don't allow garbage after payload. 28 don't allow garbage after payload.
29 - stevesk@cvs.openbsd.org 2002/02/24 16:09:52
30 [sshd.c]
31 use u_char* here; ok markus@
29 32
3020020225 3320020225
31 - (bal) Last AIX patch. Moved aix_usrinfo() outside of do_setuserconext() 34 - (bal) Last AIX patch. Moved aix_usrinfo() outside of do_setuserconext()
@@ -7699,4 +7702,4 @@
7699 - Wrote replacements for strlcpy and mkdtemp 7702 - Wrote replacements for strlcpy and mkdtemp
7700 - Released 1.0pre1 7703 - Released 1.0pre1
7701 7704
7702$Id: ChangeLog,v 1.1880 2002/02/26 17:58:29 mouring Exp $ 7705$Id: ChangeLog,v 1.1881 2002/02/26 18:00:48 mouring Exp $
diff --git a/sshd.c b/sshd.c
index 4b049e387..21a5f9c19 100644
--- a/sshd.c
+++ b/sshd.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: sshd.c,v 1.226 2002/02/11 16:19:39 markus Exp $"); 43RCSID("$OpenBSD: sshd.c,v 1.227 2002/02/24 16:09:52 stevesk Exp $");
44 44
45#include <openssl/dh.h> 45#include <openssl/dh.h>
46#include <openssl/bn.h> 46#include <openssl/bn.h>
@@ -1434,7 +1434,7 @@ do_ssh1_kex(void)
1434 } 1434 }
1435 if (rsafail) { 1435 if (rsafail) {
1436 int bytes = BN_num_bytes(session_key_int); 1436 int bytes = BN_num_bytes(session_key_int);
1437 char *buf = xmalloc(bytes); 1437 u_char *buf = xmalloc(bytes);
1438 MD5_CTX md; 1438 MD5_CTX md;
1439 1439
1440 log("do_connection: generating a fake encryption key"); 1440 log("do_connection: generating a fake encryption key");