upstream: remove prototypes with no matching function; ok djm@

OpenBSD-Commit-ID: 6d9065dadea5f14a01bece0dbfe2fba1be31c693

diff --git a/auth.h b/auth.h
index 33370eaceb862eae7c19ae92d447b4bfcc7dcdbd..98bb23d4c5ced09682353efd4c4fe4adcc3bc2a3 100644 (file)
--- a/auth.h
+++ b/auth.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.h,v 1.107 2024/05/17 00:30:23 djm Exp $ */
+/* $OpenBSD: auth.h,v 1.108 2024/05/17 06:42:04 jsg Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -155,8 +155,6 @@ void         auth2_record_info(Authctxt *authctxt, const char *, ...)
 void    auth2_update_session_info(Authctxt *, const char *, const char *);
 
 #ifdef KRB5
-int    auth_krb5(Authctxt *authctxt, krb5_data *auth, char **client, krb5_data *);
-int    auth_krb5_tgt(Authctxt *authctxt, krb5_data *tgt);
 int    auth_krb5_password(Authctxt *authctxt, const char *password);
 void   krb5_cleanup_proc(Authctxt *authctxt);
 #endif /* KRB5 */
@@ -215,7 +213,6 @@ int  sshd_hostkey_sign(struct ssh *, struct sshkey *, struct sshkey *,
     u_char **, size_t *, const u_char *, size_t, const char *);
 
 /* Key / cert options linkage to auth layer */
-const struct sshauthopt *auth_options(struct ssh *);
 int     auth_activate_options(struct ssh *, struct sshauthopt *);
 void    auth_restrict_session(struct ssh *);
 void    auth_log_authopts(const char *, const struct sshauthopt *, int);

diff --git a/channels.h b/channels.h
index bb2650f6b877f240cf6454f7150a35fe9e77d3f1..1ff90bbe1c8c10ae3c3fd68b1a9961cb623b5ec2 100644 (file)
--- a/channels.h
+++ b/channels.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.h,v 1.154 2023/12/18 14:47:20 djm Exp $ */
+/* $OpenBSD: channels.h,v 1.155 2024/05/17 06:42:04 jsg Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -325,7 +325,6 @@ int  channel_input_ieof(int, u_int32_t, struct ssh *);
 int     channel_input_oclose(int, u_int32_t, struct ssh *);
 int     channel_input_open_confirmation(int, u_int32_t, struct ssh *);
 int     channel_input_open_failure(int, u_int32_t, struct ssh *);
-int     channel_input_port_open(int, u_int32_t, struct ssh *);
 int     channel_input_window_adjust(int, u_int32_t, struct ssh *);
 int     channel_input_status_confirm(int, u_int32_t, struct ssh *);
 

diff --git a/clientloop.c b/clientloop.c
index a30d1fdbb53a0e646062548af42d58b258e66398..0b6f3c9be02a7916ca7906a8b997ce789a94a174 100644 (file)
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.406 2024/05/09 09:46:47 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.407 2024/05/17 06:42:04 jsg Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -193,7 +193,6 @@ TAILQ_HEAD(global_confirms, global_confirm);
 static struct global_confirms global_confirms =
     TAILQ_HEAD_INITIALIZER(global_confirms);
 
-void ssh_process_session2_setup(int, int, int, struct sshbuf *);
 static void quit_message(const char *fmt, ...)
     __attribute__((__format__ (printf, 1, 2)));
 

diff --git a/clientloop.h b/clientloop.h
index 31630551b23cba11ddf59a3e7c0031ccb8ac6458..4bc7bcd7c4f299b03a802a05232dfa2002e1b005 100644 (file)
--- a/clientloop.h
+++ b/clientloop.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.h,v 1.37 2020/04/03 02:40:32 djm Exp $ */
+/* $OpenBSD: clientloop.h,v 1.38 2024/05/17 06:42:04 jsg Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -43,7 +43,6 @@ struct ssh;
 int     client_loop(struct ssh *, int, int, int);
 int     client_x11_get_proto(struct ssh *, const char *, const char *,
            u_int, u_int, char **, char **);
-void    client_global_request_reply_fwd(int, u_int32_t, void *);
 void    client_session2_setup(struct ssh *, int, int, int,
            const char *, struct termios *, int, struct sshbuf *, char **);
 char    *client_request_tun_fwd(struct ssh *, int, int, int,

diff --git a/monitor.c b/monitor.c
index 77ea40479566ea9c77fe44f0423c311e39ef1d73..e6b009c8dfa06cd41908c3efb1ab436dbaf6800f 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.238 2024/05/17 00:30:24 djm Exp $ */
+/* $OpenBSD: monitor.c,v 1.239 2024/05/17 06:42:04 jsg Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -125,8 +125,6 @@ int mm_answer_keyverify(struct ssh *, int, struct sshbuf *);
 int mm_answer_pty(struct ssh *, int, struct sshbuf *);
 int mm_answer_pty_cleanup(struct ssh *, int, struct sshbuf *);
 int mm_answer_term(struct ssh *, int, struct sshbuf *);
-int mm_answer_sesskey(struct ssh *, int, struct sshbuf *);
-int mm_answer_sessid(struct ssh *, int, struct sshbuf *);
 
 #ifdef USE_PAM
 int mm_answer_pam_start(struct ssh *, int, struct sshbuf *);

diff --git a/monitor_wrap.h b/monitor_wrap.h
index 527eaf158f9936136dad2213b0ce8962b7825d85..e768036ed438a88e8ea7249d4db68be784f6435a 100644 (file)
--- a/monitor_wrap.h
+++ b/monitor_wrap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_wrap.h,v 1.50 2024/05/17 00:30:24 djm Exp $ */
+/* $OpenBSD: monitor_wrap.h,v 1.51 2024/05/17 06:42:04 jsg Exp $ */
 
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
@@ -88,10 +88,6 @@ void mm_terminate(void);
 int mm_pty_allocate(int *, int *, char *, size_t);
 void mm_session_pty_cleanup2(struct Session *);
 
-/* Key export functions */
-struct newkeys *mm_newkeys_from_blob(u_char *, int);
-int mm_newkeys_to_blob(int, u_char **, u_int *);
-
 void mm_send_keystate(struct ssh *, struct monitor*);
 
 /* bsdauth */

diff --git a/packet.h b/packet.h
index ff4c8361cfa52dbeb4a5d3c103d78f3deaafc646..5ab1f409a2c9efeb4633b8e0f84e6a5e49fc5b3d 100644 (file)
--- a/packet.h
+++ b/packet.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.h,v 1.97 2024/05/17 00:30:24 djm Exp $ */
+/* $OpenBSD: packet.h,v 1.98 2024/05/17 06:42:04 jsg Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -124,14 +124,12 @@ int        ssh_packet_send2_wrapped(struct ssh *);
 int     ssh_packet_send2(struct ssh *);
 
 int      ssh_packet_read(struct ssh *);
-int      ssh_packet_read_poll(struct ssh *);
 int ssh_packet_read_poll2(struct ssh *, u_char *, u_int32_t *seqnr_p);
 int     ssh_packet_process_incoming(struct ssh *, const char *buf, u_int len);
 int     ssh_packet_process_read(struct ssh *, int);
 int      ssh_packet_read_seqnr(struct ssh *, u_char *, u_int32_t *seqnr_p);
 int      ssh_packet_read_poll_seqnr(struct ssh *, u_char *, u_int32_t *seqnr_p);
 
-const void *ssh_packet_get_string_ptr(struct ssh *, u_int *length_ptr);
 void     ssh_packet_disconnect(struct ssh *, const char *fmt, ...)
        __attribute__((format(printf, 2, 3)))
        __attribute__((noreturn));

diff --git a/servconf.h b/servconf.h
index c446081836a47b961c0274f202adf8ae0c652ae9..56070d6b28abcc6e371b0db71e69542b25507a8b 100644 (file)
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.h,v 1.161 2024/05/17 00:30:24 djm Exp $ */
+/* $OpenBSD: servconf.h,v 1.162 2024/05/17 06:42:04 jsg Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -303,9 +303,7 @@ void         parse_server_config(ServerOptions *, const char *, struct sshbuf *,
            struct include_list *includes, struct connection_info *, int);
 void    parse_server_match_config(ServerOptions *,
            struct include_list *includes, struct connection_info *);
-int     parse_channel_timeout(const char *, char **, u_int *);
 int     parse_server_match_testspec(struct connection_info *, char *);
-int     server_match_spec_complete(struct connection_info *);
 void    servconf_merge_subsystems(ServerOptions *, ServerOptions *);
 void    copy_set_server_options(ServerOptions *, ServerOptions *, int);
 void    dump_config(ServerOptions *);

diff --git a/ssh-gss.h b/ssh-gss.h
index a8af117d2ef22feea2a32c207fcb32e02a673f90..7b14e74a8e0b2f9fe44b5ef2868bd9029eaf841e 100644 (file)
--- a/ssh-gss.h
+++ b/ssh-gss.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-gss.h,v 1.15 2021/01/27 10:05:28 djm Exp $ */
+/* $OpenBSD: ssh-gss.h,v 1.16 2024/05/17 06:42:04 jsg Exp $ */
 /*
  * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
  *
@@ -103,7 +103,6 @@ int  ssh_gssapi_check_oid(Gssctxt *, void *, size_t);
 void ssh_gssapi_set_oid_data(Gssctxt *, void *, size_t);
 void ssh_gssapi_set_oid(Gssctxt *, gss_OID);
 void ssh_gssapi_supported_oids(gss_OID_set *);
-ssh_gssapi_mech *ssh_gssapi_get_ctype(Gssctxt *);
 void ssh_gssapi_prepare_supported_oids(void);
 OM_uint32 ssh_gssapi_test_oid_supported(OM_uint32 *, gss_OID, int *);
 

diff --git a/sshkey.h b/sshkey.h
index 708f2da86778255eac3e35489a918229eb309c1b..32933bbbdb8a0ac687d98d3be1a642fc8fc25cb4 100644 (file)
--- a/sshkey.h
+++ b/sshkey.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.h,v 1.62 2023/06/21 05:10:26 djm Exp $ */
+/* $OpenBSD: sshkey.h,v 1.63 2024/05/17 06:42:04 jsg Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -316,7 +316,6 @@ int ssh_rsa_complete_crt_parameters(struct sshkey *, const BIGNUM *);
 int     sshkey_set_filename(struct sshkey *, const char *);
 int     sshkey_enable_maxsign(struct sshkey *, u_int32_t);
 u_int32_t sshkey_signatures_left(const struct sshkey *);
-int     sshkey_forward_state(const struct sshkey *, u_int32_t, int);
 int     sshkey_private_serialize_maxsign(struct sshkey *key,
     struct sshbuf *buf, u_int32_t maxsign, int);