summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2011-09-12 17:05:02 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2011-09-12 17:05:02 +0200
commit5e67665e11afbafdc72b8f5d1542494f7a9c7f64 (patch)
tree1c2822d791ce8317d0a73e5b62eb4f35690d984c
parent84c898525c362d09e4f62e72c8ace6a418d8e07e (diff)
downloadgnutls-5e67665e11afbafdc72b8f5d1542494f7a9c7f64.tar.gz
disable the 64-bit padlock until it is tested.
-rw-r--r--NEWS2
-rw-r--r--lib/accelerated/intel/aes-padlock.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index e6083c831c..c506b75b9f 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,8 @@ Reported by J. Cameijo Cerdeira.
Reported by Jonathan Nieder <jrnieder@gmail.com> 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 a44f230167..17d83c94cf 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()) {