summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/asn1/tasn_dec.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/libcrypto/asn1/tasn_dec.c b/src/lib/libcrypto/asn1/tasn_dec.c
index bf536cb667..3a27b82288 100644
--- a/src/lib/libcrypto/asn1/tasn_dec.c
+++ b/src/lib/libcrypto/asn1/tasn_dec.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tasn_dec.c,v 1.35 2018/03/29 02:29:24 inoguchi Exp $ */ 1/* $OpenBSD: tasn_dec.c,v 1.36 2018/09/17 18:18:01 tb 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 */
@@ -164,7 +164,7 @@ asn1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
164 const ASN1_TEMPLATE *tt, *errtt = NULL; 164 const ASN1_TEMPLATE *tt, *errtt = NULL;
165 const ASN1_EXTERN_FUNCS *ef; 165 const ASN1_EXTERN_FUNCS *ef;
166 const ASN1_AUX *aux = it->funcs; 166 const ASN1_AUX *aux = it->funcs;
167 ASN1_aux_cb *asn1_cb; 167 ASN1_aux_cb *asn1_cb = NULL;
168 const unsigned char *p = NULL, *q; 168 const unsigned char *p = NULL, *q;
169 unsigned char oclass; 169 unsigned char oclass;
170 char seq_eoc, seq_nolen, cst, isopt; 170 char seq_eoc, seq_nolen, cst, isopt;
@@ -183,8 +183,6 @@ asn1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
183 183
184 if (aux && aux->asn1_cb) 184 if (aux && aux->asn1_cb)
185 asn1_cb = aux->asn1_cb; 185 asn1_cb = aux->asn1_cb;
186 else
187 asn1_cb = 0;
188 186
189 if (++depth > ASN1_MAX_CONSTRUCTED_NEST) { 187 if (++depth > ASN1_MAX_CONSTRUCTED_NEST) {
190 ASN1error(ASN1_R_NESTED_TOO_DEEP); 188 ASN1error(ASN1_R_NESTED_TOO_DEEP);