Commit eeb1c397 authored by Matt Caswell's avatar Matt Caswell
Browse files

Add GOST extensions to PKCS#5 



GOST extends PKCS5 PBES2/PBKDF2 with some additional GOST specific PRFs.

Based on a patch provided by Dmitry Belyavsky <beldmit@gmail.com>

Reviewed-by: default avatarStephen Henson <steve@openssl.org>
parent bf95cde2

crypto/evp/evp_pbe.c

+4 −0
Original line number Diff line number Diff line
@@ -118,6 +118,10 @@ 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_2012_256, -1,

     NID_id_GostR3411_2012_256, 0},

    {EVP_PBE_TYPE_PRF, NID_id_tc26_hmac_gost_3411_2012_512, -1,

     NID_id_GostR3411_2012_512, 0},

    {EVP_PBE_TYPE_KDF, NID_id_pbkdf2, -1, -1, PKCS5_v2_PBKDF2_keyivgen},

#ifndef OPENSSL_NO_SCRYPT

    {EVP_PBE_TYPE_KDF, NID_id_scrypt, -1, -1, PKCS5_v2_scrypt_keyivgen}