diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2018-02-22 11:29:08 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2018-02-26 13:45:26 +0100 |
| commit | c813b4b6d343e3111c16ed4890222c4cb7255dbd (patch) | |
| tree | 89adb88128fd503456ec92087c6d7897a0eb6490 /lib/accelerated/x86/x86-common.c | |
| parent | 95e0bafbdfdb3f09936c624405912a1e7b2fd125 (diff) | |
| download | gnutls-c813b4b6d343e3111c16ed4890222c4cb7255dbd.tar.gz | |
accelerated: padlock: use the new nettle APIs
Also remove any ifdefs for nettle (it is not conditionally compiled in),
and do not register accelerators for AES-192-CBC. That cipher is widely
ignored to bother.
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
Diffstat (limited to 'lib/accelerated/x86/x86-common.c')
| -rw-r--r-- | lib/accelerated/x86/x86-common.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/accelerated/x86/x86-common.c b/lib/accelerated/x86/x86-common.c index 152b0355c3..75b2a6b166 100644 --- a/lib/accelerated/x86/x86-common.c +++ b/lib/accelerated/x86/x86-common.c @@ -1,5 +1,6 @@ /* - * Copyright (C) 2011-2012 Free Software Foundation, Inc. + * Copyright (C) 2011-2018 Free Software Foundation, Inc. + * Copyright (C) 2018 Red Hat, Inc. * * Author: Nikos Mavrogiannopoulos * @@ -306,13 +307,6 @@ void register_x86_padlock_crypto(unsigned capabilities) if (ret < 0) { gnutls_assert(); } -#ifdef HAVE_LIBNETTLE - ret = - gnutls_crypto_single_cipher_register - (GNUTLS_CIPHER_AES_192_CBC, 80, &_gnutls_aes_padlock, 0); - if (ret < 0) { - gnutls_assert(); - } ret = gnutls_crypto_single_cipher_register @@ -328,7 +322,6 @@ void register_x86_padlock_crypto(unsigned capabilities) if (ret < 0) { gnutls_assert(); } -#endif } else { _gnutls_priority_update_non_aesni(); } |