os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add advisory and patches for SA-15:26.openssl.

Browse source
This commit is contained in:
Xin LI 2015-12-05 10:05:07 +00:00
parent 60d58e3141
commit b7014d3858
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=47823
8 changed files with 407 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

32
share/security/patches/SA-15:26/openssl-9.3.patch Normal file
View file

@ -0,0 +1,32 @@
Index: crypto/openssl/crypto/asn1/tasn_dec.c
===================================================================
--- crypto/openssl/crypto/asn1/tasn_dec.c (revision 291751)
+++ crypto/openssl/crypto/asn1/tasn_dec.c (working copy)
@@ -167,6 +167,8 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsi
int otag;
int ret = 0;
ASN1_VALUE **pchptr, *ptmpval;
+ int combine = aclass & ASN1_TFLG_COMBINE;
+ aclass &= ~ASN1_TFLG_COMBINE;
if (!pval)
return 0;
if (aux && aux->asn1_cb)
@@ -532,7 +534,8 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsi
auxerr:
ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ASN1_R_AUX_ERROR);
err:
- ASN1_item_ex_free(pval, it);
+ if (combine == 0)
+ ASN1_item_ex_free(pval, it);
if (errtt)
ERR_add_error_data(4, "Field=", errtt->field_name,
", Type=", it->sname);
@@ -758,7 +761,7 @@ static int asn1_template_noexp_d2i(ASN1_VALUE **va
{
/* Nothing special */
ret = ASN1_item_ex_d2i(val, &p, len, ASN1_ITEM_ptr(tt->item),
- -1, 0, opt, ctx);
+ -1, tt->flags & ASN1_TFLG_COMBINE, opt, ctx);
if (!ret)
{
ASN1err(ASN1_F_ASN1_TEMPLATE_NOEXP_D2I,