For subject line, better to describe the change made, rather than the problem.
On Mon, Apr 24, 2017 at 02:17:56PM +0200, gm.ijew...@web.de wrote: > Now it calls CryptGenRandom() if is it compiled for windows. > > It might be possible to save the cryptographic provider in between > invocations, e.g. by making it static -- I have no idea how computationally > intensive that operation actually is. I'd think most people should really just enable gnutls during build. This just has to provide a fallback that's good enough to be functional. If someone really cares about performance of this fallback, they can send patches later.... > > Signed-off-by: Geert Martin Ijewski <gm.ijew...@web.de> > > diff --git a/crypto/random-platform.c b/crypto/random-platform.c > index 82b755a..7aa0476 100644 > --- a/crypto/random-platform.c > +++ b/crypto/random-platform.c > @@ -26,6 +26,7 @@ int qcrypto_random_bytes(uint8_t *buf G_GNUC_UNUSED, > size_t buflen G_GNUC_UNUSED, > Error **errp) > { > +#ifndef _WIN32 > int fd; > int ret = -1; > int got; > @@ -61,4 +62,26 @@ int qcrypto_random_bytes(uint8_t *buf G_GNUC_UNUSED, > cleanup: > close(fd); > return ret; > +#else > + HCRYPTPROV hCryptProv; > + > + if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, 0)) { > + if (NTE_BAD_KEYSET == GetLastError()) { > + if (!CryptAcquireContext(&hCryptProv, NULL, NULL, > + PROV_RSA_FULL, CRYPT_NEWKEYSET)) { > + error_setg_errno(errp, GetLastError(), > + "Unable to create cryptographic provider"); You forgot to "return -1' here > + } > + } You need to have an 'else' branch here that reports an error too, in cae the first CryptAcquireContext returns err != NTE_BSD_KEYSET. > + } > + > + if (!CryptGenRandom(hCryptProv, buflen, buf)) { > + error_setg_errno(errp, GetLastError(), > + "Unable to read random bytes"); > + return -1; > + } > + > + CryptReleaseContext(hCryptProv, 0); > + return 0; > +#endif > } > diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h > index ff18b23..4a5d908 100644 > --- a/include/sysemu/os-win32.h > +++ b/include/sysemu/os-win32.h > @@ -29,6 +29,7 @@ > #include <winsock2.h> > #include <windows.h> > #include <ws2tcpip.h> > +#include <Wincrypt.h> It would be preferrable to put this in random-platform.c to avoid polluting the global namespace Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|