summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2024-01-27 16:18:25 +0000
committertb <>2024-01-27 16:18:25 +0000
commit6dc773214b8d9d19fc8d7052f2c24be65fd5a3d6 (patch)
treef835a2708a684dffe0d29ca47ad1505c9ed64e76 /src
parent2b8845683a31465d2272c7d1ca8fc49201bde55d (diff)
downloadopenbsd-6dc773214b8d9d19fc8d7052f2c24be65fd5a3d6.tar.gz
openbsd-6dc773214b8d9d19fc8d7052f2c24be65fd5a3d6.tar.bz2
openbsd-6dc773214b8d9d19fc8d7052f2c24be65fd5a3d6.zip
Support HMAC with SHA-3 as a PBE PRF
ok jsing
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/evp/evp_pbe.c22
1 files changed, 21 insertions, 1 deletions
diff --git a/src/lib/libcrypto/evp/evp_pbe.c b/src/lib/libcrypto/evp/evp_pbe.c
index ed5f97b6e7..12292ab728 100644
--- a/src/lib/libcrypto/evp/evp_pbe.c
+++ b/src/lib/libcrypto/evp/evp_pbe.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: evp_pbe.c,v 1.35 2024/01/27 16:17:32 tb Exp $ */ 1/* $OpenBSD: evp_pbe.c,v 1.36 2024/01/27 16:18:25 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -226,6 +226,26 @@ static const struct pbe_config pbe_prf[] = {
226 .cipher_nid = -1, 226 .cipher_nid = -1,
227 .md_nid = NID_sha512_256, 227 .md_nid = NID_sha512_256,
228 }, 228 },
229 {
230 .pbe_nid = NID_hmac_sha3_224,
231 .cipher_nid = -1,
232 .md_nid = NID_sha3_224,
233 },
234 {
235 .pbe_nid = NID_hmac_sha3_256,
236 .cipher_nid = -1,
237 .md_nid = NID_sha3_256,
238 },
239 {
240 .pbe_nid = NID_hmac_sha3_384,
241 .cipher_nid = -1,
242 .md_nid = NID_sha3_384,
243 },
244 {
245 .pbe_nid = NID_hmac_sha3_512,
246 .cipher_nid = -1,
247 .md_nid = NID_sha3_512,
248 },
229}; 249};
230 250
231#define N_PBE_PRF (sizeof(pbe_prf) / sizeof(pbe_prf[0])) 251#define N_PBE_PRF (sizeof(pbe_prf) / sizeof(pbe_prf[0]))