diff options
| author |   jsing <jsing@openbsd.org> | 2020-06-05 17:30:41 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2020-06-05 17:30:41 +0000 |
| commit | 0dc17585e21702d324c1a89284e68280ad013824 (patch) | |
| tree | abf92870a2a7736f09d5a05f00c86c5e384f63b8 /lib | |
| parent | Add OIDs for HMAC using Streebog (GOST R 34.11-2012) hash function. (diff) | |
| download | wireguard-openbsd-0dc17585e21702d324c1a89284e68280ad013824.tar.xz wireguard-openbsd-0dc17585e21702d324c1a89284e68280ad013824.zip | |
Allow GOST R 34.11-2012 in PBE/PBKDF2/PKCS#5.
Diff from Dmitry Baryshkov <dbaryshkov@gmail.com>
Sponsored by ROSA Linux
ok inoguchi@ tb@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libcrypto/evp/evp_pbe.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libcrypto/evp/evp_pbe.c b/lib/libcrypto/evp/evp_pbe.c index de08c8d78c5..65e9e45ea88 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.25 2017/01/29 17:49:23 beck Exp $ */ +/* $OpenBSD: evp_pbe.c,v 1.26 2020/06/05 17:30:41 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -114,6 +114,8 @@ static const EVP_PBE_CTL builtin_pbe[] = { {EVP_PBE_TYPE_PRF, NID_hmacWithSHA384, -1, NID_sha384, 0}, {EVP_PBE_TYPE_PRF, NID_hmacWithSHA512, -1, NID_sha512, 0}, {EVP_PBE_TYPE_PRF, NID_id_HMACGostR3411_94, -1, NID_id_GostR3411_94, 0}, + {EVP_PBE_TYPE_PRF, NID_id_tc26_hmac_gost_3411_12_256, -1, NID_id_tc26_gost3411_2012_256, 0}, + {EVP_PBE_TYPE_PRF, NID_id_tc26_hmac_gost_3411_12_512, -1, NID_id_tc26_gost3411_2012_512, 0}, }; int |