summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--kex.h5
-rw-r--r--moduli.c4
-rw-r--r--tildexpand.c3
4 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index faec11df9..91c9ce5ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
7 - dtucker@cvs.openbsd.org 2004/05/20 10:58:05 7 - dtucker@cvs.openbsd.org 2004/05/20 10:58:05
8 [clientloop.c] 8 [clientloop.c]
9 Trivial type fix 0 -> '\0'; ok markus@ 9 Trivial type fix 0 -> '\0'; ok markus@
10 - markus@cvs.openbsd.org 2004/05/21 08:43:03
11 [kex.h moduli.c tildexpand.c]
12 add prototypes for -Wall; ok djm
10 13
1120040523 1420040523
12 - (djm) [sshd_config] Explain consequences of UsePAM=yes a little better in 15 - (djm) [sshd_config] Explain consequences of UsePAM=yes a little better in
@@ -1136,4 +1139,4 @@
1136 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1139 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1137 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1140 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1138 1141
1139$Id: ChangeLog,v 1.3360 2004/05/24 00:13:07 dtucker Exp $ 1142$Id: ChangeLog,v 1.3361 2004/05/24 00:14:24 dtucker Exp $
diff --git a/kex.h b/kex.h
index 52d442e9a..437735047 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: kex.h,v 1.33 2003/02/16 17:09:57 markus Exp $ */ 1/* $OpenBSD: kex.h,v 1.34 2004/05/21 08:43:03 markus Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -137,6 +137,9 @@ u_char *
137kexgex_hash(char *, char *, char *, int, char *, int, u_char *, int, 137kexgex_hash(char *, char *, char *, int, char *, int, u_char *, int,
138 int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *); 138 int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *);
139 139
140void
141derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
142
140#if defined(DEBUG_KEX) || defined(DEBUG_KEXDH) 143#if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
141void dump_digest(char *, u_char *, int); 144void dump_digest(char *, u_char *, int);
142#endif 145#endif
diff --git a/moduli.c b/moduli.c
index f72baab3e..c8769c0aa 100644
--- a/moduli.c
+++ b/moduli.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: moduli.c,v 1.7 2004/05/09 00:06:47 djm Exp $ */ 1/* $OpenBSD: moduli.c,v 1.8 2004/05/21 08:43:03 markus Exp $ */
2/* 2/*
3 * Copyright 1994 Phil Karn <karn@qualcomm.com> 3 * Copyright 1994 Phil Karn <karn@qualcomm.com>
4 * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com> 4 * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com>
@@ -144,6 +144,8 @@ static u_int32_t *LargeSieve, largewords, largetries, largenumbers;
144static u_int32_t largebits, largememory; /* megabytes */ 144static u_int32_t largebits, largememory; /* megabytes */
145static BIGNUM *largebase; 145static BIGNUM *largebase;
146 146
147int gen_candidates(FILE *, int, int, BIGNUM *);
148int prime_test(FILE *, FILE *, u_int32_t, u_int32_t);
147 149
148/* 150/*
149 * print moduli out in consistent form, 151 * print moduli out in consistent form,
diff --git a/tildexpand.c b/tildexpand.c
index 40aa11965..cedb653b2 100644
--- a/tildexpand.c
+++ b/tildexpand.c
@@ -11,10 +11,11 @@
11 */ 11 */
12 12
13#include "includes.h" 13#include "includes.h"
14RCSID("$OpenBSD: tildexpand.c,v 1.14 2004/05/08 00:01:37 deraadt Exp $"); 14RCSID("$OpenBSD: tildexpand.c,v 1.15 2004/05/21 08:43:03 markus Exp $");
15 15
16#include "xmalloc.h" 16#include "xmalloc.h"
17#include "log.h" 17#include "log.h"
18#include "misc.h"
18 19
19/* 20/*
20 * Expands tildes in the file name. Returns data allocated by xmalloc. 21 * Expands tildes in the file name. Returns data allocated by xmalloc.