[GNUnet-SVN] r7667 - in libmicrohttpd/src/daemon/https: lgl minitasn1 tls

[gnunet]

Author: grothoff
Date: 2008-09-08 00:08:30 -0600 (Mon, 08 Sep 2008)
New Revision: 7667

Modified:
   libmicrohttpd/src/daemon/https/lgl/Makefile.am
   libmicrohttpd/src/daemon/https/minitasn1/Makefile.am
   libmicrohttpd/src/daemon/https/tls/Makefile.am
   libmicrohttpd/src/daemon/https/tls/gnutls_priority.c
Log:
dead

Modified: libmicrohttpd/src/daemon/https/lgl/Makefile.am
===================================================================
--- libmicrohttpd/src/daemon/https/lgl/Makefile.am      2008-09-08 06:07:57 UTC 
(rev 7666)
+++ libmicrohttpd/src/daemon/https/lgl/Makefile.am      2008-09-08 06:08:30 UTC 
(rev 7667)
@@ -27,4 +27,4 @@
 strverscmp.c \
 md5.c \
 des.c 
-  
+

Modified: libmicrohttpd/src/daemon/https/minitasn1/Makefile.am
===================================================================
--- libmicrohttpd/src/daemon/https/minitasn1/Makefile.am        2008-09-08 
06:07:57 UTC (rev 7666)
+++ libmicrohttpd/src/daemon/https/minitasn1/Makefile.am        2008-09-08 
06:08:30 UTC (rev 7667)
@@ -2,8 +2,7 @@
 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/include \
 -I$(top_srcdir)/src/daemon/https/lgl \
--I$(top_srcdir)/src/daemon/https/tls \
--I$(top_srcdir)/src/daemon/https/includes 
+-I$(top_srcdir)/src/daemon/https/tls 
 
 noinst_LTLIBRARIES = libasn1.la
 

Modified: libmicrohttpd/src/daemon/https/tls/Makefile.am
===================================================================
--- libmicrohttpd/src/daemon/https/tls/Makefile.am      2008-09-08 06:07:57 UTC 
(rev 7666)
+++ libmicrohttpd/src/daemon/https/tls/Makefile.am      2008-09-08 06:08:30 UTC 
(rev 7667)
@@ -8,8 +8,6 @@
 -I$(top_srcdir)/src/daemon/https/lgl \
 -I$(top_srcdir)/src/daemon/https/minitasn1 \
 -I$(top_srcdir)/src/daemon/https/x509 \
--I$(top_srcdir)/src/daemon/https/openpgp \
--I$(top_srcdir)/src/daemon/https/opencdk \
 -I$(GCRYPT_CPPFLAGS)
 
 noinst_LTLIBRARIES = libtls.la

Modified: libmicrohttpd/src/daemon/https/tls/gnutls_priority.c
===================================================================
--- libmicrohttpd/src/daemon/https/tls/gnutls_priority.c        2008-09-08 
06:07:57 UTC (rev 7666)
+++ libmicrohttpd/src/daemon/https/tls/gnutls_priority.c        2008-09-08 
06:08:30 UTC (rev 7667)
@@ -66,22 +66,16 @@
   return 0;
 }
 
-inline static int
+static int
 _set_priority (mhd_gtls_priority_st * st, const int *list)
 {
-  int num = 0, i;
+  int num = 0;
 
-  while (list[num] != 0)
+  while ( (list[num] != 0) &&
+         (num < MAX_ALGOS) )
     num++;
-  if (num > MAX_ALGOS)
-    num = MAX_ALGOS;
   st->num_algorithms = num;
-
-  for (i = 0; i < num; i++)
-    {
-      st->priority[i] = list[i];
-    }
-
+  memcpy(st->priority, list, num * sizeof(int));
   return 0;
 }