X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/blobdiff_plain/f5799ae11d9a6d85b68449a35cd4077ae9090357..HEAD:/openssh/auth-skey.c?ds=sidebyside

diff --git a/openssh/auth-skey.c b/openssh/auth-skey.c
index eb13c5c..f921fc1 100644
--- a/openssh/auth-skey.c
+++ b/openssh/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.19 2002/06/19 00:27:55 deraadt Exp $");
+RCSID("$OpenBSD: auth-skey.c,v 1.12 2001/05/18 14:13:28 markus Exp $");
 
 #ifdef SKEY
 
@@ -30,7 +30,6 @@ RCSID("$OpenBSD: auth-skey.c,v 1.19 2002/06/19 00:27:55 deraadt Exp $");
 
 #include "xmalloc.h"
 #include "auth.h"
-#include "monitor_wrap.h"
 
 static void *
 skey_init_ctx(Authctxt *authctxt)
@@ -38,8 +37,10 @@ skey_init_ctx(Authctxt *authctxt)
 	return authctxt;
 }
 
-int
-skey_query(void *ctx, char **name, char **infotxt,
+#define PROMPT "\nS/Key Password: "
+
+static int
+skey_query(void *ctx, char **name, char **infotxt, 
     u_int* numprompts, char ***prompts, u_int **echo_on)
 {
 	Authctxt *authctxt = ctx;
@@ -50,29 +51,30 @@ skey_query(void *ctx, char **name, char **infotxt,
 	if (skeychallenge(&skey, authctxt->user, challenge) == -1)
 		return -1;
 
-	*name  = xstrdup("");
-	*infotxt  = xstrdup("");
+	*name       = xstrdup("");
+	*infotxt    = xstrdup("");
 	*numprompts = 1;
 	*prompts = xmalloc(*numprompts * sizeof(char*));
 	*echo_on = xmalloc(*numprompts * sizeof(u_int));
 	(*echo_on)[0] = 0;
 
-	len = strlen(challenge) + strlen(SKEY_PROMPT) + 1;
+	len = strlen(challenge) + strlen(PROMPT) + 1;
 	p = xmalloc(len);
-	strlcpy(p, challenge, len);
-	strlcat(p, SKEY_PROMPT, len);
+	p[0] = '\0';
+	strlcat(p, challenge, len);
+	strlcat(p, PROMPT, len);
 	(*prompts)[0] = p;
 
 	return 0;
 }
 
-int
+static 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;
@@ -92,12 +94,4 @@ 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 */