diff options
| author | Peter Maydell | 2016-07-04 17:28:58 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-07-04 17:28:58 +0200 |
| commit | 0d7e96c9b505b2afb1db08732c3a87288ccbbdd3 (patch) | |
| tree | 8b21c01b4c06af0c29ada192d69da84cf3c1c33f /include | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20160704'... (diff) | |
| parent | crypto: allow default TLS priority to be chosen at build time (diff) | |
| download | qemu-0d7e96c9b505b2afb1db08732c3a87288ccbbdd3.tar.gz qemu-0d7e96c9b505b2afb1db08732c3a87288ccbbdd3.tar.xz qemu-0d7e96c9b505b2afb1db08732c3a87288ccbbdd3.zip | |
Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2016-07-04-1' into staging
Merge qcrypto 2016/07/04 v1
# gpg: Signature made Mon 04 Jul 2016 15:54:26 BST
# gpg: using RSA key 0xBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF
* remotes/berrange/tags/pull-qcrypto-2016-07-04-1:
crypto: allow default TLS priority to be chosen at build time
crypto: add support for TLS priority string override
crypto: implement sha224, sha384, sha512 and ripemd160 hashes
crypto: switch hash code to use nettle/gcrypt directly
crypto: rename OUT to out in xts test to avoid clash on MinGW
crypto: fix handling of iv generator hash defaults
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/tlscreds.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/crypto/tlscreds.h b/include/crypto/tlscreds.h index 8e2babd533..59e91875c1 100644 --- a/include/crypto/tlscreds.h +++ b/include/crypto/tlscreds.h @@ -54,6 +54,7 @@ struct QCryptoTLSCreds { gnutls_dh_params_t dh_params; #endif bool verifyPeer; + char *priority; }; |