diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 1999-08-17 14:58:01 +0200 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 1999-08-17 14:58:01 +0200 |
| commit | c6c3450643ea00fde94e7f7471c9f134ec7d63b4 (patch) | |
| tree | 59b0ab7204db5140559faa78de45b34d912bec94 /crypto/pkcs12/pkcs12.h | |
| parent | Return 0 for succesful exit when -noout is used. (diff) | |
| download | openssl-c6c3450643ea00fde94e7f7471c9f134ec7d63b4.tar.xz openssl-c6c3450643ea00fde94e7f7471c9f134ec7d63b4.zip | |
Fix PKCS7_ENC_CONTENT_new() to include a sensible default content type and add
support for encrypted content type in PKCS7_set_content().
Diffstat (limited to 'crypto/pkcs12/pkcs12.h')
| -rw-r--r-- | crypto/pkcs12/pkcs12.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h index 4cfba5e6c6..f79cc230c7 100644 --- 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 |