comparison common-algo.c @ 360:09cb54106e89 insecure-nocrypto

explicit merge of '0501e6f661b5415eb76f3b312d183c3adfbfb712' and '2b954d406290e6a2be8eb4a262d3675ac95ac544'
author Matt Johnston <matt@ucc.asn.au>
date Mon, 02 Oct 2006 06:39:32 +0000
parents 64abb124763d
children 582cb38e4eb5
comparison
equal deleted inserted replaced
295:03f65e461915 360:09cb54106e89
101 {"twofish128-cbc", 0, (void*)&dropbear_twofish128, 1}, 101 {"twofish128-cbc", 0, (void*)&dropbear_twofish128, 1},
102 #endif 102 #endif
103 #ifdef DROPBEAR_BLOWFISH_CBC 103 #ifdef DROPBEAR_BLOWFISH_CBC
104 {"blowfish-cbc", 0, (void*)&dropbear_blowfish, 1}, 104 {"blowfish-cbc", 0, (void*)&dropbear_blowfish, 1},
105 #endif 105 #endif
106 #ifdef DROPBEAR_NONE_CIPHER
107 {"none", 0, (void*)&dropbear_nocipher, 1},
108 #endif
106 {NULL, 0, NULL, 0} 109 {NULL, 0, NULL, 0}
107 }; 110 };
108 111
109 algo_type sshhashes[] = { 112 algo_type sshhashes[] = {
110 #ifdef DROPBEAR_SHA1_96_HMAC 113 #ifdef DROPBEAR_SHA1_96_HMAC
113 #ifdef DROPBEAR_SHA1_HMAC 116 #ifdef DROPBEAR_SHA1_HMAC
114 {"hmac-sha1", 0, (void*)&dropbear_sha1, 1}, 117 {"hmac-sha1", 0, (void*)&dropbear_sha1, 1},
115 #endif 118 #endif
116 #ifdef DROPBEAR_MD5_HMAC 119 #ifdef DROPBEAR_MD5_HMAC
117 {"hmac-md5", 0, (void*)&dropbear_md5, 1}, 120 {"hmac-md5", 0, (void*)&dropbear_md5, 1},
121 #endif
122 #ifdef DROPBEAR_NONE_INTEGRITY
123 {"none", 0, (void*)&dropbear_nohash, 1},
118 #endif 124 #endif
119 {NULL, 0, NULL, 0} 125 {NULL, 0, NULL, 0}
120 }; 126 };
121 127
122 algo_type sshcompress[] = { 128 algo_type sshcompress[] = {