aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2008-08-24 22:20:59 +0000
committerChristian Grothoff <christian@grothoff.org>2008-08-24 22:20:59 +0000
commitd4593e49fb8bbdc4a520855e49d1baafd0d7bdc3 (patch)
tree1a617e223508289edd8a721f916d9ae40dea4e60
parent3306451000364b14a1066a1269f4d213c3083ae9 (diff)
downloadlibmicrohttpd-d4593e49fb8bbdc4a520855e49d1baafd0d7bdc3.tar.gz
libmicrohttpd-d4593e49fb8bbdc4a520855e49d1baafd0d7bdc3.zip
cleanup
-rw-r--r--src/daemon/https/tls/gnutls_priority.c4
-rw-r--r--src/daemon/https/x509/x509.c5
2 files changed, 1 insertions, 8 deletions
diff --git a/src/daemon/https/tls/gnutls_priority.c b/src/daemon/https/tls/gnutls_priority.c
index f871a1cf..709f5515 100644
--- a/src/daemon/https/tls/gnutls_priority.c
+++ b/src/daemon/https/tls/gnutls_priority.c
@@ -171,12 +171,10 @@ MHD_gnutls_protocol_set_priority (mhd_gtls_session_t session, const int *list)
171 int ret; 171 int ret;
172 172
173 ret = _set_priority (&session->internals.priorities.protocol, list); 173 ret = _set_priority (&session->internals.priorities.protocol, list);
174
175 /* set the current version to the first in the chain. 174 /* set the current version to the first in the chain.
176 * This will be overridden later. 175 * This will be overridden later.
177 */ 176 */
178 if (list) 177 mhd_gtls_set_current_version (session, list[0]);
179 mhd_gtls_set_current_version (session, list[0]);
180 178
181 return ret; 179 return ret;
182} 180}
diff --git a/src/daemon/https/x509/x509.c b/src/daemon/https/x509/x509.c
index 76ad46ac..9db24be9 100644
--- a/src/daemon/https/x509/x509.c
+++ b/src/daemon/https/x509/x509.c
@@ -1917,11 +1917,6 @@ gnutls_x509_dn_get_rdn_ava (gnutls_x509_dn_t dn,
1917 remlen -= lenlen; 1917 remlen -= lenlen;
1918 1918
1919 ava->value.size = asn1_get_length_der (ptr, remlen, &lenlen); 1919 ava->value.size = asn1_get_length_der (ptr, remlen, &lenlen);
1920 if (ava->value.size < 0)
1921 {
1922 gnutls_assert ();
1923 return GNUTLS_E_ASN1_DER_ERROR;
1924 }
1925 ava->value.data = ptr + lenlen; 1920 ava->value.data = ptr + lenlen;
1926 1921
1927 return 0; 1922 return 0;