diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-22 05:34:40 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-22 05:34:40 +0000 |
commit | 226cfa03781466907dd252916aeade6879e376b8 (patch) | |
tree | 3251d15053db065d74994b95e17fd65874fcaa9b /auth1.c | |
parent | 401d58f3612fa030f309d01df9815a2fc1d3c6de (diff) |
Hopefully things did not get mixed around too much. It compiles under
Linux and works. So that is at least a good sign. =)
20010122
- (bal) OpenBSD Resync
- markus@cvs.openbsd.org 2001/01/19 12:45:26 GMT 2001 by markus
[servconf.c ssh.h sshd.c]
only auth-chall.c needs #ifdef SKEY
- markus@cvs.openbsd.org 2001/01/19 15:55:10 GMT 2001 by markus
[auth-krb4.c auth-options.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c
auth1.c auth2.c channels.c clientloop.c dh.c dispatch.c nchan.c
packet.c pathname.h readconf.c scp.c servconf.c serverloop.c
session.c ssh-add.c ssh-keygen.c ssh-keyscan.c ssh.c ssh.h
ssh1.h sshconnect1.c sshd.c ttymodes.c]
move ssh1 definitions to ssh1.h, pathnames to pathnames.h
- markus@cvs.openbsd.org 2001/01/19 16:48:14
[sshd.8]
fix typo; from stevesk@
- markus@cvs.openbsd.org 2001/01/19 16:50:58
[ssh-dss.c]
clear and free digest, make consistent with other code (use dlen); from
stevesk@
- markus@cvs.openbsd.org 2001/01/20 15:55:20 GMT 2001 by markus
[auth-options.c auth-options.h auth-rsa.c auth2.c]
pass the filename to auth_parse_options()
- markus@cvs.openbsd.org 2001/01/20 17:59:40 GMT 2001
[readconf.c]
fix SIGSEGV from -o ""; problem noted by jehsom@togetherweb.com
- stevesk@cvs.openbsd.org 2001/01/20 18:20:29
[sshconnect2.c]
dh_new_group() does not return NULL. ok markus@
- markus@cvs.openbsd.org 2001/01/20 21:33:42
[ssh-add.c]
do not loop forever if askpass does not exist; from
andrew@pimlott.ne.mediaone.net
- djm@cvs.openbsd.org 2001/01/20 23:00:56
[servconf.c]
Check for NULL return from strdelim; ok markus
- djm@cvs.openbsd.org 2001/01/20 23:02:07
[readconf.c]
KNF; ok markus
- jakob@cvs.openbsd.org 2001/01/21 9:00:33
[ssh-keygen.1]
remove -R flag; ok markus@
- markus@cvs.openbsd.org 2001/01/21 19:05:40
[atomicio.c automicio.h auth-chall.c auth-krb4.c auth-options.c
auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c
auth.c auth.h auth1.c auth2-chall.c auth2.c authfd.c authfile.c
bufaux.c bufaux.h buffer.c canahost.c canahost.h channels.c
cipher.c cli.c clientloop.c clientloop.h compat.c compress.c
deattack.c dh.c dispatch.c groupaccess.c hmac.c hostfile.c kex.c
key.c key.h log-client.c log-server.c log.c log.h login.c login.h
match.c misc.c misc.h nchan.c packet.c pty.c radix.h readconf.c
readpass.c readpass.h rsa.c scp.c servconf.c serverloop.c serverloop.h
session.c sftp-server.c ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c
ssh-keyscan.c ssh-rsa.c ssh.c ssh.h sshconnect.c sshconnect.h
sshconnect1.c sshconnect2.c sshd.c tildexpand.c tildexpand.h
ttysmodes.c uidswap.c xmalloc.c]
split ssh.h and try to cleanup the #include mess. remove unnecessary
#includes. rename util.[ch] -> misc.[ch]
- (bal) renamed 'PIDDIR' to '_PATH_SSH_PIDDIR' to match OpenBSD tree
- (bal) Moved #ifdef KRB4 in auth-krb4.c above the #include to resolve
conflict when compiling for non-kerb install
- (bal) removed the #ifdef SKEY in auth1.c to match Markus' changes
on 1/19.
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 | /* |