Attachment #3247 for bug #2974

View | Details | Raw Unified | Return to bug 2974
Collapse All | Expand All

Lines 1190-1196 Specifies which PKCS#11 provider to use. Link Here

(-)a/ssh_config.5 (-3 / +1 lines)
1190	The argument to this keyword is the PKCS#11 shared library	1190	The argument to this keyword is the PKCS#11 shared library
1191	.Xr ssh 1	1191	.Xr ssh 1
1192	should use to communicate with a PKCS#11 token providing the user's	1192	should use to communicate with a PKCS#11 token providing the user's
1193	private RSA key.	1193	private RSA or ECDSA key.
1194	.It Cm Port	1194	.It Cm Port
1195	Specifies the port number to connect on the remote host.	1195	Specifies the port number to connect on the remote host.
1196	The default is 22.	1196	The default is 22.
1197	-
1198	--
1199	readconf.c \| 2 +-	1197	readconf.c \| 2 +-
1200	1 file changed, 1 insertion(+), 1 deletion(-)	1198	1 file changed, 1 insertion(+), 1 deletion(-)




	{ "gssapidelegatecredentials", oUnsupported },
#endif
#ifdef ENABLE_PKCS11
	{ "smartcarddevice", oPKCS11Provider },
	{ "pkcs11provider", oPKCS11Provider },
	{ "smartcarddevice", oPKCS11Provider },
# else
	{ "smartcarddevice", oUnsupported },
	{ "pkcs11provider", oUnsupported },
- 
--
readconf.c   | 1 +
ssh_config.5 | 3 +++
2 files changed, 4 insertions(+)

Lines 2151-2156 fill_default_options(Options * options) Link Here

(-)a/readconf.c (+1 lines)
2151	v = NULL; \	2151	v = NULL; \
2152	} \	2152	} \
2153	} while(0)	2153	} while(0)
		2154	CLEAR_ON_NONE(options->pkcs11_provider);
2154	CLEAR_ON_NONE(options->local_command);	2155	CLEAR_ON_NONE(options->local_command);
2155	CLEAR_ON_NONE(options->remote_command);	2156	CLEAR_ON_NONE(options->remote_command);
2156	CLEAR_ON_NONE(options->proxy_command);	2157	CLEAR_ON_NONE(options->proxy_command);

Lines 1191-1196 The argument to this keyword is the PKCS#11 shared library Link Here

(-)a/ssh_config.5 (-1 / +3 lines)
1191	.Xr ssh 1	1191	.Xr ssh 1
1192	should use to communicate with a PKCS#11 token providing the user's	1192	should use to communicate with a PKCS#11 token providing the user's
1193	private RSA or ECDSA key.	1193	private RSA or ECDSA key.
		1194	Setting the value to
		1195	.Cm none
		1196	(default) disables the PKCS#11 provider.
1194	.It Cm Port	1197	.It Cm Port
1195	Specifies the port number to connect on the remote host.	1198	Specifies the port number to connect on the remote host.
1196	The default is 22.	1199	The default is 22.
1197	-

Return to bug 2974

Lines 209-216 static struct { Link Here

(-)a/readconf.c (-3 / +1 lines)
209	{ "gssapidelegatecredentials", oUnsupported },	209	{ "gssapidelegatecredentials", oUnsupported },
210	#endif	210	#endif
211	#ifdef ENABLE_PKCS11	211	#ifdef ENABLE_PKCS11
212	{ "smartcarddevice", oPKCS11Provider },
213	{ "pkcs11provider", oPKCS11Provider },	212	{ "pkcs11provider", oPKCS11Provider },
		213	{ "smartcarddevice", oPKCS11Provider },
214	# else	214	# else
215	{ "smartcarddevice", oUnsupported },	215	{ "smartcarddevice", oUnsupported },
216	{ "pkcs11provider", oUnsupported },	216	{ "pkcs11provider", oUnsupported },
217	-
218	--
219	readconf.c \| 1 +	217	readconf.c \| 1 +
220	ssh_config.5 \| 3 +++	218	ssh_config.5 \| 3 +++
221	2 files changed, 4 insertions(+)	219	2 files changed, 4 insertions(+)