diff options
author | Christian Grothoff <christian@grothoff.org> | 2008-09-08 06:08:30 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2008-09-08 06:08:30 +0000 |
commit | a2f10ca9bdb5bb68baf7db0dee45a93a054faa71 (patch) | |
tree | 2908d4a87c2265d54cc2f1622ce9b61b06c4d98b | |
parent | 8fec52a837733bc2cebe1d1a518b347a359dff1a (diff) | |
download | libmicrohttpd-a2f10ca9bdb5bb68baf7db0dee45a93a054faa71.tar.gz libmicrohttpd-a2f10ca9bdb5bb68baf7db0dee45a93a054faa71.zip |
dead
-rw-r--r-- | src/daemon/https/lgl/Makefile.am | 2 | ||||
-rw-r--r-- | src/daemon/https/minitasn1/Makefile.am | 3 | ||||
-rw-r--r-- | src/daemon/https/tls/Makefile.am | 2 | ||||
-rw-r--r-- | src/daemon/https/tls/gnutls_priority.c | 16 |
4 files changed, 7 insertions, 16 deletions
diff --git a/src/daemon/https/lgl/Makefile.am b/src/daemon/https/lgl/Makefile.am index 4383dfdf..654a774f 100644 --- a/src/daemon/https/lgl/Makefile.am +++ b/src/daemon/https/lgl/Makefile.am | |||
@@ -27,4 +27,4 @@ memmem.c \ | |||
27 | strverscmp.c \ | 27 | strverscmp.c \ |
28 | md5.c \ | 28 | md5.c \ |
29 | des.c | 29 | des.c |
30 | 30 | ||
diff --git a/src/daemon/https/minitasn1/Makefile.am b/src/daemon/https/minitasn1/Makefile.am index 6c58730d..4cd9f34e 100644 --- a/src/daemon/https/minitasn1/Makefile.am +++ b/src/daemon/https/minitasn1/Makefile.am | |||
@@ -2,8 +2,7 @@ | |||
2 | AM_CPPFLAGS = \ | 2 | AM_CPPFLAGS = \ |
3 | -I$(top_srcdir)/src/include \ | 3 | -I$(top_srcdir)/src/include \ |
4 | -I$(top_srcdir)/src/daemon/https/lgl \ | 4 | -I$(top_srcdir)/src/daemon/https/lgl \ |
5 | -I$(top_srcdir)/src/daemon/https/tls \ | 5 | -I$(top_srcdir)/src/daemon/https/tls |
6 | -I$(top_srcdir)/src/daemon/https/includes | ||
7 | 6 | ||
8 | noinst_LTLIBRARIES = libasn1.la | 7 | noinst_LTLIBRARIES = libasn1.la |
9 | 8 | ||
diff --git a/src/daemon/https/tls/Makefile.am b/src/daemon/https/tls/Makefile.am index 406852da..fb2393f4 100644 --- a/src/daemon/https/tls/Makefile.am +++ b/src/daemon/https/tls/Makefile.am | |||
@@ -8,8 +8,6 @@ AM_CPPFLAGS = \ | |||
8 | -I$(top_srcdir)/src/daemon/https/lgl \ | 8 | -I$(top_srcdir)/src/daemon/https/lgl \ |
9 | -I$(top_srcdir)/src/daemon/https/minitasn1 \ | 9 | -I$(top_srcdir)/src/daemon/https/minitasn1 \ |
10 | -I$(top_srcdir)/src/daemon/https/x509 \ | 10 | -I$(top_srcdir)/src/daemon/https/x509 \ |
11 | -I$(top_srcdir)/src/daemon/https/openpgp \ | ||
12 | -I$(top_srcdir)/src/daemon/https/opencdk \ | ||
13 | -I$(GCRYPT_CPPFLAGS) | 11 | -I$(GCRYPT_CPPFLAGS) |
14 | 12 | ||
15 | noinst_LTLIBRARIES = libtls.la | 13 | noinst_LTLIBRARIES = libtls.la |
diff --git a/src/daemon/https/tls/gnutls_priority.c b/src/daemon/https/tls/gnutls_priority.c index 709f5515..bbdce41c 100644 --- a/src/daemon/https/tls/gnutls_priority.c +++ b/src/daemon/https/tls/gnutls_priority.c | |||
@@ -66,22 +66,16 @@ MHD_gnutls_cipher_set_priority (mhd_gtls_session_t session, const int *list) | |||
66 | return 0; | 66 | return 0; |
67 | } | 67 | } |
68 | 68 | ||
69 | inline static int | 69 | static int |
70 | _set_priority (mhd_gtls_priority_st * st, const int *list) | 70 | _set_priority (mhd_gtls_priority_st * st, const int *list) |
71 | { | 71 | { |
72 | int num = 0, i; | 72 | int num = 0; |
73 | 73 | ||
74 | while (list[num] != 0) | 74 | while ( (list[num] != 0) && |
75 | (num < MAX_ALGOS) ) | ||
75 | num++; | 76 | num++; |
76 | if (num > MAX_ALGOS) | ||
77 | num = MAX_ALGOS; | ||
78 | st->num_algorithms = num; | 77 | st->num_algorithms = num; |
79 | 78 | memcpy(st->priority, list, num * sizeof(int)); | |
80 | for (i = 0; i < num; i++) | ||
81 | { | ||
82 | st->priority[i] = list[i]; | ||
83 | } | ||
84 | |||
85 | return 0; | 79 | return 0; |
86 | } | 80 | } |
87 | 81 | ||