Mercurial > dropbear
diff common-algo.c @ 686:983a817f8e41 insecure-nocrypto
- Only request "none" cipher after auth has succeeded
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Thu, 17 May 2012 20:52:57 +0800 |
parents | c37857676924 |
children | cd3d3c63d189 |
line wrap: on
line diff
--- a/common-algo.c Thu May 17 08:33:11 2012 +0800 +++ b/common-algo.c Thu May 17 20:52:57 2012 +0800 @@ -301,6 +301,38 @@ buf_free(algolist); } +#ifdef DROPBEAR_NONE_CIPHER + +void +set_algo_usable(algo_type algos[], const char * algo_name, int usable) +{ + algo_type *a; + for (a = algos; a->name != NULL; a++) + { + if (strcmp(a->name, algo_name) == 0) + { + a->usable = usable; + return; + } + } +} + +int +get_algo_usable(algo_type algos[], const char * algo_name) +{ + algo_type *a; + for (a = algos; a->name != NULL; a++) + { + if (strcmp(a->name, algo_name) == 0) + { + return a->usable; + } + } + return 0; +} + +#endif // DROPBEAR_NONE_CIPHER + #ifdef ENABLE_USER_ALGO_LIST char * @@ -367,7 +399,8 @@ { *c = '\0'; try_add_algo(last_name, algos, algo_desc, new_algos, &num_ret); - last_name = c++; + c++; + last_name = c; } } try_add_algo(last_name, algos, algo_desc, new_algos, &num_ret);