diff options
author | Daiki Ueno <ueno@gnu.org> | 2023-03-28 11:23:40 +0000 |
---|---|---|
committer | Daiki Ueno <ueno@gnu.org> | 2023-03-28 11:23:40 +0000 |
commit | bd638cd6bc72c35b8ce1dddb0dd950071cbe36f6 (patch) | |
tree | 3f2f78bb0f57b1bd9161ebda0492ac8df8796cee /lib/state.c | |
parent | 195be04e144b95d084eef3c4aa72b65c01fcb7c8 (diff) | |
parent | a398ecfc297cdcdd8255106d234eb2d99bbc7525 (diff) | |
download | gnutls-bd638cd6bc72c35b8ce1dddb0dd950071cbe36f6.tar.gz |
Merge branch 'dev' into 'master'
Modifier GNUTLS_NO_EXTENSIONS renamed to GNUTLS_NO_DEFAULT_EXTENSIONS
See merge request gnutls/gnutls!1734
Diffstat (limited to 'lib/state.c')
-rw-r--r-- | lib/state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/state.c b/lib/state.c index 631299846b..5d732b0f17 100644 --- a/lib/state.c +++ b/lib/state.c @@ -556,7 +556,7 @@ void _gnutls_handshake_internal_state_clear(gnutls_session_t session) * * Note that since version 3.1.2 this function enables some common * TLS extensions such as session tickets and OCSP certificate status - * request in client side by default. To prevent that use the %GNUTLS_NO_EXTENSIONS + * request in client side by default. To prevent that use the %GNUTLS_NO_DEFAULT_EXTENSIONS * flag. * * Note that it is never mandatory to use gnutls_deinit() after this @@ -718,7 +718,7 @@ int gnutls_init(gnutls_session_t * session, unsigned int flags) } /* Enable useful extensions */ - if ((flags & GNUTLS_CLIENT) && !(flags & GNUTLS_NO_EXTENSIONS)) { + if ((flags & GNUTLS_CLIENT) && !(flags & GNUTLS_NO_DEFAULT_EXTENSIONS)) { #ifdef ENABLE_OCSP if (!(flags & GNUTLS_NO_STATUS_REQUEST)) gnutls_ocsp_status_request_enable_client(*session, NULL, |