dominic/pinentry-dmenu
1
0
Fork 0
Code Issues Pull requests Releases Activity

Add repeat function

Browse source
This commit is contained in:
Moritz Luedecke 2018-01-25 14:15:28 +01:00
parent 631b801c00
commit a9cba79ff9
2 changed files with 92 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
pinentry-dmenu.c
View file

@ -49,6 +49,9 @@ static int screen;
static char* pin;
static int pin_len;
static char* pin_repeat;
static int pin_repeat_len;
static int repeat;
static Atom clip, utf8;
static Display *dpy;
@ -123,16 +126,46 @@ nextrune(int cursor, int inc) {
return n;
}
static void
setup_pin(char* pin_ptr, int len, int reset) {
pin = pin_ptr;
pin_len = len;
if (reset) {
promptw = (prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
cursor = 0;
if (pin) {
pin[0] = '\0';
}
}
}
static void
insert(const char *str, ssize_t n) {
size_t len = strlen(pin);
// FIXME: Pinentry crashes when increasing the pin buffer the second time.
// Other pinentry programs has a limited passwort field length.
if (len + n > pin_len - 1) {
if (repeat) {
pin_repeat_len = 2 * pin_repeat_len;
pin_repeat = secmem_realloc(pin_repeat, pin_repeat_len);
setup_pin(pin_repeat, pin_repeat_len, 0);
if (!pin_repeat) {
pin_len = 0;
}
} else {
if (!pinentry_setbufferlen(pinentry, 2 * pinentry->pin_len)) {
pin_len = 0;
} else {
setup_pin(pinentry->pin, pinentry->pin_len, 0);
}
}
if (pin_len == 0) {
printf("Error: Couldn't allocate secure memory\n");
return;
}
pin_len = pinentry->pin_len;
}
/* Move existing text out of the way, insert new text, and update cursor */
@ -234,17 +267,6 @@ drawwin(void) {
drw_map(drw, win, 0, 0, mw, mh);
}
static void
setup_pin(char* pin_ptr, int len) {
pin = pin_ptr;
pin_len = len;
cursor = 0;
promptw = (prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
if (pin) {
pin[0] = '\0';
}
}
static void
setup(void) {
int x, y, i = 0;
@ -587,17 +609,24 @@ catchsig(int sig) {
static void
password(void) {
winmode = WinPin;
setup_pin(pinentry->pin, pinentry->pin_len);
repeat = 0;
setup_pin(pinentry->pin, pinentry->pin_len, 1);
run();
if (pinentry->repeat_passphrase) {
setup_pin(pinentry->repeat_passphrase);
// TODO: Add repeat text
if (!pinentry->canceled && pinentry->repeat_passphrase) {
repeat = 1;
pin_repeat_len = pinentry->pin_len;
pin_repeat = secmem_malloc(pinentry->pin_len);
setup_pin(pin_repeat, pin_repeat_len, 1);
run();
if (strcmp(pinentry->pin, pinentry->repeat_passphrase)) {
pinentry->repeat_okay = 0;
return 0;
pinentry->repeat_okay = (strcmp(pinentry->pin, pin_repeat) == 0)? 1 : 0;
secmem_free(pin_repeat);
if (!pinentry->repeat_okay) {
pinentry->result = -1;
return;
}
}
if (pinentry->canceled) {
@ -654,7 +683,10 @@ cmdhandler(pinentry_t received_pinentry) {
setup();
if (pinentry->pin) {
do {
password();
} while (!pinentry->canceled && pinentry->repeat_passphrase
&& !pinentry->repeat_okay);
} else {
confirm();
}

44
test
View file

@ -1,9 +1,43 @@
#!/bin/sh
echo "SETDESC testing pinentry-dmenu, type whatever
SETPROMPT whatever:
if [[ $1 -eq 1 ]]; then
echo "SETTITLE title
SETPROMPT prompt
SETDESC PROMPT
GETPIN
SETDESC type more of whatever:
GETPIN
SETDESC testing confirmation
BYE" | ./pinentry-dmenu
elif [[ $1 -eq 2 ]]; then
echo "SETTITLE title
SETPROMPT confirm
SETDESC CONFIRM
confirm
BYE" | ./pinentry-dmenu
elif [[ $1 -eq 3 ]]; then
echo "SETTITLE title
SETPROMPT prompt
SETDESC REPEAT
SETREPEAT repeat
GETPIN
BYE" | ./pinentry-dmenu
else
echo "SETTITLE title
SETPROMPT prompt
SETDESC PROMPT
GETPIN
SETPROMPT confirm
SETDESC CONFIRM
confirm
SETPROMPT repeat
SETDESC REPEAT
SETREPEAT
GETPIN
BYE" | ./pinentry-dmenu
fi