On Mon, Sep 19, 2016 at 03:36:38PM +0100, Peter Maydell wrote:
> On 19 September 2016 at 12:44, Daniel P. Berrange <berra...@redhat.com> wrote:
> > The following changes since commit 0f2fa73ba0ca19ebdaccf0d1785583d6601411b6:
> >
> >   Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging 
> > (2016-09-19 11:23:20 +0100)
> >
> > are available in the git repository at:
> >
> >   git://github.com/berrange/qemu tags/pull-qcrypto-2016-09-19-1
> >
> > for you to fetch changes up to 7b1f229a860fa98258a345923dd35df1097838b2:
> >
> >   crypto: add trace points for TLS cert verification (2016-09-19 12:22:22 
> > +0100)
> >
> > ----------------------------------------------------------------
> > Merge qcrypto 2016/09/19 v1
> >
> > ----------------------------------------------------------------
> > Daniel P. Berrange (8):
> >       crypto: use uint64_t for pbkdf iteration count parameters
> >       crypto: make PBKDF iterations configurable for LUKS format
> >       crypto: clear out buffer after timing pbkdf algorithm
> >       crypto: use correct derived key size when timing pbkdf
> >       crypto: remove bogus /= 2 for pbkdf iterations
> >       crypto: increase default pbkdf2 time for luks to 2 seconds
> >       crypto: support more hash algorithms for pbkdf
> >       crypto: add trace points for TLS cert verification
> 
> Fails to build with format string error, I'm afraid:
> 
> /home/petmay01/qemu/crypto/pbkdf-gcrypt.c: In function 'qcrypto_pbkdf2':
> /home/petmay01/qemu/crypto/pbkdf-gcrypt.c:61:9: error: format '%u'
> expects argument of type 'unsigned int', but argument 8 has type 'long
> unsigned int' [-Werror=format=]
>          error_setg_errno(errp, ERANGE,
>          ^
> 
> (32-bit and 64-bit ARM.)

Opps, will send a v2 shortly.

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|

Reply via email to