diff options
author | Simon Josefsson <simon@josefsson.org> | 2010-06-07 15:38:38 +0200 |
---|---|---|
committer | Simon Josefsson <simon@josefsson.org> | 2010-06-07 15:38:38 +0200 |
commit | 8a39da8c8eba5432ebeca0d3d518c99744978f5c (patch) | |
tree | 470976297d56096d295b4441962f0fa2855d0be1 | |
parent | 62e03fb4b0f30790bfb17fe428c306ac910a61bf (diff) | |
download | gnutls-8a39da8c8eba5432ebeca0d3d518c99744978f5c.tar.gz |
Expand sr acronym for easy grepping.
-rw-r--r-- | lib/ext_safe_renegotiation.c | 4 | ||||
-rw-r--r-- | lib/gnutls_handshake.c | 8 | ||||
-rw-r--r-- | lib/gnutls_int.h | 2 | ||||
-rw-r--r-- | lib/gnutls_priority.c | 10 | ||||
-rw-r--r-- | lib/gnutls_state.c | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/lib/ext_safe_renegotiation.c b/lib/ext_safe_renegotiation.c index 14392b34ab..ea0fd25111 100644 --- a/lib/ext_safe_renegotiation.c +++ b/lib/ext_safe_renegotiation.c @@ -37,7 +37,7 @@ _gnutls_safe_renegotiation_recv_params (gnutls_session_t session, DECR_LEN (data_size, len + 1 /* count the first byte and payload */ ); - if (session->internals.priorities.sr == SR_DISABLED) + if (session->internals.priorities.safe_renegotiation == SR_DISABLED) { gnutls_assert (); return 0; @@ -85,7 +85,7 @@ _gnutls_safe_renegotiation_send_params (gnutls_session_t session, ssize_t data_size = _data_size; tls_ext_st *ext = &session->security_parameters.extensions; - if (session->internals.priorities.sr == SR_DISABLED) + if (session->internals.priorities.safe_renegotiation == SR_DISABLED) { gnutls_assert (); return 0; diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c index 9c25772b6f..41a6e27fec 100644 --- a/lib/gnutls_handshake.c +++ b/lib/gnutls_handshake.c @@ -864,7 +864,7 @@ _gnutls_server_select_suite (gnutls_session_t session, opaque * data, /* First, check for safe renegotiation SCSV. */ - if (session->internals.priorities.sr != SR_DISABLED) + if (session->internals.priorities.safe_renegotiation != SR_DISABLED) { int offset; @@ -2337,7 +2337,7 @@ _gnutls_recv_hello (gnutls_session_t session, opaque * data, int datalen) } } - if (session->internals.priorities.sr == SR_DISABLED) + if (session->internals.priorities.safe_renegotiation == SR_DISABLED) { gnutls_assert (); return ret; @@ -2401,7 +2401,7 @@ _gnutls_recv_hello (gnutls_session_t session, opaque * data, int datalen) if (session->internals.initial_negotiation_completed) { - if (session->internals.priorities.sr < SR_PARTIAL) + if (session->internals.priorities.safe_renegotiation < SR_PARTIAL) { _gnutls_handshake_log ("HSK[%p]: Allowing unsafe (re)negotiation\n", session); @@ -2416,7 +2416,7 @@ _gnutls_recv_hello (gnutls_session_t session, opaque * data, int datalen) } else { - if (session->internals.priorities.sr < SR_SAFE) + if (session->internals.priorities.safe_renegotiation < SR_SAFE) { _gnutls_handshake_log ("HSK[%p]: Allowing unsafe initial negotiation\n", session); diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h index 1740e51834..273bb07799 100644 --- a/lib/gnutls_int.h +++ b/lib/gnutls_int.h @@ -472,7 +472,7 @@ struct gnutls_priority_st /* to disable record padding */ int no_padding:1; - safe_renegotiation_t sr; + safe_renegotiation_t safe_renegotiation; int ssl3_record_version; int additional_verify_flags; }; diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c index 3d721db809..8004fe3d2e 100644 --- a/lib/gnutls_priority.c +++ b/lib/gnutls_priority.c @@ -582,7 +582,7 @@ gnutls_priority_init (gnutls_priority_t * priority_cache, /* for now unsafe renegotiation is default on everyone. To be removed * when we make it the default. */ - (*priority_cache)->sr = SR_PARTIAL; + (*priority_cache)->safe_renegotiation = SR_PARTIAL; if (priorities == NULL) priorities = "NORMAL"; @@ -734,21 +734,21 @@ gnutls_priority_init (gnutls_priority_t * priority_cache, else if (strcasecmp (&broken_list[i][1], "UNSAFE_RENEGOTIATION") == 0) { - (*priority_cache)->sr = SR_UNSAFE; + (*priority_cache)->safe_renegotiation = SR_UNSAFE; } else if (strcasecmp (&broken_list[i][1], "SAFE_RENEGOTIATION") == 0) { - (*priority_cache)->sr = SR_SAFE; + (*priority_cache)->safe_renegotiation = SR_SAFE; } else if (strcasecmp (&broken_list[i][1], "PARTIAL_RENEGOTIATION") == 0) { - (*priority_cache)->sr = SR_PARTIAL; + (*priority_cache)->safe_renegotiation = SR_PARTIAL; } else if (strcasecmp (&broken_list[i][1], "DISABLE_SAFE_RENEGOTIATION") == 0) { - (*priority_cache)->sr = SR_DISABLED; + (*priority_cache)->safe_renegotiation = SR_DISABLED; } else goto error; diff --git a/lib/gnutls_state.c b/lib/gnutls_state.c index 0420edf2e9..8aba0aef50 100644 --- a/lib/gnutls_state.c +++ b/lib/gnutls_state.c @@ -353,7 +353,7 @@ gnutls_init (gnutls_session_t * session, gnutls_connection_end_t con_end) /* emulate old gnutls behavior for old applications that do not use the priority_* * functions. */ - (*session)->internals.priorities.sr = SR_PARTIAL; + (*session)->internals.priorities.safe_renegotiation = SR_PARTIAL; return 0; } |