From 063703fe30ddf9c20b67bf8c0e5761222007a43a Mon Sep 17 00:00:00 2001 From: tb Date: Sun, 16 Apr 2023 08:18:10 +0000 Subject: [PATCH] Annotate policy tree STACK_OF() goo for removal from public API ok jsing --- lib/libcrypto/stack/safestack.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/libcrypto/stack/safestack.h b/lib/libcrypto/stack/safestack.h index 84853efc265..b4f0afa0e65 100644 --- a/lib/libcrypto/stack/safestack.h +++ b/lib/libcrypto/stack/safestack.h @@ -1,4 +1,4 @@ -/* $OpenBSD: safestack.h,v 1.22 2022/07/16 19:11:51 kn Exp $ */ +/* $OpenBSD: safestack.h,v 1.23 2023/04/16 08:18:10 tb Exp $ */ /* ==================================================================== * Copyright (c) 1999 The OpenSSL Project. All rights reserved. * @@ -1765,6 +1765,8 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void) #define sk_X509_OBJECT_sort(st) SKM_sk_sort(X509_OBJECT, (st)) #define sk_X509_OBJECT_is_sorted(st) SKM_sk_is_sorted(X509_OBJECT, (st)) +/* Move these to pcy_int.h in the next major bump. */ +#if !defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_INTERNAL) #define sk_X509_POLICY_DATA_new(cmp) SKM_sk_new(X509_POLICY_DATA, (cmp)) #define sk_X509_POLICY_DATA_new_null() SKM_sk_new_null(X509_POLICY_DATA) #define sk_X509_POLICY_DATA_free(st) SKM_sk_free(X509_POLICY_DATA, (st)) @@ -1808,6 +1810,7 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void) #define sk_X509_POLICY_NODE_pop(st) SKM_sk_pop(X509_POLICY_NODE, (st)) #define sk_X509_POLICY_NODE_sort(st) SKM_sk_sort(X509_POLICY_NODE, (st)) #define sk_X509_POLICY_NODE_is_sorted(st) SKM_sk_is_sorted(X509_POLICY_NODE, (st)) +#endif #define sk_X509_PURPOSE_new(cmp) SKM_sk_new(X509_PURPOSE, (cmp)) #define sk_X509_PURPOSE_new_null() SKM_sk_new_null(X509_PURPOSE) -- 2.20.1