diff options
| author | des <des@FreeBSD.org> | 2002-06-27 22:42:11 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-06-27 22:42:11 +0000 |
| commit | 5ba29faa04960f19c0c3ff005c2b897c3094c1d6 (patch) | |
| tree | 8b0c3ca50a9406d306d417f78b63f73616b80615 /crypto/openssh/auth-skey.c | |
| parent | 434f33d82438442b1dab7090fab90db4c3d02cdb (diff) | |
| download | FreeBSD-src-5ba29faa04960f19c0c3ff005c2b897c3094c1d6.zip FreeBSD-src-5ba29faa04960f19c0c3ff005c2b897c3094c1d6.tar.gz | |
Forcibly revert to mainline.
Diffstat (limited to 'crypto/openssh/auth-skey.c')
| -rw-r--r-- | crypto/openssh/auth-skey.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/crypto/openssh/auth-skey.c b/crypto/openssh/auth-skey.c index 18243ee..eb13c5c 100644 --- a/crypto/openssh/auth-skey.c +++ b/crypto/openssh/auth-skey.c @@ -23,11 +23,10 @@ */ #include "includes.h" RCSID("$OpenBSD: auth-skey.c,v 1.19 2002/06/19 00:27:55 deraadt Exp $"); -RCSID("$FreeBSD$"); #ifdef SKEY -#include <opie.h> +#include <skey.h> #include "xmalloc.h" #include "auth.h" @@ -46,11 +45,9 @@ skey_query(void *ctx, char **name, char **infotxt, Authctxt *authctxt = ctx; char challenge[1024], *p; int len; - struct opie opie; + struct skey skey; - if (opie_haskey(authctxt->user) != 0) - return -1; - if (opiechallenge(&opie, authctxt->user, challenge) == -1) + if (skeychallenge(&skey, authctxt->user, challenge) == -1) return -1; *name = xstrdup(""); @@ -76,8 +73,8 @@ skey_respond(void *ctx, u_int numresponses, char **responses) if (authctxt->valid && numresponses == 1 && - opie_haskey(authctxt->pw->pw_name) == 0 && - opie_passverify(authctxt->pw->pw_name, responses[0]) != -1) + skey_haskey(authctxt->pw->pw_name) == 0 && + skey_passcheck(authctxt->pw->pw_name, responses[0]) != -1) return 0; return -1; } |
