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

Add new global variable pin_len

Browse source
This commit is contained in:
Moritz Luedecke 2018-01-25 10:04:51 +01:00
parent 54dd0d68bf
commit 3efd900cd2
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pinentry-dmenu.c
View file

@ -48,6 +48,7 @@ static size_t cursor;
static int screen; static int screen;
static char* pin; static char* pin;
static int pin_len;
static Atom clip, utf8; static Atom clip, utf8;
static Display *dpy; static Display *dpy;
@ -124,23 +125,18 @@ nextrune(int cursor, int inc) {
static void static void
insert(const char *str, ssize_t n) { insert(const char *str, ssize_t n) {
int repeat;
size_t len = strlen(pin); size_t len = strlen(pin);
if (len + n > pinentry->pin_len - 1) { if (len + n > pin_len - 1) {
repeat = (pin == pinentry->pin) ? 0 : 1;
if (!pinentry_setbufferlen(pinentry, 2 * pinentry->pin_len)) { if (!pinentry_setbufferlen(pinentry, 2 * pinentry->pin_len)) {
printf("Error: Couldn't allocate secure memory\n"); printf("Error: Couldn't allocate secure memory\n");
return; return;
} }
pin_len = pinentry->pin_len;
pin = (repeat) ? pinentry->pin : pinentry->repeat_passphrase;
} }
/* Move existing text out of the way, insert new text, and update cursor */ /* Move existing text out of the way, insert new text, and update cursor */
memmove(&pin[cursor + n], &pin[cursor], memmove(&pin[cursor + n], &pin[cursor], pin_len - cursor - MAX(n, 0));
pinentry->pin_len - cursor - MAX(n, 0));
if (n > 0) { if (n > 0) {
memcpy(&pin[cursor], str, n); memcpy(&pin[cursor], str, n);
@ -209,7 +205,7 @@ drawwin(void) {
drw_setscheme(drw, scheme[SchemeNormal]); drw_setscheme(drw, scheme[SchemeNormal]);
if (winmode == WinPin) { if (winmode == WinPin) {
censort = ecalloc(1, asterlen * pinentry->pin_len); censort = ecalloc(1, asterlen * pin_len);
for (i = 0; i < asterlen * strlen(pin); i += asterlen) { for (i = 0; i < asterlen * strlen(pin); i += asterlen) {
memcpy(&censort[i], asterisk, asterlen); memcpy(&censort[i], asterisk, asterlen);
@ -236,10 +232,13 @@ drawwin(void) {
} }
static void static void
setup_pin(char* pinlink) { setup_pin(char* pin_ptr, int len) {
pin = pinlink; pin = pin_ptr;
pin[0] = '\0'; pin_len = len;
cursor = 0; cursor = 0;
if (pin) {
pin[0] = '\0';
}
} }
static void static void
@ -534,8 +533,8 @@ paste(void) {
Atom da; Atom da;
/* We have been given the current selection, now insert it into input */ /* We have been given the current selection, now insert it into input */
XGetWindowProperty(dpy, win, utf8, 0, pinentry->pin_len / 4, False, XGetWindowProperty(dpy, win, utf8, 0, pin_len / 4, False, utf8, &da, &di,
utf8, &da, &di, &dl, &dl, (unsigned char **)&p); &dl, &dl, (unsigned char **)&p);
insert(p, (q = strchr(p, '\n')) ? q - p : (ssize_t) strlen(p)); insert(p, (q = strchr(p, '\n')) ? q - p : (ssize_t) strlen(p));
XFree(p); XFree(p);
drawwin(); drawwin();
@ -586,8 +585,7 @@ catchsig(int sig) {
static void static void
password(void) { password(void) {
winmode = WinPin; winmode = WinPin;
setup_pin(pinentry->pin, pinentry->pin_len);
setup_pin(pinentry->pin);
run(); run();
if (pinentry->repeat_passphrase) { if (pinentry->repeat_passphrase) {