diff options
Diffstat (limited to 'auth1.c')
-rw-r--r-- | auth1.c | 22 |
1 files changed, 20 insertions, 2 deletions
@@ -1,3 +1,4 @@ | |||
1 | /* $OpenBSD: auth1.c,v 1.70 2006/08/03 03:34:41 deraadt Exp $ */ | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
3 | * All rights reserved | 4 | * All rights reserved |
@@ -10,7 +11,14 @@ | |||
10 | */ | 11 | */ |
11 | 12 | ||
12 | #include "includes.h" | 13 | #include "includes.h" |
13 | RCSID("$OpenBSD: auth1.c,v 1.62 2005/07/16 01:35:24 djm Exp $"); | 14 | |
15 | #include <sys/types.h> | ||
16 | |||
17 | #include <stdarg.h> | ||
18 | #include <stdio.h> | ||
19 | #include <string.h> | ||
20 | #include <unistd.h> | ||
21 | #include <pwd.h> | ||
14 | 22 | ||
15 | #include "xmalloc.h" | 23 | #include "xmalloc.h" |
16 | #include "rsa.h" | 24 | #include "rsa.h" |
@@ -20,10 +28,15 @@ RCSID("$OpenBSD: auth1.c,v 1.62 2005/07/16 01:35:24 djm Exp $"); | |||
20 | #include "log.h" | 28 | #include "log.h" |
21 | #include "servconf.h" | 29 | #include "servconf.h" |
22 | #include "compat.h" | 30 | #include "compat.h" |
31 | #include "key.h" | ||
32 | #include "hostfile.h" | ||
23 | #include "auth.h" | 33 | #include "auth.h" |
24 | #include "channels.h" | 34 | #include "channels.h" |
25 | #include "session.h" | 35 | #include "session.h" |
26 | #include "uidswap.h" | 36 | #include "uidswap.h" |
37 | #ifdef GSSAPI | ||
38 | #include "ssh-gss.h" | ||
39 | #endif | ||
27 | #include "monitor_wrap.h" | 40 | #include "monitor_wrap.h" |
28 | #include "buffer.h" | 41 | #include "buffer.h" |
29 | 42 | ||
@@ -77,7 +90,7 @@ static const struct AuthMethod1 | |||
77 | { | 90 | { |
78 | int i; | 91 | int i; |
79 | 92 | ||
80 | for(i = 0; auth1_methods[i].name != NULL; i++) | 93 | for (i = 0; auth1_methods[i].name != NULL; i++) |
81 | if (auth1_methods[i].type == type) | 94 | if (auth1_methods[i].type == type) |
82 | return (&(auth1_methods[i])); | 95 | return (&(auth1_methods[i])); |
83 | 96 | ||
@@ -96,6 +109,7 @@ get_authname(int type) | |||
96 | return (buf); | 109 | return (buf); |
97 | } | 110 | } |
98 | 111 | ||
112 | /*ARGSUSED*/ | ||
99 | static int | 113 | static int |
100 | auth1_process_password(Authctxt *authctxt, char *info, size_t infolen) | 114 | auth1_process_password(Authctxt *authctxt, char *info, size_t infolen) |
101 | { | 115 | { |
@@ -120,6 +134,7 @@ auth1_process_password(Authctxt *authctxt, char *info, size_t infolen) | |||
120 | return (authenticated); | 134 | return (authenticated); |
121 | } | 135 | } |
122 | 136 | ||
137 | /*ARGSUSED*/ | ||
123 | static int | 138 | static int |
124 | auth1_process_rsa(Authctxt *authctxt, char *info, size_t infolen) | 139 | auth1_process_rsa(Authctxt *authctxt, char *info, size_t infolen) |
125 | { | 140 | { |
@@ -137,6 +152,7 @@ auth1_process_rsa(Authctxt *authctxt, char *info, size_t infolen) | |||
137 | return (authenticated); | 152 | return (authenticated); |
138 | } | 153 | } |
139 | 154 | ||
155 | /*ARGSUSED*/ | ||
140 | static int | 156 | static int |
141 | auth1_process_rhosts_rsa(Authctxt *authctxt, char *info, size_t infolen) | 157 | auth1_process_rhosts_rsa(Authctxt *authctxt, char *info, size_t infolen) |
142 | { | 158 | { |
@@ -175,6 +191,7 @@ auth1_process_rhosts_rsa(Authctxt *authctxt, char *info, size_t infolen) | |||
175 | return (authenticated); | 191 | return (authenticated); |
176 | } | 192 | } |
177 | 193 | ||
194 | /*ARGSUSED*/ | ||
178 | static int | 195 | static int |
179 | auth1_process_tis_challenge(Authctxt *authctxt, char *info, size_t infolen) | 196 | auth1_process_tis_challenge(Authctxt *authctxt, char *info, size_t infolen) |
180 | { | 197 | { |
@@ -193,6 +210,7 @@ auth1_process_tis_challenge(Authctxt *authctxt, char *info, size_t infolen) | |||
193 | return (-1); | 210 | return (-1); |
194 | } | 211 | } |
195 | 212 | ||
213 | /*ARGSUSED*/ | ||
196 | static int | 214 | static int |
197 | auth1_process_tis_response(Authctxt *authctxt, char *info, size_t infolen) | 215 | auth1_process_tis_response(Authctxt *authctxt, char *info, size_t infolen) |
198 | { | 216 | { |