samples_env.PrependUnique(LIBS = ['tinydtls'])
if target_os in ['windows', 'msys_nt']:
- samples_env.AppendUnique(LIBS = ['ws2_32', 'iphlpapi', 'advapi32'])
+ samples_env.AppendUnique(LIBS = ['ws2_32', 'iphlpapi', 'advapi32', 'bcrypt'])
Alias("samples", [dtlsserver, dtlsclient])
dtls_clock_init(void) {
#ifdef _WIN32
/* Use clock offset in milliseconds */
- dtls_clock_offset = GetTickCount();
+ dtls_clock_offset = GetTickCount64();
#else
#ifdef HAVE_TIME_H
/* Use clock offset in seconds */
void dtls_ticks(dtls_tick_t *t) {
#ifdef _WIN32
- *t = ((GetTickCount() - dtls_clock_offset) * DTLS_TICKS_PER_SECOND / 1000);
+ *t = ((GetTickCount64() - dtls_clock_offset) * DTLS_TICKS_PER_SECOND / 1000);
#else
#ifdef HAVE_SYS_TIME_H
struct timeval tv;
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
-#include <wincrypt.h>
+#include <bcrypt.h>
static int default_RNG(uint8_t *p_dest, unsigned p_size)
{
- HCRYPTPROV l_prov;
- if(!CryptAcquireContext(&l_prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT))
+ if (!BCRYPT_SUCCESS(BCryptGenRandom(NULL, (PUCHAR)p_dest, p_size, BCRYPT_USE_SYSTEM_PREFERRED_RNG)))
{
return 0;
}
- CryptGenRandom(l_prov, p_size, (BYTE *)p_dest);
- CryptReleaseContext(l_prov, 0);
-
return 1;
}
else:
liboctbstack_env.Textfile(target = 'octbstack.def', source = [File('octbstack_product.def')])
- liboctbstack_env.AppendUnique(LIBS = ['ws2_32', 'advapi32', 'iphlpapi'])
+ liboctbstack_env.AppendUnique(LIBS = ['ws2_32', 'advapi32', 'iphlpapi', 'bcrypt'])
else:
liboctbstack_env.AppendUnique(LIBS = ['m'])
if target_os in ['msys_nt', 'windows']:
catest_env.AppendUnique(LIBS = ['ws2_32',
'advapi32',
+ 'bcrypt',
'iphlpapi'])
else:
catest_env.AppendUnique(LIBS = ['m'])
if target_os in ['msys_nt', 'windows']:
sptest_env.AppendUnique(LIBS = ['ws2_32',
'advapi32',
+ 'bcrypt',
'iphlpapi'])
######################################################################
srmtest_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
if target_os == 'windows':
- srmtest_env.AppendUnique(LIBS = ['advapi32', 'kernel32', 'ws2_32', 'iphlpapi'])
+ srmtest_env.AppendUnique(LIBS = ['advapi32', 'bcrypt', 'kernel32', 'ws2_32', 'iphlpapi'])
else:
# TODO: Implement feature check.
srmtest_env.AppendUnique(CPPDEFINES = ['HAVE_LOCALTIME_R'])
stacktest_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
if target_os in ['msys_nt', 'windows']:
- stacktest_env.AppendUnique(LIBS = ['ws2_32', 'iphlpapi', 'kernel32', 'advapi32'])
+ stacktest_env.AppendUnique(LIBS = ['ws2_32', 'iphlpapi', 'kernel32', 'bcrypt', 'advapi32'])
else:
stacktest_env.PrependUnique(LIBS = ['m'])
])
if target_os in ['windows']:
- unittests_env.AppendUnique(LIBS = ['ws2_32', 'advapi32', 'iphlpapi'])
+ unittests_env.AppendUnique(LIBS = ['ws2_32', 'advapi32', 'iphlpapi', 'bcrypt'])
unittests_env.AppendUnique(CPPPATH = ['#extlibs/boost/boost'])
if unittests_env.get('SECURED') == '1':