Add PKCS#5 v2.0 ASN1 structures.

[thirdparty/openssl.git] / crypto / asn1 / asn1.h

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index 8309eb00a8b8ef0187dc5fbc404320971381f2d0..e2280c2c115455b8596ab2bd16cec1c3af2f05ec 100644 (file)
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -770,7 +770,9 @@ ASN1_STRING *ASN1_pack_string();
 #define ASN1_F_D2I_NETSCAPE_RSA_2                       142
 #define ASN1_F_D2I_NETSCAPE_SPKAC                       143
 #define ASN1_F_D2I_NETSCAPE_SPKI                        144
+#define ASN1_F_D2I_PBE2PARAM                            262
 #define ASN1_F_D2I_PBEPARAM                             249
+#define ASN1_F_D2I_PBKDF2PARAM                          263
 #define ASN1_F_D2I_PKCS12                               254
 #define ASN1_F_D2I_PKCS12_BAGS                          255
 #define ASN1_F_D2I_PKCS12_MAC_DATA                      256
@@ -829,7 +831,9 @@ ASN1_STRING *ASN1_pack_string();
 #define ASN1_F_NETSCAPE_PKEY_NEW                        189
 #define ASN1_F_NETSCAPE_SPKAC_NEW                       190
 #define ASN1_F_NETSCAPE_SPKI_NEW                        191
+#define ASN1_F_PBE2PARAM_NEW                            264
 #define ASN1_F_PBEPARAM_NEW                             251
+#define ASN1_F_PBKDF2PARAM_NEW                          265
 #define ASN1_F_PKCS12_BAGS_NEW                          258
 #define ASN1_F_PKCS12_MAC_DATA_NEW                      259
 #define ASN1_F_PKCS12_NEW                               260