diff options
author | jsg <> | 2024-05-27 09:12:32 +0000 |
---|---|---|
committer | jsg <> | 2024-05-27 09:12:32 +0000 |
commit | 8d78f6625f014d794fde6e4b4190bb6d7c2410f0 (patch) | |
tree | ae8db8e9b30292df8490160fa5cf4f6006583940 /src/lib | |
parent | 09f87a1e448f95c82821ad37370de4fcd8e018e4 (diff) | |
download | openbsd-8d78f6625f014d794fde6e4b4190bb6d7c2410f0.tar.gz openbsd-8d78f6625f014d794fde6e4b4190bb6d7c2410f0.tar.bz2 openbsd-8d78f6625f014d794fde6e4b4190bb6d7c2410f0.zip |
remove unused typedefs with structs that were removed
ENGINE, SSL and SSL_CTX remain even though the structs in the typedefs
don't exist as they are used as incomplete types.
feedback, ports bulk build and ok tb@
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libcrypto/ossl_typ.h | 9 | ||||
-rw-r--r-- | src/lib/libssl/ssl.h | 7 |
2 files changed, 2 insertions, 14 deletions
diff --git a/src/lib/libcrypto/ossl_typ.h b/src/lib/libcrypto/ossl_typ.h index 237a8d9672..2d8e6674d2 100644 --- a/src/lib/libcrypto/ossl_typ.h +++ b/src/lib/libcrypto/ossl_typ.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ossl_typ.h,v 1.30 2023/08/11 05:10:35 tb Exp $ */ | 1 | /* $OpenBSD: ossl_typ.h,v 1.31 2024/05/27 09:12:32 jsg Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -94,9 +94,6 @@ typedef struct bn_gencb_st BN_GENCB; | |||
94 | typedef struct bio_st BIO; | 94 | typedef struct bio_st BIO; |
95 | typedef struct buf_mem_st BUF_MEM; | 95 | typedef struct buf_mem_st BUF_MEM; |
96 | 96 | ||
97 | typedef struct comp_ctx_st COMP_CTX; | ||
98 | typedef struct comp_method_st COMP_METHOD; | ||
99 | |||
100 | typedef struct evp_cipher_st EVP_CIPHER; | 97 | typedef struct evp_cipher_st EVP_CIPHER; |
101 | typedef struct evp_cipher_ctx_st EVP_CIPHER_CTX; | 98 | typedef struct evp_cipher_ctx_st EVP_CIPHER_CTX; |
102 | typedef struct evp_md_st EVP_MD; | 99 | typedef struct evp_md_st EVP_MD; |
@@ -130,7 +127,6 @@ typedef struct rand_meth_st RAND_METHOD; | |||
130 | typedef struct x509_st X509; | 127 | typedef struct x509_st X509; |
131 | typedef struct X509_algor_st X509_ALGOR; | 128 | typedef struct X509_algor_st X509_ALGOR; |
132 | typedef struct X509_crl_st X509_CRL; | 129 | typedef struct X509_crl_st X509_CRL; |
133 | typedef struct x509_crl_method_st X509_CRL_METHOD; | ||
134 | typedef struct x509_revoked_st X509_REVOKED; | 130 | typedef struct x509_revoked_st X509_REVOKED; |
135 | typedef struct X509_name_st X509_NAME; | 131 | typedef struct X509_name_st X509_NAME; |
136 | typedef struct X509_pubkey_st X509_PUBKEY; | 132 | typedef struct X509_pubkey_st X509_PUBKEY; |
@@ -147,9 +143,6 @@ typedef struct pkcs8_priv_key_info_st PKCS8_PRIV_KEY_INFO; | |||
147 | typedef struct v3_ext_ctx X509V3_CTX; | 143 | typedef struct v3_ext_ctx X509V3_CTX; |
148 | typedef struct conf_st CONF; | 144 | typedef struct conf_st CONF; |
149 | 145 | ||
150 | typedef struct store_st STORE; | ||
151 | typedef struct store_method_st STORE_METHOD; | ||
152 | |||
153 | typedef struct ui_st UI; | 146 | typedef struct ui_st UI; |
154 | typedef struct ui_method_st UI_METHOD; | 147 | typedef struct ui_method_st UI_METHOD; |
155 | 148 | ||
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 9a5f8d025e..22d4809868 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.236 2024/03/02 11:48:55 tb Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.237 2024/05/27 09:12:31 jsg 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 | * |
@@ -510,11 +510,6 @@ int SSL_CTX_set_num_tickets(SSL_CTX *ctx, size_t num_tickets); | |||
510 | size_t SSL_CTX_get_num_tickets(const SSL_CTX *ctx); | 510 | size_t SSL_CTX_get_num_tickets(const SSL_CTX *ctx); |
511 | STACK_OF(X509) *SSL_get0_verified_chain(const SSL *s); | 511 | STACK_OF(X509) *SSL_get0_verified_chain(const SSL *s); |
512 | 512 | ||
513 | #ifndef LIBRESSL_INTERNAL | ||
514 | struct ssl_aead_ctx_st; | ||
515 | typedef struct ssl_aead_ctx_st SSL_AEAD_CTX; | ||
516 | #endif | ||
517 | |||
518 | #define SSL_MAX_CERT_LIST_DEFAULT 1024*100 /* 100k max cert list :-) */ | 513 | #define SSL_MAX_CERT_LIST_DEFAULT 1024*100 /* 100k max cert list :-) */ |
519 | 514 | ||
520 | #define SSL_SESSION_CACHE_MAX_SIZE_DEFAULT (1024*20) | 515 | #define SSL_SESSION_CACHE_MAX_SIZE_DEFAULT (1024*20) |