summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbenno@openbsd.org <benno@openbsd.org>2019-02-10 16:35:41 +0000
committerDamien Miller <djm@mindrot.org>2019-02-11 20:26:16 +1100
commita8c807f1956f81a92a758d3d0237d0ff06d0be5d (patch)
treea85b099e8a1d01905cd3733bfc81daa4563c9be5
parent3d896c157c722bc47adca51a58dca859225b5874 (diff)
upstream: ssh-keygen -D pkcs11.so needs to initialize pkcs11
interactive, so it can ask for the smartcards PIN. ok markus@ OpenBSD-Commit-ID: 1be7ccf88f1876e0fc4d7c9b3f96019ac5655bab
-rw-r--r--ssh-keygen.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 992491f1..5d078772 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.326 2019/01/23 04:51:02 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.327 2019/02/10 16:35:41 benno Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -769,7 +769,7 @@ do_download(struct passwd *pw)
fptype = print_bubblebabble ? SSH_DIGEST_SHA1 : fingerprint_hash;
rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_DEFAULT;
- pkcs11_init(0);
+ pkcs11_init(1);
nkeys = pkcs11_add_provider(pkcs11provider, NULL, &keys);
if (nkeys <= 0)
fatal("cannot read public key from pkcs11");