diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2023-04-24 22:30:18 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2023-04-24 22:30:18 +0000 |
| commit | 5b960f2aed2ec1a991ae78847797d7399a283850 (patch) | |
| tree | f8f9f9b1a83842d712e690902f86a0e9802d07f6 | |
| parent | c6dba1d39dcdaaf7143d0fc24a3f58c896bcbc88 (diff) | |
Future users of libcrypto will also have to do without strong extranet
support.
discussed with beck and jsing
| -rw-r--r-- | lib/libcrypto/stack/safestack.h | 4 | ||||
| -rw-r--r-- | lib/libcrypto/x509/x509v3.h | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/libcrypto/stack/safestack.h b/lib/libcrypto/stack/safestack.h index b4f0afa0e65..b577f2f60fa 100644 --- a/lib/libcrypto/stack/safestack.h +++ b/lib/libcrypto/stack/safestack.h @@ -1,4 +1,4 @@ -/* $OpenBSD: safestack.h,v 1.23 2023/04/16 08:18:10 tb Exp $ */ +/* $OpenBSD: safestack.h,v 1.24 2023/04/24 22:30:17 tb Exp $ */ /* ==================================================================== * Copyright (c) 1999 The OpenSSL Project. All rights reserved. * @@ -1479,6 +1479,7 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void) #define sk_STORE_OBJECT_sort(st) SKM_sk_sort(STORE_OBJECT, (st)) #define sk_STORE_OBJECT_is_sorted(st) SKM_sk_is_sorted(STORE_OBJECT, (st)) +#if !defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_INTERNAL) #define sk_SXNETID_new(cmp) SKM_sk_new(SXNETID, (cmp)) #define sk_SXNETID_new_null() SKM_sk_new_null(SXNETID) #define sk_SXNETID_free(st) SKM_sk_free(SXNETID, (st)) @@ -1500,6 +1501,7 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void) #define sk_SXNETID_pop(st) SKM_sk_pop(SXNETID, (st)) #define sk_SXNETID_sort(st) SKM_sk_sort(SXNETID, (st)) #define sk_SXNETID_is_sorted(st) SKM_sk_is_sorted(SXNETID, (st)) +#endif #define sk_UI_STRING_new(cmp) SKM_sk_new(UI_STRING, (cmp)) #define sk_UI_STRING_new_null() SKM_sk_new_null(UI_STRING) diff --git a/lib/libcrypto/x509/x509v3.h b/lib/libcrypto/x509/x509v3.h index 9a08845191c..722eb931e35 100644 --- a/lib/libcrypto/x509/x509v3.h +++ b/lib/libcrypto/x509/x509v3.h @@ -1,4 +1,4 @@ -/* $OpenBSD: x509v3.h,v 1.19 2023/04/16 08:21:13 tb Exp $ */ +/* $OpenBSD: x509v3.h,v 1.20 2023/04/24 22:30:17 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -265,6 +265,7 @@ struct AUTHORITY_KEYID_st { /* Strong extranet structures */ +#if !defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_INTERNAL) typedef struct SXNET_ID_st { ASN1_INTEGER *zone; ASN1_OCTET_STRING *user; @@ -276,6 +277,7 @@ typedef struct SXNET_st { ASN1_INTEGER *version; STACK_OF(SXNETID) *ids; } SXNET; +#endif typedef struct NOTICEREF_st { ASN1_STRING *organization; @@ -516,6 +518,7 @@ BASIC_CONSTRAINTS *d2i_BASIC_CONSTRAINTS(BASIC_CONSTRAINTS **a, const unsigned c int i2d_BASIC_CONSTRAINTS(BASIC_CONSTRAINTS *a, unsigned char **out); extern const ASN1_ITEM BASIC_CONSTRAINTS_it; +#if !defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_INTERNAL) SXNET *SXNET_new(void); void SXNET_free(SXNET *a); SXNET *d2i_SXNET(SXNET **a, const unsigned char **in, long len); @@ -537,6 +540,7 @@ int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *izone, const char *user, ASN1_OCTET_STRING *SXNET_get_id_asc(SXNET *sx, const char *zone); ASN1_OCTET_STRING *SXNET_get_id_ulong(SXNET *sx, unsigned long lzone); ASN1_OCTET_STRING *SXNET_get_id_INTEGER(SXNET *sx, ASN1_INTEGER *zone); +#endif AUTHORITY_KEYID *AUTHORITY_KEYID_new(void); void AUTHORITY_KEYID_free(AUTHORITY_KEYID *a); |