diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-07-14 11:44:01 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-07-14 13:27:45 +0200 |
commit | 2c47a23dec110fb77e1cda36d6bdb83fc4d5e252 (patch) | |
tree | 37e41d6e5c477105788c74ef7243ec83e92c70d4 /doc | |
parent | 2ed04522e24b801251d7fd1768b7fccfd7b8deac (diff) | |
download | libmicrohttpd-2c47a23dec110fb77e1cda36d6bdb83fc4d5e252.tar.gz libmicrohttpd-2c47a23dec110fb77e1cda36d6bdb83fc4d5e252.zip |
integrate TLS PSK patch from Tal Moaz (plus documentation, plus style and bugfixes
Diffstat (limited to 'doc')
-rw-r--r-- | doc/libmicrohttpd.texi | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/libmicrohttpd.texi b/doc/libmicrohttpd.texi index e4437441..d2886a25 100644 --- a/doc/libmicrohttpd.texi +++ b/doc/libmicrohttpd.texi | |||
@@ -869,6 +869,16 @@ information provided. The callback is expected to access the SNI data | |||
869 | using gnutls_server_name_get(). Using this option requires GnuTLS 3.0 | 869 | using gnutls_server_name_get(). Using this option requires GnuTLS 3.0 |
870 | or higher. | 870 | or higher. |
871 | 871 | ||
872 | @item MHD_OPTION_GNUTLS_PSK_CRED_HANDLER | ||
873 | @cindex SSL | ||
874 | @cindex TLS | ||
875 | @cindex PSK | ||
876 | Use pre-shared key for TLS credentials. | ||
877 | Pass a pointer to callback of type | ||
878 | @code{MHD_PskServerCredentialsCallback} and a closure. | ||
879 | The function will be called to | ||
880 | retrieve the shared key for a given username. | ||
881 | |||
872 | @item MHD_OPTION_DIGEST_AUTH_RANDOM | 882 | @item MHD_OPTION_DIGEST_AUTH_RANDOM |
873 | @cindex digest auth | 883 | @cindex digest auth |
874 | @cindex random | 884 | @cindex random |