aboutsummaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2019-03-13 20:38:51 -0700
committerRichard Henderson <richard.henderson@linaro.org>2019-05-22 12:38:54 -0400
commit14a356f47560c8275b8e04fbee484a617fc45f80 (patch)
tree3cd9be6b4fcbcf1224a8d093a18df34ac5de860a /crypto
parent243dc2cf95298383b657cf95896615197d8b35aa (diff)
downloadqemu-14a356f47560c8275b8e04fbee484a617fc45f80.zip
qemu-14a356f47560c8275b8e04fbee484a617fc45f80.tar.gz
qemu-14a356f47560c8275b8e04fbee484a617fc45f80.tar.bz2
crypto: Reverse code blocks in random-platform.c
Use #ifdef _WIN32 instead of #ifndef _WIN32. This will make other tests easier to sequence. Reviewed-by: Laurent Vivier <lvivier@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/random-platform.c35
1 files changed, 17 insertions, 18 deletions
diff --git a/crypto/random-platform.c b/crypto/random-platform.c
index 7541b4c..f995fc0 100644
--- a/crypto/random-platform.c
+++ b/crypto/random-platform.c
@@ -32,7 +32,14 @@ static int fd; /* a file handle to either /dev/urandom or /dev/random */
int qcrypto_random_init(Error **errp)
{
-#ifndef _WIN32
+#ifdef _WIN32
+ if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL,
+ CRYPT_SILENT | CRYPT_VERIFYCONTEXT)) {
+ error_setg_win32(errp, GetLastError(),
+ "Unable to create cryptographic provider");
+ return -1;
+ }
+#else
/* TBD perhaps also add support for BSD getentropy / Linux
* getrandom syscalls directly */
fd = open("/dev/urandom", O_RDONLY);
@@ -44,15 +51,7 @@ int qcrypto_random_init(Error **errp)
error_setg(errp, "No /dev/urandom or /dev/random found");
return -1;
}
-#else
- if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL,
- CRYPT_SILENT | CRYPT_VERIFYCONTEXT)) {
- error_setg_win32(errp, GetLastError(),
- "Unable to create cryptographic provider");
- return -1;
- }
#endif
-
return 0;
}
@@ -60,7 +59,15 @@ int qcrypto_random_bytes(uint8_t *buf G_GNUC_UNUSED,
size_t buflen G_GNUC_UNUSED,
Error **errp)
{
-#ifndef _WIN32
+#ifdef _WIN32
+ if (!CryptGenRandom(hCryptProv, buflen, buf)) {
+ error_setg_win32(errp, GetLastError(),
+ "Unable to read random bytes");
+ return -1;
+ }
+
+ return 0;
+#else
int ret = -1;
int got;
@@ -82,13 +89,5 @@ int qcrypto_random_bytes(uint8_t *buf G_GNUC_UNUSED,
ret = 0;
cleanup:
return ret;
-#else
- if (!CryptGenRandom(hCryptProv, buflen, buf)) {
- error_setg_win32(errp, GetLastError(),
- "Unable to read random bytes");
- return -1;
- }
-
- return 0;
#endif
}