diff options
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | Makefile.in | 8 | ||||
-rw-r--r-- | ssh-pkcs11-helper.8 | 43 |
3 files changed, 49 insertions, 3 deletions
@@ -25,6 +25,7 @@ | |||
25 | - markus@cvs.openbsd.org 2010/02/08 10:52:47 | 25 | - markus@cvs.openbsd.org 2010/02/08 10:52:47 |
26 | [regress/agent-pkcs11.sh] | 26 | [regress/agent-pkcs11.sh] |
27 | test for PKCS#11 support (currently disabled) | 27 | test for PKCS#11 support (currently disabled) |
28 | - (djm) [Makefile.in ssh-pkcs11-helper.8] Add manpage for PKCS#11 helper | ||
28 | 29 | ||
29 | 20100212 | 30 | 20100212 |
30 | - (djm) OpenBSD CVS Sync | 31 | - (djm) OpenBSD CVS Sync |
diff --git a/Makefile.in b/Makefile.in index 1e4f64a64..69e3567da 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.305 2010/02/11 22:34:22 djm Exp $ | 1 | # $Id: Makefile.in,v 1.306 2010/02/24 07:18:51 djm Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -93,8 +93,8 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ | |||
93 | audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o \ | 93 | audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o \ |
94 | roaming_common.o roaming_serv.o | 94 | roaming_common.o roaming_serv.o |
95 | 95 | ||
96 | MANPAGES = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out sshd_config.5.out ssh_config.5.out | 96 | MANPAGES = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out |
97 | MANPAGES_IN = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 sshd_config.5 ssh_config.5 | 97 | MANPAGES_IN = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5 |
98 | MANTYPE = @MANTYPE@ | 98 | MANTYPE = @MANTYPE@ |
99 | 99 | ||
100 | CONFIGFILES=sshd_config.out ssh_config.out moduli.out | 100 | CONFIGFILES=sshd_config.out ssh_config.out moduli.out |
@@ -285,6 +285,7 @@ install-files: | |||
285 | $(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1 | 285 | $(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1 |
286 | $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 | 286 | $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 |
287 | $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 | 287 | $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 |
288 | $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 | ||
288 | -rm -f $(DESTDIR)$(bindir)/slogin | 289 | -rm -f $(DESTDIR)$(bindir)/slogin |
289 | ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin | 290 | ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin |
290 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 291 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
@@ -383,6 +384,7 @@ uninstall: | |||
383 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8 | 384 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8 |
384 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 | 385 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 |
385 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 | 386 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 |
387 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 | ||
386 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 388 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
387 | 389 | ||
388 | tests interop-tests: $(TARGETS) | 390 | tests interop-tests: $(TARGETS) |
diff --git a/ssh-pkcs11-helper.8 b/ssh-pkcs11-helper.8 new file mode 100644 index 000000000..9bdaadc01 --- /dev/null +++ b/ssh-pkcs11-helper.8 | |||
@@ -0,0 +1,43 @@ | |||
1 | .\" $OpenBSD: ssh-pkcs11-helper.8,v 1.3 2010/02/10 23:20:38 markus Exp $ | ||
2 | .\" | ||
3 | .\" Copyright (c) 2010 Markus Friedl. All rights reserved. | ||
4 | .\" | ||
5 | .\" Permission to use, copy, modify, and distribute this software for any | ||
6 | .\" purpose with or without fee is hereby granted, provided that the above | ||
7 | .\" copyright notice and this permission notice appear in all copies. | ||
8 | .\" | ||
9 | .\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
10 | .\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
11 | .\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
12 | .\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
13 | .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
14 | .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
15 | .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
16 | .\" | ||
17 | .Dd $Mdocdate: February 10 2010 $ | ||
18 | .Dt SSH-PKCS11-HELPER 8 | ||
19 | .Os | ||
20 | .Sh NAME | ||
21 | .Nm ssh-pkcs11-helper | ||
22 | .Nd ssh-agent helper program for PKCS#11 support | ||
23 | .Sh SYNOPSIS | ||
24 | .Nm | ||
25 | .Sh DESCRIPTION | ||
26 | .Nm | ||
27 | is used by | ||
28 | .Xr ssh-agent 1 | ||
29 | to access keys provided by a PKCS#11 token. | ||
30 | .Pp | ||
31 | .Nm | ||
32 | is not intended to be invoked by the user, but from | ||
33 | .Xr ssh-agent 1 . | ||
34 | .Sh SEE ALSO | ||
35 | .Xr ssh 1 , | ||
36 | .Xr ssh-add 1 , | ||
37 | .Xr ssh-agent 1 | ||
38 | .Sh HISTORY | ||
39 | .Nm | ||
40 | first appeared in | ||
41 | .Ox 4.7 . | ||
42 | .Sh AUTHORS | ||
43 | .An Markus Friedl Aq markus@openbsd.org | ||