diff options
| author | Ander Juaristi <a@juaristi.eus> | 2020-03-02 16:37:10 +0100 |
|---|---|---|
| committer | Ander Juaristi <a@juaristi.eus> | 2020-03-23 17:00:58 +0100 |
| commit | d00638997fa269a975095d852633b48b2b64fbf9 (patch) | |
| tree | 2e59386d821c9e4ab07122f6189d1b8f04658452 /doc | |
| parent | 5aff47e3dad565172f0268e0b685282f816bd1b9 (diff) | |
| download | gnutls-d00638997fa269a975095d852633b48b2b64fbf9.tar.gz | |
psk: Allow non-NULL PSK usernames
This commit closes #586.
Two new functions are introduced: gnutls_psk_server_get_username2()
and gnutls_psk_set_client_username2(), which are identical in behavior
to those named similarly (without the final '2'), but allow arbitrary
gnutls datums (not strings) to be used as usernames.
Two new callback functions are also introduced, with their respective
setters: gnutls_psk_set_server_credentials_function2() and
gnutls_psk_set_client_credentials_function2().
In addition, the password file format is extended so that non-string
usernames can be specified. A leading '#' character tells GnuTLS that the
username should be interpreted as a raw byte string (encoded in HEX).
Example:
#deadbeef:9e32cf7786321a828ef7668f09fb35db
Signed-off-by: Ander Juaristi's avatarAnder Juaristi <a@juaristi.eus>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.am | 8 | ||||
| -rw-r--r-- | doc/manpages/Makefile.am | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index dd962d6a78..9c72b01281 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1727,16 +1727,24 @@ FUNCS += functions/gnutls_psk_free_server_credentials FUNCS += functions/gnutls_psk_free_server_credentials.short FUNCS += functions/gnutls_psk_server_get_username FUNCS += functions/gnutls_psk_server_get_username.short +FUNCS += functions/gnutls_psk_server_get_username2 +FUNCS += functions/gnutls_psk_server_get_username2.short FUNCS += functions/gnutls_psk_set_client_credentials FUNCS += functions/gnutls_psk_set_client_credentials.short +FUNCS += functions/gnutls_psk_set_client_credentials2 +FUNCS += functions/gnutls_psk_set_client_credentials2.short FUNCS += functions/gnutls_psk_set_client_credentials_function FUNCS += functions/gnutls_psk_set_client_credentials_function.short +FUNCS += functions/gnutls_psk_set_client_credentials_function2 +FUNCS += functions/gnutls_psk_set_client_credentials_function2.short FUNCS += functions/gnutls_psk_set_params_function FUNCS += functions/gnutls_psk_set_params_function.short FUNCS += functions/gnutls_psk_set_server_credentials_file FUNCS += functions/gnutls_psk_set_server_credentials_file.short FUNCS += functions/gnutls_psk_set_server_credentials_function FUNCS += functions/gnutls_psk_set_server_credentials_function.short +FUNCS += functions/gnutls_psk_set_server_credentials_function2 +FUNCS += functions/gnutls_psk_set_server_credentials_function2.short FUNCS += functions/gnutls_psk_set_server_credentials_hint FUNCS += functions/gnutls_psk_set_server_credentials_hint.short FUNCS += functions/gnutls_psk_set_server_dh_params diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am index 6d381d8bd0..60c937da83 100644 --- a/doc/manpages/Makefile.am +++ b/doc/manpages/Makefile.am @@ -665,11 +665,15 @@ APIMANS += gnutls_psk_client_get_hint.3 APIMANS += gnutls_psk_free_client_credentials.3 APIMANS += gnutls_psk_free_server_credentials.3 APIMANS += gnutls_psk_server_get_username.3 +APIMANS += gnutls_psk_server_get_username2.3 APIMANS += gnutls_psk_set_client_credentials.3 +APIMANS += gnutls_psk_set_client_credentials2.3 APIMANS += gnutls_psk_set_client_credentials_function.3 +APIMANS += gnutls_psk_set_client_credentials_function2.3 APIMANS += gnutls_psk_set_params_function.3 APIMANS += gnutls_psk_set_server_credentials_file.3 APIMANS += gnutls_psk_set_server_credentials_function.3 +APIMANS += gnutls_psk_set_server_credentials_function2.3 APIMANS += gnutls_psk_set_server_credentials_hint.3 APIMANS += gnutls_psk_set_server_dh_params.3 APIMANS += gnutls_psk_set_server_known_dh_params.3 |