diff options
author | tb <> | 2024-01-18 16:30:43 +0000 |
---|---|---|
committer | tb <> | 2024-01-18 16:30:43 +0000 |
commit | 41715a56a8585222600beacbb678b0e54701fb65 (patch) | |
tree | 2144e9a2ddb3510ad9ccdbf30211cef58d12620f /src | |
parent | 2e512464afc7ae85e37665bb45cbd5e799fec97d (diff) | |
download | openbsd-41715a56a8585222600beacbb678b0e54701fb65.tar.gz openbsd-41715a56a8585222600beacbb678b0e54701fb65.tar.bz2 openbsd-41715a56a8585222600beacbb678b0e54701fb65.zip |
Switch from EVP_CIPHER_type() to EVP_CIPHER_nid()
EVP_CIPHER_type() will never return NID_gost89_cnt since it has no
associated ASN1_OBJECT. Switching to EVP_CIPHER_nid() has a slight
chance of working. Do that before beck applies the flensing knife.
ok beck
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libssl/tls12_record_layer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/tls12_record_layer.c b/src/lib/libssl/tls12_record_layer.c index 997026be92..3f2fe71e21 100644 --- a/src/lib/libssl/tls12_record_layer.c +++ b/src/lib/libssl/tls12_record_layer.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls12_record_layer.c,v 1.40 2023/07/08 20:38:23 beck Exp $ */ | 1 | /* $OpenBSD: tls12_record_layer.c,v 1.41 2024/01/18 16:30:43 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2020 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2020 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -525,7 +525,7 @@ tls12_record_layer_ccs_cipher(struct tls12_record_layer *rl, | |||
525 | goto err; | 525 | goto err; |
526 | 526 | ||
527 | /* More special handling for GOST... */ | 527 | /* More special handling for GOST... */ |
528 | if (EVP_CIPHER_type(rl->cipher) == NID_gost89_cnt) { | 528 | if (EVP_CIPHER_nid(rl->cipher) == NID_gost89_cnt) { |
529 | gost_param_nid = NID_id_tc26_gost_28147_param_Z; | 529 | gost_param_nid = NID_id_tc26_gost_28147_param_Z; |
530 | if (EVP_MD_type(rl->handshake_hash) == NID_id_GostR3411_94) | 530 | if (EVP_MD_type(rl->handshake_hash) == NID_id_GostR3411_94) |
531 | gost_param_nid = NID_id_Gost28147_89_CryptoPro_A_ParamSet; | 531 | gost_param_nid = NID_id_Gost28147_89_CryptoPro_A_ParamSet; |