diff options
| author | Daiki Ueno <dueno@redhat.com> | 2018-08-21 15:02:56 +0200 |
|---|---|---|
| committer | Daiki Ueno <dueno@redhat.com> | 2018-08-23 11:07:48 +0200 |
| commit | a5ebd994d79acf270962a5e7da31a49a4e69b421 (patch) | |
| tree | 1b5cab918062f8ebdeb3ba640c03c90fe2f368df | |
| parent | df85e8259ceaf60cd016c5867cc2ab61d65d3747 (diff) | |
| download | gnutls-tmp-psk-ext-refactor.tar.gz | |
ext/pre_shared_key: use consistent name for regitration entrytmp-psk-ext-refactor
Signed-off-by: Daiki Ueno <dueno@redhat.com>
| -rw-r--r-- | lib/ext/pre_shared_key.c | 2 | ||||
| -rw-r--r-- | lib/ext/pre_shared_key.h | 2 | ||||
| -rw-r--r-- | lib/ext/psk_ke_modes.c | 2 | ||||
| -rw-r--r-- | lib/ext/psk_ke_modes.h | 2 | ||||
| -rw-r--r-- | lib/hello_ext.c | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/lib/ext/pre_shared_key.c b/lib/ext/pre_shared_key.c index b669e159fa..c6bb20c688 100644 --- a/lib/ext/pre_shared_key.c +++ b/lib/ext/pre_shared_key.c @@ -768,7 +768,7 @@ static int _gnutls_psk_recv_params(gnutls_session_t session, } } -const hello_ext_entry_st ext_pre_shared_key = { +const hello_ext_entry_st ext_mod_pre_shared_key = { .name = "Pre Shared Key", .tls_id = PRE_SHARED_KEY_TLS_ID, .gid = GNUTLS_EXTENSION_PRE_SHARED_KEY, diff --git a/lib/ext/pre_shared_key.h b/lib/ext/pre_shared_key.h index 1168750656..4ad7b240f3 100644 --- a/lib/ext/pre_shared_key.h +++ b/lib/ext/pre_shared_key.h @@ -7,7 +7,7 @@ #define PRE_SHARED_KEY_TLS_ID 41 -extern const hello_ext_entry_st ext_pre_shared_key; +extern const hello_ext_entry_st ext_mod_pre_shared_key; inline static unsigned _gnutls_have_psk_credentials(const gnutls_psk_client_credentials_t cred, gnutls_session_t session) diff --git a/lib/ext/psk_ke_modes.c b/lib/ext/psk_ke_modes.c index dacfba7ef6..a2fa7377e7 100644 --- a/lib/ext/psk_ke_modes.c +++ b/lib/ext/psk_ke_modes.c @@ -194,7 +194,7 @@ psk_ke_modes_recv_params(gnutls_session_t session, } } -const hello_ext_entry_st ext_psk_ke_modes = { +const hello_ext_entry_st ext_mod_psk_ke_modes = { .name = "PSK Key Exchange Modes", .tls_id = 45, .gid = GNUTLS_EXTENSION_PSK_KE_MODES, diff --git a/lib/ext/psk_ke_modes.h b/lib/ext/psk_ke_modes.h index bd06139ff5..82c2c10bba 100644 --- a/lib/ext/psk_ke_modes.h +++ b/lib/ext/psk_ke_modes.h @@ -3,6 +3,6 @@ #include <hello_ext.h> -extern const hello_ext_entry_st ext_psk_ke_modes; +extern const hello_ext_entry_st ext_mod_psk_ke_modes; #endif diff --git a/lib/hello_ext.c b/lib/hello_ext.c index 28e8e8c08e..c4907aaced 100644 --- a/lib/hello_ext.c +++ b/lib/hello_ext.c @@ -95,8 +95,8 @@ static hello_ext_entry_st const *extfunc[MAX_EXT_TYPES+1] = { #ifdef ENABLE_ALPN [GNUTLS_EXTENSION_ALPN] = &ext_mod_alpn, #endif - [GNUTLS_EXTENSION_PSK_KE_MODES] = &ext_psk_ke_modes, - [GNUTLS_EXTENSION_PRE_SHARED_KEY] = &ext_pre_shared_key, + [GNUTLS_EXTENSION_PSK_KE_MODES] = &ext_mod_psk_ke_modes, + [GNUTLS_EXTENSION_PRE_SHARED_KEY] = &ext_mod_pre_shared_key, [GNUTLS_EXTENSION_RECORD_SIZE_LIMIT] = &ext_mod_record_size_limit, /* This must be the last extension registered. */ |