From eee154c8b0da6fa536e93b08747e26ccf686d722 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 9 Jul 2012 11:43:14 +0000 Subject: [PATCH] -LRN: use cryptoapi for PRNG on W32 --- src/testcurl/daemontest_digestauth.c | 25 +++++++++++++++++++ .../daemontest_digestauth_with_arguments.c | 25 +++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/src/testcurl/daemontest_digestauth.c b/src/testcurl/daemontest_digestauth.c index c46cfc6b..5b4e7a9e 100644 --- a/src/testcurl/daemontest_digestauth.c +++ b/src/testcurl/daemontest_digestauth.c @@ -35,6 +35,8 @@ #ifndef WINDOWS #include #include +#else +#include #endif #define PAGE "libmicrohttpd demoAccess granted" @@ -135,6 +137,7 @@ testDigestAuth () cbc.buf = buf; cbc.size = 2048; cbc.pos = 0; +#if !WINDOWS fd = open("/dev/urandom", O_RDONLY); if (-1 == fd) { @@ -157,6 +160,28 @@ testDigestAuth () off += len; } (void) close(fd); +#else + { + HCRYPTPROV cc; + BOOL b; + b = CryptAcquireContext (&cc, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + if (b == 0) + { + fprintf (stderr, "Failed to acquire crypto provider context: %lu\n", + GetLastError ()); + return 1; + } + b = CryptGenRandom (cc, 8, rnd); + if (b == 0) + { + fprintf (stderr, "Failed to generate 8 random bytes: %lu\n", + GetLastError ()); + } + CryptReleaseContext (cc, 0); + if (b == 0) + return 1; + } +#endif d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, 1337, NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_DIGEST_AUTH_RANDOM, sizeof (rnd), rnd, diff --git a/src/testcurl/daemontest_digestauth_with_arguments.c b/src/testcurl/daemontest_digestauth_with_arguments.c index 70830a26..130bfc44 100644 --- a/src/testcurl/daemontest_digestauth_with_arguments.c +++ b/src/testcurl/daemontest_digestauth_with_arguments.c @@ -35,6 +35,8 @@ #ifndef WINDOWS #include #include +#else +#include #endif #define PAGE "libmicrohttpd demoAccess granted" @@ -135,6 +137,7 @@ testDigestAuth () cbc.buf = buf; cbc.size = 2048; cbc.pos = 0; +#if !WINDOWS fd = open("/dev/urandom", O_RDONLY); if (-1 == fd) { @@ -157,6 +160,28 @@ testDigestAuth () off += len; } (void) close(fd); +#else + { + HCRYPTPROV cc; + BOOL b; + b = CryptAcquireContext (&cc, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + if (b == 0) + { + fprintf (stderr, "Failed to acquire crypto provider context: %lu\n", + GetLastError ()); + return 1; + } + b = CryptGenRandom (cc, 8, rnd); + if (b == 0) + { + fprintf (stderr, "Failed to generate 8 random bytes: %lu\n", + GetLastError ()); + } + CryptReleaseContext (cc, 0); + if (b == 0) + return 1; + } +#endif d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, 1337, NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_DIGEST_AUTH_RANDOM, sizeof (rnd), rnd,