summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/asn1/tasn_dec.c5
-rw-r--r--src/lib/libssl/src/crypto/asn1/tasn_dec.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/src/lib/libcrypto/asn1/tasn_dec.c b/src/lib/libcrypto/asn1/tasn_dec.c
index e9059df982..f19c457169 100644
--- a/src/lib/libcrypto/asn1/tasn_dec.c
+++ b/src/lib/libcrypto/asn1/tasn_dec.c
@@ -126,6 +126,7 @@ ASN1_item_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
126{ 126{
127 ASN1_TLC c; 127 ASN1_TLC c;
128 ASN1_VALUE *ptmpval = NULL; 128 ASN1_VALUE *ptmpval = NULL;
129
129 if (!pval) 130 if (!pval)
130 pval = &ptmpval; 131 pval = &ptmpval;
131 asn1_tlc_clear_nc(&c); 132 asn1_tlc_clear_nc(&c);
@@ -139,6 +140,7 @@ ASN1_template_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
139 const ASN1_TEMPLATE *tt) 140 const ASN1_TEMPLATE *tt)
140{ 141{
141 ASN1_TLC c; 142 ASN1_TLC c;
143
142 asn1_tlc_clear_nc(&c); 144 asn1_tlc_clear_nc(&c);
143 return asn1_template_ex_d2i(pval, in, len, tt, 0, &c); 145 return asn1_template_ex_d2i(pval, in, len, tt, 0, &c);
144} 146}
@@ -166,6 +168,7 @@ ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
166 int otag; 168 int otag;
167 int ret = 0; 169 int ret = 0;
168 ASN1_VALUE **pchptr, *ptmpval; 170 ASN1_VALUE **pchptr, *ptmpval;
171
169 if (!pval) 172 if (!pval)
170 return 0; 173 return 0;
171 if (aux && aux->asn1_cb) 174 if (aux && aux->asn1_cb)
@@ -841,6 +844,7 @@ asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len, int utype,
841 int ret = 0; 844 int ret = 0;
842 const ASN1_PRIMITIVE_FUNCS *pf; 845 const ASN1_PRIMITIVE_FUNCS *pf;
843 ASN1_INTEGER **tint; 846 ASN1_INTEGER **tint;
847
844 pf = it->funcs; 848 pf = it->funcs;
845 849
846 if (pf && pf->prim_c2i) 850 if (pf && pf->prim_c2i)
@@ -1153,6 +1157,7 @@ asn1_check_tlen(long *olen, int *otag, unsigned char *oclass, char *inf,
1153 int ptag, pclass; 1157 int ptag, pclass;
1154 long plen; 1158 long plen;
1155 const unsigned char *p, *q; 1159 const unsigned char *p, *q;
1160
1156 p = *in; 1161 p = *in;
1157 q = p; 1162 q = p;
1158 1163
diff --git a/src/lib/libssl/src/crypto/asn1/tasn_dec.c b/src/lib/libssl/src/crypto/asn1/tasn_dec.c
index e9059df982..f19c457169 100644
--- a/src/lib/libssl/src/crypto/asn1/tasn_dec.c
+++ b/src/lib/libssl/src/crypto/asn1/tasn_dec.c
@@ -126,6 +126,7 @@ ASN1_item_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
126{ 126{
127 ASN1_TLC c; 127 ASN1_TLC c;
128 ASN1_VALUE *ptmpval = NULL; 128 ASN1_VALUE *ptmpval = NULL;
129
129 if (!pval) 130 if (!pval)
130 pval = &ptmpval; 131 pval = &ptmpval;
131 asn1_tlc_clear_nc(&c); 132 asn1_tlc_clear_nc(&c);
@@ -139,6 +140,7 @@ ASN1_template_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
139 const ASN1_TEMPLATE *tt) 140 const ASN1_TEMPLATE *tt)
140{ 141{
141 ASN1_TLC c; 142 ASN1_TLC c;
143
142 asn1_tlc_clear_nc(&c); 144 asn1_tlc_clear_nc(&c);
143 return asn1_template_ex_d2i(pval, in, len, tt, 0, &c); 145 return asn1_template_ex_d2i(pval, in, len, tt, 0, &c);
144} 146}
@@ -166,6 +168,7 @@ ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
166 int otag; 168 int otag;
167 int ret = 0; 169 int ret = 0;
168 ASN1_VALUE **pchptr, *ptmpval; 170 ASN1_VALUE **pchptr, *ptmpval;
171
169 if (!pval) 172 if (!pval)
170 return 0; 173 return 0;
171 if (aux && aux->asn1_cb) 174 if (aux && aux->asn1_cb)
@@ -841,6 +844,7 @@ asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len, int utype,
841 int ret = 0; 844 int ret = 0;
842 const ASN1_PRIMITIVE_FUNCS *pf; 845 const ASN1_PRIMITIVE_FUNCS *pf;
843 ASN1_INTEGER **tint; 846 ASN1_INTEGER **tint;
847
844 pf = it->funcs; 848 pf = it->funcs;
845 849
846 if (pf && pf->prim_c2i) 850 if (pf && pf->prim_c2i)
@@ -1153,6 +1157,7 @@ asn1_check_tlen(long *olen, int *otag, unsigned char *oclass, char *inf,
1153 int ptag, pclass; 1157 int ptag, pclass;
1154 long plen; 1158 long plen;
1155 const unsigned char *p, *q; 1159 const unsigned char *p, *q;
1160
1156 p = *in; 1161 p = *in;
1157 q = p; 1162 q = p;
1158 1163