- deraadt@cvs.openbsd.org 2006/03/19 18:53:12

[openssh.git] / auth-skey.c

diff --git a/auth-skey.c b/auth-skey.c
index e897d18756e5a12da97870f414174f488107c5ea..ce8c1a8096d13d05ae0e734d56ba8b89adb4dd3a 100644 (file)
--- a/auth-skey.c
+++ b/auth-skey.c
@@ -22,7 +22,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: auth-skey.c,v 1.17 2002/03/18 17:50:31 provos Exp $");
 
 #ifdef SKEY
 
@@ -38,7 +37,7 @@ skey_init_ctx(Authctxt *authctxt)
        return authctxt;
 }
 
-static int
+int
 skey_query(void *ctx, char **name, char **infotxt,
     u_int* numprompts, char ***prompts, u_int **echo_on)
 {
@@ -47,13 +46,14 @@ 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;
 
@@ -66,7 +66,7 @@ skey_query(void *ctx, char **name, char **infotxt,
        return 0;
 }
 
-static int
+int
 skey_respond(void *ctx, u_int numresponses, char **responses)
 {
        Authctxt *authctxt = ctx;