summary refs log tree commit diff stats
path: root/chardev/char-socket.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-07-03 23:06:18 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-07-03 23:06:18 +0100
commit2a018f6e98782a4931b936a3087404ed81685bac (patch)
treeaf5c160ce5077ef7dd323d13a4e463eb83230b1d /chardev/char-socket.c
parent79c2b203a932db5882a3f328db53e5a448cd47f9 (diff)
parente1a6dc91ddb55ef77a705b62b6e62634631fd57d (diff)
downloadfocaccia-qemu-2a018f6e98782a4931b936a3087404ed81685bac.tar.gz
focaccia-qemu-2a018f6e98782a4931b936a3087404ed81685bac.zip
Merge remote-tracking branch 'remotes/berrange/tags/qcrypto-next-pull-request' into staging
Add support for PSK credentials with TLS

# gpg: Signature made Tue 03 Jul 2018 13:04:51 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: Implement TLS Pre-Shared Keys (PSK).

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'chardev/char-socket.c')
0 files changed, 0 insertions, 0 deletions