mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-02-17 14:32:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Check and print out boolean type properly.

Browse Source 
If underlying type is boolean don't check field is NULL.

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2016-07-18 23:59:39 +01:00
parent e3ea3afd6d
commit ad72d9fdf7
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crypto/asn1/tasn_prn.c
View File

@ -151,7 +151,8 @@ static int asn1_item_print_ctx(BIO *out, ASN1_VALUE **fld, int indent,
} else } else
asn1_cb = 0; asn1_cb = 0;
if (*fld == NULL) { if (((it->itype != ASN1_ITYPE_PRIMITIVE)
|| (it->utype != V_ASN1_BOOLEAN)) && *fld == NULL) {
if (pctx->flags & ASN1_PCTX_FLAGS_SHOW_ABSENT) { if (pctx->flags & ASN1_PCTX_FLAGS_SHOW_ABSENT) {
if (!nohdr && !asn1_print_fsname(out, indent, fname, sname, pctx)) if (!nohdr && !asn1_print_fsname(out, indent, fname, sname, pctx))
return 0; return 0;
@ -443,11 +444,16 @@ static int asn1_primitive_print(BIO *out, ASN1_VALUE **fld,
return 0; return 0;
if (pf && pf->prim_print) if (pf && pf->prim_print)
return pf->prim_print(out, fld, it, indent, pctx); return pf->prim_print(out, fld, it, indent, pctx);
str = (ASN1_STRING *)*fld; if (it->itype == ASN1_ITYPE_MSTRING) {
if (it->itype == ASN1_ITYPE_MSTRING) str = (ASN1_STRING *)*fld;
utype = str->type & ~V_ASN1_NEG; utype = str->type & ~V_ASN1_NEG;
else } else {
utype = it->utype; utype = it->utype;
if (utype == V_ASN1_BOOLEAN)
str = NULL;
else
str = (ASN1_STRING *)*fld;
}
if (utype == V_ASN1_ANY) { if (utype == V_ASN1_ANY) {
ASN1_TYPE *atype = (ASN1_TYPE *)*fld; ASN1_TYPE *atype = (ASN1_TYPE *)*fld;
utype = atype->type; utype = atype->type;