mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-25 11:22:10 +00:00
8668706d0f
[Makefile.in auth-bsdauth.c auth-chall.c auth-options.c auth-rsa.c
[auth2-none.c auth2-pubkey.c authfile.c authfile.h cipher-3des1.c
[cipher-chachapoly.c cipher-chachapoly.h cipher.c cipher.h
[digest-libc.c digest-openssl.c digest.h dns.c entropy.c hmac.h
[hostfile.c key.c key.h krl.c monitor.c packet.c rsa.c rsa.h
[ssh-add.c ssh-agent.c ssh-dss.c ssh-ecdsa.c ssh-ed25519.c
[ssh-keygen.c ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c
[ssh-rsa.c sshbuf-misc.c sshbuf.h sshconnect.c sshconnect1.c
[sshconnect2.c sshd.c sshkey.c sshkey.h
[openbsd-compat/openssl-compat.c openbsd-compat/openssl-compat.h]
New key API: refactor key-related functions to be more library-like,
existing API is offered as a set of wrappers.
with and ok markus@
Thanks also to Ben Hawkes, David Tomaschik, Ivan Fratric, Matthew
Dempsky and Ron Bowes for a detailed review a few months ago.
NB. This commit also removes portable OpenSSH support for OpenSSL
<0.9.8e.
146 lines
3.6 KiB
C
146 lines
3.6 KiB
C
/* $OpenBSD: auth-bsdauth.c,v 1.13 2014/06/24 01:13:21 djm Exp $ */
|
|
/*
|
|
* 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"
|
|
|
|
#include <sys/types.h>
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
|
|
#include <stdarg.h>
|
|
|
|
#ifdef BSD_AUTH
|
|
#include "xmalloc.h"
|
|
#include "key.h"
|
|
#include "hostfile.h"
|
|
#include "auth.h"
|
|
#include "log.h"
|
|
#include "buffer.h"
|
|
#ifdef GSSAPI
|
|
#include "ssh-gss.h"
|
|
#endif
|
|
#include "monitor_wrap.h"
|
|
|
|
static void *
|
|
bsdauth_init_ctx(Authctxt *authctxt)
|
|
{
|
|
return authctxt;
|
|
}
|
|
|
|
int
|
|
bsdauth_query(void *ctx, char **name, char **infotxt,
|
|
u_int *numprompts, char ***prompts, u_int **echo_on)
|
|
{
|
|
Authctxt *authctxt = ctx;
|
|
char *challenge = NULL;
|
|
|
|
*infotxt = NULL;
|
|
*numprompts = 0;
|
|
*prompts = NULL;
|
|
*echo_on = NULL;
|
|
|
|
if (authctxt->as != NULL) {
|
|
debug2("bsdauth_query: try reuse session");
|
|
challenge = auth_getitem(authctxt->as, AUTHV_CHALLENGE);
|
|
if (challenge == NULL) {
|
|
auth_close(authctxt->as);
|
|
authctxt->as = NULL;
|
|
}
|
|
}
|
|
|
|
if (challenge == NULL) {
|
|
debug2("bsdauth_query: new bsd auth session");
|
|
debug3("bsdauth_query: style %s",
|
|
authctxt->style ? authctxt->style : "<default>");
|
|
authctxt->as = auth_userchallenge(authctxt->user,
|
|
authctxt->style, "auth-ssh", &challenge);
|
|
if (authctxt->as == NULL)
|
|
challenge = NULL;
|
|
debug2("bsdauth_query: <%s>", challenge ? challenge : "empty");
|
|
}
|
|
|
|
if (challenge == NULL)
|
|
return -1;
|
|
|
|
*name = xstrdup("");
|
|
*infotxt = xstrdup("");
|
|
*numprompts = 1;
|
|
*prompts = xcalloc(*numprompts, sizeof(char *));
|
|
*echo_on = xcalloc(*numprompts, sizeof(u_int));
|
|
(*prompts)[0] = xstrdup(challenge);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
bsdauth_respond(void *ctx, u_int numresponses, char **responses)
|
|
{
|
|
Authctxt *authctxt = ctx;
|
|
int authok;
|
|
|
|
if (!authctxt->valid)
|
|
return -1;
|
|
|
|
if (authctxt->as == 0)
|
|
error("bsdauth_respond: no bsd auth session");
|
|
|
|
if (numresponses != 1)
|
|
return -1;
|
|
|
|
authok = auth_userresponse(authctxt->as, responses[0], 0);
|
|
authctxt->as = NULL;
|
|
debug3("bsdauth_respond: <%s> = <%d>", responses[0], authok);
|
|
|
|
return (authok == 0) ? -1 : 0;
|
|
}
|
|
|
|
static void
|
|
bsdauth_free_ctx(void *ctx)
|
|
{
|
|
Authctxt *authctxt = ctx;
|
|
|
|
if (authctxt && authctxt->as) {
|
|
auth_close(authctxt->as);
|
|
authctxt->as = NULL;
|
|
}
|
|
}
|
|
|
|
KbdintDevice bsdauth_device = {
|
|
"bsdauth",
|
|
bsdauth_init_ctx,
|
|
bsdauth_query,
|
|
bsdauth_respond,
|
|
bsdauth_free_ctx
|
|
};
|
|
|
|
KbdintDevice mm_bsdauth_device = {
|
|
"bsdauth",
|
|
bsdauth_init_ctx,
|
|
mm_bsdauth_query,
|
|
mm_bsdauth_respond,
|
|
bsdauth_free_ctx
|
|
};
|
|
#endif
|