summaryrefslogtreecommitdiffstats
path: root/crypto/pkcs12/pk12err.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>1999-08-17 12:58:01 +0000
committerDr. Stephen Henson <steve@openssl.org>1999-08-17 12:58:01 +0000
commitc6c3450643ea00fde94e7f7471c9f134ec7d63b4 (patch)
tree59b0ab7204db5140559faa78de45b34d912bec94 /crypto/pkcs12/pk12err.c
parent2cfa692136da461b08008dd751595f8879672a36 (diff)
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/pk12err.c')
-rw-r--r--crypto/pkcs12/pk12err.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/pkcs12/pk12err.c b/crypto/pkcs12/pk12err.c
index 38d7be7675..5bbe2fa330 100644
--- a/crypto/pkcs12/pk12err.c
+++ b/crypto/pkcs12/pk12err.c
@@ -99,6 +99,7 @@ static ERR_STRING_DATA PKCS12_str_reasons[]=
{PKCS12_R_DECODE_ERROR ,"decode error"},
{PKCS12_R_ENCODE_ERROR ,"encode error"},
{PKCS12_R_ENCRYPT_ERROR ,"encrypt error"},
+{PKCS12_R_ERROR_SETTING_ENCRYPTED_DATA_TYPE,"error setting encrypted data type"},
{PKCS12_R_INVALID_NULL_ARGUMENT ,"invalid null argument"},
{PKCS12_R_INVALID_NULL_PKCS12_POINTER ,"invalid null pkcs12 pointer"},
{PKCS12_R_IV_GEN_ERROR ,"iv gen error"},