summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2024-03-02 11:22:48 +0000
committertb <>2024-03-02 11:22:48 +0000
commitc7c997effc0f051e0ff4bfa6ba632bc8e18959dd (patch)
tree4e53fe86119b9350bebca5478ba924c0402e3988
parentd0b64fd35a751a9304cb39bfc275ec1121c14fd7 (diff)
downloadopenbsd-c7c997effc0f051e0ff4bfa6ba632bc8e18959dd.tar.gz
openbsd-c7c997effc0f051e0ff4bfa6ba632bc8e18959dd.tar.bz2
openbsd-c7c997effc0f051e0ff4bfa6ba632bc8e18959dd.zip
Remove a few no longer used sk_FOO_* stanzas
ok jsing
Diffstat
-rw-r--r--src/lib/libcrypto/stack/safestack.h86
1 files changed, 1 insertions, 85 deletions
diff --git a/src/lib/libcrypto/stack/safestack.h b/src/lib/libcrypto/stack/safestack.h
index d1f436da1b..8425a45c6c 100644
--- a/src/lib/libcrypto/stack/safestack.h
+++ b/src/lib/libcrypto/stack/safestack.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: safestack.h,v 1.32 2024/03/02 11:20:36 tb Exp $ */ 1/* $OpenBSD: safestack.h,v 1.33 2024/03/02 11:22:48 tb Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1999 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1999 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -266,27 +266,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_STRING, char)
266#define sk_ASN1_OBJECT_sort(st) SKM_sk_sort(ASN1_OBJECT, (st)) 266#define sk_ASN1_OBJECT_sort(st) SKM_sk_sort(ASN1_OBJECT, (st))
267#define sk_ASN1_OBJECT_is_sorted(st) SKM_sk_is_sorted(ASN1_OBJECT, (st)) 267#define sk_ASN1_OBJECT_is_sorted(st) SKM_sk_is_sorted(ASN1_OBJECT, (st))
268 268
269#define sk_ASN1_STRING_TABLE_new(cmp) SKM_sk_new(ASN1_STRING_TABLE, (cmp))
270#define sk_ASN1_STRING_TABLE_new_null() SKM_sk_new_null(ASN1_STRING_TABLE)
271#define sk_ASN1_STRING_TABLE_free(st) SKM_sk_free(ASN1_STRING_TABLE, (st))
272#define sk_ASN1_STRING_TABLE_num(st) SKM_sk_num(ASN1_STRING_TABLE, (st))
273#define sk_ASN1_STRING_TABLE_value(st, i) SKM_sk_value(ASN1_STRING_TABLE, (st), (i))
274#define sk_ASN1_STRING_TABLE_set(st, i, val) SKM_sk_set(ASN1_STRING_TABLE, (st), (i), (val))
275#define sk_ASN1_STRING_TABLE_zero(st) SKM_sk_zero(ASN1_STRING_TABLE, (st))
276#define sk_ASN1_STRING_TABLE_push(st, val) SKM_sk_push(ASN1_STRING_TABLE, (st), (val))
277#define sk_ASN1_STRING_TABLE_unshift(st, val) SKM_sk_unshift(ASN1_STRING_TABLE, (st), (val))
278#define sk_ASN1_STRING_TABLE_find(st, val) SKM_sk_find(ASN1_STRING_TABLE, (st), (val))
279#define sk_ASN1_STRING_TABLE_delete(st, i) SKM_sk_delete(ASN1_STRING_TABLE, (st), (i))
280#define sk_ASN1_STRING_TABLE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_STRING_TABLE, (st), (ptr))
281#define sk_ASN1_STRING_TABLE_insert(st, val, i) SKM_sk_insert(ASN1_STRING_TABLE, (st), (val), (i))
282#define sk_ASN1_STRING_TABLE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_STRING_TABLE, (st), (cmp))
283#define sk_ASN1_STRING_TABLE_dup(st) SKM_sk_dup(ASN1_STRING_TABLE, st)
284#define sk_ASN1_STRING_TABLE_pop_free(st, free_func) SKM_sk_pop_free(ASN1_STRING_TABLE, (st), (free_func))
285#define sk_ASN1_STRING_TABLE_shift(st) SKM_sk_shift(ASN1_STRING_TABLE, (st))
286#define sk_ASN1_STRING_TABLE_pop(st) SKM_sk_pop(ASN1_STRING_TABLE, (st))
287#define sk_ASN1_STRING_TABLE_sort(st) SKM_sk_sort(ASN1_STRING_TABLE, (st))
288#define sk_ASN1_STRING_TABLE_is_sorted(st) SKM_sk_is_sorted(ASN1_STRING_TABLE, (st))
289
290#define sk_ASN1_TYPE_new(cmp) SKM_sk_new(ASN1_TYPE, (cmp)) 269#define sk_ASN1_TYPE_new(cmp) SKM_sk_new(ASN1_TYPE, (cmp))
291#define sk_ASN1_TYPE_new_null() SKM_sk_new_null(ASN1_TYPE) 270#define sk_ASN1_TYPE_new_null() SKM_sk_new_null(ASN1_TYPE)
292#define sk_ASN1_TYPE_free(st) SKM_sk_free(ASN1_TYPE, (st)) 271#define sk_ASN1_TYPE_free(st) SKM_sk_free(ASN1_TYPE, (st))
@@ -709,27 +688,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_STRING, char)
709#define sk_EVP_MD_sort(st) SKM_sk_sort(EVP_MD, (st)) 688#define sk_EVP_MD_sort(st) SKM_sk_sort(EVP_MD, (st))
710#define sk_EVP_MD_is_sorted(st) SKM_sk_is_sorted(EVP_MD, (st)) 689#define sk_EVP_MD_is_sorted(st) SKM_sk_is_sorted(EVP_MD, (st))
711 690
712#define sk_EVP_PBE_CTL_new(cmp) SKM_sk_new(EVP_PBE_CTL, (cmp))
713#define sk_EVP_PBE_CTL_new_null() SKM_sk_new_null(EVP_PBE_CTL)
714#define sk_EVP_PBE_CTL_free(st) SKM_sk_free(EVP_PBE_CTL, (st))
715#define sk_EVP_PBE_CTL_num(st) SKM_sk_num(EVP_PBE_CTL, (st))
716#define sk_EVP_PBE_CTL_value(st, i) SKM_sk_value(EVP_PBE_CTL, (st), (i))
717#define sk_EVP_PBE_CTL_set(st, i, val) SKM_sk_set(EVP_PBE_CTL, (st), (i), (val))
718#define sk_EVP_PBE_CTL_zero(st) SKM_sk_zero(EVP_PBE_CTL, (st))
719#define sk_EVP_PBE_CTL_push(st, val) SKM_sk_push(EVP_PBE_CTL, (st), (val))
720#define sk_EVP_PBE_CTL_unshift(st, val) SKM_sk_unshift(EVP_PBE_CTL, (st), (val))
721#define sk_EVP_PBE_CTL_find(st, val) SKM_sk_find(EVP_PBE_CTL, (st), (val))
722#define sk_EVP_PBE_CTL_delete(st, i) SKM_sk_delete(EVP_PBE_CTL, (st), (i))
723#define sk_EVP_PBE_CTL_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_PBE_CTL, (st), (ptr))
724#define sk_EVP_PBE_CTL_insert(st, val, i) SKM_sk_insert(EVP_PBE_CTL, (st), (val), (i))
725#define sk_EVP_PBE_CTL_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_PBE_CTL, (st), (cmp))
726#define sk_EVP_PBE_CTL_dup(st) SKM_sk_dup(EVP_PBE_CTL, st)
727#define sk_EVP_PBE_CTL_pop_free(st, free_func) SKM_sk_pop_free(EVP_PBE_CTL, (st), (free_func))
728#define sk_EVP_PBE_CTL_shift(st) SKM_sk_shift(EVP_PBE_CTL, (st))
729#define sk_EVP_PBE_CTL_pop(st) SKM_sk_pop(EVP_PBE_CTL, (st))
730#define sk_EVP_PBE_CTL_sort(st) SKM_sk_sort(EVP_PBE_CTL, (st))
731#define sk_EVP_PBE_CTL_is_sorted(st) SKM_sk_is_sorted(EVP_PBE_CTL, (st))
732
733#define sk_EVP_PKEY_ASN1_METHOD_new(cmp) SKM_sk_new(EVP_PKEY_ASN1_METHOD, (cmp)) 691#define sk_EVP_PKEY_ASN1_METHOD_new(cmp) SKM_sk_new(EVP_PKEY_ASN1_METHOD, (cmp))
734#define sk_EVP_PKEY_ASN1_METHOD_new_null() SKM_sk_new_null(EVP_PKEY_ASN1_METHOD) 692#define sk_EVP_PKEY_ASN1_METHOD_new_null() SKM_sk_new_null(EVP_PKEY_ASN1_METHOD)
735#define sk_EVP_PKEY_ASN1_METHOD_free(st) SKM_sk_free(EVP_PKEY_ASN1_METHOD, (st)) 693#define sk_EVP_PKEY_ASN1_METHOD_free(st) SKM_sk_free(EVP_PKEY_ASN1_METHOD, (st))
@@ -1570,27 +1528,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_STRING, char)
1570#define sk_X509_OBJECT_sort(st) SKM_sk_sort(X509_OBJECT, (st)) 1528#define sk_X509_OBJECT_sort(st) SKM_sk_sort(X509_OBJECT, (st))
1571#define sk_X509_OBJECT_is_sorted(st) SKM_sk_is_sorted(X509_OBJECT, (st)) 1529#define sk_X509_OBJECT_is_sorted(st) SKM_sk_is_sorted(X509_OBJECT, (st))
1572 1530
1573#define sk_X509_PURPOSE_new(cmp) SKM_sk_new(X509_PURPOSE, (cmp))
1574#define sk_X509_PURPOSE_new_null() SKM_sk_new_null(X509_PURPOSE)
1575#define sk_X509_PURPOSE_free(st) SKM_sk_free(X509_PURPOSE, (st))
1576#define sk_X509_PURPOSE_num(st) SKM_sk_num(X509_PURPOSE, (st))
1577#define sk_X509_PURPOSE_value(st, i) SKM_sk_value(X509_PURPOSE, (st), (i))
1578#define sk_X509_PURPOSE_set(st, i, val) SKM_sk_set(X509_PURPOSE, (st), (i), (val))
1579#define sk_X509_PURPOSE_zero(st) SKM_sk_zero(X509_PURPOSE, (st))
1580#define sk_X509_PURPOSE_push(st, val) SKM_sk_push(X509_PURPOSE, (st), (val))
1581#define sk_X509_PURPOSE_unshift(st, val) SKM_sk_unshift(X509_PURPOSE, (st), (val))
1582#define sk_X509_PURPOSE_find(st, val) SKM_sk_find(X509_PURPOSE, (st), (val))
1583#define sk_X509_PURPOSE_delete(st, i) SKM_sk_delete(X509_PURPOSE, (st), (i))
1584#define sk_X509_PURPOSE_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_PURPOSE, (st), (ptr))
1585#define sk_X509_PURPOSE_insert(st, val, i) SKM_sk_insert(X509_PURPOSE, (st), (val), (i))
1586#define sk_X509_PURPOSE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_PURPOSE, (st), (cmp))
1587#define sk_X509_PURPOSE_dup(st) SKM_sk_dup(X509_PURPOSE, st)
1588#define sk_X509_PURPOSE_pop_free(st, free_func) SKM_sk_pop_free(X509_PURPOSE, (st), (free_func))
1589#define sk_X509_PURPOSE_shift(st) SKM_sk_shift(X509_PURPOSE, (st))
1590#define sk_X509_PURPOSE_pop(st) SKM_sk_pop(X509_PURPOSE, (st))
1591#define sk_X509_PURPOSE_sort(st) SKM_sk_sort(X509_PURPOSE, (st))
1592#define sk_X509_PURPOSE_is_sorted(st) SKM_sk_is_sorted(X509_PURPOSE, (st))
1593
1594#define sk_X509_REVOKED_new(cmp) SKM_sk_new(X509_REVOKED, (cmp)) 1531#define sk_X509_REVOKED_new(cmp) SKM_sk_new(X509_REVOKED, (cmp))
1595#define sk_X509_REVOKED_new_null() SKM_sk_new_null(X509_REVOKED) 1532#define sk_X509_REVOKED_new_null() SKM_sk_new_null(X509_REVOKED)
1596#define sk_X509_REVOKED_free(st) SKM_sk_free(X509_REVOKED, (st)) 1533#define sk_X509_REVOKED_free(st) SKM_sk_free(X509_REVOKED, (st))
@@ -1612,27 +1549,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_STRING, char)
1612#define sk_X509_REVOKED_sort(st) SKM_sk_sort(X509_REVOKED, (st)) 1549#define sk_X509_REVOKED_sort(st) SKM_sk_sort(X509_REVOKED, (st))
1613#define sk_X509_REVOKED_is_sorted(st) SKM_sk_is_sorted(X509_REVOKED, (st)) 1550#define sk_X509_REVOKED_is_sorted(st) SKM_sk_is_sorted(X509_REVOKED, (st))
1614 1551
1615#define sk_X509_TRUST_new(cmp) SKM_sk_new(X509_TRUST, (cmp))
1616#define sk_X509_TRUST_new_null() SKM_sk_new_null(X509_TRUST)
1617#define sk_X509_TRUST_free(st) SKM_sk_free(X509_TRUST, (st))
1618#define sk_X509_TRUST_num(st) SKM_sk_num(X509_TRUST, (st))
1619#define sk_X509_TRUST_value(st, i) SKM_sk_value(X509_TRUST, (st), (i))
1620#define sk_X509_TRUST_set(st, i, val) SKM_sk_set(X509_TRUST, (st), (i), (val))
1621#define sk_X509_TRUST_zero(st) SKM_sk_zero(X509_TRUST, (st))
1622#define sk_X509_TRUST_push(st, val) SKM_sk_push(X509_TRUST, (st), (val))
1623#define sk_X509_TRUST_unshift(st, val) SKM_sk_unshift(X509_TRUST, (st), (val))
1624#define sk_X509_TRUST_find(st, val) SKM_sk_find(X509_TRUST, (st), (val))
1625#define sk_X509_TRUST_delete(st, i) SKM_sk_delete(X509_TRUST, (st), (i))
1626#define sk_X509_TRUST_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_TRUST, (st), (ptr))
1627#define sk_X509_TRUST_insert(st, val, i) SKM_sk_insert(X509_TRUST, (st), (val), (i))
1628#define sk_X509_TRUST_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_TRUST, (st), (cmp))
1629#define sk_X509_TRUST_dup(st) SKM_sk_dup(X509_TRUST, st)
1630#define sk_X509_TRUST_pop_free(st, free_func) SKM_sk_pop_free(X509_TRUST, (st), (free_func))
1631#define sk_X509_TRUST_shift(st) SKM_sk_shift(X509_TRUST, (st))
1632#define sk_X509_TRUST_pop(st) SKM_sk_pop(X509_TRUST, (st))
1633#define sk_X509_TRUST_sort(st) SKM_sk_sort(X509_TRUST, (st))
1634#define sk_X509_TRUST_is_sorted(st) SKM_sk_is_sorted(X509_TRUST, (st))
1635
1636#define sk_X509_VERIFY_PARAM_new(cmp) SKM_sk_new(X509_VERIFY_PARAM, (cmp)) 1552#define sk_X509_VERIFY_PARAM_new(cmp) SKM_sk_new(X509_VERIFY_PARAM, (cmp))
1637#define sk_X509_VERIFY_PARAM_new_null() SKM_sk_new_null(X509_VERIFY_PARAM) 1553#define sk_X509_VERIFY_PARAM_new_null() SKM_sk_new_null(X509_VERIFY_PARAM)
1638#define sk_X509_VERIFY_PARAM_free(st) SKM_sk_free(X509_VERIFY_PARAM, (st)) 1554#define sk_X509_VERIFY_PARAM_free(st) SKM_sk_free(X509_VERIFY_PARAM, (st))
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-20 13:02:36 +0000