qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] b7b681: TLS: provide slightly more informatio


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] b7b681: TLS: provide slightly more information when TLS ce...
Date: Mon, 13 Jun 2016 06:30:07 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: b7b68166dcbadb1c207b4b6f25b23a18a292da2d
      
https://github.com/qemu/qemu/commit/b7b68166dcbadb1c207b4b6f25b23a18a292da2d
  Author: Alex Bligh <address@hidden>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M crypto/tlscredsx509.c

  Log Message:
  -----------
  TLS: provide slightly more information when TLS certificate loading fails

Give slightly more information when certification loading fails.
Rather than have no information, you now get gnutls's only slightly
less unhelpful error messages.

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


  Commit: e7ed11f083015bf34a121cfff31540cf9c2bae23
      
https://github.com/qemu/qemu/commit/e7ed11f083015bf34a121cfff31540cf9c2bae23
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M tests/test-crypto-secret.c

  Log Message:
  -----------
  crypto: remove temp files on completion of secrets test

The secret object tests left some temporary files on disk
when completing. Ensure they are unlink, and rename them
to make it more obvious where they come from.

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


  Commit: b35c1f3361ebf6ec9ea5022903af4b559bff6063
      
https://github.com/qemu/qemu/commit/b35c1f3361ebf6ec9ea5022903af4b559bff6063
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M crypto/hash.c

  Log Message:
  -----------
  crypto: assert that qcrypto_hash_digest_len is in range

Otherwise unintended results could happen.  For example,
Coverity reports a division by zero in qcrypto_afsplit_hash.
While this cannot really happen, it shows that the contract
of qcrypto_hash_digest_len can be improved.

Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>


  Commit: c8d70e59738e672021926c7747af8ef9dea15c82
      
https://github.com/qemu/qemu/commit/c8d70e59738e672021926c7747af8ef9dea15c82
  Author: Mike Frysinger <address@hidden>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M include/crypto/aes.h

  Log Message:
  -----------
  crypto: aes: always rename internal symbols

OpenSSL's libcrypto always defines AES symbols with the same names as
qemu's local aes code.  This is problematic when enabling at least curl
as that frequently also uses libcrypto.  It might not be noticed when
running, but if you try to statically link, everything falls down.

An example snippet:
  LINK  qemu-nbd
.../libcrypto.a(aes-x86_64.o): In function 'AES_encrypt':
(.text+0x460): multiple definition of 'AES_encrypt'
crypto/aes.o:aes.c:(.text+0x670): first defined here
.../libcrypto.a(aes-x86_64.o): In function 'AES_decrypt':
(.text+0x9f0): multiple definition of 'AES_decrypt'
crypto/aes.o:aes.c:(.text+0xb30): first defined here
.../libcrypto.a(aes-x86_64.o): In function 'AES_cbc_encrypt':
(.text+0xf90): multiple definition of 'AES_cbc_encrypt'
crypto/aes.o:aes.c:(.text+0xff0): first defined here
collect2: error: ld returned 1 exit status
.../qemu-2.6.0/rules.mak:105: recipe for target 'qemu-nbd' failed
make: *** [qemu-nbd] Error 1

The aes.h header has redefines already for FreeBSD, but go ahead and
enable that for everyone since there's no real good reason to not use
a namespace all the time.

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


  Commit: 55e5c3a2d2433bd2e1e635a7ba395f1c70341794
      
https://github.com/qemu/qemu/commit/55e5c3a2d2433bd2e1e635a7ba395f1c70341794
  Author: Peter Maydell <address@hidden>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M crypto/hash.c
    M crypto/tlscredsx509.c
    M include/crypto/aes.h
    M tests/test-crypto-secret.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/berrange/tags/qcrypto-next-2016-06-13-v1' into staging

Merge qcrypto-next 2016/06/13 v1

# gpg: Signature made Mon 13 Jun 2016 12:43:22 BST
# gpg:                using RSA key 0xBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <address@hidden>"
# gpg:                 aka "Daniel P. Berrange <address@hidden>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF

* remotes/berrange/tags/qcrypto-next-2016-06-13-v1:
  crypto: aes: always rename internal symbols
  crypto: assert that qcrypto_hash_digest_len is in range
  crypto: remove temp files on completion of secrets test
  TLS: provide slightly more information when TLS certificate loading fails

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


Compare: https://github.com/qemu/qemu/compare/8fdf038722a0...55e5c3a2d243

reply via email to

[Prev in Thread] Current Thread [Next in Thread]