unifdef -U CRYPTO_MDEBUG -m tasn_new.c

diff --git a/lib/libcrypto/asn1/tasn_new.c b/lib/libcrypto/asn1/tasn_new.c
index 7c9bb98..231d5f6 100644 (file)
--- a/lib/libcrypto/asn1/tasn_new.c
+++ b/lib/libcrypto/asn1/tasn_new.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tasn_new.c,v 1.18 2019/04/01 15:48:04 jsing Exp $ */
+/* $OpenBSD: tasn_new.c,v 1.19 2021/12/15 17:53:36 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -103,10 +103,6 @@ asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int combine)
        if (!combine)
                *pval = NULL;
 
-#ifdef CRYPTO_MDEBUG
-       if (it->sname)
-               CRYPTO_push_info(it->sname);
-#endif
 
        switch (it->itype) {
        case ASN1_ITYPE_EXTERN:
@@ -136,10 +132,6 @@ asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int combine)
                        if (!i)
                                goto auxerr;
                        if (i == 2) {
-#ifdef CRYPTO_MDEBUG
-                               if (it->sname)
-                                       CRYPTO_pop_info();
-#endif
                                return 1;
                        }
                }
@@ -160,10 +152,6 @@ asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int combine)
                        if (!i)
                                goto auxerr;
                        if (i == 2) {
-#ifdef CRYPTO_MDEBUG
-                               if (it->sname)
-                                       CRYPTO_pop_info();
-#endif
                                return 1;
                        }
                }
@@ -183,27 +171,15 @@ asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int combine)
                        goto auxerr;
                break;
        }
-#ifdef CRYPTO_MDEBUG
-       if (it->sname)
-               CRYPTO_pop_info();
-#endif
        return 1;
 
 memerr:
        ASN1error(ERR_R_MALLOC_FAILURE);
-#ifdef CRYPTO_MDEBUG
-       if (it->sname)
-               CRYPTO_pop_info();
-#endif
        return 0;
 
 auxerr:
        ASN1error(ASN1_R_AUX_ERROR);
        ASN1_item_ex_free(pval, it);
-#ifdef CRYPTO_MDEBUG
-       if (it->sname)
-               CRYPTO_pop_info();
-#endif
        return 0;
 
 }
@@ -257,10 +233,6 @@ ASN1_template_new(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt)
                *pval = NULL;
                return 1;
        }
-#ifdef CRYPTO_MDEBUG
-       if (tt->field_name)
-               CRYPTO_push_info(tt->field_name);
-#endif
        /* If SET OF or SEQUENCE OF, its a STACK */
        if (tt->flags & ASN1_TFLG_SK_MASK) {
                STACK_OF(ASN1_VALUE) *skval;
@@ -277,10 +249,6 @@ ASN1_template_new(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt)
        /* Otherwise pass it back to the item routine */
        ret = asn1_item_ex_combine_new(pval, it, tt->flags & ASN1_TFLG_COMBINE);
 done:
-#ifdef CRYPTO_MDEBUG
-       if (it->sname)
-               CRYPTO_pop_info();
-#endif
        return ret;
 }