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

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 992491f153e73579490f568bc95102c8cd833a7c..5d0787728dff3acec15423d4e189080e5c4161da 100644 (file)
--- 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");