More PKCS#5 v2.0 development. Add a function to setup a PKCS#5 v2.0

[openssl.git] / crypto / objects / objects.h

diff --git a/crypto/objects/objects.h b/crypto/objects/objects.h
index fd5c02d3138309c88d718bdd48faabc7b86b03bf..e0f88f1f0360164a2e2aeb414b67693275995622 100644 (file)
--- 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"