From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Eduardo Otubo" <otubo@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Juan Quintela" <quintela@redhat.com>,
"Jason Wang" <jasowang@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Jiri Pirko" <jiri@resnulli.us>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Eric Blake" <eblake@redhat.com>
Subject: [PULL 17/26] crypto: add gnutls pbkdf provider
Date: Wed, 14 Jul 2021 15:08:49 +0100 [thread overview]
Message-ID: <20210714140858.2247409-18-berrange@redhat.com> (raw)
In-Reply-To: <20210714140858.2247409-1-berrange@redhat.com>
This adds support for using gnutls as a provider of the crypto
pbkdf APIs.
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
crypto/meson.build | 2 +-
crypto/pbkdf-gnutls.c | 90 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 91 insertions(+), 1 deletion(-)
create mode 100644 crypto/pbkdf-gnutls.c
diff --git a/crypto/meson.build b/crypto/meson.build
index e2f25810fc..95a6a83504 100644
--- a/crypto/meson.build
+++ b/crypto/meson.build
@@ -29,7 +29,7 @@ if nettle.found()
elif gcrypt.found()
crypto_ss.add(gcrypt, files('hash-gcrypt.c', 'hmac-gcrypt.c', 'pbkdf-gcrypt.c'))
elif gnutls_crypto.found()
- crypto_ss.add(gnutls, files('hash-gnutls.c', 'hmac-glib.c', 'pbkdf-stub.c')
+ crypto_ss.add(gnutls, files('hash-gnutls.c', 'hmac-gnutls.c', 'pbkdf-gnutls.c'))
else
crypto_ss.add(files('hash-glib.c', 'hmac-glib.c', 'pbkdf-stub.c'))
endif
diff --git a/crypto/pbkdf-gnutls.c b/crypto/pbkdf-gnutls.c
new file mode 100644
index 0000000000..2dfbbd382c
--- /dev/null
+++ b/crypto/pbkdf-gnutls.c
@@ -0,0 +1,90 @@
+/*
+ * QEMU Crypto PBKDF support (Password-Based Key Derivation Function)
+ *
+ * Copyright (c) 2021 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "qemu/osdep.h"
+#include <gnutls/crypto.h>
+#include "qapi/error.h"
+#include "crypto/pbkdf.h"
+
+bool qcrypto_pbkdf2_supports(QCryptoHashAlgorithm hash)
+{
+ switch (hash) {
+ case QCRYPTO_HASH_ALG_MD5:
+ case QCRYPTO_HASH_ALG_SHA1:
+ case QCRYPTO_HASH_ALG_SHA224:
+ case QCRYPTO_HASH_ALG_SHA256:
+ case QCRYPTO_HASH_ALG_SHA384:
+ case QCRYPTO_HASH_ALG_SHA512:
+ case QCRYPTO_HASH_ALG_RIPEMD160:
+ return true;
+ default:
+ return false;
+ }
+}
+
+int qcrypto_pbkdf2(QCryptoHashAlgorithm hash,
+ const uint8_t *key, size_t nkey,
+ const uint8_t *salt, size_t nsalt,
+ uint64_t iterations,
+ uint8_t *out, size_t nout,
+ Error **errp)
+{
+ static const int hash_map[QCRYPTO_HASH_ALG__MAX] = {
+ [QCRYPTO_HASH_ALG_MD5] = GNUTLS_DIG_MD5,
+ [QCRYPTO_HASH_ALG_SHA1] = GNUTLS_DIG_SHA1,
+ [QCRYPTO_HASH_ALG_SHA224] = GNUTLS_DIG_SHA224,
+ [QCRYPTO_HASH_ALG_SHA256] = GNUTLS_DIG_SHA256,
+ [QCRYPTO_HASH_ALG_SHA384] = GNUTLS_DIG_SHA384,
+ [QCRYPTO_HASH_ALG_SHA512] = GNUTLS_DIG_SHA512,
+ [QCRYPTO_HASH_ALG_RIPEMD160] = GNUTLS_DIG_RMD160,
+ };
+ int ret;
+ const gnutls_datum_t gkey = { (unsigned char *)key, nkey };
+ const gnutls_datum_t gsalt = { (unsigned char *)salt, nsalt };
+
+ if (iterations > ULONG_MAX) {
+ error_setg_errno(errp, ERANGE,
+ "PBKDF iterations %llu must be less than %lu",
+ (long long unsigned)iterations, ULONG_MAX);
+ return -1;
+ }
+
+ if (hash >= G_N_ELEMENTS(hash_map) ||
+ hash_map[hash] == GNUTLS_DIG_UNKNOWN) {
+ error_setg_errno(errp, ENOSYS,
+ "PBKDF does not support hash algorithm %s",
+ QCryptoHashAlgorithm_str(hash));
+ return -1;
+ }
+
+ ret = gnutls_pbkdf2(hash_map[hash],
+ &gkey,
+ &gsalt,
+ iterations,
+ out,
+ nout);
+ if (ret != 0) {
+ error_setg(errp, "Cannot derive password: %s",
+ gnutls_strerror(ret));
+ return -1;
+ }
+
+ return 0;
+}
--
2.31.1
next prev parent reply other threads:[~2021-07-14 14:20 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-14 14:08 [PULL v2 00/26] Crypto and more patches Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 01/26] crypto: remove conditional around 3DES crypto test cases Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 02/26] crypto: remove obsolete crypto test condition Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 03/26] crypto: skip essiv ivgen tests if AES+ECB isn't available Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 04/26] crypto: use &error_fatal in crypto tests Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 05/26] crypto: fix gcrypt min version 1.8 regression Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 06/26] crypto: drop gcrypt thread initialization code Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 07/26] crypto: drop custom XTS support in gcrypt driver Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 08/26] crypto: add crypto tests for single block DES-ECB and DES-CBC Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 09/26] crypto: delete built-in DES implementation Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 10/26] crypto: delete built-in XTS cipher mode support Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 11/26] crypto: replace 'des-rfb' cipher with 'des' Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 12/26] crypto: flip priority of backends to prefer gcrypt Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 13/26] crypto: introduce build system for gnutls crypto backend Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 14/26] crypto: add gnutls cipher provider Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 15/26] crypto: add gnutls hash provider Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 16/26] crypto: add gnutls hmac provider Daniel P. Berrangé
2021-07-14 14:08 ` Daniel P. Berrangé [this message]
2021-07-14 14:08 ` [PULL 18/26] crypto: prefer gnutls as the crypto backend if new enough Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 19/26] net/rocker: use GDateTime for formatting timestamp in debug messages Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 20/26] io: use GDateTime for formatting timestamp for websock headers Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 21/26] seccomp: don't block getters for resource control syscalls Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 22/26] tests/migration: fix unix socket migration Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 23/26] docs: fix typo s/Intel/AMD/ in CPU model notes Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 24/26] qemu-options: re-arrange CPU topology options Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 25/26] qemu-options: tweak to show that CPU count is optional Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 26/26] qemu-options: rewrite help for -smp options Daniel P. Berrangé
2021-07-15 20:38 ` [PULL v2 00/26] Crypto and more patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210714140858.2247409-18-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=armbru@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=ehabkost@redhat.com \
--cc=jasowang@redhat.com \
--cc=jiri@resnulli.us \
--cc=kraxel@redhat.com \
--cc=otubo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).