diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-03-17 10:13:05 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-03-17 10:13:28 +0100 |
| commit | 9c903a14e6767d6bea1a220a88574bd49e54fcbf (patch) | |
| tree | 8c558b75733aa8ced4dbc8c7efde2cc9aa2ca34a /lib/gnutls_priority.c | |
| parent | 982e81d30114da4bda95e28f522eb06b20a1481b (diff) | |
| download | gnutls-9c903a14e6767d6bea1a220a88574bd49e54fcbf.tar.gz | |
INITIAL_SAFE_RENEGOTIATION implies SAFE_RENEGOTIATION.
Diffstat (limited to 'lib/gnutls_priority.c')
| -rw-r--r-- | lib/gnutls_priority.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c index 36bdc6370c..d9d480968c 100644 --- a/lib/gnutls_priority.c +++ b/lib/gnutls_priority.c @@ -529,7 +529,8 @@ gnutls_priority_set (gnutls_session_t session, gnutls_priority_t priority) * "%SAFE_RENEGOTIATION" will allow safe renegotiation only. * * "%INITIAL_SAFE_RENEGOTIATION" will force initial safe negotiation even if - * renegotiation wasn't requested. Only valid for server side. + * renegotiation wasn't requested. Only valid for server side and implies + * "%SAFE_RENEGOTIATION". * * "%DISABLE_SAFE_RENEGOTIATION" will disable safe renegotiation completely. Do not use * unless you know what you are doing. Testing purposes only. @@ -732,7 +733,10 @@ gnutls_priority_init (gnutls_priority_t * priority_cache, (*priority_cache)->unsafe_renegotiation = 0; else if (strcasecmp (&broken_list[i][1], "INITIAL_SAFE_RENEGOTIATION") == 0) - (*priority_cache)->initial_safe_renegotiation = 1; + { + (*priority_cache)->unsafe_renegotiation = 0; + (*priority_cache)->initial_safe_renegotiation = 1; + } else if (strcasecmp (&broken_list[i][1], "DISABLE_SAFE_RENEGOTIATION") == 0) (*priority_cache)->disable_safe_renegotiation = 1; |