Failed in applying to current master (
apply log)
Maintainers: "Daniel P. Berrangé" <berrange@redhat.com>
crypto/block-luks-priv.h | 143 +++++++++++++
crypto/block-luks.c | 228 +++++++++------------
crypto/pbkdf.c | 23 +++
crypto/tlscredspsk.c | 16 +-
io/channel-watch.c | 12 +-
meson.build | 9 +
scripts/git-submodule.sh | 12 +-
softmmu/qemu-seccomp.c | 13 ++
tests/unit/crypto-tls-psk-helpers.c | 11 +-
tests/unit/test-crypto-block.c | 302 +++++++++++++++++++++++++++-
util/qemu-sockets.c | 5 +-
11 files changed, 616 insertions(+), 158 deletions(-)
create mode 100644 crypto/block-luks-priv.h