diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2009-11-06 20:18:53 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2009-11-06 20:27:19 +0200 |
| commit | 2a63b8301b4a4e1f7424036f5fcbb480dd910b0b (patch) | |
| tree | 83a25480cf10a8a87cf4efd4a83aa69ee28de867 | |
| parent | 674bf68ba6229598048f6a3a5e9eb48a4d058b7f (diff) | |
| download | gnutls-2a63b8301b4a4e1f7424036f5fcbb480dd910b0b.tar.gz | |
More dead code removed. Based on suggestions by Steve Grubb and Tomaz Mraz
| -rw-r--r-- | lib/gnutls_algorithms.c | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/lib/gnutls_algorithms.c b/lib/gnutls_algorithms.c index bb1a5f193b..f5d78078ad 100644 --- a/lib/gnutls_algorithms.c +++ b/lib/gnutls_algorithms.c @@ -1057,12 +1057,6 @@ _gnutls_version_priority (gnutls_session_t session, gnutls_protocol_t version) { /* actually returns the priority */ unsigned int i; - if (session->internals.priorities.protocol.priority == NULL) - { - gnutls_assert (); - return -1; - } - for (i = 0; i < session->internals.priorities.protocol.algorithms; i++) { if (session->internals.priorities.protocol.priority[i] == version) @@ -1076,16 +1070,11 @@ _gnutls_version_lowest (gnutls_session_t session) { /* returns the lowest version supported */ unsigned int i, min = 0xff; - if (session->internals.priorities.protocol.priority == NULL) + for (i = 0; i < session->internals.priorities.protocol.algorithms; i++) { - return GNUTLS_VERSION_UNKNOWN; + if (session->internals.priorities.protocol.priority[i] < min) + min = session->internals.priorities.protocol.priority[i]; } - else - for (i = 0; i < session->internals.priorities.protocol.algorithms; i++) - { - if (session->internals.priorities.protocol.priority[i] < min) - min = session->internals.priorities.protocol.priority[i]; - } if (min == 0xff) return GNUTLS_VERSION_UNKNOWN; /* unknown version */ @@ -1098,16 +1087,11 @@ _gnutls_version_max (gnutls_session_t session) { /* returns the maximum version supported */ unsigned int i, max = 0x00; - if (session->internals.priorities.protocol.priority == NULL) + for (i = 0; i < session->internals.priorities.protocol.algorithms; i++) { - return GNUTLS_VERSION_UNKNOWN; + if (session->internals.priorities.protocol.priority[i] > max) + max = session->internals.priorities.protocol.priority[i]; } - else - for (i = 0; i < session->internals.priorities.protocol.algorithms; i++) - { - if (session->internals.priorities.protocol.priority[i] > max) - max = session->internals.priorities.protocol.priority[i]; - } if (max == 0x00) return GNUTLS_VERSION_UNKNOWN; /* unknown version */ |