diff options
| author | Peter Maydell | 2018-04-06 18:51:20 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-04-06 18:51:21 +0200 |
| commit | 08e173f29461396575c85510eb41474b993cb1fb (patch) | |
| tree | b4acff2b6b9296d138b9388774af21c7cbbe9a14 /tests | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-hppa-20180407' into staging (diff) | |
| parent | crypto: ensure we use a predictable TLS priority setting (diff) | |
| download | qemu-08e173f29461396575c85510eb41474b993cb1fb.tar.gz qemu-08e173f29461396575c85510eb41474b993cb1fb.tar.xz qemu-08e173f29461396575c85510eb41474b993cb1fb.zip | |
Merge remote-tracking branch 'remotes/berrange/tags/qcrypto-next-pull-request' into staging
# gpg: Signature made Fri 06 Apr 2018 14:29:10 BST
# gpg: using RSA key BE86EBB415104FDF
# 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/qcrypto-next-pull-request:
crypto: ensure we use a predictable TLS priority setting
docs: Document -object tls-creds-x509 priority=xxx
docs: update information for TLS certificate management
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test-crypto-tlssession.c | 1 | ||||
| -rw-r--r-- | tests/test-io-channel-tls.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/test-crypto-tlssession.c b/tests/test-crypto-tlssession.c index 1a4a066d76..82f21c27f2 100644 --- a/tests/test-crypto-tlssession.c +++ b/tests/test-crypto-tlssession.c @@ -75,6 +75,7 @@ static QCryptoTLSCreds *test_tls_creds_create(QCryptoTLSCredsEndpoint endpoint, "server" : "client"), "dir", certdir, "verify-peer", "yes", + "priority", "NORMAL", /* We skip initial sanity checks here because we * want to make sure that problems are being * detected at the TLS session validation stage, diff --git a/tests/test-io-channel-tls.c b/tests/test-io-channel-tls.c index 32743b2c96..bb88ee870f 100644 --- a/tests/test-io-channel-tls.c +++ b/tests/test-io-channel-tls.c @@ -78,6 +78,7 @@ static QCryptoTLSCreds *test_tls_creds_create(QCryptoTLSCredsEndpoint endpoint, "server" : "client"), "dir", certdir, "verify-peer", "yes", + "priority", "NORMAL", /* We skip initial sanity checks here because we * want to make sure that problems are being * detected at the TLS session validation stage, |