[SCM] GNU gnutls branch, master, updated. gnutls_3_0_17-21-g86882fc

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=86882fc1694f60d03772e9e423ce17f6b3e51ccc

The branch, master has been updated
       via  86882fc1694f60d03772e9e423ce17f6b3e51ccc (commit)
      from  324603f98f255c1aaf9b77a47795253f8f62a4cc (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 86882fc1694f60d03772e9e423ce17f6b3e51ccc
Author: Nikos Mavrogiannopoulos <[email protected]>
Date:   Tue Mar 20 21:05:28 2012 +0100

    Only call check_phe_partial() if PHE has been detected.

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

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

diff --git a/NEWS b/NEWS
index 93fa1ab..95b0f9e 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,9 @@ See the end for copying conditions.
 ** certtool: Avoid a Y2K38 bug when generating certificates.
 Patch by Robert Millan.
 
+** libgnutls: Corrected VIA padlock detection for old 
+VIA processors.
+
 ** libgnutls: Updated assembler files.
 
 ** libgnutls: Time in generated certificates is stored
diff --git a/lib/accelerated/x86/aes-padlock.c b/lib/accelerated/x86/aes-padlock.c
index 6391413..40ecc38 100644
--- a/lib/accelerated/x86/aes-padlock.c
+++ b/lib/accelerated/x86/aes-padlock.c
@@ -282,7 +282,7 @@ register_padlock_crypto (void)
 #ifdef HAVE_LIBNETTLE
   phe = check_phe ();
 
-  if (check_phe_partial () && phe)
+  if (phe && check_phe_partial ())
     {
       _gnutls_debug_log ("Padlock SHA1 and SHA256 (partial) accelerator was detected\n");
       if (check_phe_sha512 ())


hooks/post-receive
-- 
GNU gnutls