summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTheo Buehler <tb@cvs.openbsd.org>2024-01-27 16:17:33 +0000
committerTheo Buehler <tb@cvs.openbsd.org>2024-01-27 16:17:33 +0000
commit88404ed8b6092080eebb5faa5176956ae31c2c4c (patch)
tree0bad99fe603e10dd990d0e73c7c13ee93119be79 /lib
parentd248f04667e93349010704931cff3fa3ef6aae77 (diff)
Support HMAC with truncated SHA-2 as a PBE PRF
ok jsing
Diffstat (limited to 'lib')
-rw-r--r--lib/libcrypto/evp/evp_pbe.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/libcrypto/evp/evp_pbe.c b/lib/libcrypto/evp/evp_pbe.c
index 8553478bc4a..ed5f97b6e70 100644
--- a/lib/libcrypto/evp/evp_pbe.c
+++ b/lib/libcrypto/evp/evp_pbe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp_pbe.c,v 1.34 2023/12/18 13:12:43 tb Exp $ */
+/* $OpenBSD: evp_pbe.c,v 1.35 2024/01/27 16:17:32 tb Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 1999.
*/
@@ -216,6 +216,16 @@ static const struct pbe_config pbe_prf[] = {
.cipher_nid = -1,
.md_nid = NID_id_tc26_gost3411_2012_512,
},
+ {
+ .pbe_nid = NID_hmacWithSHA512_224,
+ .cipher_nid = -1,
+ .md_nid = NID_sha512_224,
+ },
+ {
+ .pbe_nid = NID_hmacWithSHA512_256,
+ .cipher_nid = -1,
+ .md_nid = NID_sha512_256,
+ },
};
#define N_PBE_PRF (sizeof(pbe_prf) / sizeof(pbe_prf[0]))