From: "Daniel P. Berrange" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Gabriel L. Somlo" <somlo@cmu.edu>,
Markus Armbruster <armbru@redhat.com>
Subject: [Qemu-devel] [PATCH v1 1/2] crypto: add compat cast5_set_key with nettle < 3.0.0
Date: Fri, 18 Mar 2016 13:21:55 +0000 [thread overview]
Message-ID: <1458307316-25894-2-git-send-email-berrange@redhat.com> (raw)
In-Reply-To: <1458307316-25894-1-git-send-email-berrange@redhat.com>
Prior to the nettle 3.0.0 release, the cast5_set_key function
was actually named cast128_set_key, so we must add a compatibility
definition.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
crypto/cipher-nettle.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/crypto/cipher-nettle.c b/crypto/cipher-nettle.c
index 3c982e4..bec4f1c 100644
--- a/crypto/cipher-nettle.c
+++ b/crypto/cipher-nettle.c
@@ -34,6 +34,8 @@ typedef nettle_crypt_func nettle_cipher_func;
typedef void * cipher_ctx_t;
typedef unsigned cipher_length_t;
+
+#define cast5_set_key cast128_set_key
#else
typedef const void * cipher_ctx_t;
typedef size_t cipher_length_t;
--
2.5.0
next prev parent reply other threads:[~2016-03-18 13:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-18 13:21 [Qemu-devel] [PATCH v1 0/2] Fix build problems with nettle < 3.0.0 Daniel P. Berrange
2016-03-18 13:21 ` Daniel P. Berrange [this message]
2016-03-18 13:23 ` [Qemu-devel] [PATCH v1 2/2] crypto: fix cipher function signature mismatch with nettle & xts Daniel P. Berrange
2016-03-18 13:33 ` [Qemu-devel] [PATCH v1 0/2] Fix build problems with nettle < 3.0.0 Gabriel L. Somlo
2016-03-18 20:38 ` Eduardo Habkost
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=1458307316-25894-2-git-send-email-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=armbru@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=somlo@cmu.edu \
/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).