[SCM] GNU gnutls branch, master, updated. gnutls_3_0_2-37-g5e67665

[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=5e67665e11afbafdc72b8f5d1542494f7a9c7f64

The branch, master has been updated
       via  5e67665e11afbafdc72b8f5d1542494f7a9c7f64 (commit)
       via  84c898525c362d09e4f62e72c8ace6a418d8e07e (commit)
      from  8775f5dc0ab16d7a72be2f56818ea1179d1e7ebe (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 5e67665e11afbafdc72b8f5d1542494f7a9c7f64
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Sep 12 17:05:02 2011 +0200

    disable the 64-bit padlock until it is tested.

commit 84c898525c362d09e4f62e72c8ace6a418d8e07e
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Sep 12 16:26:39 2011 +0200

    corrected typo in cpuid for 386.

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

Summary of changes:
 NEWS                                |    2 ++
 lib/accelerated/intel/aes-padlock.c |    5 ++++-
 lib/accelerated/x86.h               |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index e6083c8..c506b75 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,8 @@ Reported by J. Cameijo Cerdeira.
 Reported by Jonathan Nieder <address@hidden> in
 <http://bugs.debian.org/640639>.
 
+** libgnutls: Added support for VIA padlock AES optimizations.
+
 ** libgnutls: Added support for elliptic curves in
 PKCS #11.
 
diff --git a/lib/accelerated/intel/aes-padlock.c 
b/lib/accelerated/intel/aes-padlock.c
index a44f230..17d83c9 100644
--- a/lib/accelerated/intel/aes-padlock.c
+++ b/lib/accelerated/intel/aes-padlock.c
@@ -184,7 +184,10 @@ void register_padlock_crypto(void)
 {
     int ret;
 
-    if (check_via() == 0)
+    /* Only enable the 32-bit padlock variant, until
+     * the 64-bit code is tested.
+     */
+    if (sizeof(unsigned int) != 4 || check_via() == 0)
         return;
 
     if (check_padlock()) {
diff --git a/lib/accelerated/x86.h b/lib/accelerated/x86.h
index df411df..973624b 100644
--- a/lib/accelerated/x86.h
+++ b/lib/accelerated/x86.h
@@ -22,7 +22,7 @@ inline static void g_cpuid(uint32_t func, unsigned int *ax, 
unsigned int *bx, un
                   "cpuid\n" 
                   "movl %%ebx, %1\n"
                   "popl %%ebx\n"
-                  :"=a" (*ax), "=r"(*bx), "=c"(*cx), "=d"(*cx)
+                  :"=a" (*ax), "=r"(*bx), "=c"(*cx), "=d"(*dx)
                   :"a"(func)
                   :"cc");
 }


hooks/post-receive
-- 
GNU gnutls