diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:34:25 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:34:25 +0000 |
commit | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (patch) | |
tree | 28fc9a13eaab935e4de055b561b333d67387a934 /cipher.c | |
parent | 04942aa41fa94ec6f2c3ce1d348f600f31bb7c78 (diff) | |
parent | 3e2e0ac10674d77618c4c7339e18b83ced247492 (diff) |
import openssh-4.3p2-gsskex-20060223.patch
Diffstat (limited to 'cipher.c')
-rw-r--r-- | cipher.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -334,7 +334,7 @@ cipher_get_keyiv(CipherContext *cc, u_char *iv, u_int len) | |||
334 | if ((u_int)evplen != len) | 334 | if ((u_int)evplen != len) |
335 | fatal("%s: wrong iv length %d != %d", __func__, | 335 | fatal("%s: wrong iv length %d != %d", __func__, |
336 | evplen, len); | 336 | evplen, len); |
337 | #if OPENSSL_VERSION_NUMBER < 0x00907000L | 337 | #ifdef USE_BUILTIN_RIJNDAEL |
338 | if (c->evptype == evp_rijndael) | 338 | if (c->evptype == evp_rijndael) |
339 | ssh_rijndael_iv(&cc->evp, 0, iv, len); | 339 | ssh_rijndael_iv(&cc->evp, 0, iv, len); |
340 | else | 340 | else |
@@ -365,7 +365,7 @@ cipher_set_keyiv(CipherContext *cc, u_char *iv) | |||
365 | evplen = EVP_CIPHER_CTX_iv_length(&cc->evp); | 365 | evplen = EVP_CIPHER_CTX_iv_length(&cc->evp); |
366 | if (evplen == 0) | 366 | if (evplen == 0) |
367 | return; | 367 | return; |
368 | #if OPENSSL_VERSION_NUMBER < 0x00907000L | 368 | #ifdef USE_BUILTIN_RIJNDAEL |
369 | if (c->evptype == evp_rijndael) | 369 | if (c->evptype == evp_rijndael) |
370 | ssh_rijndael_iv(&cc->evp, 1, iv, evplen); | 370 | ssh_rijndael_iv(&cc->evp, 1, iv, evplen); |
371 | else | 371 | else |