diff options
Diffstat (limited to 'src/lib/libcrypto/evp/e_des3.c')
| -rw-r--r-- | src/lib/libcrypto/evp/e_des3.c | 69 |
1 files changed, 39 insertions, 30 deletions
diff --git a/src/lib/libcrypto/evp/e_des3.c b/src/lib/libcrypto/evp/e_des3.c index 48fbcdb366..f3eb4cce1b 100644 --- a/src/lib/libcrypto/evp/e_des3.c +++ b/src/lib/libcrypto/evp/e_des3.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: e_des3.c,v 1.30 2024/04/09 13:52:41 beck Exp $ */ | 1 | /* $OpenBSD: e_des3.c,v 1.31 2025/05/27 03:58:12 tb Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -258,13 +258,14 @@ static const EVP_CIPHER des_ede_cbc = { | |||
| 258 | .block_size = 8, | 258 | .block_size = 8, |
| 259 | .key_len = 16, | 259 | .key_len = 16, |
| 260 | .iv_len = 8, | 260 | .iv_len = 8, |
| 261 | .flags = EVP_CIPH_RAND_KEY | EVP_CIPH_CBC_MODE, | 261 | .flags = EVP_CIPH_RAND_KEY | EVP_CIPH_CBC_MODE | |
| 262 | EVP_CIPH_FLAG_DEFAULT_ASN1, | ||
| 262 | .init = des_ede_init_key, | 263 | .init = des_ede_init_key, |
| 263 | .do_cipher = des_ede_cbc_cipher, | 264 | .do_cipher = des_ede_cbc_cipher, |
| 264 | .cleanup = NULL, | 265 | .cleanup = NULL, |
| 265 | .ctx_size = sizeof(DES_EDE_KEY), | 266 | .ctx_size = sizeof(DES_EDE_KEY), |
| 266 | .set_asn1_parameters = EVP_CIPHER_set_asn1_iv, | 267 | .set_asn1_parameters = NULL, |
| 267 | .get_asn1_parameters = EVP_CIPHER_get_asn1_iv, | 268 | .get_asn1_parameters = NULL, |
| 268 | .ctrl = des3_ctrl, | 269 | .ctrl = des3_ctrl, |
| 269 | }; | 270 | }; |
| 270 | 271 | ||
| @@ -280,13 +281,14 @@ static const EVP_CIPHER des_ede_cfb64 = { | |||
| 280 | .block_size = 1, | 281 | .block_size = 1, |
| 281 | .key_len = 16, | 282 | .key_len = 16, |
| 282 | .iv_len = 8, | 283 | .iv_len = 8, |
| 283 | .flags = EVP_CIPH_RAND_KEY | EVP_CIPH_CFB_MODE, | 284 | .flags = EVP_CIPH_RAND_KEY | EVP_CIPH_CFB_MODE | |
| 285 | EVP_CIPH_FLAG_DEFAULT_ASN1, | ||
| 284 | .init = des_ede_init_key, | 286 | .init = des_ede_init_key, |
| 285 | .do_cipher = des_ede_cfb64_cipher, | 287 | .do_cipher = des_ede_cfb64_cipher, |
| 286 | .cleanup = NULL, | 288 | .cleanup = NULL, |
| 287 | .ctx_size = sizeof(DES_EDE_KEY), | 289 | .ctx_size = sizeof(DES_EDE_KEY), |
| 288 | .set_asn1_parameters = EVP_CIPHER_set_asn1_iv, | 290 | .set_asn1_parameters = NULL, |
| 289 | .get_asn1_parameters = EVP_CIPHER_get_asn1_iv, | 291 | .get_asn1_parameters = NULL, |
| 290 | .ctrl = des3_ctrl, | 292 | .ctrl = des3_ctrl, |
| 291 | }; | 293 | }; |
| 292 | 294 | ||
| @@ -307,8 +309,8 @@ static const EVP_CIPHER des_ede_ofb = { | |||
| 307 | .do_cipher = des_ede_ofb_cipher, | 309 | .do_cipher = des_ede_ofb_cipher, |
| 308 | .cleanup = NULL, | 310 | .cleanup = NULL, |
| 309 | .ctx_size = sizeof(DES_EDE_KEY), | 311 | .ctx_size = sizeof(DES_EDE_KEY), |
| 310 | .set_asn1_parameters = EVP_CIPHER_set_asn1_iv, | 312 | .set_asn1_parameters = NULL, |
| 311 | .get_asn1_parameters = EVP_CIPHER_get_asn1_iv, | 313 | .get_asn1_parameters = NULL, |
| 312 | .ctrl = des3_ctrl, | 314 | .ctrl = des3_ctrl, |
| 313 | }; | 315 | }; |
| 314 | 316 | ||
| @@ -324,13 +326,14 @@ static const EVP_CIPHER des_ede_ecb = { | |||
| 324 | .block_size = 8, | 326 | .block_size = 8, |
| 325 | .key_len = 16, | 327 | .key_len = 16, |
| 326 | .iv_len = 0, | 328 | .iv_len = 0, |
| 327 | .flags = EVP_CIPH_RAND_KEY | EVP_CIPH_ECB_MODE, | 329 | .flags = EVP_CIPH_RAND_KEY | EVP_CIPH_ECB_MODE | |
| 330 | EVP_CIPH_FLAG_DEFAULT_ASN1, | ||
| 328 | .init = des_ede_init_key, | 331 | .init = des_ede_init_key, |
| 329 | .do_cipher = des_ede_ecb_cipher, | 332 | .do_cipher = des_ede_ecb_cipher, |
| 330 | .cleanup = NULL, | 333 | .cleanup = NULL, |
| 331 | .ctx_size = sizeof(DES_EDE_KEY), | 334 | .ctx_size = sizeof(DES_EDE_KEY), |
| 332 | .set_asn1_parameters = EVP_CIPHER_set_asn1_iv, | 335 | .set_asn1_parameters = NULL, |
| 333 | .get_asn1_parameters = EVP_CIPHER_get_asn1_iv, | 336 | .get_asn1_parameters = NULL, |
| 334 | .ctrl = des3_ctrl, | 337 | .ctrl = des3_ctrl, |
| 335 | }; | 338 | }; |
| 336 | 339 | ||
| @@ -352,13 +355,14 @@ static const EVP_CIPHER des_ede3_cbc = { | |||
| 352 | .block_size = 8, | 355 | .block_size = 8, |
| 353 | .key_len = 24, | 356 | .key_len = 24, |
| 354 | .iv_len = 8, | 357 | .iv_len = 8, |
| 355 | .flags = EVP_CIPH_RAND_KEY | EVP_CIPH_CBC_MODE, | 358 | .flags = EVP_CIPH_RAND_KEY | EVP_CIPH_CBC_MODE | |
| 359 | EVP_CIPH_FLAG_DEFAULT_ASN1, | ||
| 356 | .init = des_ede3_init_key, | 360 | .init = des_ede3_init_key, |
| 357 | .do_cipher = des_ede3_cbc_cipher, | 361 | .do_cipher = des_ede3_cbc_cipher, |
| 358 | .cleanup = NULL, | 362 | .cleanup = NULL, |
| 359 | .ctx_size = sizeof(DES_EDE_KEY), | 363 | .ctx_size = sizeof(DES_EDE_KEY), |
| 360 | .set_asn1_parameters = EVP_CIPHER_set_asn1_iv, | 364 | .set_asn1_parameters = NULL, |
| 361 | .get_asn1_parameters = EVP_CIPHER_get_asn1_iv, | 365 | .get_asn1_parameters = NULL, |
| 362 | .ctrl = des3_ctrl, | 366 | .ctrl = des3_ctrl, |
| 363 | }; | 367 | }; |
| 364 | 368 | ||
| @@ -374,13 +378,14 @@ static const EVP_CIPHER des_ede3_cfb64 = { | |||
| 374 | .block_size = 1, | 378 | .block_size = 1, |
| 375 | .key_len = 24, | 379 | .key_len = 24, |
| 376 | .iv_len = 8, | 380 | .iv_len = 8, |
| 377 | .flags = EVP_CIPH_RAND_KEY | EVP_CIPH_CFB_MODE, | 381 | .flags = EVP_CIPH_RAND_KEY | EVP_CIPH_CFB_MODE | |
| 382 | EVP_CIPH_FLAG_DEFAULT_ASN1, | ||
| 378 | .init = des_ede3_init_key, | 383 | .init = des_ede3_init_key, |
| 379 | .do_cipher = des_ede3_cfb64_cipher, | 384 | .do_cipher = des_ede3_cfb64_cipher, |
| 380 | .cleanup = NULL, | 385 | .cleanup = NULL, |
| 381 | .ctx_size = sizeof(DES_EDE_KEY), | 386 | .ctx_size = sizeof(DES_EDE_KEY), |
| 382 | .set_asn1_parameters = EVP_CIPHER_set_asn1_iv, | 387 | .set_asn1_parameters = NULL, |
| 383 | .get_asn1_parameters = EVP_CIPHER_get_asn1_iv, | 388 | .get_asn1_parameters = NULL, |
| 384 | .ctrl = des3_ctrl, | 389 | .ctrl = des3_ctrl, |
| 385 | }; | 390 | }; |
| 386 | 391 | ||
| @@ -396,13 +401,14 @@ static const EVP_CIPHER des_ede3_ofb = { | |||
| 396 | .block_size = 1, | 401 | .block_size = 1, |
| 397 | .key_len = 24, | 402 | .key_len = 24, |
| 398 | .iv_len = 8, | 403 | .iv_len = 8, |
| 399 | .flags = EVP_CIPH_RAND_KEY | EVP_CIPH_OFB_MODE, | 404 | .flags = EVP_CIPH_RAND_KEY | EVP_CIPH_OFB_MODE | |
| 405 | EVP_CIPH_FLAG_DEFAULT_ASN1, | ||
| 400 | .init = des_ede3_init_key, | 406 | .init = des_ede3_init_key, |
| 401 | .do_cipher = des_ede3_ofb_cipher, | 407 | .do_cipher = des_ede3_ofb_cipher, |
| 402 | .cleanup = NULL, | 408 | .cleanup = NULL, |
| 403 | .ctx_size = sizeof(DES_EDE_KEY), | 409 | .ctx_size = sizeof(DES_EDE_KEY), |
| 404 | .set_asn1_parameters = EVP_CIPHER_set_asn1_iv, | 410 | .set_asn1_parameters = NULL, |
| 405 | .get_asn1_parameters = EVP_CIPHER_get_asn1_iv, | 411 | .get_asn1_parameters = NULL, |
| 406 | .ctrl = des3_ctrl, | 412 | .ctrl = des3_ctrl, |
| 407 | }; | 413 | }; |
| 408 | 414 | ||
| @@ -418,13 +424,14 @@ static const EVP_CIPHER des_ede3_ecb = { | |||
| 418 | .block_size = 8, | 424 | .block_size = 8, |
| 419 | .key_len = 24, | 425 | .key_len = 24, |
| 420 | .iv_len = 0, | 426 | .iv_len = 0, |
| 421 | .flags = EVP_CIPH_RAND_KEY | EVP_CIPH_ECB_MODE, | 427 | .flags = EVP_CIPH_RAND_KEY | EVP_CIPH_ECB_MODE | |
| 428 | EVP_CIPH_FLAG_DEFAULT_ASN1, | ||
| 422 | .init = des_ede3_init_key, | 429 | .init = des_ede3_init_key, |
| 423 | .do_cipher = des_ede3_ecb_cipher, | 430 | .do_cipher = des_ede3_ecb_cipher, |
| 424 | .cleanup = NULL, | 431 | .cleanup = NULL, |
| 425 | .ctx_size = sizeof(DES_EDE_KEY), | 432 | .ctx_size = sizeof(DES_EDE_KEY), |
| 426 | .set_asn1_parameters = EVP_CIPHER_set_asn1_iv, | 433 | .set_asn1_parameters = NULL, |
| 427 | .get_asn1_parameters = EVP_CIPHER_get_asn1_iv, | 434 | .get_asn1_parameters = NULL, |
| 428 | .ctrl = des3_ctrl, | 435 | .ctrl = des3_ctrl, |
| 429 | }; | 436 | }; |
| 430 | 437 | ||
| @@ -441,13 +448,14 @@ static const EVP_CIPHER des_ede3_cfb1 = { | |||
| 441 | .block_size = 1, | 448 | .block_size = 1, |
| 442 | .key_len = 24, | 449 | .key_len = 24, |
| 443 | .iv_len = 8, | 450 | .iv_len = 8, |
| 444 | .flags = EVP_CIPH_RAND_KEY | EVP_CIPH_CFB_MODE, | 451 | .flags = EVP_CIPH_RAND_KEY | EVP_CIPH_CFB_MODE | |
| 452 | EVP_CIPH_FLAG_DEFAULT_ASN1, | ||
| 445 | .init = des_ede3_init_key, | 453 | .init = des_ede3_init_key, |
| 446 | .do_cipher = des_ede3_cfb1_cipher, | 454 | .do_cipher = des_ede3_cfb1_cipher, |
| 447 | .cleanup = NULL, | 455 | .cleanup = NULL, |
| 448 | .ctx_size = sizeof(DES_EDE_KEY), | 456 | .ctx_size = sizeof(DES_EDE_KEY), |
| 449 | .set_asn1_parameters = EVP_CIPHER_set_asn1_iv, | 457 | .set_asn1_parameters = NULL, |
| 450 | .get_asn1_parameters = EVP_CIPHER_get_asn1_iv, | 458 | .get_asn1_parameters = NULL, |
| 451 | .ctrl = des3_ctrl, | 459 | .ctrl = des3_ctrl, |
| 452 | }; | 460 | }; |
| 453 | 461 | ||
| @@ -464,13 +472,14 @@ static const EVP_CIPHER des_ede3_cfb8 = { | |||
| 464 | .block_size = 1, | 472 | .block_size = 1, |
| 465 | .key_len = 24, | 473 | .key_len = 24, |
| 466 | .iv_len = 8, | 474 | .iv_len = 8, |
| 467 | .flags = EVP_CIPH_RAND_KEY | EVP_CIPH_CFB_MODE, | 475 | .flags = EVP_CIPH_RAND_KEY | EVP_CIPH_CFB_MODE | |
| 476 | EVP_CIPH_FLAG_DEFAULT_ASN1, | ||
| 468 | .init = des_ede3_init_key, | 477 | .init = des_ede3_init_key, |
| 469 | .do_cipher = des_ede3_cfb8_cipher, | 478 | .do_cipher = des_ede3_cfb8_cipher, |
| 470 | .cleanup = NULL, | 479 | .cleanup = NULL, |
| 471 | .ctx_size = sizeof(DES_EDE_KEY), | 480 | .ctx_size = sizeof(DES_EDE_KEY), |
| 472 | .set_asn1_parameters = EVP_CIPHER_set_asn1_iv, | 481 | .set_asn1_parameters = NULL, |
| 473 | .get_asn1_parameters = EVP_CIPHER_get_asn1_iv, | 482 | .get_asn1_parameters = NULL, |
| 474 | .ctrl = des3_ctrl, | 483 | .ctrl = des3_ctrl, |
| 475 | }; | 484 | }; |
| 476 | 485 | ||
