projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Swap to using _longjmp/_setjmp instead of longjmp/setjmp
[oweals/openssl.git]
/
crypto
/
asn1
/
p5_pbe.c
diff --git
a/crypto/asn1/p5_pbe.c
b/crypto/asn1/p5_pbe.c
index cc91fad53b2aa1440d4bbbcbcd093621eb07872d..4d7a9c61c14e361fbec9bf537d2663f5da7ea832 100644
(file)
--- a/
crypto/asn1/p5_pbe.c
+++ b/
crypto/asn1/p5_pbe.c
@@
-82,7
+82,7
@@
int PKCS5_pbe_set0_algor(X509_ALGOR *algor, int alg, int iter,
unsigned char *sstr;
pbe = PBEPARAM_new();
unsigned char *sstr;
pbe = PBEPARAM_new();
- if (
!pbe
) {
+ if (
pbe == NULL
) {
ASN1err(ASN1_F_PKCS5_PBE_SET0_ALGOR, ERR_R_MALLOC_FAILURE);
goto err;
}
ASN1err(ASN1_F_PKCS5_PBE_SET0_ALGOR, ERR_R_MALLOC_FAILURE);
goto err;
}
@@
-128,7
+128,7
@@
X509_ALGOR *PKCS5_pbe_set(int alg, int iter,
{
X509_ALGOR *ret;
ret = X509_ALGOR_new();
{
X509_ALGOR *ret;
ret = X509_ALGOR_new();
- if (
!ret
) {
+ if (
ret == NULL
) {
ASN1err(ASN1_F_PKCS5_PBE_SET, ERR_R_MALLOC_FAILURE);
return NULL;
}
ASN1err(ASN1_F_PKCS5_PBE_SET, ERR_R_MALLOC_FAILURE);
return NULL;
}