summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorderaadt@openbsd.org <deraadt@openbsd.org>2015-02-03 08:07:20 +0000
committerDamien Miller <djm@mindrot.org>2015-02-05 07:43:00 +1100
commitce4f59b2405845584f45e0b3214760eb0008c06c (patch)
tree95a69000fdb9c8ee886242fe34a04650e858927f
parent5d34aa94938abb12b877a25be51862757f25d54b (diff)
upstream commit
missing ; djm and mlarkin really having great interactions recently
-rw-r--r--ssh-pkcs11.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c
index ddc89d515..c3a112fa1 100644
--- a/ssh-pkcs11.c
+++ b/ssh-pkcs11.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-pkcs11.c,v 1.16 2015/02/02 22:48:53 djm Exp $ */ 1/* $OpenBSD: ssh-pkcs11.c,v 1.17 2015/02/03 08:07:20 deraadt Exp $ */
2/* 2/*
3 * Copyright (c) 2010 Markus Friedl. All rights reserved. 3 * Copyright (c) 2010 Markus Friedl. All rights reserved.
4 * 4 *
@@ -368,7 +368,7 @@ pkcs11_open_session(struct pkcs11_provider *p, CK_ULONG slotidx, char *pin)
368 } 368 }
369 if (login_required && pin) { 369 if (login_required && pin) {
370 rv = f->C_Login(session, CKU_USER, 370 rv = f->C_Login(session, CKU_USER,
371 (u_char *)pin, strlen(pin)) 371 (u_char *)pin, strlen(pin));
372 if (rv != CKR_OK && rv != CKR_USER_ALREADY_LOGGED_IN) { 372 if (rv != CKR_OK && rv != CKR_USER_ALREADY_LOGGED_IN) {
373 error("C_Login failed: %lu", rv); 373 error("C_Login failed: %lu", rv);
374 if ((rv = f->C_CloseSession(session)) != CKR_OK) 374 if ((rv = f->C_CloseSession(session)) != CKR_OK)