diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 1999-06-06 23:34:44 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 1999-06-06 23:34:44 +0000 |
| commit | 8e21c14607173ae5b0ea04c5a24b36514f6887f1 (patch) | |
| tree | f7405084c830e15fe0ee4590bac6139eeda90938 /crypto/objects/objects.h | |
| parent | 2bd83ca1c95405fe03b33cdc98e6fa43e7258246 (diff) | |
| download | openssl-8e21c14607173ae5b0ea04c5a24b36514f6887f1.tar.gz | |
More PKCS#5 v2.0 development. Add a function to setup a PKCS#5 v2.0
AlgorithmIdentifier and make various ASN1 fixes.
Diffstat (limited to 'crypto/objects/objects.h')
| -rw-r--r-- | crypto/objects/objects.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/crypto/objects/objects.h b/crypto/objects/objects.h index fd5c02d313..e0f88f1f03 100644 --- a/crypto/objects/objects.h +++ b/crypto/objects/objects.h @@ -384,10 +384,13 @@ extern "C" { #define NID_pbeWithSHA1AndRC2_CBC 68 #define OBJ_pbeWithSHA1AndRC2_CBC OBJ_pkcs,5L,11L -/* proposed by microsoft to RSA */ -#define LN_pbeWithSHA1AndRC4 "pbeWithSHA1AndRC4" -#define NID_pbeWithSHA1AndRC4 69 -#define OBJ_pbeWithSHA1AndRC4 OBJ_pkcs,5L,12L +/* proposed by microsoft to RSA as pbeWithSHA1AndRC4: it is now + * defined explicitly in PKCS#5 v2.0 as id-PBKDF2 which is something + * completely different. + */ +#define LN_id_pbkdf2 "PBKDF2" +#define NID_id_pbkdf2 69 +#define OBJ_id_pbkdf2 OBJ_pkcs,5L,12L #define SN_dsaWithSHA1_2 "DSA-SHA1-old" #define LN_dsaWithSHA1_2 "dsaWithSHA1-old" |