- provos@cvs.openbsd.org 2002/03/18 17:50:31

     [auth-bsdauth.c auth-options.c auth-rh-rsa.c auth-rsa.c auth-skey.c auth.h
      auth1.c auth2-chall.c auth2.c kex.c kex.h kexdh.c kexgex.c servconf.c
      session.h servconf.h serverloop.c session.c sshd.c]
     integrate privilege separated openssh; its turned off by default for now.
     work done by me and markus@

applied, but outside of ensure that smaller code bits migrated with
their owners.. no work was tried to 'fix' it to work. =)  Later project!

1 files changed, 12 insertions, 5 deletions

diff --git a/auth-skey.c b/auth-skey.c
index df19f7507..e897d1875 100644
--- 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.16 2002/01/12 13:10:29 markus Exp $");
+RCSID("$OpenBSD: auth-skey.c,v 1.17 2002/03/18 17:50:31 provos Exp $");
 
 #ifdef SKEY
 
@@ -30,6 +30,7 @@ RCSID("$OpenBSD: auth-skey.c,v 1.16 2002/01/12 13:10:29 markus Exp $");
 
 #include "xmalloc.h"
 #include "auth.h"
+#include "monitor_wrap.h"
 
 static void *
 skey_init_ctx(Authctxt *authctxt)
@@ -37,8 +38,6 @@ skey_init_ctx(Authctxt *authctxt)
         return authctxt;
 }
 
-#define PROMPT "\nS/Key Password: "
-
 static int
 skey_query(void *ctx, char **name, char **infotxt,
     u_int* numprompts, char ***prompts, u_int **echo_on)
@@ -58,10 +57,10 @@ skey_query(void *ctx, char **name, char **infotxt,
         *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;
@@ -93,4 +92,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 */