projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow explicit group parameters for DH groups.
[u/mdw/catacomb]
/
passphrase.c
diff --git
a/passphrase.c
b/passphrase.c
index
a8dacc2
..
d27b9a4
100644
(file)
--- a/
passphrase.c
+++ b/
passphrase.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: passphrase.c,v 1.
4 2001/04/19 18:26:01
mdw Exp $
+ * $Id: passphrase.c,v 1.
5 2002/01/13 13:41:37
mdw Exp $
*
* Reading of passphrases (Unix-specific)
*
*
* Reading of passphrases (Unix-specific)
*
@@
-30,6
+30,9
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: passphrase.c,v $
/*----- Revision history --------------------------------------------------*
*
* $Log: passphrase.c,v $
+ * Revision 1.5 2002/01/13 13:41:37 mdw
+ * Fix stupidity in passphrase verification.
+ *
* Revision 1.4 2001/04/19 18:26:01 mdw
* Re-request broken passphrases.
*
* Revision 1.4 2001/04/19 18:26:01 mdw
* Re-request broken passphrases.
*
@@
-125,7
+128,6
@@
int passphrase_read(const char *tag, unsigned mode, char *buf, size_t sz)
/* --- Read from the terminal --- */
/* --- Read from the terminal --- */
-again:
dstr_putf(&d, "%s %s: ",
mode == PMODE_READ ? "Passphrase" : "New passphrase",
tag);
dstr_putf(&d, "%s %s: ",
mode == PMODE_READ ? "Passphrase" : "New passphrase",
tag);
@@
-135,9
+137,9
@@
again:
char b[1024];
DRESET(&d);
dstr_putf(&d, "Verify passphrase %s: ", tag);
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));
memset(b, 0, sizeof(b));
+ goto fail;
}
}
dstr_destroy(&d);
}
}
dstr_destroy(&d);