[SCM] GNU gnutls branch, master, updated. gnutls_3_0_3-27-gb7b8ec1

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=b7b8ec136a089794d99f419687c6e3ee1495d754

The branch, master has been updated
       via  b7b8ec136a089794d99f419687c6e3ee1495d754 (commit)
       via  a006a1f4b2f5d3d2efb951b72752a1ebb7e0af62 (commit)
      from  60a13b98e9f410c3b1019252f271d3c0f20b2e61 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b7b8ec136a089794d99f419687c6e3ee1495d754
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Sep 25 18:35:13 2011 +0200

    corrections in debugging code.

commit a006a1f4b2f5d3d2efb951b72752a1ebb7e0af62
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Sep 25 18:17:30 2011 +0200

    Better usage of X86 conditionals to simplify and avoid an undefined warning 
in x86-32.

-----------------------------------------------------------------------

Summary of changes:
 configure.ac                      |    1 +
 lib/accelerated/Makefile.am       |   12 +++---------
 lib/accelerated/accelerated.c     |    2 +-
 lib/accelerated/intel/Makefile.am |    3 ++-
 lib/accelerated/{ => intel}/x86.h |    0
 lib/opencdk/read-packet.c         |    2 +-
 lib/opencdk/stream.c              |    2 +-
 7 files changed, 9 insertions(+), 13 deletions(-)
 rename lib/accelerated/{ => intel}/x86.h (100%)

diff --git a/configure.ac b/configure.ac
index e5797f5..b3b6fb3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,6 +96,7 @@ fi
 
 AM_CONDITIONAL(ASM_X86_64, test x"$hw_accel" = x"x86-64")
 AM_CONDITIONAL(ASM_X86_32, test x"$hw_accel" = x"x86")
+AM_CONDITIONAL(ASM_X86, test x"$hw_accel" = x"x86" -o x"$hw_accel" = x"x86-64")
 AM_CONDITIONAL(HAVE_GCC_GNU89_INLINE_OPTION, test "$gnu89_inline" = "yes"])
 AM_CONDITIONAL(HAVE_GCC, test "$GCC" = "yes")
 
diff --git a/lib/accelerated/Makefile.am b/lib/accelerated/Makefile.am
index e9426d0..440a73b 100644
--- a/lib/accelerated/Makefile.am
+++ b/lib/accelerated/Makefile.am
@@ -32,18 +32,12 @@ endif
 
 noinst_LTLIBRARIES = libaccelerated.la
 
-EXTRA_DIST = x86.h accelerated.h cryptodev.h
+EXTRA_DIST = accelerated.h cryptodev.h
 libaccelerated_la_SOURCES = accelerated.c cryptodev.c
 libaccelerated_la_LIBADD =
 
-if ASM_X86_64
+if ASM_X86
 SUBDIRS += intel
-AM_CFLAGS += -DASM_X86_64
-libaccelerated_la_LIBADD += intel/libintel.la
-endif
-
-if ASM_X86_32
-SUBDIRS += intel
-AM_CFLAGS += -DASM_X86_32
+AM_CFLAGS += -DASM_X86
 libaccelerated_la_LIBADD += intel/libintel.la
 endif
diff --git a/lib/accelerated/accelerated.c b/lib/accelerated/accelerated.c
index 8a89e3d..50f48c9 100644
--- a/lib/accelerated/accelerated.c
+++ b/lib/accelerated/accelerated.c
@@ -23,7 +23,7 @@
 #include <accelerated.h>
 #if defined(ASM_X86_32) || defined(ASM_X86_64)
 # include <intel/aes-x86.h>
-# include <x86.h>
+# include <intel/x86.h>
 #endif
 
 void _gnutls_register_accel_crypto(void)
diff --git a/lib/accelerated/intel/Makefile.am 
b/lib/accelerated/intel/Makefile.am
index 0882929..cbb00e9 100644
--- a/lib/accelerated/intel/Makefile.am
+++ b/lib/accelerated/intel/Makefile.am
@@ -34,12 +34,13 @@ EXTRA_DIST = README license.txt
 
 noinst_LTLIBRARIES = libintel.la
 
-libintel_la_SOURCES = aes-x86.c aes-padlock.c aes-gcm-padlock.c aes-padlock.h 
aes-x86.h
+libintel_la_SOURCES = aes-x86.c aes-padlock.c aes-gcm-padlock.c aes-padlock.h 
aes-x86.h x86.h
 
 if ASM_X86_64
 AM_CPPFLAGS += -DASM_X86_64
 libintel_la_SOURCES += asm/appro-aes-x86-64.s asm/appro-aes-gcm-x86-64.s 
aes-gcm-x86.c asm/padlock-x86-64.s asm/cpuid-x86-64.s
 else
+AM_CPPFLAGS += -DASM_X86_32
 libintel_la_SOURCES += asm/appro-aes-x86.s asm/padlock-x86.s asm/cpuid-x86.s
 endif
 
diff --git a/lib/accelerated/x86.h b/lib/accelerated/intel/x86.h
similarity index 100%
rename from lib/accelerated/x86.h
rename to lib/accelerated/intel/x86.h
diff --git a/lib/opencdk/read-packet.c b/lib/opencdk/read-packet.c
index df0c04f..700f6ba 100644
--- a/lib/opencdk/read-packet.c
+++ b/lib/opencdk/read-packet.c
@@ -556,7 +556,7 @@ read_user_id (cdk_stream_t inp, size_t pktlen, 
cdk_pkt_userid_t user_id)
     return CDK_Inv_Packet;
 
   if (DEBUG_PKT)
-    _gnutls_write_log ("read_user_id: %lu octets\n", pktlen);
+    _gnutls_write_log ("read_user_id: %lu octets\n", (unsigned long)pktlen);
 
   user_id->len = pktlen;
   rc = stream_read (inp, user_id->name, pktlen, &nread);
diff --git a/lib/opencdk/stream.c b/lib/opencdk/stream.c
index 0c5f9e9..fe6f2a2 100644
--- a/lib/opencdk/stream.c
+++ b/lib/opencdk/stream.c
@@ -1477,7 +1477,7 @@ cdk_stream_mmap_part (cdk_stream_t s, off_t off, size_t 
len,
     len = cdk_stream_get_length (s);
   if (!len)
     {
-      _gnutls_read_log ("cdk_stream_mmap_part: invalid file size %lu\n", len);
+      _gnutls_read_log ("cdk_stream_mmap_part: invalid file size %lu\n", 
(unsigned long)len);
       gnutls_assert ();
       return s->error;
     }


hooks/post-receive
-- 
GNU gnutls