Merge qcrypto fixes 2016/03/30 v1
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABCAAGBQJW+9u3AAoJEL6G67QVEE/fp1gP/jadd5kk39ydHUMEoDS8uAnB OUXN630NPvxxGW+6K4LYweYMqgZCpKGFaUx0l7tlWXuyA4WQ1jgELM5pSZVZkJls RStMHH8uU85Ufl1nv9duOVfiQv3e/VgIaPaCQ1eb6AESdXq4nCSYoLbxKEOs1E0N i2ULk0BTZqYJ8YDN1CVyMfPE2IMt3of4zadt53G6KUYSrcdPGF7kPHzz064zv45q PLM5EKOMnrCJmoiAQ6ys3+TwruyS927QjjQqNL5yrhrdtHp+rTkt7PZbBP2WBiej CQoF5ss393OCueNnRzVW5HjC2xscFzvPXFaUn+sRZWxQL+2nFC2HCONRSGlQR1xN ErIogThVYJFUROzFRlDUarGO3nACSVgLC1f31GTqUogExbDF6OfPOt1i7DkwjGgB wsxBfbBayf1X8DAIF42jJoVV8jatVHb8B2VQFanxtDtjDFdWh4jaqNsNEpSbvqiU y8rKZXpIr99t2q9drmTYFbKAqHmsPqUenCbU9h9QLfYo+A/66bkXNNjMK8iNiOQg oXEtlLpYvDjudJa3sDm6TBfm/Bn0KPnqVpbaXmQVzxbraeOC9JTRlZNKfng0D0BZ 2guB2ochmsoC9pR8rqINQCHWH1hTxpdc9PraRHyECQ3qOj1IoaUVnORDSQXbj5v0 uCLoThpQjQaPwtGHER0x =6BRp -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2016-03-30-1' into staging Merge qcrypto fixes 2016/03/30 v1 # gpg: Signature made Wed 30 Mar 2016 14:59:19 BST using RSA key ID 15104FDF # gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" # gpg: aka "Daniel P. Berrange <berrange@redhat.com>" * remotes/berrange/tags/pull-qcrypto-2016-03-30-1: crypto: do an explicit check for nettle pbkdf functions Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
69bc7f5029
16
configure
vendored
16
configure
vendored
|
@ -308,6 +308,7 @@ gnutls=""
|
|||
gnutls_hash=""
|
||||
gnutls_rnd=""
|
||||
nettle=""
|
||||
nettle_kdf="no"
|
||||
gcrypt=""
|
||||
gcrypt_kdf="no"
|
||||
vte=""
|
||||
|
@ -2335,6 +2336,17 @@ if test "$nettle" != "no"; then
|
|||
libs_tools="$nettle_libs $libs_tools"
|
||||
QEMU_CFLAGS="$QEMU_CFLAGS $nettle_cflags"
|
||||
nettle="yes"
|
||||
|
||||
cat > $TMPC << EOF
|
||||
#include <nettle/pbkdf2.h>
|
||||
int main(void) {
|
||||
pbkdf2_hmac_sha256(8, NULL, 1000, 8, NULL, 8, NULL);
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
if compile_prog "$nettle_cflags" "$nettle_libs" ; then
|
||||
nettle_kdf=yes
|
||||
fi
|
||||
else
|
||||
if test "$nettle" = "yes"; then
|
||||
feature_not_found "nettle" "Install nettle devel"
|
||||
|
@ -4746,6 +4758,7 @@ if test "$nettle" = "yes"; then
|
|||
else
|
||||
echo "nettle $nettle"
|
||||
fi
|
||||
echo "nettle kdf $nettle_kdf"
|
||||
echo "libtasn1 $tasn1"
|
||||
echo "VTE support $vte"
|
||||
echo "curses support $curses"
|
||||
|
@ -5130,6 +5143,9 @@ fi
|
|||
if test "$nettle" = "yes" ; then
|
||||
echo "CONFIG_NETTLE=y" >> $config_host_mak
|
||||
echo "CONFIG_NETTLE_VERSION_MAJOR=${nettle_version%%.*}" >> $config_host_mak
|
||||
if test "$nettle_kdf" = "yes" ; then
|
||||
echo "CONFIG_NETTLE_KDF=y" >> $config_host_mak
|
||||
fi
|
||||
fi
|
||||
if test "$tasn1" = "yes" ; then
|
||||
echo "CONFIG_TASN1=y" >> $config_host_mak
|
||||
|
|
|
@ -11,8 +11,8 @@ crypto-obj-y += secret.o
|
|||
crypto-obj-$(CONFIG_GCRYPT) += random-gcrypt.o
|
||||
crypto-obj-$(if $(CONFIG_GCRYPT),n,$(CONFIG_GNUTLS_RND)) += random-gnutls.o
|
||||
crypto-obj-y += pbkdf.o
|
||||
crypto-obj-$(CONFIG_NETTLE) += pbkdf-nettle.o
|
||||
crypto-obj-$(if $(CONFIG_NETTLE),n,$(CONFIG_GCRYPT_KDF)) += pbkdf-gcrypt.o
|
||||
crypto-obj-$(CONFIG_NETTLE_KDF) += pbkdf-nettle.o
|
||||
crypto-obj-$(if $(CONFIG_NETTLE_KDF),n,$(CONFIG_GCRYPT_KDF)) += pbkdf-gcrypt.o
|
||||
crypto-obj-y += ivgen.o
|
||||
crypto-obj-y += ivgen-essiv.o
|
||||
crypto-obj-y += ivgen-plain.o
|
||||
|
|
Loading…
Reference in a new issue