Garbage collect the app_items field of ASN1_ADB

This is unused and was removed in OpenSSL 5b70372d when it was
replaced with an ASN.1 ADB callback (which we don't support).

ok inoguchi jsing

diff --git a/lib/libcrypto/asn1/asn1t.h b/lib/libcrypto/asn1/asn1t.h
index a4d0aac..82369d3 100644 (file)
--- a/lib/libcrypto/asn1/asn1t.h
+++ b/lib/libcrypto/asn1/asn1t.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1t.h,v 1.17 2022/01/14 08:14:48 tb Exp $ */
+/* $OpenBSD: asn1t.h,v 1.18 2022/01/14 08:16:13 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -487,7 +487,6 @@ typedef struct ASN1_ADB_st ASN1_ADB;
 struct ASN1_ADB_st {
        unsigned long flags;    /* Various flags */
        unsigned long offset;   /* Offset of selector field */
-       STACK_OF(ASN1_ADB_TABLE) **app_items; /* Application defined items */
        const ASN1_ADB_TABLE *tbl;      /* Table of possible types */
        long tblcount;          /* Number of entries in tbl */
        const ASN1_TEMPLATE *default_tt;  /* Type to use if no match */

diff --git a/lib/libcrypto/cms/cms_asn1.c b/lib/libcrypto/cms/cms_asn1.c
index ac53fec..cc00aef 100644 (file)
--- a/lib/libcrypto/cms/cms_asn1.c
+++ b/lib/libcrypto/cms/cms_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms_asn1.c,v 1.18 2019/08/11 10:43:57 jsing Exp $ */
+/* $OpenBSD: cms_asn1.c,v 1.19 2022/01/14 08:16:13 tb Exp $ */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
@@ -1323,7 +1323,6 @@ static const ASN1_ADB_TABLE CMS_ContentInfo_adbtbl[] = {
 static const ASN1_ADB CMS_ContentInfo_adb = {
        .flags = 0,
        .offset = offsetof(CMS_ContentInfo, contentType),
-       .app_items = 0,
        .tbl = CMS_ContentInfo_adbtbl,
        .tblcount = sizeof(CMS_ContentInfo_adbtbl) / sizeof(ASN1_ADB_TABLE),
        .default_tt = &cms_default_tt,

diff --git a/lib/libcrypto/ec/ec_asn1.c b/lib/libcrypto/ec/ec_asn1.c
index befeee9..6ec8ab0 100644 (file)
--- a/lib/libcrypto/ec/ec_asn1.c
+++ b/lib/libcrypto/ec/ec_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_asn1.c,v 1.34 2021/08/31 20:14:40 tb Exp $ */
+/* $OpenBSD: ec_asn1.c,v 1.35 2022/01/14 08:16:13 tb Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -295,7 +295,6 @@ static const ASN1_ADB_TABLE X9_62_CHARACTERISTIC_TWO_adbtbl[] = {
 static const ASN1_ADB X9_62_CHARACTERISTIC_TWO_adb = {
        .flags = 0,
        .offset = offsetof(X9_62_CHARACTERISTIC_TWO, type),
-       .app_items = 0,
        .tbl = X9_62_CHARACTERISTIC_TWO_adbtbl,
        .tblcount = sizeof(X9_62_CHARACTERISTIC_TWO_adbtbl) / sizeof(ASN1_ADB_TABLE),
        .default_tt = &char_two_def_tt,
@@ -387,7 +386,6 @@ static const ASN1_ADB_TABLE X9_62_FIELDID_adbtbl[] = {
 static const ASN1_ADB X9_62_FIELDID_adb = {
        .flags = 0,
        .offset = offsetof(X9_62_FIELDID, fieldType),
-       .app_items = 0,
        .tbl = X9_62_FIELDID_adbtbl,
        .tblcount = sizeof(X9_62_FIELDID_adbtbl) / sizeof(ASN1_ADB_TABLE),
        .default_tt = &fieldID_def_tt,

diff --git a/lib/libcrypto/pkcs12/p12_asn.c b/lib/libcrypto/pkcs12/p12_asn.c
index 3baf8f4..d152063 100644 (file)
--- a/lib/libcrypto/pkcs12/p12_asn.c
+++ b/lib/libcrypto/pkcs12/p12_asn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_asn.c,v 1.9 2015/07/25 17:08:40 jsing Exp $ */
+/* $OpenBSD: p12_asn.c,v 1.10 2022/01/14 08:16:13 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -230,7 +230,6 @@ static const ASN1_ADB_TABLE PKCS12_BAGS_adbtbl[] = {
 static const ASN1_ADB PKCS12_BAGS_adb = {
        .flags = 0,
        .offset = offsetof(PKCS12_BAGS, type),
-       .app_items = 0,
        .tbl = PKCS12_BAGS_adbtbl,
        .tblcount = sizeof(PKCS12_BAGS_adbtbl) / sizeof(ASN1_ADB_TABLE),
        .default_tt = &bag_default_tt,
@@ -369,7 +368,6 @@ static const ASN1_ADB_TABLE PKCS12_SAFEBAG_adbtbl[] = {
 static const ASN1_ADB PKCS12_SAFEBAG_adb = {
        .flags = 0,
        .offset = offsetof(PKCS12_SAFEBAG, type),
-       .app_items = 0,
        .tbl = PKCS12_SAFEBAG_adbtbl,
        .tblcount = sizeof(PKCS12_SAFEBAG_adbtbl) / sizeof(ASN1_ADB_TABLE),
        .default_tt = &safebag_default_tt,

diff --git a/lib/libcrypto/pkcs7/pk7_asn1.c b/lib/libcrypto/pkcs7/pk7_asn1.c
index 81e4a01..6665905 100644 (file)
--- a/lib/libcrypto/pkcs7/pk7_asn1.c
+++ b/lib/libcrypto/pkcs7/pk7_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pk7_asn1.c,v 1.12 2015/07/25 15:33:06 jsing Exp $ */
+/* $OpenBSD: pk7_asn1.c,v 1.13 2022/01/14 08:16:13 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -146,7 +146,6 @@ static const ASN1_ADB_TABLE PKCS7_adbtbl[] = {
 static const ASN1_ADB PKCS7_adb = {
        .flags = 0,
        .offset = offsetof(PKCS7, type),
-       .app_items = 0,
        .tbl = PKCS7_adbtbl,
        .tblcount = sizeof(PKCS7_adbtbl) / sizeof(ASN1_ADB_TABLE),
        .default_tt = &p7default_tt,

diff --git a/lib/libcrypto/x509/x509_cpols.c b/lib/libcrypto/x509/x509_cpols.c
index 54b7178..93527a4 100644 (file)
--- a/lib/libcrypto/x509/x509_cpols.c
+++ b/lib/libcrypto/x509/x509_cpols.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_cpols.c,v 1.3 2022/01/08 07:25:52 tb Exp $ */
+/* $OpenBSD: x509_cpols.c,v 1.4 2022/01/14 08:16:13 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -233,7 +233,6 @@ static const ASN1_ADB_TABLE POLICYQUALINFO_adbtbl[] = {
 static const ASN1_ADB POLICYQUALINFO_adb = {
        .flags = 0,
        .offset = offsetof(POLICYQUALINFO, pqualid),
-       .app_items = 0,
        .tbl = POLICYQUALINFO_adbtbl,
        .tblcount = sizeof(POLICYQUALINFO_adbtbl) / sizeof(ASN1_ADB_TABLE),
        .default_tt = &policydefault_tt,