Deleted Added
sdiff udiff text old ( 149753 ) new ( 162856 )
full compact
auth-skey.c (149753) auth-skey.c (162856)
1/* $OpenBSD: auth-skey.c,v 1.26 2006/08/05 08:28:24 dtucker Exp $ */
1/*
2 * Copyright (c) 2001 Markus Friedl. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

--- 7 unchanged lines hidden (view full) ---

16 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
17 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
18 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
19 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
20 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */
2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.

--- 7 unchanged lines hidden (view full) ---

17 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
18 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25
24#include "includes.h"
26#include "includes.h"
25RCSID("$OpenBSD: auth-skey.c,v 1.20 2002/06/30 21:59:45 deraadt Exp $");
26RCSID("$FreeBSD: head/crypto/openssh/auth-skey.c 149753 2005-09-03 07:04:25Z des $");
27__RCSID("$FreeBSD: head/crypto/openssh/auth-skey.c 162856 2006-09-30 13:38:06Z des $");
27
28#ifdef SKEY
29
28
29#ifdef SKEY
30
31#include <sys/types.h>
32
33#include <pwd.h>
34#include <stdio.h>
35
30#ifdef OPIE
31#include <opie.h>
32#define skey opie
33#define skeychallenge(k, u, c) opiechallenge((k), (u), (c))
34#define skey_haskey(u) opie_haskey((u))
35#define skey_passcheck(u, r) opie_passverify((u), (r))
36#else
37#include <skey.h>
38#endif
39
40#include "xmalloc.h"
36#ifdef OPIE
37#include <opie.h>
38#define skey opie
39#define skeychallenge(k, u, c) opiechallenge((k), (u), (c))
40#define skey_haskey(u) opie_haskey((u))
41#define skey_passcheck(u, r) opie_passverify((u), (r))
42#else
43#include <skey.h>
44#endif
45
46#include "xmalloc.h"
47#include "key.h"
48#include "hostfile.h"
41#include "auth.h"
49#include "auth.h"
50#include "ssh-gss.h"
42#include "monitor_wrap.h"
43
44static void *
45skey_init_ctx(Authctxt *authctxt)
46{
47 return authctxt;
48}
49
50int
51skey_query(void *ctx, char **name, char **infotxt,
52 u_int* numprompts, char ***prompts, u_int **echo_on)
53{
54 Authctxt *authctxt = ctx;
51#include "monitor_wrap.h"
52
53static void *
54skey_init_ctx(Authctxt *authctxt)
55{
56 return authctxt;
57}
58
59int
60skey_query(void *ctx, char **name, char **infotxt,
61 u_int* numprompts, char ***prompts, u_int **echo_on)
62{
63 Authctxt *authctxt = ctx;
55 char challenge[1024], *p;
56 int len;
64 char challenge[1024];
57 struct skey skey;
58
59 if (_compat_skeychallenge(&skey, authctxt->user, challenge,
60 sizeof(challenge)) == -1)
61 return -1;
62
63 *name = xstrdup("");
64 *infotxt = xstrdup("");
65 *numprompts = 1;
65 struct skey skey;
66
67 if (_compat_skeychallenge(&skey, authctxt->user, challenge,
68 sizeof(challenge)) == -1)
69 return -1;
70
71 *name = xstrdup("");
72 *infotxt = xstrdup("");
73 *numprompts = 1;
66 *prompts = xmalloc(*numprompts * sizeof(char *));
67 *echo_on = xmalloc(*numprompts * sizeof(u_int));
68 (*echo_on)[0] = 0;
74 *prompts = xcalloc(*numprompts, sizeof(char *));
75 *echo_on = xcalloc(*numprompts, sizeof(u_int));
69
76
70 len = strlen(challenge) + strlen(SKEY_PROMPT) + 1;
71 p = xmalloc(len);
72 strlcpy(p, challenge, len);
73 strlcat(p, SKEY_PROMPT, len);
74 (*prompts)[0] = p;
77 xasprintf(*prompts, "%s%s", challenge, SKEY_PROMPT);
75
76 return 0;
77}
78
79int
80skey_respond(void *ctx, u_int numresponses, char **responses)
81{
82 Authctxt *authctxt = ctx;

--- 31 unchanged lines hidden --- 		78
79 return 0;
80}
81
82int
83skey_respond(void *ctx, u_int numresponses, char **responses)
84{
85 Authctxt *authctxt = ctx;

--- 31 unchanged lines hidden ---