| Index: nss/lib/util/pkcs11t.h
|
| diff --git a/nss/lib/util/pkcs11t.h b/nss/lib/util/pkcs11t.h
|
| index 23931413e4407b85d89e07544c85a0b61d37fdce..3fd66115fd602304442e8668b0b3b4b74cdde316 100644
|
| --- a/nss/lib/util/pkcs11t.h
|
| +++ b/nss/lib/util/pkcs11t.h
|
| @@ -1787,9 +1787,15 @@ typedef CK_ULONG CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE;
|
|
|
| typedef CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE CK_PTR CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE_PTR;
|
|
|
| -/* The following PRFs are defined in PKCS #5 v2.0. */
|
| -#define CKP_PKCS5_PBKD2_HMAC_SHA1 0x00000001
|
| -
|
| +/* The following PRFs are defined in PKCS #5 v2.1. */
|
| +#define CKP_PKCS5_PBKD2_HMAC_SHA1 0x00000001
|
| +#define CKP_PKCS5_PBKD2_HMAC_GOSTR3411 0x00000002
|
| +#define CKP_PKCS5_PBKD2_HMAC_SHA224 0x00000003
|
| +#define CKP_PKCS5_PBKD2_HMAC_SHA256 0x00000004
|
| +#define CKP_PKCS5_PBKD2_HMAC_SHA384 0x00000005
|
| +#define CKP_PKCS5_PBKD2_HMAC_SHA512 0x00000006
|
| +#define CKP_PKCS5_PBKD2_HMAC_SHA512_224 0x00000007
|
| +#define CKP_PKCS5_PBKD2_HMAC_SHA512_256 0x00000008
|
|
|
| /* CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE is new for v2.10.
|
| * CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE is used to indicate the
|
|
|