From: jsing Date: Sun, 19 Dec 2021 14:33:53 +0000 (+0000) Subject: Put CTLOG and SCT stacks definitions in the right place. X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=04cd639876139c50a47f5c312a88541cc2a1e0c6;p=openbsd Put CTLOG and SCT stacks definitions in the right place. No functional change. --- diff --git a/lib/libcrypto/stack/safestack.h b/lib/libcrypto/stack/safestack.h index dbcb9ef350a..1c6d633ed59 100644 --- a/lib/libcrypto/stack/safestack.h +++ b/lib/libcrypto/stack/safestack.h @@ -1,4 +1,4 @@ -/* $OpenBSD: safestack.h,v 1.19 2021/11/24 01:12:43 beck Exp $ */ +/* $OpenBSD: safestack.h,v 1.20 2021/12/19 14:33:53 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999 The OpenSSL Project. All rights reserved. * @@ -663,6 +663,30 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void) #define sk_CRYPTO_dynlock_sort(st) SKM_sk_sort(CRYPTO_dynlock, (st)) #define sk_CRYPTO_dynlock_is_sorted(st) SKM_sk_is_sorted(CRYPTO_dynlock, (st)) +#ifdef LIBRESSL_CRYPTO_INTERNAL +#define sk_CTLOG_new(cmp) SKM_sk_new(CTLOG, (cmp)) +#define sk_CTLOG_new_null() SKM_sk_new_null(CTLOG) +#define sk_CTLOG_free(st) SKM_sk_free(CTLOG, (st)) +#define sk_CTLOG_num(st) SKM_sk_num(CTLOG, (st)) +#define sk_CTLOG_value(st, i) SKM_sk_value(CTLOG, (st), (i)) +#define sk_CTLOG_set(st, i, val) SKM_sk_set(CTLOG, (st), (i), (val)) +#define sk_CTLOG_zero(st) SKM_sk_zero(CTLOG, (st)) +#define sk_CTLOG_push(st, val) SKM_sk_push(CTLOG, (st), (val)) +#define sk_CTLOG_unshift(st, val) SKM_sk_unshift(CTLOG, (st), (val)) +#define sk_CTLOG_find(st, val) SKM_sk_find(CTLOG, (st), (val)) +#define sk_CTLOG_find_ex(st, val) SKM_sk_find_ex(CTLOG, (st), (val)) +#define sk_CTLOG_delete(st, i) SKM_sk_delete(CTLOG, (st), (i)) +#define sk_CTLOG_delete_ptr(st, ptr) SKM_sk_delete_ptr(CTLOG, (st), (ptr)) +#define sk_CTLOG_insert(st, val, i) SKM_sk_insert(CTLOG, (st), (val), (i)) +#define sk_CTLOG_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CTLOG, (st), (cmp)) +#define sk_CTLOG_dup(st) SKM_sk_dup(CTLOG, st) +#define sk_CTLOG_pop_free(st, free_func) SKM_sk_pop_free(CTLOG, (st), (free_func)) +#define sk_CTLOG_shift(st) SKM_sk_shift(CTLOG, (st)) +#define sk_CTLOG_pop(st) SKM_sk_pop(CTLOG, (st)) +#define sk_CTLOG_sort(st) SKM_sk_sort(CTLOG, (st)) +#define sk_CTLOG_is_sorted(st) SKM_sk_is_sorted(CTLOG, (st)) +#endif + #define sk_DIST_POINT_new(cmp) SKM_sk_new(DIST_POINT, (cmp)) #define sk_DIST_POINT_new_null() SKM_sk_new_null(DIST_POINT) #define sk_DIST_POINT_free(st) SKM_sk_free(DIST_POINT, (st)) @@ -1279,6 +1303,30 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void) #define sk_POLICY_MAPPING_sort(st) SKM_sk_sort(POLICY_MAPPING, (st)) #define sk_POLICY_MAPPING_is_sorted(st) SKM_sk_is_sorted(POLICY_MAPPING, (st)) +#ifdef LIBRESSL_CRYPTO_INTERNAL +#define sk_SCT_new(cmp) SKM_sk_new(SCT, (cmp)) +#define sk_SCT_new_null() SKM_sk_new_null(SCT) +#define sk_SCT_free(st) SKM_sk_free(SCT, (st)) +#define sk_SCT_num(st) SKM_sk_num(SCT, (st)) +#define sk_SCT_value(st, i) SKM_sk_value(SCT, (st), (i)) +#define sk_SCT_set(st, i, val) SKM_sk_set(SCT, (st), (i), (val)) +#define sk_SCT_zero(st) SKM_sk_zero(SCT, (st)) +#define sk_SCT_push(st, val) SKM_sk_push(SCT, (st), (val)) +#define sk_SCT_unshift(st, val) SKM_sk_unshift(SCT, (st), (val)) +#define sk_SCT_find(st, val) SKM_sk_find(SCT, (st), (val)) +#define sk_SCT_find_ex(st, val) SKM_sk_find_ex(SCT, (st), (val)) +#define sk_SCT_delete(st, i) SKM_sk_delete(SCT, (st), (i)) +#define sk_SCT_delete_ptr(st, ptr) SKM_sk_delete_ptr(SCT, (st), (ptr)) +#define sk_SCT_insert(st, val, i) SKM_sk_insert(SCT, (st), (val), (i)) +#define sk_SCT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SCT, (st), (cmp)) +#define sk_SCT_dup(st) SKM_sk_dup(SCT, st) +#define sk_SCT_pop_free(st, free_func) SKM_sk_pop_free(SCT, (st), (free_func)) +#define sk_SCT_shift(st) SKM_sk_shift(SCT, (st)) +#define sk_SCT_pop(st) SKM_sk_pop(SCT, (st)) +#define sk_SCT_sort(st) SKM_sk_sort(SCT, (st)) +#define sk_SCT_is_sorted(st) SKM_sk_is_sorted(SCT, (st)) +#endif + #define sk_SRTP_PROTECTION_PROFILE_new(cmp) SKM_sk_new(SRTP_PROTECTION_PROFILE, (cmp)) #define sk_SRTP_PROTECTION_PROFILE_new_null() SKM_sk_new_null(SRTP_PROTECTION_PROFILE) #define sk_SRTP_PROTECTION_PROFILE_free(st) SKM_sk_free(SRTP_PROTECTION_PROFILE, (st)) @@ -2179,50 +2227,4 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void) LHM_lh_stats_bio(SSL_SESSION,lh,out) #define lh_SSL_SESSION_free(lh) LHM_lh_free(SSL_SESSION,lh) -#ifdef LIBRESSL_CRYPTO_INTERNAL -#define sk_CTLOG_new(cmp) SKM_sk_new(CTLOG, (cmp)) -#define sk_CTLOG_new_null() SKM_sk_new_null(CTLOG) -#define sk_CTLOG_free(st) SKM_sk_free(CTLOG, (st)) -#define sk_CTLOG_num(st) SKM_sk_num(CTLOG, (st)) -#define sk_CTLOG_value(st, i) SKM_sk_value(CTLOG, (st), (i)) -#define sk_CTLOG_set(st, i, val) SKM_sk_set(CTLOG, (st), (i), (val)) -#define sk_CTLOG_zero(st) SKM_sk_zero(CTLOG, (st)) -#define sk_CTLOG_push(st, val) SKM_sk_push(CTLOG, (st), (val)) -#define sk_CTLOG_unshift(st, val) SKM_sk_unshift(CTLOG, (st), (val)) -#define sk_CTLOG_find(st, val) SKM_sk_find(CTLOG, (st), (val)) -#define sk_CTLOG_find_ex(st, val) SKM_sk_find_ex(CTLOG, (st), (val)) -#define sk_CTLOG_delete(st, i) SKM_sk_delete(CTLOG, (st), (i)) -#define sk_CTLOG_delete_ptr(st, ptr) SKM_sk_delete_ptr(CTLOG, (st), (ptr)) -#define sk_CTLOG_insert(st, val, i) SKM_sk_insert(CTLOG, (st), (val), (i)) -#define sk_CTLOG_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CTLOG, (st), (cmp)) -#define sk_CTLOG_dup(st) SKM_sk_dup(CTLOG, st) -#define sk_CTLOG_pop_free(st, free_func) SKM_sk_pop_free(CTLOG, (st), (free_func)) -#define sk_CTLOG_shift(st) SKM_sk_shift(CTLOG, (st)) -#define sk_CTLOG_pop(st) SKM_sk_pop(CTLOG, (st)) -#define sk_CTLOG_sort(st) SKM_sk_sort(CTLOG, (st)) -#define sk_CTLOG_is_sorted(st) SKM_sk_is_sorted(CTLOG, (st)) - -#define sk_SCT_new(cmp) SKM_sk_new(SCT, (cmp)) -#define sk_SCT_new_null() SKM_sk_new_null(SCT) -#define sk_SCT_free(st) SKM_sk_free(SCT, (st)) -#define sk_SCT_num(st) SKM_sk_num(SCT, (st)) -#define sk_SCT_value(st, i) SKM_sk_value(SCT, (st), (i)) -#define sk_SCT_set(st, i, val) SKM_sk_set(SCT, (st), (i), (val)) -#define sk_SCT_zero(st) SKM_sk_zero(SCT, (st)) -#define sk_SCT_push(st, val) SKM_sk_push(SCT, (st), (val)) -#define sk_SCT_unshift(st, val) SKM_sk_unshift(SCT, (st), (val)) -#define sk_SCT_find(st, val) SKM_sk_find(SCT, (st), (val)) -#define sk_SCT_find_ex(st, val) SKM_sk_find_ex(SCT, (st), (val)) -#define sk_SCT_delete(st, i) SKM_sk_delete(SCT, (st), (i)) -#define sk_SCT_delete_ptr(st, ptr) SKM_sk_delete_ptr(SCT, (st), (ptr)) -#define sk_SCT_insert(st, val, i) SKM_sk_insert(SCT, (st), (val), (i)) -#define sk_SCT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SCT, (st), (cmp)) -#define sk_SCT_dup(st) SKM_sk_dup(SCT, st) -#define sk_SCT_pop_free(st, free_func) SKM_sk_pop_free(SCT, (st), (free_func)) -#define sk_SCT_shift(st) SKM_sk_shift(SCT, (st)) -#define sk_SCT_pop(st) SKM_sk_pop(SCT, (st)) -#define sk_SCT_sort(st) SKM_sk_sort(SCT, (st)) -#define sk_SCT_is_sorted(st) SKM_sk_is_sorted(SCT, (st)) -#endif - #endif /* !defined HEADER_SAFESTACK_H */