Merged with Alon's tree @ r660

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@665 e7ae566f-a301-0410-adde-c780ea21d3b5

diff --git a/openvpn.8 b/openvpn.8
index 7655524a1696223c439538d6aed32c0d18f94f41..9242ca1b1cb803a205d696a60f9eeccaf390a76e 100644 (file)
--- a/openvpn.8
+++ b/openvpn.8
@@ -209,6 +209,7 @@ openvpn \- secure IP tunnel daemon.
 [\ \fB\-\-pkcs11\-slot\fR\ \fIname\fR\ ]
 [\ \fB\-\-pkcs11\-id\-type\fR\ \fItype\fR\ ]
 [\ \fB\-\-pkcs11\-id\fR\ \fIname\fR\ ]
+[\ \fB\-\-pkcs11\-pin\-cache\fR\ \fIseconds\fR\ ]
 [\ \fB\-\-pkcs11\-protected\-authentication\fR\ ]
 [\ \fB\-\-pkcs12\fR\ \fIfile\fR\ ]
 [\ \fB\-\-plugin\fR\ \fImodule\-pathname\ init\-string\fR\ ]
@@ -3585,6 +3586,10 @@ Specify how to locate the correct objects. Type can be one of the following:
 Specify a name of the object to search for.
 .\"*********************************************************
 .TP
+.B --pkcs11-pin-cache seconds
+Specify how many seconds the PIN can be cached, the default is until the token is removed.
+.\"*********************************************************
+.TP
 .B --pkcs11-protected-authentication
 Use PKCS#11 protected authentication path, useful for biometric and external
 keypad devices.