Use basename of objxref.pl not whole path in generated header.

[oweals/openssl.git] / crypto / asn1 / tasn_prn.c

diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c
index f595e385f21e21331457ca4cae5cbc15c86112d9..453698012dabd7096e442e3e569c8ffcd11f0ad3 100644 (file)
--- a/crypto/asn1/tasn_prn.c
+++ b/crypto/asn1/tasn_prn.c
@@ -1,5 +1,5 @@
 /* tasn_prn.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
 /* ====================================================================
@@ -354,6 +354,8 @@ int asn1_template_print_ctx(BIO *out, ASN1_VALUE **fld, int indent,
                {
                char *tname;
                ASN1_VALUE *skitem;
+               STACK_OF(ASN1_VALUE) *stack;
+
                /* SET OF, SEQUENCE OF */
                if (fname)
                        {
@@ -371,12 +373,13 @@ int asn1_template_print_ctx(BIO *out, ASN1_VALUE **fld, int indent,
                                        fname) <= 0)
                                return 0;
                        }
-               for(i = 0; i < sk_num((STACK *)*fld); i++)
+               stack = (STACK_OF(ASN1_VALUE) *)*fld;
+               for(i = 0; i < sk_ASN1_VALUE_num(stack); i++)
                        {
                        if ((i > 0) && (BIO_puts(out, "\n") <= 0))
                                return 0;
 
-                       skitem = (ASN1_VALUE *)sk_value((STACK *)*fld, i);
+                       skitem = sk_ASN1_VALUE_value(stack, i);
                        if (!asn1_item_print_ctx(out, &skitem, indent + 2,
                                ASN1_ITEM_ptr(tt->item), NULL, NULL, 1, pctx))
                                return 0;
@@ -506,7 +509,8 @@ static int asn1_print_obstring_ctx(BIO *out, ASN1_STRING *str, int indent,
                }
        else if (BIO_puts(out, "\n") <= 0)
                return 0;
-       if (BIO_dump_indent(out, (char *)str->data, str->length,
+       if ((str->length > 0)
+               && BIO_dump_indent(out, (char *)str->data, str->length,
                                indent + 2) <= 0)
                return 0;
        return 1;
@@ -521,8 +525,12 @@ static int asn1_primitive_print(BIO *out, ASN1_VALUE **fld,
        ASN1_STRING *str;
        int ret = 1, needlf = 1;
        const char *pname;
+       const ASN1_PRIMITIVE_FUNCS *pf;
+       pf = it->funcs;
        if (!asn1_print_fsname(out, indent, fname, sname, pctx))
                        return 0;
+       if (pf && pf->prim_print)
+               return pf->prim_print(out, fld, it, indent, pctx);
        str = (ASN1_STRING *)*fld;
        if (it->itype == ASN1_ITYPE_MSTRING)
                utype = str->type & ~V_ASN1_NEG;
@@ -532,7 +540,7 @@ static int asn1_primitive_print(BIO *out, ASN1_VALUE **fld,
                {
                ASN1_TYPE *atype = (ASN1_TYPE *)*fld;
                utype = atype->type;
-               fld = (ASN1_VALUE **)&atype->value.ptr;
+               fld = &atype->value.asn1_value;
                str = (ASN1_STRING *)*fld;
                if (pctx->flags & ASN1_PCTX_FLAGS_NO_ANY_TYPE)
                        pname = NULL;