summaryrefslogtreecommitdiffstats
path: root/crypto/pkcs12/pk12err.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2005-06-30 13:34:58 +0200
committerDr. Stephen Henson <steve@openssl.org>2005-06-30 13:34:58 +0200
commit1c2f1fe505f55a5df2430d78128a4ace331e6597 (patch)
tree049b5e3cf1e015287b3cdbcbca568d47c3cad6e3 /crypto/pkcs12/pk12err.c
parentActually, the 64bit format specifier differs between SIXTY_FOUR_BIT and (diff)
downloadopenssl-1c2f1fe505f55a5df2430d78128a4ace331e6597.tar.xz
openssl-1c2f1fe505f55a5df2430d78128a4ace331e6597.zip
Check PKCS7 structures in PKCS#12 files are of type data.
Diffstat (limited to 'crypto/pkcs12/pk12err.c')
-rw-r--r--crypto/pkcs12/pk12err.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/pkcs12/pk12err.c b/crypto/pkcs12/pk12err.c
index f01801e686..5c92cb08e0 100644
--- a/crypto/pkcs12/pk12err.c
+++ b/crypto/pkcs12/pk12err.c
@@ -94,6 +94,8 @@ static ERR_STRING_DATA PKCS12_str_functs[]=
{ERR_FUNC(PKCS12_F_PKCS12_PBE_KEYIVGEN), "PKCS12_PBE_keyivgen"},
{ERR_FUNC(PKCS12_F_PKCS12_SETUP_MAC), "PKCS12_setup_mac"},
{ERR_FUNC(PKCS12_F_PKCS12_SET_MAC), "PKCS12_set_mac"},
+{ERR_FUNC(PKCS12_F_PKCS12_UNPACK_AUTHSAFES), "PKCS12_unpack_authsafes"},
+{ERR_FUNC(PKCS12_F_PKCS12_UNPACK_P7DATA), "PKCS12_unpack_p7data"},
{ERR_FUNC(PKCS12_F_PKCS12_VERIFY_MAC), "PKCS12_verify_mac"},
{ERR_FUNC(PKCS12_F_PKCS8_ADD_KEYUSAGE), "PKCS8_add_keyusage"},
{ERR_FUNC(PKCS12_F_PKCS8_ENCRYPT), "PKCS8_encrypt"},
@@ -103,6 +105,7 @@ static ERR_STRING_DATA PKCS12_str_functs[]=
static ERR_STRING_DATA PKCS12_str_reasons[]=
{
{ERR_REASON(PKCS12_R_CANT_PACK_STRUCTURE),"cant pack structure"},
+{ERR_REASON(PKCS12_R_CONTENT_TYPE_NOT_DATA),"content type not data"},
{ERR_REASON(PKCS12_R_DECODE_ERROR) ,"decode error"},
{ERR_REASON(PKCS12_R_ENCODE_ERROR) ,"encode error"},
{ERR_REASON(PKCS12_R_ENCRYPT_ERROR) ,"encrypt error"},