diff options
Diffstat (limited to 'auth1.c')
-rw-r--r-- | auth1.c | 12 |
1 files changed, 4 insertions, 8 deletions
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: auth1.c,v 1.11 2001/01/18 16:59:59 markus Exp $"); | 13 | RCSID("$OpenBSD: auth1.c,v 1.13 2001/01/21 19:05:43 markus Exp $"); |
14 | 14 | ||
15 | #ifdef HAVE_OSF_SIA | 15 | #ifdef HAVE_OSF_SIA |
16 | # include <sia.h> | 16 | # include <sia.h> |
@@ -19,10 +19,11 @@ RCSID("$OpenBSD: auth1.c,v 1.11 2001/01/18 16:59:59 markus Exp $"); | |||
19 | 19 | ||
20 | #include "xmalloc.h" | 20 | #include "xmalloc.h" |
21 | #include "rsa.h" | 21 | #include "rsa.h" |
22 | #include "ssh.h" | 22 | #include "ssh1.h" |
23 | #include "packet.h" | 23 | #include "packet.h" |
24 | #include "buffer.h" | 24 | #include "buffer.h" |
25 | #include "mpaux.h" | 25 | #include "mpaux.h" |
26 | #include "log.h" | ||
26 | #include "servconf.h" | 27 | #include "servconf.h" |
27 | #include "compat.h" | 28 | #include "compat.h" |
28 | #include "auth.h" | 29 | #include "auth.h" |
@@ -278,11 +279,6 @@ do_authloop(Authctxt *authctxt) | |||
278 | xfree(password); | 279 | xfree(password); |
279 | break; | 280 | break; |
280 | 281 | ||
281 | #ifdef SKEY /* ISSUE: Is this right? we don't define | ||
282 | having skey_authentication in | ||
283 | servconf.h by default so I assume | ||
284 | we need to deal with this via #ifdef | ||
285 | in some reasonable way */ | ||
286 | case SSH_CMSG_AUTH_TIS: | 282 | case SSH_CMSG_AUTH_TIS: |
287 | debug("rcvd SSH_CMSG_AUTH_TIS"); | 283 | debug("rcvd SSH_CMSG_AUTH_TIS"); |
288 | if (options.skey_authentication == 1) { | 284 | if (options.skey_authentication == 1) { |
@@ -297,6 +293,7 @@ do_authloop(Authctxt *authctxt) | |||
297 | } | 293 | } |
298 | } | 294 | } |
299 | break; | 295 | break; |
296 | |||
300 | case SSH_CMSG_AUTH_TIS_RESPONSE: | 297 | case SSH_CMSG_AUTH_TIS_RESPONSE: |
301 | debug("rcvd SSH_CMSG_AUTH_TIS_RESPONSE"); | 298 | debug("rcvd SSH_CMSG_AUTH_TIS_RESPONSE"); |
302 | if (options.skey_authentication == 1) { | 299 | if (options.skey_authentication == 1) { |
@@ -308,7 +305,6 @@ do_authloop(Authctxt *authctxt) | |||
308 | xfree(response); | 305 | xfree(response); |
309 | } | 306 | } |
310 | break; | 307 | break; |
311 | #endif /* ISSUE: End of wrong SKEY defines */ | ||
312 | 308 | ||
313 | default: | 309 | default: |
314 | /* | 310 | /* |