tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
benno@openbsd.org 2019-02-10 16:35:41 +00:00 committed by Damien Miller
parent 3d896c157c
commit a8c807f195
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssh-keygen.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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; fptype = print_bubblebabble ? SSH_DIGEST_SHA1 : fingerprint_hash;
rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_DEFAULT; rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_DEFAULT;
pkcs11_init(0); pkcs11_init(1);
nkeys = pkcs11_add_provider(pkcs11provider, NULL, &keys); nkeys = pkcs11_add_provider(pkcs11provider, NULL, &keys);
if (nkeys <= 0) if (nkeys <= 0)
fatal("cannot read public key from pkcs11"); fatal("cannot read public key from pkcs11");