Documented that the --file options in gnutls-cli and gnutls-serv can accept a PKCS...

diff --git a/doc/manpages/gnutls-cli.1 b/doc/manpages/gnutls-cli.1
index 9d1208e5678038ea07452998155216a71dbb79f7..3f5dfc8559f7a18e1da2b71ea190a55f195252a6 100644 (file)
--- a/doc/manpages/gnutls-cli.1
+++ b/doc/manpages/gnutls-cli.1
@@ -151,13 +151,14 @@ SRP password to use.
 .IP "\-\-srpusername \fINAME\fR"
 SRP username to use.
 .IP "\-\-x509cafile \fIFILE\fR"
-Certificate file to use.
+Certificate file to use. This option accepts PKCS \#11 URLs such as
+pkcs11:token=Root%20CA%20Certificates;serial=1%3AROOTS%3ADEFAULT;model=1%2E0;manufacturer=Gnome%20Keyring
 .IP "\-\-x509certfile \fIFILE\fR"
-X.509 Certificate file to use.
+X.509 Certificate file to use, or a PKCS \#11 URL.
 .IP "\-\-x509fmtder"
 Use DER format for certificates
 .IP "\-\-x509keyfile \fIFILE\fR"
-X.509 key file to use.
+X.509 key file or PKCS \#11 URL to use.
 .IP "\-\-x509crlfile \fIFILE\fR"
 X.509 CRL file to use.
 .IP "\-\-pskusername \fINAME\fR"

diff --git a/src/cli-gaa.c b/src/cli-gaa.c
index 40c8447a5c7f48a6a8bf73c3e008c736de7313f6..1d633ca77964f3a9507dd878ff0ba4afda3ef97c 100644 (file)
--- a/src/cli-gaa.c
+++ b/src/cli-gaa.c
@@ -146,14 +146,14 @@ void gaa_help(void)
        __gaa_helpsingle(0, "kx", "kx1 kx2... ", "Key exchange methods to enable.");
        __gaa_helpsingle(0, "ctypes", "certType1 certType2... ", "Certificate types to enable.");
        __gaa_helpsingle(0, "priority", "PRIORITY STRING ", "Priorities string.");
-       __gaa_helpsingle(0, "x509cafile", "FILE ", "Certificate file to use.");
+       __gaa_helpsingle(0, "x509cafile", "FILE ", "Certificate file or PKCS #11 URL to use.");
        __gaa_helpsingle(0, "x509crlfile", "FILE ", "CRL file to use.");
        __gaa_helpsingle(0, "pgpkeyfile", "FILE ", "PGP Key file to use.");
        __gaa_helpsingle(0, "pgpkeyring", "FILE ", "PGP Key ring file to use.");
        __gaa_helpsingle(0, "pgpcertfile", "FILE ", "PGP Public Key (certificate) file to use.");
        __gaa_helpsingle(0, "pgpsubkey", "HEX|auto ", "PGP subkey to use.");
-       __gaa_helpsingle(0, "x509keyfile", "FILE ", "X.509 key file to use.");
-       __gaa_helpsingle(0, "x509certfile", "FILE ", "X.509 Certificate file to use.");
+       __gaa_helpsingle(0, "x509keyfile", "FILE ", "X.509 key file or PKCS #11 URL to use.");
+       __gaa_helpsingle(0, "x509certfile", "FILE ", "X.509 Certificate file or PKCS #11 URL to use.");
        __gaa_helpsingle(0, "srpusername", "NAME ", "SRP username to use.");
        __gaa_helpsingle(0, "srppasswd", "PASSWD ", "SRP password to use.");
        __gaa_helpsingle(0, "pskusername", "NAME ", "PSK username to use.");

diff --git a/src/cli.gaa b/src/cli.gaa
index 79866f4fa39f74c908596e179a3e7c0cd040b0fb..7cd00844ce79837bfb1f373aee4219e8b55e3de2 100644 (file)
--- a/src/cli.gaa
+++ b/src/cli.gaa
@@ -75,7 +75,7 @@ option (ctypes) *STR "certType1 certType2..." { $ctype = $1; $nctype = @1 } "Cer
 option (priority) STR "PRIORITY STRING" { $priorities = $1 } "Priorities string."
 
 #char *x509_cafile;
-option (x509cafile) STR "FILE" { $x509_cafile = $1 } "Certificate file to use."
+option (x509cafile) STR "FILE" { $x509_cafile = $1 } "Certificate file or PKCS #11 URL to use."
 
 #char *x509_crlfile;
 option (x509crlfile) STR "FILE" { $x509_crlfile = $1 } "CRL file to use."
@@ -93,10 +93,10 @@ option (pgpcertfile) STR "FILE" { $pgp_certfile = $1 } "PGP Public Key (certific
 option (pgpsubkey) STR "HEX|auto" { $pgp_subkey = $1 } "PGP subkey to use."
 
 #char *x509_keyfile;
-option (x509keyfile) STR "FILE" { $x509_keyfile = $1 } "X.509 key file to use."
+option (x509keyfile) STR "FILE" { $x509_keyfile = $1 } "X.509 key file or PKCS #11 URL to use."
 
 #char *x509_certfile;
-option (x509certfile) STR "FILE" { $x509_certfile = $1 } "X.509 Certificate file to use."
+option (x509certfile) STR "FILE" { $x509_certfile = $1 } "X.509 Certificate file or PKCS #11 URL to use."
 
 #char *srp_username;
 option (srpusername) STR "NAME" { $srp_username = $1 } "SRP username to use."

diff --git a/src/serv-gaa.c b/src/serv-gaa.c
index ab7472b3feefc3249c211f7b8f53d544af7f2617..7e502aa6a8b03de35a381227e1290ccc8c38c6bf 100644 (file)
--- a/src/serv-gaa.c
+++ b/src/serv-gaa.c
@@ -135,14 +135,14 @@ void gaa_help(void)
        __gaa_helpsingle(0, "echo", "", "Act as an Echo Server.");
        __gaa_helpsingle(0, "dhparams", "FILE ", "DH params file to use.");
        __gaa_helpsingle(0, "x509fmtder", "", "Use DER format for certificates");
-       __gaa_helpsingle(0, "x509cafile", "FILE ", "Certificate file to use.");
+       __gaa_helpsingle(0, "x509cafile", "FILE ", "Certificate file or PKCS #11 URL to use.");
        __gaa_helpsingle(0, "x509crlfile", "FILE ", "CRL file to use.");
        __gaa_helpsingle(0, "pgpkeyring", "FILE ", "PGP Key ring file to use.");
        __gaa_helpsingle(0, "pgpkeyfile", "FILE ", "PGP Key file to use.");
        __gaa_helpsingle(0, "pgpcertfile", "FILE ", "PGP Public Key (certificate) file to use.");
        __gaa_helpsingle(0, "pgpsubkey", "HEX|auto ", "PGP subkey to use.");
-       __gaa_helpsingle(0, "x509keyfile", "FILE ", "X.509 key file to use.");
-       __gaa_helpsingle(0, "x509certfile", "FILE ", "X.509 Certificate file to use.");
+       __gaa_helpsingle(0, "x509keyfile", "FILE ", "X.509 key file or PKCS #11 URL to use.");
+       __gaa_helpsingle(0, "x509certfile", "FILE ", "X.509 Certificate file or PKCS #11 URL to use.");
        __gaa_helpsingle(0, "x509dsakeyfile", "FILE ", "Alternative X.509 key file to use.");
        __gaa_helpsingle(0, "x509dsacertfile", "FILE ", "Alternative X.509 certificate file to use.");
        __gaa_helpsingle('r', "require-cert", "", "Require a valid certificate.");

diff --git a/src/serv.gaa b/src/serv.gaa
index f4607f0e5e5c13add8e1fa207e12a81782e48792..37130ccb7b560addfdb3f4daf442466481d14526 100644 (file)
--- a/src/serv.gaa
+++ b/src/serv.gaa
@@ -38,7 +38,7 @@ option (dhparams) STR "FILE" { $dh_params_file = $1 } "DH params file to use."
 option (x509fmtder) { $fmtder = 1 } "Use DER format for certificates"
 
 #char *x509_cafile;
-option (x509cafile) STR "FILE" { $x509_cafile = $1 } "Certificate file to use."
+option (x509cafile) STR "FILE" { $x509_cafile = $1 } "Certificate file or PKCS #11 URL to use."
 
 #char *x509_crlfile;
 option (x509crlfile) STR "FILE" { $x509_crlfile = $1 } "CRL file to use."
@@ -56,10 +56,10 @@ option (pgpcertfile) STR "FILE" { $pgp_certfile = $1 } "PGP Public Key (certific
 option (pgpsubkey) STR "HEX|auto" { $pgp_subkey = $1 } "PGP subkey to use."
 
 #char *x509_keyfile;
-option (x509keyfile) STR "FILE" { $x509_keyfile = $1 } "X.509 key file to use."
+option (x509keyfile) STR "FILE" { $x509_keyfile = $1 } "X.509 key file or PKCS #11 URL to use."
 
 #char *x509_certfile;
-option (x509certfile) STR "FILE" { $x509_certfile = $1 } "X.509 Certificate file to use."
+option (x509certfile) STR "FILE" { $x509_certfile = $1 } "X.509 Certificate file or PKCS #11 URL to use."
 
 #char *x509_dsakeyfile;
 option (x509dsakeyfile) STR "FILE" { $x509_dsakeyfile = $1 } "Alternative X.509 key file to use."