X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/250a0324deb36fd164d7d1ededc985f4c141520c..578a86d91941a0f722b87973d88e84ec2cf9a608:/passphrase.c

diff --git a/passphrase.c b/passphrase.c
index a8dacc2..0b8ddcf 100644
--- a/passphrase.c
+++ b/passphrase.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: passphrase.c,v 1.4 2001/04/19 18:26:01 mdw Exp $
+ * $Id: passphrase.c,v 1.6 2004/04/08 01:36:15 mdw Exp $
  *
  * Reading of passphrases (Unix-specific)
  *
@@ -27,25 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- 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.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <errno.h>
@@ -125,7 +106,6 @@ int passphrase_read(const char *tag, unsigned mode, char *buf, size_t sz)
 
   /* --- Read from the terminal --- */
 
-again:
   dstr_putf(&d, "%s %s: ",
 	    mode == PMODE_READ ? "Passphrase" : "New passphrase",
 	    tag);
@@ -135,9 +115,9 @@ again:
     char b[1024];
     DRESET(&d);
     dstr_putf(&d, "Verify passphrase %s: ", tag);
-    if (pixie_getpass(d.buf, b, sizeof(b)) ||
-	strcmp(b, buf) != 0) {
+    if (pixie_getpass(d.buf, b, sizeof(b)) || strcmp(b, buf) != 0) {
       memset(b, 0, sizeof(b));
+      goto fail;
     }
   }
   dstr_destroy(&d);