merge of 57902417ad22502b79c63fcabb7f4a8c8449e682

and 92bb4dd3f6f212342a5c991f738b987d7a07a6b2

--HG--
extra : convert_revision : f4bf35030bf75c46ab649774ebaf7bcf8e545b04
This commit is contained in:
Matt Johnston 2005-09-02 15:33:45 +00:00
commit b332e4aaf9
2 changed files with 1 additions and 4 deletions

View File

@ -210,7 +210,7 @@ int have_algo(char* algo, size_t algolen, algo_type algos[]) {
void buf_put_algolist(buffer * buf, algo_type localalgos[]) {
unsigned int pos = 0, i, len;
char str[MAX_ALGO_LIST_LEN];
char str[50]; /* enough for local algo storage */
for (i = 0; localalgos[i].name != NULL; i++) {
if (localalgos[i].usable) {

View File

@ -289,9 +289,6 @@ etc) slower (perhaps by 50%). Recommended for most small systems. */
#define MAX_PROPOSED_ALGO 20
#define MAX_ALGO_LIST_LEN 100 /* max length of our sent algorithm list
(cipher is longest) */
/* size/count limits */
#define MAX_LISTEN_ADDR 10