diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_mutl.c')
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_mutl.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_mutl.c b/src/lib/libcrypto/pkcs12/p12_mutl.c index 140d21155e..4886b9b289 100644 --- a/src/lib/libcrypto/pkcs12/p12_mutl.c +++ b/src/lib/libcrypto/pkcs12/p12_mutl.c | |||
@@ -72,12 +72,6 @@ int PKCS12_gen_mac (PKCS12 *p12, const char *pass, int passlen, | |||
72 | unsigned char key[PKCS12_MAC_KEY_LENGTH], *salt; | 72 | unsigned char key[PKCS12_MAC_KEY_LENGTH], *salt; |
73 | int saltlen, iter; | 73 | int saltlen, iter; |
74 | 74 | ||
75 | if (!PKCS7_type_is_data(p12->authsafes)) | ||
76 | { | ||
77 | PKCS12err(PKCS12_F_PKCS12_GEN_MAC,PKCS12_R_CONTENT_TYPE_NOT_DATA); | ||
78 | return 0; | ||
79 | } | ||
80 | |||
81 | salt = p12->mac->salt->data; | 75 | salt = p12->mac->salt->data; |
82 | saltlen = p12->mac->salt->length; | 76 | saltlen = p12->mac->salt->length; |
83 | if (!p12->mac->iter) iter = 1; | 77 | if (!p12->mac->iter) iter = 1; |