diff options
author | tb <> | 2022-01-14 08:16:13 +0000 |
---|---|---|
committer | tb <> | 2022-01-14 08:16:13 +0000 |
commit | 72623a3ef957eb2abae8f23270f10fce78f84123 (patch) | |
tree | 74d6c4cd010903a61c401e87224b05cd978c67e0 /src/lib/libcrypto/pkcs12 | |
parent | b4428794e46977d3522eb9b836c6ad7ded3031ca (diff) | |
download | openbsd-72623a3ef957eb2abae8f23270f10fce78f84123.tar.gz openbsd-72623a3ef957eb2abae8f23270f10fce78f84123.tar.bz2 openbsd-72623a3ef957eb2abae8f23270f10fce78f84123.zip |
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
Diffstat (limited to 'src/lib/libcrypto/pkcs12')
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_asn.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_asn.c b/src/lib/libcrypto/pkcs12/p12_asn.c index 3baf8f43d5..d152063e37 100644 --- a/src/lib/libcrypto/pkcs12/p12_asn.c +++ b/src/lib/libcrypto/pkcs12/p12_asn.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p12_asn.c,v 1.9 2015/07/25 17:08:40 jsing Exp $ */ | 1 | /* $OpenBSD: p12_asn.c,v 1.10 2022/01/14 08:16:13 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -230,7 +230,6 @@ static const ASN1_ADB_TABLE PKCS12_BAGS_adbtbl[] = { | |||
230 | static const ASN1_ADB PKCS12_BAGS_adb = { | 230 | static const ASN1_ADB PKCS12_BAGS_adb = { |
231 | .flags = 0, | 231 | .flags = 0, |
232 | .offset = offsetof(PKCS12_BAGS, type), | 232 | .offset = offsetof(PKCS12_BAGS, type), |
233 | .app_items = 0, | ||
234 | .tbl = PKCS12_BAGS_adbtbl, | 233 | .tbl = PKCS12_BAGS_adbtbl, |
235 | .tblcount = sizeof(PKCS12_BAGS_adbtbl) / sizeof(ASN1_ADB_TABLE), | 234 | .tblcount = sizeof(PKCS12_BAGS_adbtbl) / sizeof(ASN1_ADB_TABLE), |
236 | .default_tt = &bag_default_tt, | 235 | .default_tt = &bag_default_tt, |
@@ -369,7 +368,6 @@ static const ASN1_ADB_TABLE PKCS12_SAFEBAG_adbtbl[] = { | |||
369 | static const ASN1_ADB PKCS12_SAFEBAG_adb = { | 368 | static const ASN1_ADB PKCS12_SAFEBAG_adb = { |
370 | .flags = 0, | 369 | .flags = 0, |
371 | .offset = offsetof(PKCS12_SAFEBAG, type), | 370 | .offset = offsetof(PKCS12_SAFEBAG, type), |
372 | .app_items = 0, | ||
373 | .tbl = PKCS12_SAFEBAG_adbtbl, | 371 | .tbl = PKCS12_SAFEBAG_adbtbl, |
374 | .tblcount = sizeof(PKCS12_SAFEBAG_adbtbl) / sizeof(ASN1_ADB_TABLE), | 372 | .tblcount = sizeof(PKCS12_SAFEBAG_adbtbl) / sizeof(ASN1_ADB_TABLE), |
375 | .default_tt = &safebag_default_tt, | 373 | .default_tt = &safebag_default_tt, |