qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Sean Bruno <sbruno@ignoranthack.me>
To: qemu-devel <qemu-devel@nongnu.org>
Subject: Re: [Qemu-devel] [PATCH v3] bsd-user: Add patches to fix AES_* link errors
Date: Tue, 17 Jun 2014 09:48:21 -0700	[thread overview]
Message-ID: <1403023701.39699.9.camel@bruno> (raw)
In-Reply-To: <1402930927-41125-1-git-send-email-sbruno@freebsd.org>

On Mon, 2014-06-16 at 08:02 -0700, Sean Bruno wrote:
> v3
>  Drop patch1 as it has been superceeded
>  Drop patch3 as it doesn't belong in this patchset
> 
> v2
>  Correct email address for Ed Maste
> 
> Redefine functions as QEMU_AES_* to avoid conflicts with AES_* in
> -lcrypto needed (at least) by -lcurl.
> 
> Take from emulators/qemu-devel/files/patch-include-qemu-aes.h
> 
> Signed-off-by: Sean Bruno <sbruno@freebsd.org>
> Signed-off-by: Ed Maste <emaste@freebsd.org>
> ---
>  include/qemu/aes.h | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/include/qemu/aes.h b/include/qemu/aes.h
> index e79c707..d310411 100644
> --- a/include/qemu/aes.h
> +++ b/include/qemu/aes.h
> @@ -10,6 +10,15 @@ struct aes_key_st {
>  };
>  typedef struct aes_key_st AES_KEY;
>  
> +/* FreeBSD has it's own AES_set_decrypt_key in -lcrypto, avoid conflicts */
> +#ifdef __FreeBSD__
> +#define AES_set_encrypt_key QEMU_AES_set_encrypt_key
> +#define AES_set_decrypt_key QEMU_AES_set_decrypt_key
> +#define AES_encrypt QEMU_AES_encrypt
> +#define AES_decrypt QEMU_AES_decrypt
> +#define AES_cbc_encrypt QEMU_AES_cbc_encrypt
> +#endif
> +
>  int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
>  	AES_KEY *key);
>  int AES_set_decrypt_key(const unsigned char *userKey, const int bits,


Ping.  This fixes an in tree link failure for bsd-user.

sean

  reply	other threads:[~2014-06-17 16:48 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-16 15:02 [Qemu-devel] [PATCH v3] bsd-user: Add patches to fix AES_* link errors Sean Bruno
2014-06-17 16:48 ` Sean Bruno [this message]
2014-06-19 13:40   ` Sean Bruno
2014-06-19 15:17     ` 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=1403023701.39699.9.camel@bruno \
    --to=sbruno@ignoranthack.me \
    --cc=qemu-devel@nongnu.org \
    --cc=sbruno@freebsd.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).