comparison common-kex.c @ 1278:0c47d97aa9d5

merge
author Matt Johnston <matt@ucc.asn.au>
date Wed, 16 Mar 2016 22:53:27 +0800
parents 9169e4e7cbee
children 750ec4ec4cbe b28624698130
comparison
equal deleted inserted replaced
1264:a20b6af6f182 1278:0c47d97aa9d5
36 #include "dbrandom.h" 36 #include "dbrandom.h"
37 #include "runopts.h" 37 #include "runopts.h"
38 #include "ecc.h" 38 #include "ecc.h"
39 #include "crypto_desc.h" 39 #include "crypto_desc.h"
40 40
41 static void kexinitialise(); 41 static void kexinitialise(void);
42 static void gen_new_keys(); 42 static void gen_new_keys(void);
43 #ifndef DISABLE_ZLIB 43 #ifndef DISABLE_ZLIB
44 static void gen_new_zstream_recv(); 44 static void gen_new_zstream_recv(void);
45 static void gen_new_zstream_trans(); 45 static void gen_new_zstream_trans(void);
46 #endif 46 #endif
47 static void read_kex_algos(); 47 static void read_kex_algos(void);
48 /* helper function for gen_new_keys */ 48 /* helper function for gen_new_keys */
49 static void hashkeys(unsigned char *out, unsigned int outlen, 49 static void hashkeys(unsigned char *out, unsigned int outlen,
50 const hash_state * hs, const unsigned char X); 50 const hash_state * hs, const unsigned char X);
51 static void finish_kexhashbuf(void); 51 static void finish_kexhashbuf(void);
52 52