Attachment 2570 Details for Bug 2240 – Simplified/merged patch

[patch] Simplified/merged patch

x-patch.txt (text/plain), 1.40 KB, created by Dirk-Willem van Gulik on 2015-03-18 19:30:55 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dirk-Willem van Gulik

Created: 2015-03-18 19:30:55 AEDT

Size: 1.40 KB

patch

obsolete

>diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c
>index c3a112f..74d83b8 100644
>--- a/ssh-pkcs11.c
>+++ b/ssh-pkcs11.c
>@@ -255,22 +255,27 @@ pkcs11_rsa_private_encrypt(int flen, const u_char *from, u_char *to, RSA *rsa,
> 	si = &k11->provider->slotinfo[k11->slotidx];
> 	if ((si->token.flags & CKF_LOGIN_REQUIRED) && !si->logged_in) {
> 		if (!pkcs11_interactive) {
>-			error("need pin");
>+			error("need pin entry%s", 
>+				(si->token.flags & CKF_PROTECTED_AUTHENTICATION_PATH) ? " on reader keypad" : "");
> 			return (-1);
> 		}
>-		snprintf(prompt, sizeof(prompt), "Enter PIN for '%s': ",
>-		    si->token.label);
>-		pin = read_passphrase(prompt, RP_ALLOW_EOF);
>-		if (pin == NULL)
>-			return (-1);	/* bail out */
>-		rv = f->C_Login(si->session, CKU_USER,
>-		    (u_char *)pin, strlen(pin));
>+		if (si->token.flags & CKF_PROTECTED_AUTHENTICATION_PATH) {
>+			verbose("Deferring PIN entry to keypad of chipcard reader.");
>+			pin = NULL;
>+		} else {
>+			snprintf(prompt, sizeof(prompt), "Enter PIN for '%s': ",
>+			    si->token.label);
>+			pin = read_passphrase(prompt, RP_ALLOW_EOF);
>+			if (pin == NULL)
>+				return (-1);	/* bail out */
>+		};
>+		rv = f->C_Login(si->session, CKU_USER, pin, pin ? strlen(pin): 0);
>+		if (pin) free(pin);
>+
> 		if (rv != CKR_OK && rv != CKR_USER_ALREADY_LOGGED_IN) {
>-			free(pin);
> 			error("C_Login failed: %lu", rv);
> 			return (-1);
> 		}
>-		free(pin);
> 		si->logged_in = 1;
> 	}
> 	key_filter[1].pValue = k11->keyid;

Actions: View | Diff

Attachments on bug 2240: 2435 | 2569 | 2570