=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/auth-skey.c,v retrieving revision 1.12.4.1 retrieving revision 1.12.4.2 diff -u -r1.12.4.1 -r1.12.4.2 --- src/usr.bin/ssh/Attic/auth-skey.c 2002/03/07 17:37:46 1.12.4.1 +++ src/usr.bin/ssh/Attic/auth-skey.c 2002/05/17 00:03:23 1.12.4.2 @@ -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.4.1 2002/03/07 17:37:46 jason Exp $"); +RCSID("$OpenBSD: auth-skey.c,v 1.12.4.2 2002/05/17 00:03:23 miod Exp $"); #ifdef SKEY @@ -30,6 +30,7 @@ #include "xmalloc.h" #include "auth.h" +#include "monitor_wrap.h" static void * skey_init_ctx(Authctxt *authctxt) @@ -37,9 +38,7 @@ return authctxt; } -#define PROMPT "\nS/Key Password: " - -static int +int skey_query(void *ctx, char **name, char **infotxt, u_int* numprompts, char ***prompts, u_int **echo_on) { @@ -58,16 +57,16 @@ *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); strlcpy(p, challenge, len); - strlcat(p, PROMPT, 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; @@ -91,6 +90,14 @@ skey_init_ctx, skey_query, skey_respond, + skey_free_ctx +}; + +KbdintDevice mm_skey_device = { + "skey", + skey_init_ctx, + mm_skey_query, + mm_skey_respond, skey_free_ctx }; #endif /* SKEY */