diff mbox

[v3] bsd-user: Add patches to fix AES_* link errors

Message ID 1402930927-41125-1-git-send-email-sbruno@freebsd.org
State New
Headers show

Commit Message

Sean Bruno June 16, 2014, 3:02 p.m. UTC 
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(+)

Comments

Sean Bruno June 17, 2014, 4:48 p.m. UTC | #1 
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
Sean Bruno June 19, 2014, 1:40 p.m. UTC | #2 
On Tue, 2014-06-17 at 09:48 -0700, Sean Bruno wrote:
> 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
> 
> 

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


sean
Peter Maydell June 19, 2014, 3:17 p.m. UTC | #3 
On 19 June 2014 14:40, Sean Bruno <sbruno@ignoranthack.me> wrote:
> On Tue, 2014-06-17 at 09:48 -0700, Sean Bruno wrote:
>> 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>

Applied, thanks, though I had to rewrite the commit
message.

thanks
-- PMM
diff mbox

Patch

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,