| cipher.c (149753) | cipher.c (157019) |
|---|---|
| 1/* 2 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * All rights reserved 5 * 6 * As far as I am concerned, the code I have written for this software 7 * can be used freely for any purpose. Any derived versions of this 8 * software must be clearly marked as such, and if the derived work is --- 320 unchanged lines hidden (view full) --- 329 case SSH_CIPHER_DES: 330 case SSH_CIPHER_BLOWFISH: 331 evplen = EVP_CIPHER_CTX_iv_length(&cc->evp); 332 if (evplen <= 0) 333 return; 334 if ((u_int)evplen != len) 335 fatal("%s: wrong iv length %d != %d", __func__, 336 evplen, len); | 1/* 2 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * All rights reserved 5 * 6 * As far as I am concerned, the code I have written for this software 7 * can be used freely for any purpose. Any derived versions of this 8 * software must be clearly marked as such, and if the derived work is --- 320 unchanged lines hidden (view full) --- 329 case SSH_CIPHER_DES: 330 case SSH_CIPHER_BLOWFISH: 331 evplen = EVP_CIPHER_CTX_iv_length(&cc->evp); 332 if (evplen <= 0) 333 return; 334 if ((u_int)evplen != len) 335 fatal("%s: wrong iv length %d != %d", __func__, 336 evplen, len); |
| 337#if OPENSSL_VERSION_NUMBER < 0x00907000L | 337#ifdef USE_BUILTIN_RIJNDAEL |
| 338 if (c->evptype == evp_rijndael) 339 ssh_rijndael_iv(&cc->evp, 0, iv, len); 340 else 341#endif 342 if (c->evptype == evp_aes_128_ctr) 343 ssh_aes_ctr_iv(&cc->evp, 0, iv, len); 344 else 345 memcpy(iv, cc->evp.iv, len); --- 14 unchanged lines hidden (view full) --- 360 361 switch (c->number) { 362 case SSH_CIPHER_SSH2: 363 case SSH_CIPHER_DES: 364 case SSH_CIPHER_BLOWFISH: 365 evplen = EVP_CIPHER_CTX_iv_length(&cc->evp); 366 if (evplen == 0) 367 return; | 338 if (c->evptype == evp_rijndael) 339 ssh_rijndael_iv(&cc->evp, 0, iv, len); 340 else 341#endif 342 if (c->evptype == evp_aes_128_ctr) 343 ssh_aes_ctr_iv(&cc->evp, 0, iv, len); 344 else 345 memcpy(iv, cc->evp.iv, len); --- 14 unchanged lines hidden (view full) --- 360 361 switch (c->number) { 362 case SSH_CIPHER_SSH2: 363 case SSH_CIPHER_DES: 364 case SSH_CIPHER_BLOWFISH: 365 evplen = EVP_CIPHER_CTX_iv_length(&cc->evp); 366 if (evplen == 0) 367 return; |
| 368#if OPENSSL_VERSION_NUMBER < 0x00907000L | 368#ifdef USE_BUILTIN_RIJNDAEL |
| 369 if (c->evptype == evp_rijndael) 370 ssh_rijndael_iv(&cc->evp, 1, iv, evplen); 371 else 372#endif 373 if (c->evptype == evp_aes_128_ctr) 374 ssh_aes_ctr_iv(&cc->evp, 1, iv, evplen); 375 else 376 memcpy(cc->evp.iv, iv, evplen); --- 43 unchanged lines hidden --- | 369 if (c->evptype == evp_rijndael) 370 ssh_rijndael_iv(&cc->evp, 1, iv, evplen); 371 else 372#endif 373 if (c->evptype == evp_aes_128_ctr) 374 ssh_aes_ctr_iv(&cc->evp, 1, iv, evplen); 375 else 376 memcpy(cc->evp.iv, iv, evplen); --- 43 unchanged lines hidden --- |