X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/9c5b124e27327e4afeb2aba916cf427d41a89f80..2685767a6125c1620719c7de6234aedf41857b7e:/passphrase.c

diff --git a/passphrase.c b/passphrase.c
index ced4385..a8dacc2 100644
--- a/passphrase.c
+++ b/passphrase.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: passphrase.c,v 1.1 1999/12/22 15:58:20 mdw Exp $
+ * $Id: passphrase.c,v 1.4 2001/04/19 18:26:01 mdw Exp $
  *
  * Reading of passphrases (Unix-specific)
  *
@@ -30,6 +30,17 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: passphrase.c,v $
+ * Revision 1.4  2001/04/19 18:26:01  mdw
+ * Re-request broken passphrases.
+ *
+ * Revision 1.3  2000/12/06 20:33:27  mdw
+ * Make flags be macros rather than enumerations, to ensure that they're
+ * unsigned.
+ *
+ * Revision 1.2  2000/06/17 11:49:37  mdw
+ * New pixie protocol allowing application to request passphrases and send
+ * them to the pixie.
+ *
  * Revision 1.1  1999/12/22 15:58:20  mdw
  * Portable interface to reading passphrases.
  *
@@ -54,9 +65,7 @@
 static int fd = -1;
 static unsigned flags = 0;
 
-enum {
-  f_fail = 1
-};
+#define f_fail 1u
 
 /*----- Main code ---------------------------------------------------------*/
 
@@ -99,21 +108,27 @@ static int pconn(void)
 int passphrase_read(const char *tag, unsigned mode, char *buf, size_t sz)
 {
   dstr d = DSTR_INIT;
+  int rc = 1;
 
   /* --- Try talking to the pixie --- */
 
   if (!pconn()) {
-    if (pixie_read(fd, tag, mode, buf, sz)) {
+    rc = pixie_read(fd, tag, mode, buf, sz);
+    if (rc < 0) {
       close(fd);
       fd = -1;
       return (-1);
     }
-    return (0);
+    if (rc == 0)
+      return (0);
   }
 
   /* --- Read from the terminal --- */
 
-  dstr_putf(&d, "Passphrase %s: ", tag);
+again:
+  dstr_putf(&d, "%s %s: ",
+	    mode == PMODE_READ ? "Passphrase" : "New passphrase",
+	    tag);
   if (pixie_getpass(d.buf, buf, sz))
     goto fail;
   if (mode == PMODE_VERIFY) {
@@ -123,10 +138,14 @@ int passphrase_read(const char *tag, unsigned mode, char *buf, size_t sz)
     if (pixie_getpass(d.buf, b, sizeof(b)) ||
 	strcmp(b, buf) != 0) {
       memset(b, 0, sizeof(b));
-      goto fail;
     }
   }
   dstr_destroy(&d);
+
+  /* --- If the pixie is interested, tell it the new passphrase --- */
+
+  if (fd >= 0)
+    pixie_set(fd, tag, buf);
   return (0);
 
   /* --- Tidy up after a failure --- */