From 0db3d0e1b16a10853c578249fb18f2e231ea88b3 Mon Sep 17 00:00:00 2001 From: Bryan Hunt Date: Mon, 18 Jan 2021 21:10:26 -0700 Subject: [PATCH] conda-forge environment support for windows platforms --- lib/pkcs11/pkcs11_token.c | 2 +- python/setup.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/pkcs11/pkcs11_token.c b/lib/pkcs11/pkcs11_token.c index 7bcfd6291..386c48e76 100644 --- a/lib/pkcs11/pkcs11_token.c +++ b/lib/pkcs11/pkcs11_token.c @@ -125,7 +125,7 @@ CK_RV pkcs11_token_init(CK_SLOT_ID slotID, CK_UTF8CHAR_PTR pPin, CK_ULONG ulPinL { #if PKCS11_TOKEN_INIT_SUPPORT CK_RV rv; - uint8_t buf[34]; + uint8_t buf[34] = {0}; uint8_t * pConfig = NULL; bool lock = false; pkcs11_lib_ctx_ptr pLibCtx; diff --git a/python/setup.py b/python/setup.py index 7b0cd77a2..4be20063a 100644 --- a/python/setup.py +++ b/python/setup.py @@ -123,6 +123,7 @@ def build_extension(self, ext): # Suppress cmake output devnull = open(os.devnull, 'r+b') nousb = bool(os.environ.get('CRYPTOAUTHLIB_NOUSB', False)) + cmake_gen = os.environ.get('CMAKE_GEN', None) # Check if CMAKE is installed try: @@ -158,6 +159,8 @@ def build_extension(self, ext): '-DCMAKE_RUNTIME_OUTPUT_DIRECTORY_%s=' % cfg.upper() + extdir] if sys.maxsize > 2**32: cmake_args += ['-A', 'x64'] + if cmake_gen is not None: + cmake_args += ['-G', '"{}"'.format(cmake_gen)] else: cmake_args += ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir]