summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormmcc <>2015-12-22 08:44:44 +0000
committermmcc <>2015-12-22 08:44:44 +0000
commit4338530be2359299758f744c0749dd2081e456bb (patch)
treef505380fee16bdc553e4cc92d23db4f706a2ecdb
parent5852e0c5a90494ddfed3506a57f30ab024f99a5f (diff)
downloadopenbsd-4338530be2359299758f744c0749dd2081e456bb.tar.gz
openbsd-4338530be2359299758f744c0749dd2081e456bb.tar.bz2
openbsd-4338530be2359299758f744c0749dd2081e456bb.zip
initialize a pointer to NULL rather than 0
-rw-r--r--src/lib/libcrypto/asn1/tasn_enc.c4
-rw-r--r--src/lib/libssl/src/crypto/asn1/tasn_enc.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/asn1/tasn_enc.c b/src/lib/libcrypto/asn1/tasn_enc.c
index c59033e54d..0a6426a95e 100644
--- a/src/lib/libcrypto/asn1/tasn_enc.c
+++ b/src/lib/libcrypto/asn1/tasn_enc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tasn_enc.c,v 1.16 2015/02/14 15:23:57 miod Exp $ */ 1/* $OpenBSD: tasn_enc.c,v 1.17 2015/12/22 08:44:44 mmcc Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
@@ -134,7 +134,7 @@ ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out, const ASN1_ITEM *it,
134 int i, seqcontlen, seqlen, ndef = 1; 134 int i, seqcontlen, seqlen, ndef = 1;
135 const ASN1_EXTERN_FUNCS *ef; 135 const ASN1_EXTERN_FUNCS *ef;
136 const ASN1_AUX *aux = it->funcs; 136 const ASN1_AUX *aux = it->funcs;
137 ASN1_aux_cb *asn1_cb = 0; 137 ASN1_aux_cb *asn1_cb = NULL;
138 138
139 if ((it->itype != ASN1_ITYPE_PRIMITIVE) && !*pval) 139 if ((it->itype != ASN1_ITYPE_PRIMITIVE) && !*pval)
140 return 0; 140 return 0;
diff --git a/src/lib/libssl/src/crypto/asn1/tasn_enc.c b/src/lib/libssl/src/crypto/asn1/tasn_enc.c
index c59033e54d..0a6426a95e 100644
--- a/src/lib/libssl/src/crypto/asn1/tasn_enc.c
+++ b/src/lib/libssl/src/crypto/asn1/tasn_enc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tasn_enc.c,v 1.16 2015/02/14 15:23:57 miod Exp $ */ 1/* $OpenBSD: tasn_enc.c,v 1.17 2015/12/22 08:44:44 mmcc Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
@@ -134,7 +134,7 @@ ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out, const ASN1_ITEM *it,
134 int i, seqcontlen, seqlen, ndef = 1; 134 int i, seqcontlen, seqlen, ndef = 1;
135 const ASN1_EXTERN_FUNCS *ef; 135 const ASN1_EXTERN_FUNCS *ef;
136 const ASN1_AUX *aux = it->funcs; 136 const ASN1_AUX *aux = it->funcs;
137 ASN1_aux_cb *asn1_cb = 0; 137 ASN1_aux_cb *asn1_cb = NULL;
138 138
139 if ((it->itype != ASN1_ITYPE_PRIMITIVE) && !*pval) 139 if ((it->itype != ASN1_ITYPE_PRIMITIVE) && !*pval)
140 return 0; 140 return 0;