[Qemu-commits] [qemu/qemu] 69c0b2: crypto: fix typo in docs for secret object type

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 69c0b278af1389300e5c53107721dfa4e18139d7
      
https://github.com/qemu/qemu/commit/69c0b278af1389300e5c53107721dfa4e18139d7
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-04-05 (Tue, 05 Apr 2016)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  crypto: fix typo in docs for secret object type

The docs for the secret object type specified the wrong number
of bytes for the AES initialization vector.

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


  Commit: c44e92a4151248f80a31c8aa7343e399e508fa95
      
https://github.com/qemu/qemu/commit/c44e92a4151248f80a31c8aa7343e399e508fa95
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-04-05 (Tue, 05 Apr 2016)

  Changed paths:
    M tests/Makefile

  Log Message:
  -----------
  crypto: fix nettle config check for running pbkdf test

The pbkdf test is being built based on a check for CONFIG_NETTLE.
As of fff2f982ab6ac0dd2b641d30303f72270a019f28, it should be
instead checking CONFIG_NETTLE_KDF

Reported-by: "Dr. David Alan Gilbert" <address@hidden>
Tested-by: Bruce Rogers <address@hidden>
Tested-by: Ed Maste <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>


  Commit: a226f7653620f8c5b570ca63c26df98bdc1d84c4
      
https://github.com/qemu/qemu/commit/a226f7653620f8c5b570ca63c26df98bdc1d84c4
  Author: Peter Maydell <address@hidden>
  Date:   2016-04-05 (Tue, 05 Apr 2016)

  Changed paths:
    M qemu-options.hx
    M tests/Makefile

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/berrange/tags/pull-qcrypto-2016-04-05-1' into staging

Merge QCrypto fixes 2016/04/05 v1

# gpg: Signature made Tue 05 Apr 2016 10:53:59 BST 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-qcrypto-2016-04-05-1:
  crypto: fix nettle config check for running pbkdf test
  crypto: fix typo in docs for secret object type

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


Compare: https://github.com/qemu/qemu/compare/cc621a9838cb...a226f7653620