Fix PKCS7_ENC_CONTENT_new() to include a sensible default content type and add

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

diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h
index 4cfba5e6c61d34a758cce744a896719f04c8bc43..f79cc230c7fb5804f62c109f3462a492eda6356d 100644 (file)
--- a/crypto/pkcs12/pkcs12.h
+++ b/crypto/pkcs12/pkcs12.h
@@ -313,6 +313,7 @@ PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12);
 #define PKCS12_R_DECODE_ERROR                           101
 #define PKCS12_R_ENCODE_ERROR                           102
 #define PKCS12_R_ENCRYPT_ERROR                          103
+#define PKCS12_R_ERROR_SETTING_ENCRYPTED_DATA_TYPE      120
 #define PKCS12_R_INVALID_NULL_ARGUMENT                  104
 #define PKCS12_R_INVALID_NULL_PKCS12_POINTER            105
 #define PKCS12_R_IV_GEN_ERROR                           106