989d921f5d
I'm very pleased to announce the release of our new website and documentation using the new toolchain with Hugo and AsciiDoctor. To get more information about the new toolchain please read the FreeBSD Documentation Project Primer[1], Hugo docs[2] and AsciiDoctor docs[3]. Acknowledgment: Benedict Reuschling <bcr@> Glen Barber <gjb@> Hiroki Sato <hrs@> Li-Wen Hsu <lwhsu@> Sean Chittenden <seanc@> The FreeBSD Foundation [1] https://docs.FreeBSD.org/en/books/fdp-primer/ [2] https://gohugo.io/documentation/ [3] https://docs.asciidoctor.org/home/ Approved by: doceng, core
45 lines
2 KiB
Diff
45 lines
2 KiB
Diff
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)
|
|
@@ -180,6 +180,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)
|
|
@@ -500,7 +502,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);
|
|
@@ -689,7 +692,7 @@ static int asn1_template_noexp_d2i(ASN1_VALUE **va
|
|
} else {
|
|
/* 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, ERR_R_NESTED_ASN1_ERROR);
|
|
goto err;
|
|
Index: crypto/openssl/crypto/rsa/rsa_ameth.c
|
|
===================================================================
|
|
--- crypto/openssl/crypto/rsa/rsa_ameth.c (revision 291751)
|
|
+++ crypto/openssl/crypto/rsa/rsa_ameth.c (working copy)
|
|
@@ -279,7 +279,7 @@ static RSA_PSS_PARAMS *rsa_pss_decode(const X509_A
|
|
if (pss->maskGenAlgorithm) {
|
|
ASN1_TYPE *param = pss->maskGenAlgorithm->parameter;
|
|
if (OBJ_obj2nid(pss->maskGenAlgorithm->algorithm) == NID_mgf1
|
|
- && param->type == V_ASN1_SEQUENCE) {
|
|
+ && param && param->type == V_ASN1_SEQUENCE) {
|
|
p = param->value.sequence->data;
|
|
plen = param->value.sequence->length;
|
|
*pmaskHash = d2i_X509_ALGOR(NULL, &p, plen);
|