summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2007-02-06 15:42:16 +0000
committerSimon Josefsson <simon@josefsson.org>2007-02-06 15:42:16 +0000
commit67bdd22ac367f34ba2bcb1b7bc21d76dcde96d7b (patch)
tree01f75df176ea0e4312a05d1a27f31cc946d5b2ca
parent9d7a62347aa2f581140cf96aff05930dc67b9f0f (diff)
downloadgnutls-67bdd22ac367f34ba2bcb1b7bc21d76dcde96d7b.tar.gz
mention psk
-rw-r--r--doc/gnutls.texi31
1 files changed, 17 insertions, 14 deletions
diff --git a/doc/gnutls.texi b/doc/gnutls.texi
index 7ae87c94e4..da4f79e474 100644
--- a/doc/gnutls.texi
+++ b/doc/gnutls.texi
@@ -2425,18 +2425,6 @@ gnutls-serv --http \
--pgpcertfile openpgp-server.txt
@end example
-Starting a server with support for both X.509 and OpenPGP can be done
-by combining the parameters:
-
-@example
-gnutls-serv --http \
- --x509cafile x509-ca.pem \
- --x509keyfile x509-server-key.pem \
- --x509certfile x509-server.pem \
- --pgpkeyfile openpgp-server-key.txt \
- --pgpcertfile openpgp-server.txt
-@end example
-
The next step is to add support for SRP authentication.
@example
@@ -2455,7 +2443,21 @@ gnutls-serv --http \
--srppasswd srp-passwd.txt
@end example
-Combine this with the earlier parameters and you get this command:
+Let's also add support for PSK.
+
+@example
+$ psktool --passwd psk-passwd.txt
+@end example
+
+Start the server with PSK support:
+
+@example
+gnutls-serv --http \
+ --pskpasswd psk-passwd.txt
+@end example
+
+Finally, we start the server with all the earlier parameters and you
+get this command:
@example
gnutls-serv --http \
@@ -2465,7 +2467,8 @@ gnutls-serv --http \
--pgpkeyfile openpgp-server-key.txt \
--pgpcertfile openpgp-server.txt \
--srppasswdconf srp-tpasswd.conf \
- --srppasswd srp-passwd.txt
+ --srppasswd srp-passwd.txt \
+ --pskpasswd psk-passwd.txt
@end example
@node Invoking certtool