summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--auth-skey.c6
-rw-r--r--auth2.c3
3 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 211e248f2..3247f9589 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
10 - stevesk@cvs.openbsd.org 2002/05/11 20:24:48 10 - stevesk@cvs.openbsd.org 2002/05/11 20:24:48
11 [ssh.h] 11 [ssh.h]
12 typo in comment 12 typo in comment
13 - itojun@cvs.openbsd.org 2002/05/13 02:37:39
14 [auth-skey.c auth2.c]
15 less warnings. skey_{respond,query} are public (in auth.h)
13 16
1420020514 1720020514
15 - (stevesk) [README.privsep] PAM+privsep works with Solaris 8. 18 - (stevesk) [README.privsep] PAM+privsep works with Solaris 8.
@@ -614,4 +617,4 @@
614 - (stevesk) entropy.c: typo in debug message 617 - (stevesk) entropy.c: typo in debug message
615 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 618 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
616 619
617$Id: ChangeLog,v 1.2124 2002/05/15 16:09:57 mouring Exp $ 620$Id: ChangeLog,v 1.2125 2002/05/15 16:14:36 mouring Exp $
diff --git a/auth-skey.c b/auth-skey.c
index e897d1875..b64550443 100644
--- a/auth-skey.c
+++ b/auth-skey.c
@@ -22,7 +22,7 @@
22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */ 23 */
24#include "includes.h" 24#include "includes.h"
25RCSID("$OpenBSD: auth-skey.c,v 1.17 2002/03/18 17:50:31 provos Exp $"); 25RCSID("$OpenBSD: auth-skey.c,v 1.18 2002/05/13 02:37:39 itojun Exp $");
26 26
27#ifdef SKEY 27#ifdef SKEY
28 28
@@ -38,7 +38,7 @@ skey_init_ctx(Authctxt *authctxt)
38 return authctxt; 38 return authctxt;
39} 39}
40 40
41static int 41int
42skey_query(void *ctx, char **name, char **infotxt, 42skey_query(void *ctx, char **name, char **infotxt,
43 u_int* numprompts, char ***prompts, u_int **echo_on) 43 u_int* numprompts, char ***prompts, u_int **echo_on)
44{ 44{
@@ -66,7 +66,7 @@ skey_query(void *ctx, char **name, char **infotxt,
66 return 0; 66 return 0;
67} 67}
68 68
69static int 69int
70skey_respond(void *ctx, u_int numresponses, char **responses) 70skey_respond(void *ctx, u_int numresponses, char **responses)
71{ 71{
72 Authctxt *authctxt = ctx; 72 Authctxt *authctxt = ctx;
diff --git a/auth2.c b/auth2.c
index 20584caa9..6bcc56527 100644
--- a/auth2.c
+++ b/auth2.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: auth2.c,v 1.90 2002/05/12 23:53:45 djm Exp $"); 26RCSID("$OpenBSD: auth2.c,v 1.91 2002/05/13 02:37:39 itojun Exp $");
27 27
28#include <openssl/evp.h> 28#include <openssl/evp.h>
29 29
@@ -51,6 +51,7 @@ RCSID("$OpenBSD: auth2.c,v 1.90 2002/05/12 23:53:45 djm Exp $");
51#include "canohost.h" 51#include "canohost.h"
52#include "match.h" 52#include "match.h"
53#include "monitor_wrap.h" 53#include "monitor_wrap.h"
54#include "atomicio.h"
54 55
55/* import */ 56/* import */
56extern ServerOptions options; 57extern ServerOptions options;