From: jsg Date: Sun, 19 May 2024 07:12:50 +0000 (+0000) Subject: remove prototypes with no matching function X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=5158016f5db4e4cc2a3c2eac434efa81eb9e7031;p=openbsd remove prototypes with no matching function feedback and ok tb@ --- diff --git a/lib/libcrypto/bio/bio.h b/lib/libcrypto/bio/bio.h index a50fb163425..8327ffc071e 100644 --- a/lib/libcrypto/bio/bio.h +++ b/lib/libcrypto/bio/bio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bio.h,v 1.63 2024/03/02 09:22:41 tb Exp $ */ +/* $OpenBSD: bio.h,v 1.64 2024/05/19 07:12:50 jsg Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -364,10 +364,6 @@ int BIO_meth_set_callback_ctrl(BIO_METHOD *biom, #define BIO_C_GET_WRITE_GUARANTEE 140 #define BIO_C_GET_READ_REQUEST 141 #define BIO_C_SHUTDOWN_WR 142 -#define BIO_C_NREAD0 143 -#define BIO_C_NREAD 144 -#define BIO_C_NWRITE0 145 -#define BIO_C_NWRITE 146 #define BIO_C_RESET_READ_REQUEST 147 #define BIO_C_SET_MD_CTX 148 @@ -566,11 +562,6 @@ int BIO_get_retry_reason(BIO *bio); void BIO_set_retry_reason(BIO *bio, int reason); BIO * BIO_dup_chain(BIO *in); -int BIO_nread0(BIO *bio, char **buf); -int BIO_nread(BIO *bio, char **buf, int num); -int BIO_nwrite0(BIO *bio, char **buf); -int BIO_nwrite(BIO *bio, char **buf, int num); - long BIO_debug_callback(BIO *bio, int cmd, const char *argp, int argi, long argl, long ret); diff --git a/lib/libcrypto/cms/cms_local.h b/lib/libcrypto/cms/cms_local.h index 2e3a3637e88..6be60e90478 100644 --- a/lib/libcrypto/cms/cms_local.h +++ b/lib/libcrypto/cms/cms_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_local.h,v 1.5 2023/08/24 04:56:36 tb Exp $ */ +/* $OpenBSD: cms_local.h,v 1.6 2024/05/19 07:12:50 jsg Exp $ */ /* * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. @@ -394,8 +394,6 @@ extern const ASN1_ITEM CMS_Attributes_Sign_it; extern const ASN1_ITEM CMS_Attributes_Verify_it; extern const ASN1_ITEM CMS_RecipientInfo_it; extern const ASN1_ITEM CMS_PasswordRecipientInfo_it; -CMS_IssuerAndSerialNumber *CMS_IssuerAndSerialNumber_new(void); -void CMS_IssuerAndSerialNumber_free(CMS_IssuerAndSerialNumber *a); #define CMS_SIGNERINFO_ISSUER_SERIAL 0 #define CMS_SIGNERINFO_KEYIDENTIFIER 1 @@ -423,9 +421,6 @@ int cms_SignerIdentifier_get0_signer_id(CMS_SignerIdentifier *sid, ASN1_OCTET_STRING **keyid, X509_NAME **issuer, ASN1_INTEGER **sno); int cms_SignerIdentifier_cert_cmp(CMS_SignerIdentifier *sid, X509 *cert); -CMS_ContentInfo *cms_CompressedData_create(int comp_nid); -BIO *cms_CompressedData_init_bio(CMS_ContentInfo *cms); - BIO *cms_DigestAlgorithm_init_bio(X509_ALGOR *digestAlgorithm); int cms_DigestAlgorithm_find_ctx(EVP_MD_CTX *mctx, BIO *chain, X509_ALGOR *mdalg); diff --git a/lib/libcrypto/conf/conf_api.h b/lib/libcrypto/conf/conf_api.h index 95f9386226a..2793e8413b5 100644 --- a/lib/libcrypto/conf/conf_api.h +++ b/lib/libcrypto/conf/conf_api.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf_api.h,v 1.4 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: conf_api.h,v 1.5 2024/05/19 07:12:50 jsg Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -77,7 +77,6 @@ STACK_OF(CONF_VALUE) *_CONF_get_section_values(const CONF *conf, int _CONF_add_string(CONF *conf, CONF_VALUE *section, CONF_VALUE *value); char *_CONF_get_string(const CONF *conf, const char *section, const char *name); -long _CONF_get_number(const CONF *conf, const char *section, const char *name); int _CONF_new_data(CONF *conf); void _CONF_free_data(CONF *conf); diff --git a/lib/libcrypto/idea/idea.h b/lib/libcrypto/idea/idea.h index e5ddd3a6f61..81c3453bce6 100644 --- a/lib/libcrypto/idea/idea.h +++ b/lib/libcrypto/idea/idea.h @@ -1,4 +1,4 @@ -/* $OpenBSD: idea.h,v 1.11 2023/07/07 12:51:58 beck Exp $ */ +/* $OpenBSD: idea.h,v 1.12 2024/05/19 07:12:50 jsg Exp $ */ /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -79,7 +79,6 @@ typedef struct idea_key_st { IDEA_INT data[9][6]; } IDEA_KEY_SCHEDULE; -const char *idea_options(void); void idea_ecb_encrypt(const unsigned char *in, unsigned char *out, IDEA_KEY_SCHEDULE *ks); void idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks); diff --git a/lib/libcrypto/man/BIO_s_bio.3 b/lib/libcrypto/man/BIO_s_bio.3 index b3e6c3d32c1..efda019df3f 100644 --- a/lib/libcrypto/man/BIO_s_bio.3 +++ b/lib/libcrypto/man/BIO_s_bio.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: BIO_s_bio.3,v 1.19 2023/04/29 12:01:53 schwarze Exp $ +.\" $OpenBSD: BIO_s_bio.3,v 1.20 2024/05/19 07:12:50 jsg Exp $ .\" full merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400 .\" .\" This file was written by @@ -53,7 +53,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: April 29 2023 $ +.Dd $Mdocdate: May 19 2024 $ .Dt BIO_S_BIO 3 .Os .Sh NAME @@ -69,16 +69,6 @@ .Nm BIO_get_read_request , .Nm BIO_ctrl_get_read_request , .Nm BIO_ctrl_reset_read_request -.\" The following non-copying I/O functions are intentionally undocumented -.\" because they seem fragile and unused by anything: -.\" .Nm BIO_nread0 -.\" .Nm BIO_nread -.\" .Nm BIO_nwrite0 -.\" .Nm BIO_nwrite -.\" .Nm BIO_C_NREAD0 -.\" .Nm BIO_C_NREAD -.\" .Nm BIO_C_NWRITE0 -.\" .Nm BIO_C_NWRITE .Nd BIO pair BIO .Sh SYNOPSIS .In openssl/bio.h diff --git a/lib/libcrypto/rsa/rsa.h b/lib/libcrypto/rsa/rsa.h index 4fcef3a97c3..60512317bdb 100644 --- a/lib/libcrypto/rsa/rsa.h +++ b/lib/libcrypto/rsa/rsa.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa.h,v 1.65 2023/07/28 10:05:16 tb Exp $ */ +/* $OpenBSD: rsa.h,v 1.66 2024/05/19 07:12:50 jsg Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -274,8 +274,6 @@ int RSA_set_method(RSA *rsa, const RSA_METHOD *meth); const RSA_METHOD *RSA_PKCS1_OpenSSL(void); const RSA_METHOD *RSA_PKCS1_SSLeay(void); -const RSA_METHOD *RSA_null_method(void); - int RSA_pkey_ctx_ctrl(EVP_PKEY_CTX *ctx, int optype, int cmd, int p1, void *p2); RSA *d2i_RSAPublicKey(RSA **a, const unsigned char **in, long len); diff --git a/lib/libcrypto/x509/x509_internal.h b/lib/libcrypto/x509/x509_internal.h index 280d1ae46cf..9b9980ece57 100644 --- a/lib/libcrypto/x509/x509_internal.h +++ b/lib/libcrypto/x509/x509_internal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_internal.h,v 1.27 2023/11/13 10:33:00 tb Exp $ */ +/* $OpenBSD: x509_internal.h,v 1.28 2024/05/19 07:12:50 jsg Exp $ */ /* * Copyright (c) 2020 Bob Beck * @@ -134,7 +134,6 @@ int x509_constraints_check(struct x509_constraints_names *names, struct x509_constraints_names *excluded, int *error); int x509_constraints_chain(STACK_OF(X509) *chain, int *error, int *depth); -int x509_verify_cert_info_populate(X509 *cert); int x509_vfy_check_security_level(X509_STORE_CTX *ctx); __END_HIDDEN_DECLS diff --git a/lib/libssl/ssl_local.h b/lib/libssl/ssl_local.h index 551bdd5766c..eeef569fa93 100644 --- a/lib/libssl/ssl_local.h +++ b/lib/libssl/ssl_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_local.h,v 1.15 2024/05/10 05:08:05 tb Exp $ */ +/* $OpenBSD: ssl_local.h,v 1.16 2024/05/19 07:12:50 jsg Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1305,7 +1305,6 @@ int ssl_verify_alarm_type(long type); int SSL_SESSION_ticket(SSL_SESSION *ss, unsigned char **out, size_t *out_len); -const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p); int ssl3_do_write(SSL *s, int type); int ssl3_send_alert(SSL *s, int level, int desc); int ssl3_get_req_cert_types(SSL *s, CBB *cbb);