projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
free NULL cleanup 8
[openssl.git]
/
crypto
/
pkcs12
/
p12_mutl.c
diff --git
a/crypto/pkcs12/p12_mutl.c
b/crypto/pkcs12/p12_mutl.c
index 4138a4d50803b6c22762f583c3440c4ba5387cb5..252aca0021f06a39b7cb3bd524699708ece1c3d7 100644
(file)
--- a/
crypto/pkcs12/p12_mutl.c
+++ b/
crypto/pkcs12/p12_mutl.c
@@
-146,7
+146,7
@@
int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen,
PKCS12err(PKCS12_F_PKCS12_SET_MAC, PKCS12_R_MAC_GENERATION_ERROR);
return 0;
}
PKCS12err(PKCS12_F_PKCS12_SET_MAC, PKCS12_R_MAC_GENERATION_ERROR);
return 0;
}
- if (!(
M_
ASN1_OCTET_STRING_set(p12->mac->dinfo->digest, mac, maclen))) {
+ if (!(ASN1_OCTET_STRING_set(p12->mac->dinfo->digest, mac, maclen))) {
PKCS12err(PKCS12_F_PKCS12_SET_MAC, PKCS12_R_MAC_STRING_SET_ERROR);
return 0;
}
PKCS12err(PKCS12_F_PKCS12_SET_MAC, PKCS12_R_MAC_STRING_SET_ERROR);
return 0;
}
@@
-160,7
+160,7
@@
int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen,
if (!(p12->mac = PKCS12_MAC_DATA_new()))
return PKCS12_ERROR;
if (iter > 1) {
if (!(p12->mac = PKCS12_MAC_DATA_new()))
return PKCS12_ERROR;
if (iter > 1) {
- if (!(p12->mac->iter =
M_
ASN1_INTEGER_new())) {
+ if (!(p12->mac->iter = ASN1_INTEGER_new())) {
PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, ERR_R_MALLOC_FAILURE);
return 0;
}
PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, ERR_R_MALLOC_FAILURE);
return 0;
}
@@
-177,7
+177,7
@@
int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen,
return 0;
}
if (!salt) {
return 0;
}
if (!salt) {
- if (RAND_
pseudo_bytes(p12->mac->salt->data, saltlen) <
0)
+ if (RAND_
bytes(p12->mac->salt->data, saltlen) <=
0)
return 0;
} else
memcpy(p12->mac->salt->data, salt, saltlen);
return 0;
} else
memcpy(p12->mac->salt->data, salt, saltlen);