comparison common-algo.c @ 681:a4b7627b3157 insecure-nocrypto

Update insecure-nocrypto to current head
author Matt Johnston <matt@ucc.asn.au>
date Wed, 16 May 2012 22:54:51 +0800
parents 03073a27abb3 0129fd8ccc71
children c37857676924
comparison
equal deleted inserted replaced
680:bd4b5d7886e5 681:a4b7627b3157
158 {"twofish128-cbc", 0, &dropbear_twofish128, 1, &dropbear_mode_cbc}, 158 {"twofish128-cbc", 0, &dropbear_twofish128, 1, &dropbear_mode_cbc},
159 #endif 159 #endif
160 #ifdef DROPBEAR_BLOWFISH 160 #ifdef DROPBEAR_BLOWFISH
161 {"blowfish-cbc", 0, &dropbear_blowfish, 1, &dropbear_mode_cbc}, 161 {"blowfish-cbc", 0, &dropbear_blowfish, 1, &dropbear_mode_cbc},
162 #endif 162 #endif
163 #ifdef DROPBEAR_NONE_CIPHER
164 {"none", 0, (void*)&dropbear_nocipher, 1, &dropbear_mode_none},
165 #endif
163 {NULL, 0, NULL, 0, NULL} 166 {NULL, 0, NULL, 0, NULL}
164 }; 167 };
165 168
166 algo_type sshhashes[] = { 169 algo_type sshhashes[] = {
167 #ifdef DROPBEAR_SHA2_256_HMAC 170 #ifdef DROPBEAR_SHA2_256_HMAC
175 #endif 178 #endif
176 #ifdef DROPBEAR_SHA1_HMAC 179 #ifdef DROPBEAR_SHA1_HMAC
177 {"hmac-sha1", 0, &dropbear_sha1, 1, NULL}, 180 {"hmac-sha1", 0, &dropbear_sha1, 1, NULL},
178 #endif 181 #endif
179 #ifdef DROPBEAR_MD5_HMAC 182 #ifdef DROPBEAR_MD5_HMAC
180 {"hmac-md5", 0, &dropbear_md5, 1, NULL}, 183 {"hmac-md5", 0, (void*)&dropbear_md5, 1, NULL},
184 #endif
185 #ifdef DROPBEAR_NONE_INTEGRITY
186 {"none", 0, (void*)&dropbear_nohash, 1, NULL},
181 #endif 187 #endif
182 {NULL, 0, NULL, 0, NULL} 188 {NULL, 0, NULL, 0, NULL}
183 }; 189 };
184 190
185 #ifndef DISABLE_ZLIB 191 #ifndef DISABLE_ZLIB