[Qemu-commits] [qemu/qemu] 621e6a: crypto: add compat cast5_set_key with nettle < 3....

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 621e6ae657d4cb44f19461db0796b09cca438778
      
https://github.com/qemu/qemu/commit/621e6ae657d4cb44f19461db0796b09cca438778
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-03-21 (Mon, 21 Mar 2016)

  Changed paths:
    M crypto/cipher-nettle.c

  Log Message:
  -----------
  crypto: add compat cast5_set_key with  nettle < 3.0.0

Prior to the nettle 3.0.0 release, the cast5_set_key function
was actually named cast128_set_key, so we must add a compatibility
definition.

Signed-off-by: Daniel P. Berrange <address@hidden>


  Commit: f7ac78cfe1bdb1f0067eac66edd2ae550080f061
      
https://github.com/qemu/qemu/commit/f7ac78cfe1bdb1f0067eac66edd2ae550080f061
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-03-21 (Mon, 21 Mar 2016)

  Changed paths:
    M crypto/cipher-nettle.c

  Log Message:
  -----------
  crypto: fix cipher function signature mismatch with nettle & xts

For versions of nettle < 3.0.0, the cipher functions took a
'void *ctx' and 'unsigned len' instad of 'const void *ctx'
and 'size_t len'. The xts functions though are builtin to
QEMU and always expect the latter signatures. Define a
second set of wrappers to use with the correct signatures
needed by XTS mode.

Signed-off-by: Daniel P. Berrange <address@hidden>


  Commit: 9fa570d57e44e065b663715400eafc60fe66e005
      
https://github.com/qemu/qemu/commit/9fa570d57e44e065b663715400eafc60fe66e005
  Author: Peter Maydell <address@hidden>
  Date:   2016-03-21 (Mon, 21 Mar 2016)

  Changed paths:
    M crypto/cipher-nettle.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/berrange/tags/pull-crypto-2016-03-21-1' 
into staging

Merge crypto 2016/03/21 v1

# gpg: Signature made Mon 21 Mar 2016 10:05:51 GMT using RSA key ID 15104FDF
# gpg: Good signature from "Daniel P. Berrange <address@hidden>"
# gpg:                 aka "Daniel P. Berrange <address@hidden>"

* remotes/berrange/tags/pull-crypto-2016-03-21-1:
  crypto: fix cipher function signature mismatch with nettle & xts
  crypto: add compat cast5_set_key with  nettle < 3.0.0

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/4829e0378dfb...9fa570d57e44