mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-11-28 07:14:31 +08:00
226cfa0378
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.
114 lines
3.5 KiB
C
114 lines
3.5 KiB
C
/*
|
|
* Copyright (c) 2001 Markus Friedl. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
#include "includes.h"
|
|
RCSID("$OpenBSD: auth2-chall.c,v 1.2 2001/01/21 19:05:43 markus Exp $");
|
|
|
|
#include "ssh2.h"
|
|
#include "auth.h"
|
|
#include "packet.h"
|
|
#include "xmalloc.h"
|
|
#include "dispatch.h"
|
|
#include "log.h"
|
|
|
|
void send_userauth_into_request(Authctxt *authctxt, char *challenge, int echo);
|
|
void input_userauth_info_response(int type, int plen, void *ctxt);
|
|
|
|
/*
|
|
* try challenge-reponse, return -1 (= postponed) if we have to
|
|
* wait for the response.
|
|
*/
|
|
int
|
|
auth2_challenge(Authctxt *authctxt, char *devs)
|
|
{
|
|
char *challenge;
|
|
|
|
if (!authctxt->valid || authctxt->user == NULL)
|
|
return 0;
|
|
if ((challenge = get_challenge(authctxt, devs)) == NULL)
|
|
return 0;
|
|
send_userauth_into_request(authctxt, challenge, 0);
|
|
dispatch_set(SSH2_MSG_USERAUTH_INFO_RESPONSE,
|
|
&input_userauth_info_response);
|
|
authctxt->postponed = 1;
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
send_userauth_into_request(Authctxt *authctxt, char *challenge, int echo)
|
|
{
|
|
int nprompts = 1;
|
|
|
|
packet_start(SSH2_MSG_USERAUTH_INFO_REQUEST);
|
|
/* name, instruction and language are unused */
|
|
packet_put_cstring("");
|
|
packet_put_cstring("");
|
|
packet_put_cstring("");
|
|
packet_put_int(nprompts);
|
|
packet_put_cstring(challenge);
|
|
packet_put_char(echo);
|
|
packet_send();
|
|
packet_write_wait();
|
|
}
|
|
|
|
void
|
|
input_userauth_info_response(int type, int plen, void *ctxt)
|
|
{
|
|
Authctxt *authctxt = ctxt;
|
|
int authenticated = 0;
|
|
u_int nresp, rlen;
|
|
char *response, *method = "challenge-reponse";
|
|
|
|
if (authctxt == NULL)
|
|
fatal("input_userauth_info_response: no authctxt");
|
|
|
|
authctxt->postponed = 0; /* reset */
|
|
nresp = packet_get_int();
|
|
if (nresp == 1) {
|
|
response = packet_get_string(&rlen);
|
|
packet_done();
|
|
if (strlen(response) == 0) {
|
|
/*
|
|
* if we received an empty response, resend challenge
|
|
* with echo enabled
|
|
*/
|
|
char *challenge = get_challenge(authctxt, NULL);
|
|
if (challenge != NULL) {
|
|
send_userauth_into_request(authctxt,
|
|
challenge, 1);
|
|
authctxt->postponed = 1;
|
|
}
|
|
} else if (authctxt->valid) {
|
|
authenticated = verify_response(authctxt, response);
|
|
memset(response, 'r', rlen);
|
|
}
|
|
xfree(response);
|
|
}
|
|
auth_log(authctxt, authenticated, method, " ssh2");
|
|
if (!authctxt->postponed) {
|
|
/* unregister callback and send reply */
|
|
dispatch_set(SSH2_MSG_USERAUTH_INFO_RESPONSE, NULL);
|
|
userauth_reply(authctxt, authenticated);
|
|
}
|
|
}
|