Attachment 3247 Details for Bug 2974 – proposed patch

[patch] proposed patch

openssh-pkcs11provider.patch (text/plain), 2.67 KB, created by Jakub Jelen on 2019-02-28 21:47:44 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Jelen

Created: 2019-02-28 21:47:44 AEDT

Size: 2.67 KB

patch

obsolete

>From 4aa9036c656a170ed740f47f0f28fad46e4753ad Mon Sep 17 00:00:00 2001
>From: Jakub Jelen <jjelen@redhat.com>
>Date: Thu, 28 Feb 2019 11:42:35 +0100
>Subject: [PATCH 1/3] List also ECDSA keys
>
>Signed-off-by: Jakub Jelen <jjelen@redhat.com>
>---
> ssh_config.5 | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/ssh_config.5 b/ssh_config.5
>index 9df41d87..293e06c9 100644
>--- a/ssh_config.5
>+++ b/ssh_config.5
>@@ -1190,7 +1190,7 @@ Specifies which PKCS#11 provider to use.
> The argument to this keyword is the PKCS#11 shared library
> .Xr ssh 1
> should use to communicate with a PKCS#11 token providing the user's
>-private RSA key.
>+private RSA or ECDSA key.
> .It Cm Port
> Specifies the port number to connect on the remote host.
> The default is 22.
>-- 
>2.20.1
>
>
>From 1d0ca874f64972a19c37e665dc42831abbff0ce8 Mon Sep 17 00:00:00 2001
>From: Jakub Jelen <jjelen@redhat.com>
>Date: Thu, 28 Feb 2019 11:43:43 +0100
>Subject: [PATCH 2/3] Dump the documented option name for PKCS11Provider
>
>Signed-off-by: Jakub Jelen <jjelen@redhat.com>
>---
> readconf.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/readconf.c b/readconf.c
>index fd83133d..599ea640 100644
>--- a/readconf.c
>+++ b/readconf.c
>@@ -209,8 +209,8 @@ static struct {
> 	{ "gssapidelegatecredentials", oUnsupported },
> #endif
> #ifdef ENABLE_PKCS11
>-	{ "smartcarddevice", oPKCS11Provider },
> 	{ "pkcs11provider", oPKCS11Provider },
>+	{ "smartcarddevice", oPKCS11Provider },
> # else
> 	{ "smartcarddevice", oUnsupported },
> 	{ "pkcs11provider", oUnsupported },
>-- 
>2.20.1
>
>
>From 2404e2460b3a2509ca07ceca10abacd63c9da6d1 Mon Sep 17 00:00:00 2001
>From: Jakub Jelen <jjelen@redhat.com>
>Date: Thu, 28 Feb 2019 11:44:28 +0100
>Subject: [PATCH 3/3] Allow setting the PKCS11Provider to none
>
>Signed-off-by: Jakub Jelen <jjelen@redhat.com>
>---
> readconf.c   | 1 +
> ssh_config.5 | 3 +++
> 2 files changed, 4 insertions(+)
>
>diff --git a/readconf.c b/readconf.c
>index 599ea640..ec44d461 100644
>--- a/readconf.c
>+++ b/readconf.c
>@@ -2151,6 +2151,7 @@ fill_default_options(Options * options)
> 			v = NULL; \
> 		} \
> 	} while(0)
>+	CLEAR_ON_NONE(options->pkcs11_provider);
> 	CLEAR_ON_NONE(options->local_command);
> 	CLEAR_ON_NONE(options->remote_command);
> 	CLEAR_ON_NONE(options->proxy_command);
>diff --git a/ssh_config.5 b/ssh_config.5
>index 293e06c9..e9cca9eb 100644
>--- a/ssh_config.5
>+++ b/ssh_config.5
>@@ -1191,6 +1191,9 @@ The argument to this keyword is the PKCS#11 shared library
> .Xr ssh 1
> should use to communicate with a PKCS#11 token providing the user's
> private RSA or ECDSA key.
>+Setting the value to
>+.Cm none
>+(default) disables the PKCS#11 provider.
> .It Cm Port
> Specifies the port number to connect on the remote host.
> The default is 22.
>-- 
>2.20.1
>

Actions: View | Diff

Attachments on bug 2974: 3247