[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/26] crypto: drop gcrypt thread initialization code
From: |
Daniel P . Berrangé |
Subject: |
[PULL 06/26] crypto: drop gcrypt thread initialization code |
Date: |
Wed, 14 Jul 2021 15:08:38 +0100 |
This is only required on gcrypt < 1.6.0, and is thus obsolete
since
commit b33a84632a3759c00320fd80923aa963c11207fc
Author: Daniel P. Berrangé <berrange@redhat.com>
Date: Fri May 14 13:04:08 2021 +0100
crypto: bump min gcrypt to 1.8.0, dropping RHEL-7 support
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
crypto/init.c | 62 ---------------------------------------------------
1 file changed, 62 deletions(-)
diff --git a/crypto/init.c b/crypto/init.c
index ea233b9192..fb7f1bff10 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -35,21 +35,6 @@
#include "crypto/random.h"
/* #define DEBUG_GNUTLS */
-
-/*
- * We need to init gcrypt threading if
- *
- * - gcrypt < 1.6.0
- *
- */
-
-#if (defined(CONFIG_GCRYPT) && \
- (GCRYPT_VERSION_NUMBER < 0x010600))
-#define QCRYPTO_INIT_GCRYPT_THREADS
-#else
-#undef QCRYPTO_INIT_GCRYPT_THREADS
-#endif
-
#ifdef DEBUG_GNUTLS
static void qcrypto_gnutls_log(int level, const char *str)
{
@@ -57,55 +42,8 @@ static void qcrypto_gnutls_log(int level, const char *str)
}
#endif
-#ifdef QCRYPTO_INIT_GCRYPT_THREADS
-static int qcrypto_gcrypt_mutex_init(void **priv)
-{ \
- QemuMutex *lock = NULL;
- lock = g_new0(QemuMutex, 1);
- qemu_mutex_init(lock);
- *priv = lock;
- return 0;
-}
-
-static int qcrypto_gcrypt_mutex_destroy(void **priv)
-{
- QemuMutex *lock = *priv;
- qemu_mutex_destroy(lock);
- g_free(lock);
- return 0;
-}
-
-static int qcrypto_gcrypt_mutex_lock(void **priv)
-{
- QemuMutex *lock = *priv;
- qemu_mutex_lock(lock);
- return 0;
-}
-
-static int qcrypto_gcrypt_mutex_unlock(void **priv)
-{
- QemuMutex *lock = *priv;
- qemu_mutex_unlock(lock);
- return 0;
-}
-
-static struct gcry_thread_cbs qcrypto_gcrypt_thread_impl = {
- (GCRY_THREAD_OPTION_PTHREAD | (GCRY_THREAD_OPTION_VERSION << 8)),
- NULL,
- qcrypto_gcrypt_mutex_init,
- qcrypto_gcrypt_mutex_destroy,
- qcrypto_gcrypt_mutex_lock,
- qcrypto_gcrypt_mutex_unlock,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
-};
-#endif /* QCRYPTO_INIT_GCRYPT */
-
int qcrypto_init(Error **errp)
{
-#ifdef QCRYPTO_INIT_GCRYPT_THREADS
- gcry_control(GCRYCTL_SET_THREAD_CBS, &qcrypto_gcrypt_thread_impl);
-#endif /* QCRYPTO_INIT_GCRYPT_THREADS */
-
#ifdef CONFIG_GNUTLS
int ret;
ret = gnutls_global_init();
--
2.31.1
- [PULL v2 00/26] Crypto and more patches, Daniel P . Berrangé, 2021/07/14
- [PULL 02/26] crypto: remove obsolete crypto test condition, Daniel P . Berrangé, 2021/07/14
- [PULL 01/26] crypto: remove conditional around 3DES crypto test cases, Daniel P . Berrangé, 2021/07/14
- [PULL 03/26] crypto: skip essiv ivgen tests if AES+ECB isn't available, Daniel P . Berrangé, 2021/07/14
- [PULL 04/26] crypto: use &error_fatal in crypto tests, Daniel P . Berrangé, 2021/07/14
- [PULL 05/26] crypto: fix gcrypt min version 1.8 regression, Daniel P . Berrangé, 2021/07/14
- [PULL 06/26] crypto: drop gcrypt thread initialization code,
Daniel P . Berrangé <=
- [PULL 07/26] crypto: drop custom XTS support in gcrypt driver, Daniel P . Berrangé, 2021/07/14
- [PULL 08/26] crypto: add crypto tests for single block DES-ECB and DES-CBC, Daniel P . Berrangé, 2021/07/14
- [PULL 09/26] crypto: delete built-in DES implementation, Daniel P . Berrangé, 2021/07/14
- [PULL 10/26] crypto: delete built-in XTS cipher mode support, Daniel P . Berrangé, 2021/07/14
- [PULL 11/26] crypto: replace 'des-rfb' cipher with 'des', Daniel P . Berrangé, 2021/07/14
- [PULL 13/26] crypto: introduce build system for gnutls crypto backend, Daniel P . Berrangé, 2021/07/14
- [PULL 12/26] crypto: flip priority of backends to prefer gcrypt, Daniel P . Berrangé, 2021/07/14
- [PULL 14/26] crypto: add gnutls cipher provider, Daniel P . Berrangé, 2021/07/14
- [PULL 15/26] crypto: add gnutls hash provider, Daniel P . Berrangé, 2021/07/14
- [PULL 16/26] crypto: add gnutls hmac provider, Daniel P . Berrangé, 2021/07/14