mirror of git://anongit.mindrot.org/openssh.git
- markus@cvs.openbsd.org 2004/05/21 08:43:03
[kex.h moduli.c tildexpand.c] add prototypes for -Wall; ok djm
This commit is contained in:
parent
e167582947
commit
e4ab1157db
|
@ -7,6 +7,9 @@
|
||||||
- dtucker@cvs.openbsd.org 2004/05/20 10:58:05
|
- dtucker@cvs.openbsd.org 2004/05/20 10:58:05
|
||||||
[clientloop.c]
|
[clientloop.c]
|
||||||
Trivial type fix 0 -> '\0'; ok markus@
|
Trivial type fix 0 -> '\0'; ok markus@
|
||||||
|
- markus@cvs.openbsd.org 2004/05/21 08:43:03
|
||||||
|
[kex.h moduli.c tildexpand.c]
|
||||||
|
add prototypes for -Wall; ok djm
|
||||||
|
|
||||||
20040523
|
20040523
|
||||||
- (djm) [sshd_config] Explain consequences of UsePAM=yes a little better in
|
- (djm) [sshd_config] Explain consequences of UsePAM=yes a little better in
|
||||||
|
@ -1136,4 +1139,4 @@
|
||||||
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
|
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
|
||||||
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
|
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.3360 2004/05/24 00:13:07 dtucker Exp $
|
$Id: ChangeLog,v 1.3361 2004/05/24 00:14:24 dtucker Exp $
|
||||||
|
|
5
kex.h
5
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.
|
* 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,
|
kexgex_hash(char *, char *, char *, int, char *, int, u_char *, int,
|
||||||
int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *);
|
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)
|
#if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
|
||||||
void dump_digest(char *, u_char *, int);
|
void dump_digest(char *, u_char *, int);
|
||||||
#endif
|
#endif
|
||||||
|
|
4
moduli.c
4
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 1994 Phil Karn <karn@qualcomm.com>
|
||||||
* Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.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 u_int32_t largebits, largememory; /* megabytes */
|
||||||
static BIGNUM *largebase;
|
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,
|
* print moduli out in consistent form,
|
||||||
|
|
|
@ -11,10 +11,11 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#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 "xmalloc.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
|
#include "misc.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Expands tildes in the file name. Returns data allocated by xmalloc.
|
* Expands tildes in the file name. Returns data allocated by xmalloc.
|
||||||
|
|
Loading…
Reference in New Issue