From 6f2ee5a9a79b7b50dcd481715ff4209cfb40223c Mon Sep 17 00:00:00 2001 From: tb <> Date: Wed, 31 Dec 2025 13:48:01 +0000 Subject: Remove STABLE_FLAGS_MALLOC Formerly used by ASN1_STRING_TABLE_{add,cleanup}() which were removed two years ago. Annotate why STABLE_NO_MASK stays: as usual, security/xca ends up being the sole consumer of some nonsense. Apparently it needs its own reimplementation of ASN1_STRING_set_by_NID(), another removable public API that should never have been exposed. ok kenjiro --- src/lib/libcrypto/asn1/asn1.h | 5 +++-- src/lib/libcrypto/man/ASN1_STRING_TABLE_get.3 | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h index ec31b9dd19..7285ad0590 100644 --- a/src/lib/libcrypto/asn1/asn1.h +++ b/src/lib/libcrypto/asn1/asn1.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asn1.h,v 1.93 2025/12/21 09:37:05 tb Exp $ */ +/* $OpenBSD: asn1.h,v 1.94 2025/12/31 13:48:00 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -202,8 +202,9 @@ typedef struct ASN1_ENCODING_st { /* Used with ASN1 LONG type: if a long is set to this it is omitted */ #define ASN1_LONG_UNDEF 0x7fffffffL -#define STABLE_FLAGS_MALLOC 0x01 +/* Used by security/xca */ #define STABLE_NO_MASK 0x02 + #define DIRSTRING_TYPE \ (B_ASN1_PRINTABLESTRING|B_ASN1_T61STRING|B_ASN1_BMPSTRING|B_ASN1_UTF8STRING) #define PKCS9STRING_TYPE (DIRSTRING_TYPE|B_ASN1_IA5STRING) diff --git a/src/lib/libcrypto/man/ASN1_STRING_TABLE_get.3 b/src/lib/libcrypto/man/ASN1_STRING_TABLE_get.3 index 4149b73d34..f9e69a89e5 100644 --- a/src/lib/libcrypto/man/ASN1_STRING_TABLE_get.3 +++ b/src/lib/libcrypto/man/ASN1_STRING_TABLE_get.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ASN1_STRING_TABLE_get.3,v 1.5 2025/06/08 22:37:23 schwarze Exp $ +.\" $OpenBSD: ASN1_STRING_TABLE_get.3,v 1.6 2025/12/31 13:48:01 tb Exp $ .\" checked up to: .\" OpenSSL ASN1_STRING_TABLE_add.pod 7b608d08 Jul 27 01:18:50 2017 +0800 .\" @@ -16,11 +16,10 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: June 8 2025 $ +.Dd $Mdocdate: December 31 2025 $ .Dt ASN1_STRING_TABLE_GET 3 .Os .Sh NAME -.\" .Dv STABLE_FLAGS_MALLOC is intentionally undocumented because it is unused .Nm ASN1_STRING_TABLE_get .Nd retrieve an entry from the global ASN.1 string table .Sh SYNOPSIS -- cgit v1.2.3-55-g6feb