upstream commit

remove prototypes for long-gone s/key support; ok
 dtucker@

Upstream-ID: db5bed3c57118af986490ab23d399df807359a79

diff --git a/auth.h b/auth.h
index 8b27575b071d2ebb6e4d3461ef9e1073f016f131..fffbe6c071bc10912f8110926d1df4e747afade2 100644 (file)
--- a/auth.h
+++ b/auth.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.h,v 1.84 2015/05/08 06:41:56 djm Exp $ */
+/* $OpenBSD: auth.h,v 1.85 2015/11/11 01:48:01 djm Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -180,8 +180,6 @@ int auth2_challenge(Authctxt *, char *);
 void   auth2_challenge_stop(Authctxt *);
 int    bsdauth_query(void *, char **, char **, u_int *, char ***, u_int **);
 int    bsdauth_respond(void *, u_int, char **);
-int    skey_query(void *, char **, char **, u_int *, char ***, u_int **);
-int    skey_respond(void *, u_int, char **);
 
 int    allowed_user(struct passwd *);
 struct passwd * getpwnamallow(const char *user);

diff --git a/monitor_wrap.h b/monitor_wrap.h
index de4a08f99ff3239cb6e82acb329e64d2f09f7e15..2b8c18d6a4a7732dcdb34f4e90717922251d19d2 100644 (file)
--- a/monitor_wrap.h
+++ b/monitor_wrap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_wrap.h,v 1.27 2015/05/01 03:23:51 djm Exp $ */
+/* $OpenBSD: monitor_wrap.h,v 1.28 2015/11/11 01:48:01 djm Exp $ */
 
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
@@ -98,10 +98,6 @@ void mm_send_keystate(struct monitor*);
 int mm_bsdauth_query(void *, char **, char **, u_int *, char ***, u_int **);
 int mm_bsdauth_respond(void *, u_int, char **);
 
-/* skey */
-int mm_skey_query(void *, char **, char **, u_int *, char ***, u_int **);
-int mm_skey_respond(void *, u_int, char **);
-
 /* zlib allocation hooks */
 void mm_init_compression(struct mm_master *);