- dtucker@cvs.openbsd.org 2005/07/08 09:26:18

[openssh.git] / auth-skey.c

diff --git a/auth-skey.c b/auth-skey.c
index f921fc1bb70d8473b4527dc6d0ab10c8ff136d72..ac1af69ed917473b147c05bff3b78bbb65ccfeaf 100644 (file)
--- a/auth-skey.c
+++ b/auth-skey.c
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: auth-skey.c,v 1.12 2001/05/18 14:13:28 markus Exp $");
+RCSID("$OpenBSD: auth-skey.c,v 1.20 2002/06/30 21:59:45 deraadt Exp $");
 
 #ifdef SKEY
 
@@ -30,6 +30,7 @@ RCSID("$OpenBSD: auth-skey.c,v 1.12 2001/05/18 14:13:28 markus Exp $");
 
 #include "xmalloc.h"
 #include "auth.h"
+#include "monitor_wrap.h"
 
 static void *
 skey_init_ctx(Authctxt *authctxt)
@@ -37,10 +38,8 @@ skey_init_ctx(Authctxt *authctxt)
        return authctxt;
 }
 
-#define PROMPT "\nS/Key Password: "
-
-static int
-skey_query(void *ctx, char **name, char **infotxt, 
+int
+skey_query(void *ctx, char **name, char **infotxt,
     u_int* numprompts, char ***prompts, u_int **echo_on)
 {
        Authctxt *authctxt = ctx;
@@ -48,33 +47,33 @@ skey_query(void *ctx, char **name, char **infotxt,
        int len;
        struct skey skey;
 
-       if (skeychallenge(&skey, authctxt->user, challenge) == -1)
+       if (_compat_skeychallenge(&skey, authctxt->user, challenge, 
+           sizeof(challenge)) == -1)
                return -1;
 
-       *name       = xstrdup("");
-       *infotxt    = xstrdup("");
+       *name  = xstrdup("");
+       *infotxt  = xstrdup("");
        *numprompts = 1;
-       *prompts = xmalloc(*numprompts * sizeof(char*));
+       *prompts = xmalloc(*numprompts * sizeof(char *));
        *echo_on = xmalloc(*numprompts * sizeof(u_int));
        (*echo_on)[0] = 0;
 
-       len = strlen(challenge) + strlen(PROMPT) + 1;
+       len = strlen(challenge) + strlen(SKEY_PROMPT) + 1;
        p = xmalloc(len);
-       p[0] = '\0';
-       strlcat(p, challenge, len);
-       strlcat(p, PROMPT, len);
+       strlcpy(p, challenge, len);
+       strlcat(p, SKEY_PROMPT, len);
        (*prompts)[0] = p;
 
        return 0;
 }
 
-static int
+int
 skey_respond(void *ctx, u_int numresponses, char **responses)
 {
        Authctxt *authctxt = ctx;
- 
+
        if (authctxt->valid &&
-           numresponses == 1 && 
+           numresponses == 1 &&
            skey_haskey(authctxt->pw->pw_name) == 0 &&
            skey_passcheck(authctxt->pw->pw_name, responses[0]) != -1)
            return 0;
@@ -94,4 +93,12 @@ KbdintDevice skey_device = {
        skey_respond,
        skey_free_ctx
 };
+
+KbdintDevice mm_skey_device = {
+       "skey",
+       skey_init_ctx,
+       mm_skey_query,
+       mm_skey_respond,
+       skey_free_ctx
+};
 #endif /* SKEY */