From d298f2ba07db90ea51dcd50700b216bb05d5f7a4 Mon Sep 17 00:00:00 2001 From: tedu <> Date: Fri, 18 Apr 2014 16:11:22 +0000 Subject: guenther would prefer more separation --- src/lib/libcrypto/asn1/tasn_dec.c | 2 ++ src/lib/libssl/src/crypto/asn1/tasn_dec.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/lib/libcrypto/asn1/tasn_dec.c b/src/lib/libcrypto/asn1/tasn_dec.c index 1ce40039b1..be37ac0c96 100644 --- a/src/lib/libcrypto/asn1/tasn_dec.c +++ b/src/lib/libcrypto/asn1/tasn_dec.c @@ -171,11 +171,13 @@ ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len, if (!pval) return 0; + /* always start fresh */ if (*pval) { ASN1_item_ex_free(pval, it); *pval = NULL; } + if (aux && aux->asn1_cb) asn1_cb = aux->asn1_cb; else diff --git a/src/lib/libssl/src/crypto/asn1/tasn_dec.c b/src/lib/libssl/src/crypto/asn1/tasn_dec.c index 1ce40039b1..be37ac0c96 100644 --- a/src/lib/libssl/src/crypto/asn1/tasn_dec.c +++ b/src/lib/libssl/src/crypto/asn1/tasn_dec.c @@ -171,11 +171,13 @@ ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len, if (!pval) return 0; + /* always start fresh */ if (*pval) { ASN1_item_ex_free(pval, it); *pval = NULL; } + if (aux && aux->asn1_cb) asn1_cb = aux->asn1_cb; else -- cgit v1.2.3-55-g6feb