* [Qemu-devel] [PATCH] Fix use of libnettle
@ 2015-07-16 8:23 ncornu
2015-07-16 14:17 ` Peter Maydell
0 siblings, 1 reply; 2+ messages in thread
From: ncornu @ 2015-07-16 8:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Nicolas Cornu
From: Nicolas Cornu <ncornu@aldebaran.com>
With libnettle 3.1.1 a new struct is used
Signed-off-by: Nicolas Cornu <ncornu@aldebaran.com>
---
crypto/cipher-nettle.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/crypto/cipher-nettle.c b/crypto/cipher-nettle.c
index e5a14bc..f06ea92 100644
--- a/crypto/cipher-nettle.c
+++ b/crypto/cipher-nettle.c
@@ -27,8 +27,8 @@ typedef struct QCryptoCipherNettle QCryptoCipherNettle;
struct QCryptoCipherNettle {
void *ctx_encrypt;
void *ctx_decrypt;
- nettle_crypt_func *alg_encrypt;
- nettle_crypt_func *alg_decrypt;
+ nettle_cipher_func *alg_encrypt;
+ nettle_cipher_func *alg_decrypt;
uint8_t *iv;
size_t niv;
};
@@ -83,8 +83,8 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm alg,
des_set_key(ctx->ctx_encrypt, rfbkey);
g_free(rfbkey);
- ctx->alg_encrypt = (nettle_crypt_func *)des_encrypt;
- ctx->alg_decrypt = (nettle_crypt_func *)des_decrypt;
+ ctx->alg_encrypt = (nettle_cipher_func *)des_encrypt;
+ ctx->alg_decrypt = (nettle_cipher_func *)des_decrypt;
ctx->niv = DES_BLOCK_SIZE;
break;
@@ -98,8 +98,8 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm alg,
aes_set_encrypt_key(ctx->ctx_encrypt, nkey, key);
aes_set_decrypt_key(ctx->ctx_decrypt, nkey, key);
- ctx->alg_encrypt = (nettle_crypt_func *)aes_encrypt;
- ctx->alg_decrypt = (nettle_crypt_func *)aes_decrypt;
+ ctx->alg_encrypt = (nettle_cipher_func *)aes_encrypt;
+ ctx->alg_decrypt = (nettle_cipher_func *)aes_decrypt;
ctx->niv = AES_BLOCK_SIZE;
break;
--
2.4.6
--
*This email and any attachment thereto are confidential and intended solely
for the use of the individual or entity to whom they are addressed.If you
are not the intended recipient, please be advised that disclosing, copying,
distributing or taking any action in reliance on the contents of this email
is strictly prohibited. In such case, please immediately advise the sender,
and delete all copies and attachment from your system.This email shall not
be construed and is not tantamount to an offer, an acceptance of offer, or
an agreement by Aldebaran Robotics on any discussion or contractual
document whatsoever. No employee or agent is authorized to represent or
bind Aldebaran Robotics to third parties by email, or act on behalf of
Aldebaran Robotics by email, without express written confirmation by
Aldebaran Robotics' duly authorized representatives.*
------------------------------
*Ce message électronique et éventuelles pièces jointes sont confidentiels,
et exclusivement destinés à la personne ou l'entité à qui ils sont
adressés.*
*Si vous n'êtes pas le destinataire visé, vous êtes prié de ne pas
divulguer, copier, distribuer ou prendre toute décision sur la foi de ce
message électronique. Merci d'en aviser immédiatement l'expéditeur et de
supprimer toutes les copies et éventuelles pièces jointes de votre système.*
*Ce message électronique n'équivaut pas à une offre, à une acceptation
d'offre, ou à un accord d'Aldebaran Robotics sur toute discussion ou
document contractuel quel qu'il soit, et ne peut être interprété comme tel.
Aucun employé ou agent d'Aldebaran Robotics n'est autorisé à représenter ou
à engager la société par email, ou à agir au nom et pour le compte de la
société par email, sans qu'une confirmation écrite soit donnée par le
représentant légal d'Aldebaran Robotics ou par toute autre personne ayant
reçu délégation de pouvoir appropriée.*
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] Fix use of libnettle
2015-07-16 8:23 [Qemu-devel] [PATCH] Fix use of libnettle ncornu
@ 2015-07-16 14:17 ` Peter Maydell
0 siblings, 0 replies; 2+ messages in thread
From: Peter Maydell @ 2015-07-16 14:17 UTC (permalink / raw)
To: ncornu; +Cc: QEMU Developers
On 16 July 2015 at 09:23, <ncornu@aldebaran.com> wrote:
> From: Nicolas Cornu <ncornu@aldebaran.com>
>
> With libnettle 3.1.1 a new struct is used
>
> Signed-off-by: Nicolas Cornu <ncornu@aldebaran.com>
Thanks for the patch, but we already have patches on the list to
fix this one.
-- PMM
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-07-16 14:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-16 8:23 [Qemu-devel] [PATCH] Fix use of libnettle ncornu
2015-07-16 14:17 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.