summaryrefslogtreecommitdiff
path: root/ssh-keygen.c
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 /ssh-keygen.c
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
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r--ssh-keygen.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 992491f15..5d0787728 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.326 2019/01/23 04:51:02 djm Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.327 2019/02/10 16:35:41 benno Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -769,7 +769,7 @@ do_download(struct passwd *pw)
769 fptype = print_bubblebabble ? SSH_DIGEST_SHA1 : fingerprint_hash; 769 fptype = print_bubblebabble ? SSH_DIGEST_SHA1 : fingerprint_hash;
770 rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_DEFAULT; 770 rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_DEFAULT;
771 771
772 pkcs11_init(0); 772 pkcs11_init(1);
773 nkeys = pkcs11_add_provider(pkcs11provider, NULL, &keys); 773 nkeys = pkcs11_add_provider(pkcs11provider, NULL, &keys);
774 if (nkeys <= 0) 774 if (nkeys <= 0)
775 fatal("cannot read public key from pkcs11"); 775 fatal("cannot read public key from pkcs11");