|
Lines 44-49
Link Here
|
| 44 |
#include <openssl/md5.h> |
44 |
#include <openssl/md5.h> |
| 45 |
#include "rijndael.h" |
45 |
#include "rijndael.h" |
| 46 |
|
46 |
|
|
|
47 |
#if OPENSSL_VERSION_NUMBER < 0x00906000L |
| 48 |
#define SSH_OLD_EVP |
| 49 |
#define EVP_CIPHER_CTX_get_app_data(e) ((e)->app_data) |
| 50 |
#endif |
| 51 |
|
| 47 |
static EVP_CIPHER *evp_ssh1_3des(void); |
52 |
static EVP_CIPHER *evp_ssh1_3des(void); |
| 48 |
static EVP_CIPHER *evp_ssh1_bf(void); |
53 |
static EVP_CIPHER *evp_ssh1_bf(void); |
| 49 |
static EVP_CIPHER *evp_rijndael(void); |
54 |
static EVP_CIPHER *evp_rijndael(void); |
|
Lines 171-177
Link Here
|
| 171 |
int encrypt) |
176 |
int encrypt) |
| 172 |
{ |
177 |
{ |
| 173 |
static int dowarn = 1; |
178 |
static int dowarn = 1; |
|
|
179 |
#ifdef SSH_OLD_EVP |
| 180 |
EVP_CIPHER *type; |
| 181 |
#else |
| 174 |
const EVP_CIPHER *type; |
182 |
const EVP_CIPHER *type; |
|
|
183 |
#endif |
| 175 |
int klen; |
184 |
int klen; |
| 176 |
|
185 |
|
| 177 |
if (cipher->number == SSH_CIPHER_DES) { |
186 |
if (cipher->number == SSH_CIPHER_DES) { |
|
Lines 196-201
Link Here
|
| 196 |
type = (*cipher->evptype)(); |
205 |
type = (*cipher->evptype)(); |
| 197 |
|
206 |
|
| 198 |
EVP_CIPHER_CTX_init(&cc->evp); |
207 |
EVP_CIPHER_CTX_init(&cc->evp); |
|
|
208 |
#ifdef SSH_OLD_EVP |
| 209 |
if (type->key_len > 0 && type->key_len != keylen) { |
| 210 |
debug("cipher_init: set keylen (%d -> %d)", |
| 211 |
type->key_len, keylen); |
| 212 |
type->key_len = keylen; |
| 213 |
} |
| 214 |
EVP_CipherInit(&cc->evp, type, (u_char *)key, (u_char *)iv, |
| 215 |
(encrypt == CIPHER_ENCRYPT)); |
| 216 |
#else |
| 199 |
if (EVP_CipherInit(&cc->evp, type, NULL, (u_char *)iv, |
217 |
if (EVP_CipherInit(&cc->evp, type, NULL, (u_char *)iv, |
| 200 |
(encrypt == CIPHER_ENCRYPT)) == 0) |
218 |
(encrypt == CIPHER_ENCRYPT)) == 0) |
| 201 |
fatal("cipher_init: EVP_CipherInit failed for %s", |
219 |
fatal("cipher_init: EVP_CipherInit failed for %s", |
|
Lines 210-215
Link Here
|
| 210 |
if (EVP_CipherInit(&cc->evp, NULL, (u_char *)key, NULL, -1) == 0) |
228 |
if (EVP_CipherInit(&cc->evp, NULL, (u_char *)key, NULL, -1) == 0) |
| 211 |
fatal("cipher_init: EVP_CipherInit: set key failed for %s", |
229 |
fatal("cipher_init: EVP_CipherInit: set key failed for %s", |
| 212 |
cipher->name); |
230 |
cipher->name); |
|
|
231 |
#endif |
| 213 |
} |
232 |
} |
| 214 |
|
233 |
|
| 215 |
void |
234 |
void |
|
Lines 217-231
Link Here
|
| 217 |
{ |
236 |
{ |
| 218 |
if (len % cc->cipher->block_size) |
237 |
if (len % cc->cipher->block_size) |
| 219 |
fatal("cipher_encrypt: bad plaintext length %d", len); |
238 |
fatal("cipher_encrypt: bad plaintext length %d", len); |
|
|
239 |
#ifdef SSH_OLD_EVP |
| 240 |
EVP_Cipher(&cc->evp, dest, (u_char *)src, len); |
| 241 |
#else |
| 220 |
if (EVP_Cipher(&cc->evp, dest, (u_char *)src, len) == 0) |
242 |
if (EVP_Cipher(&cc->evp, dest, (u_char *)src, len) == 0) |
| 221 |
fatal("evp_crypt: EVP_Cipher failed"); |
243 |
fatal("evp_crypt: EVP_Cipher failed"); |
|
|
244 |
#endif |
| 222 |
} |
245 |
} |
| 223 |
|
246 |
|
| 224 |
void |
247 |
void |
| 225 |
cipher_cleanup(CipherContext *cc) |
248 |
cipher_cleanup(CipherContext *cc) |
| 226 |
{ |
249 |
{ |
|
|
250 |
#ifdef SSH_OLD_EVP |
| 251 |
EVP_CIPHER_CTX_cleanup(&cc->evp); |
| 252 |
#else |
| 227 |
if (EVP_CIPHER_CTX_cleanup(&cc->evp) == 0) |
253 |
if (EVP_CIPHER_CTX_cleanup(&cc->evp) == 0) |
| 228 |
error("cipher_cleanup: EVP_CIPHER_CTX_cleanup failed"); |
254 |
error("cipher_cleanup: EVP_CIPHER_CTX_cleanup failed"); |
|
|
255 |
#endif |
| 229 |
} |
256 |
} |
| 230 |
|
257 |
|
| 231 |
/* |
258 |
/* |
|
Lines 296-301
Link Here
|
| 296 |
EVP_CIPHER_CTX_init(&c->k1); |
323 |
EVP_CIPHER_CTX_init(&c->k1); |
| 297 |
EVP_CIPHER_CTX_init(&c->k2); |
324 |
EVP_CIPHER_CTX_init(&c->k2); |
| 298 |
EVP_CIPHER_CTX_init(&c->k3); |
325 |
EVP_CIPHER_CTX_init(&c->k3); |
|
|
326 |
#ifdef SSH_OLD_EVP |
| 327 |
EVP_CipherInit(&c->k1, EVP_des_cbc(), k1, NULL, enc); |
| 328 |
EVP_CipherInit(&c->k2, EVP_des_cbc(), k2, NULL, !enc); |
| 329 |
EVP_CipherInit(&c->k3, EVP_des_cbc(), k3, NULL, enc); |
| 330 |
#else |
| 299 |
if (EVP_CipherInit(&c->k1, EVP_des_cbc(), k1, NULL, enc) == 0 || |
331 |
if (EVP_CipherInit(&c->k1, EVP_des_cbc(), k1, NULL, enc) == 0 || |
| 300 |
EVP_CipherInit(&c->k2, EVP_des_cbc(), k2, NULL, !enc) == 0 || |
332 |
EVP_CipherInit(&c->k2, EVP_des_cbc(), k2, NULL, !enc) == 0 || |
| 301 |
EVP_CipherInit(&c->k3, EVP_des_cbc(), k3, NULL, enc) == 0) { |
333 |
EVP_CipherInit(&c->k3, EVP_des_cbc(), k3, NULL, enc) == 0) { |
|
Lines 304-309
Link Here
|
| 304 |
EVP_CIPHER_CTX_set_app_data(ctx, NULL); |
336 |
EVP_CIPHER_CTX_set_app_data(ctx, NULL); |
| 305 |
return (0); |
337 |
return (0); |
| 306 |
} |
338 |
} |
|
|
339 |
#endif |
| 307 |
return (1); |
340 |
return (1); |
| 308 |
} |
341 |
} |
| 309 |
static int |
342 |
static int |
|
Lines 315-324
Link Here
|
| 315 |
error("ssh1_3des_cbc: no context"); |
348 |
error("ssh1_3des_cbc: no context"); |
| 316 |
return (0); |
349 |
return (0); |
| 317 |
} |
350 |
} |
|
|
351 |
#ifdef SSH_OLD_EVP |
| 352 |
EVP_Cipher(&c->k1, dest, (u_char *)src, len); |
| 353 |
EVP_Cipher(&c->k2, dest, dest, len); |
| 354 |
EVP_Cipher(&c->k3, dest, dest, len); |
| 355 |
#else |
| 318 |
if (EVP_Cipher(&c->k1, dest, (u_char *)src, len) == 0 || |
356 |
if (EVP_Cipher(&c->k1, dest, (u_char *)src, len) == 0 || |
| 319 |
EVP_Cipher(&c->k2, dest, dest, len) == 0 || |
357 |
EVP_Cipher(&c->k2, dest, dest, len) == 0 || |
| 320 |
EVP_Cipher(&c->k3, dest, dest, len) == 0) |
358 |
EVP_Cipher(&c->k3, dest, dest, len) == 0) |
| 321 |
return (0); |
359 |
return (0); |
|
|
360 |
#endif |
| 322 |
return (1); |
361 |
return (1); |
| 323 |
} |
362 |
} |
| 324 |
static int |
363 |
static int |
|
Lines 346-352
Link Here
|
| 346 |
ssh1_3des.init = ssh1_3des_init; |
385 |
ssh1_3des.init = ssh1_3des_init; |
| 347 |
ssh1_3des.cleanup = ssh1_3des_cleanup; |
386 |
ssh1_3des.cleanup = ssh1_3des_cleanup; |
| 348 |
ssh1_3des.do_cipher = ssh1_3des_cbc; |
387 |
ssh1_3des.do_cipher = ssh1_3des_cbc; |
|
|
388 |
#ifndef SSH_OLD_EVP |
| 349 |
ssh1_3des.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH; |
389 |
ssh1_3des.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH; |
|
|
390 |
#endif |
| 350 |
return (&ssh1_3des); |
391 |
return (&ssh1_3des); |
| 351 |
} |
392 |
} |
| 352 |
|
393 |
|
|
Lines 494-500
Link Here
|
| 494 |
rijndal_cbc.init = ssh_rijndael_init; |
535 |
rijndal_cbc.init = ssh_rijndael_init; |
| 495 |
rijndal_cbc.cleanup = ssh_rijndael_cleanup; |
536 |
rijndal_cbc.cleanup = ssh_rijndael_cleanup; |
| 496 |
rijndal_cbc.do_cipher = ssh_rijndael_cbc; |
537 |
rijndal_cbc.do_cipher = ssh_rijndael_cbc; |
|
|
538 |
#ifndef SSH_OLD_EVP |
| 497 |
rijndal_cbc.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | |
539 |
rijndal_cbc.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | |
| 498 |
EVP_CIPH_ALWAYS_CALL_INIT; |
540 |
EVP_CIPH_ALWAYS_CALL_INIT; |
|
|
541 |
#endif |
| 499 |
return (&rijndal_cbc); |
542 |
return (&rijndal_cbc); |
| 500 |
} |
543 |
} |