summaryrefslogtreecommitdiffstats
path: root/crypto/pkcs12/pkcs12.h
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/pkcs12.h
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/pkcs12.h')
-rw-r--r--crypto/pkcs12/pkcs12.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h
index f66f62a419..a2d7e359a0 100644
--- a/crypto/pkcs12/pkcs12.h
+++ b/crypto/pkcs12/pkcs12.h
@@ -297,12 +297,15 @@ void ERR_load_PKCS12_strings(void);
#define PKCS12_F_PKCS12_PBE_KEYIVGEN 120
#define PKCS12_F_PKCS12_SETUP_MAC 122
#define PKCS12_F_PKCS12_SET_MAC 123
+#define PKCS12_F_PKCS12_UNPACK_AUTHSAFES 130
+#define PKCS12_F_PKCS12_UNPACK_P7DATA 131
#define PKCS12_F_PKCS12_VERIFY_MAC 126
#define PKCS12_F_PKCS8_ADD_KEYUSAGE 124
#define PKCS12_F_PKCS8_ENCRYPT 125
/* Reason codes. */
#define PKCS12_R_CANT_PACK_STRUCTURE 100
+#define PKCS12_R_CONTENT_TYPE_NOT_DATA 121
#define PKCS12_R_DECODE_ERROR 101
#define PKCS12_R_ENCODE_ERROR 102
#define PKCS12_R_ENCRYPT_ERROR 103