diff options
author | Darren Tucker <dtucker@zip.com.au> | 2005-12-19 17:40:40 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2005-12-19 17:40:40 +1100 |
commit | 129d0bb6a65dcd9639e841cc3fd2ef3490420d7b (patch) | |
tree | a56f568a753739143c8662390e8cf6d8f2f34025 /cipher.c | |
parent | d40c66cf3f5d7713ea9489778dc450a48984a81d (diff) |
- (dtucker) [cipher-aes.c cipher-ctr.c cipher.c configure.ac
openbsd-compat/openssl-compat.h] Check for and work around broken AES
ciphers >128bit on (some) Solaris 10 systems. ok djm@
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 |