Diff

Differences From Artifact [529f4ed791]:

To Artifact [dc4d40b905]:


232
233
234
235
236
237
238
239

240
241
242
243
244
245
246
247

248
249
250
251
252
253
254
232
233
234
235
236
237
238

239



240
241
242
243
244
245
246
247
248
249
250
251
252







-
+
-
-
-





+







 */

#define SSH1_BUFFER_LIMIT 32768
#define SSH_MAX_BACKLOG 32768
#define OUR_V2_WINSIZE 16384

/*
 * Ciphers for SSH2. We miss out single-DES because it isn't
 * Ciphers for SSH2.
 * supported; also 3DES and Blowfish are both done differently from
 * SSH1. (3DES uses outer chaining; Blowfish has the opposite
 * endianness and different-sized keys.)
 */
const static struct ssh2_ciphers *ciphers[] = {
    &ssh2_aes,
    &ssh2_blowfish,
    &ssh2_3des,
    &ssh2_des,
};

const static struct ssh_kex *kex_algs[] = {
    &ssh_diffiehellman_gex,
    &ssh_diffiehellman
};

3168
3169
3170
3171
3172
3173
3174
3175


3176
3177
3178
3179
3180
3181
3182
3166
3167
3168
3169
3170
3171
3172

3173
3174
3175
3176
3177
3178
3179
3180
3181







-
+
+







    for (i = 0; i < CIPHER_MAX; i++) {
	switch (cfg.ssh_cipherlist[i]) {
	  case CIPHER_BLOWFISH:
	    preferred_ciphers[n_preferred_ciphers] = &ssh2_blowfish;
	    n_preferred_ciphers++;
	    break;
	  case CIPHER_DES:
	    /* Not supported in SSH2; silently drop */
	    preferred_ciphers[n_preferred_ciphers] = &ssh2_des;
	    n_preferred_ciphers++;
	    break;
	  case CIPHER_3DES:
	    preferred_ciphers[n_preferred_ciphers] = &ssh2_3des;
	    n_preferred_ciphers++;
	    break;
	  case CIPHER_AES:
	    preferred_ciphers[n_preferred_ciphers] = &ssh2_aes;