comparison common-algo.c @ 1014:37c510c2ac7c coverity

merge
author Matt Johnston <matt@ucc.asn.au>
date Tue, 10 Feb 2015 21:47:43 +0800
parents ffd2359564b0
children 6c42bab6e081
comparison
equal deleted inserted replaced
1006:0aa1feb8adda 1014:37c510c2ac7c
142 {"aes128-ctr", 0, &dropbear_aes128, 1, &dropbear_mode_ctr}, 142 {"aes128-ctr", 0, &dropbear_aes128, 1, &dropbear_mode_ctr},
143 #endif 143 #endif
144 #ifdef DROPBEAR_AES256 144 #ifdef DROPBEAR_AES256
145 {"aes256-ctr", 0, &dropbear_aes256, 1, &dropbear_mode_ctr}, 145 {"aes256-ctr", 0, &dropbear_aes256, 1, &dropbear_mode_ctr},
146 #endif 146 #endif
147 #ifdef DROPBEAR_TWOFISH256
148 {"twofish256-ctr", 0, &dropbear_twofish256, 1, &dropbear_mode_ctr},
149 #endif
150 #ifdef DROPBEAR_TWOFISH128
151 {"twofish128-ctr", 0, &dropbear_twofish128, 1, &dropbear_mode_ctr},
152 #endif
147 #endif /* DROPBEAR_ENABLE_CTR_MODE */ 153 #endif /* DROPBEAR_ENABLE_CTR_MODE */
148 154
149 #ifdef DROPBEAR_ENABLE_CBC_MODE 155 #ifdef DROPBEAR_ENABLE_CBC_MODE
150 #ifdef DROPBEAR_AES128 156 #ifdef DROPBEAR_AES128
151 {"aes128-cbc", 0, &dropbear_aes128, 1, &dropbear_mode_cbc}, 157 {"aes128-cbc", 0, &dropbear_aes128, 1, &dropbear_mode_cbc},