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: let PKCS11Provider=none do what users expect 

print PKCS11Provider instead of obsolete SmartcardDevice in config dump.

bz#2974 ok dtucker@

OpenBSD-Commit-ID: c303d6f0230a33aa2dd92dc9b68843d56a64f846
This commit is contained in:
djm@openbsd.org 2019-03-01 02:08:50 +00:00 committed by Damien Miller
parent 8e7bac35aa
commit 95a8058c1a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
readconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.c,v 1.303 2019/02/23 08:20:43 djm Exp $ */ /* $OpenBSD: readconf.c,v 1.304 2019/03/01 02:08:50 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -208,8 +208,8 @@ static struct {
{ "gssapidelegatecredentials", oUnsupported }, { "gssapidelegatecredentials", oUnsupported },
#endif #endif
#ifdef ENABLE_PKCS11 #ifdef ENABLE_PKCS11
{ "smartcarddevice", oPKCS11Provider },
{ "pkcs11provider", oPKCS11Provider }, { "pkcs11provider", oPKCS11Provider },
{ "smartcarddevice", oPKCS11Provider },
# else # else
{ "smartcarddevice", oUnsupported }, { "smartcarddevice", oUnsupported },
{ "pkcs11provider", oUnsupported }, { "pkcs11provider", oUnsupported },
@ -2147,6 +2147,7 @@ fill_default_options(Options * options)
CLEAR_ON_NONE(options->proxy_command); CLEAR_ON_NONE(options->proxy_command);
CLEAR_ON_NONE(options->control_path); CLEAR_ON_NONE(options->control_path);
CLEAR_ON_NONE(options->revoked_host_keys); CLEAR_ON_NONE(options->revoked_host_keys);
CLEAR_ON_NONE(options->pkcs11_provider);
if (options->jump_host != NULL && if (options->jump_host != NULL &&
strcmp(options->jump_host, "none") == 0 && strcmp(options->jump_host, "none") == 0 &&
options->jump_port == 0 && options->jump_user == NULL) { options->jump_port == 0 && options->jump_user == NULL) {