diff options
| author | tb <> | 2025-12-31 13:48:01 +0000 |
|---|---|---|
| committer | tb <> | 2025-12-31 13:48:01 +0000 |
| commit | 6f2ee5a9a79b7b50dcd481715ff4209cfb40223c (patch) | |
| tree | a535bc6ad505d4fe62a3fcb9e970accf88126841 | |
| parent | 126a2d3ddac6e54e807fc6e4f115de54de845ce4 (diff) | |
| download | openbsd-6f2ee5a9a79b7b50dcd481715ff4209cfb40223c.tar.gz openbsd-6f2ee5a9a79b7b50dcd481715ff4209cfb40223c.tar.bz2 openbsd-6f2ee5a9a79b7b50dcd481715ff4209cfb40223c.zip | |
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
| -rw-r--r-- | src/lib/libcrypto/asn1/asn1.h | 5 | ||||
| -rw-r--r-- | src/lib/libcrypto/man/ASN1_STRING_TABLE_get.3 | 5 |
2 files changed, 5 insertions, 5 deletions
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 @@ | |||
| 1 | /* $OpenBSD: asn1.h,v 1.93 2025/12/21 09:37:05 tb Exp $ */ | 1 | /* $OpenBSD: asn1.h,v 1.94 2025/12/31 13:48:00 tb Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -202,8 +202,9 @@ typedef struct ASN1_ENCODING_st { | |||
| 202 | /* Used with ASN1 LONG type: if a long is set to this it is omitted */ | 202 | /* Used with ASN1 LONG type: if a long is set to this it is omitted */ |
| 203 | #define ASN1_LONG_UNDEF 0x7fffffffL | 203 | #define ASN1_LONG_UNDEF 0x7fffffffL |
| 204 | 204 | ||
| 205 | #define STABLE_FLAGS_MALLOC 0x01 | 205 | /* Used by security/xca */ |
| 206 | #define STABLE_NO_MASK 0x02 | 206 | #define STABLE_NO_MASK 0x02 |
| 207 | |||
| 207 | #define DIRSTRING_TYPE \ | 208 | #define DIRSTRING_TYPE \ |
| 208 | (B_ASN1_PRINTABLESTRING|B_ASN1_T61STRING|B_ASN1_BMPSTRING|B_ASN1_UTF8STRING) | 209 | (B_ASN1_PRINTABLESTRING|B_ASN1_T61STRING|B_ASN1_BMPSTRING|B_ASN1_UTF8STRING) |
| 209 | #define PKCS9STRING_TYPE (DIRSTRING_TYPE|B_ASN1_IA5STRING) | 210 | #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 @@ | |||
| 1 | .\" $OpenBSD: ASN1_STRING_TABLE_get.3,v 1.5 2025/06/08 22:37:23 schwarze Exp $ | 1 | .\" $OpenBSD: ASN1_STRING_TABLE_get.3,v 1.6 2025/12/31 13:48:01 tb Exp $ |
| 2 | .\" checked up to: | 2 | .\" checked up to: |
| 3 | .\" OpenSSL ASN1_STRING_TABLE_add.pod 7b608d08 Jul 27 01:18:50 2017 +0800 | 3 | .\" OpenSSL ASN1_STRING_TABLE_add.pod 7b608d08 Jul 27 01:18:50 2017 +0800 |
| 4 | .\" | 4 | .\" |
| @@ -16,11 +16,10 @@ | |||
| 16 | .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | 16 | .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
| 17 | .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 17 | .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
| 18 | .\" | 18 | .\" |
| 19 | .Dd $Mdocdate: June 8 2025 $ | 19 | .Dd $Mdocdate: December 31 2025 $ |
| 20 | .Dt ASN1_STRING_TABLE_GET 3 | 20 | .Dt ASN1_STRING_TABLE_GET 3 |
| 21 | .Os | 21 | .Os |
| 22 | .Sh NAME | 22 | .Sh NAME |
| 23 | .\" .Dv STABLE_FLAGS_MALLOC is intentionally undocumented because it is unused | ||
| 24 | .Nm ASN1_STRING_TABLE_get | 23 | .Nm ASN1_STRING_TABLE_get |
| 25 | .Nd retrieve an entry from the global ASN.1 string table | 24 | .Nd retrieve an entry from the global ASN.1 string table |
| 26 | .Sh SYNOPSIS | 25 | .Sh SYNOPSIS |
