Mercurial > dropbear
diff algo.h @ 773:a9f2a6ae4eb5
merge
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Sun, 14 Apr 2013 22:49:19 +0800 |
parents | eafdf8b363f5 |
children | 7dcb46da72d9 |
line wrap: on
line diff
--- a/algo.h Sun Apr 14 22:49:10 2013 +0800 +++ b/algo.h Sun Apr 14 22:49:19 2013 +0800 @@ -83,10 +83,18 @@ int have_algo(char* algo, size_t algolen, algo_type algos[]); void buf_put_algolist(buffer * buf, algo_type localalgos[]); -algo_type * svr_buf_match_algo(buffer* buf, algo_type localalgos[], - int *goodguess); -algo_type * cli_buf_match_algo(buffer* buf, algo_type localalgos[], - int *goodguess); +enum kexguess2_used { + KEXGUESS2_LOOK, + KEXGUESS2_NO, + KEXGUESS2_YES, +}; + +#define KEXGUESS2_ALGO_NAME "[email protected]" +#define KEXGUESS2_ALGO_ID 99 + + +algo_type * buf_match_algo(buffer* buf, algo_type localalgos[], + enum kexguess2_used *kexguess2, int *goodguess); #ifdef ENABLE_USER_ALGO_LIST int check_user_algos(const char* user_algo_list, algo_type * algos,