summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2004-05-21 08:43:04 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2004-05-21 08:43:04 +0000
commit0b474ad823283b410542c7b535c8d68a963b9deb (patch)
treeaaf9783edbf6771d30e471bae55b8c47fa3ec4e9 /usr.bin/ssh
parent14757fa30bd4b6049c3d57fb4de4fb5e57f5df8b (diff)
add prototypes for -Wall; ok djm
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/kex.h5
-rw-r--r--usr.bin/ssh/moduli.c4
-rw-r--r--usr.bin/ssh/tildexpand.c3
3 files changed, 9 insertions, 3 deletions
diff --git a/usr.bin/ssh/kex.h b/usr.bin/ssh/kex.h
index 52d442e9a7d..43773504730 100644
--- a/usr.bin/ssh/kex.h
+++ b/usr.bin/ssh/kex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.33 2003/02/16 17:09:57 markus Exp $ */
+/* $OpenBSD: kex.h,v 1.34 2004/05/21 08:43:03 markus Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -137,6 +137,9 @@ u_char *
kexgex_hash(char *, char *, char *, int, char *, int, u_char *, int,
int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *);
+void
+derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+
#if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
void dump_digest(char *, u_char *, int);
#endif
diff --git a/usr.bin/ssh/moduli.c b/usr.bin/ssh/moduli.c
index f72baab3e44..c8769c0aa5f 100644
--- a/usr.bin/ssh/moduli.c
+++ b/usr.bin/ssh/moduli.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: moduli.c,v 1.7 2004/05/09 00:06:47 djm Exp $ */
+/* $OpenBSD: moduli.c,v 1.8 2004/05/21 08:43:03 markus Exp $ */
/*
* Copyright 1994 Phil Karn <karn@qualcomm.com>
* Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com>
@@ -144,6 +144,8 @@ static u_int32_t *LargeSieve, largewords, largetries, largenumbers;
static u_int32_t largebits, largememory; /* megabytes */
static BIGNUM *largebase;
+int gen_candidates(FILE *, int, int, BIGNUM *);
+int prime_test(FILE *, FILE *, u_int32_t, u_int32_t);
/*
* print moduli out in consistent form,
diff --git a/usr.bin/ssh/tildexpand.c b/usr.bin/ssh/tildexpand.c
index 40aa11965e4..cedb653b244 100644
--- a/usr.bin/ssh/tildexpand.c
+++ b/usr.bin/ssh/tildexpand.c
@@ -11,10 +11,11 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: tildexpand.c,v 1.14 2004/05/08 00:01:37 deraadt Exp $");
+RCSID("$OpenBSD: tildexpand.c,v 1.15 2004/05/21 08:43:03 markus Exp $");
#include "xmalloc.h"
#include "log.h"
+#include "misc.h"
/*
* Expands tildes in the file name. Returns data allocated by xmalloc.