20210511

Author: bryan-hunt

.github/workflows/build.yml

@@ -19,24 +19,19 @@ jobs:
       - uses: actions/setup-python@v2
         name: Install Python
         with:
-          python-version: '3.7'
+          python-version: '3.8'
 
       - name: Describe Tag & Branch Name
         id: build_names
         shell: bash
         run: |
           echo ::set-output name=TAG_NAME::${GITHUB_REF#refs/tags/}
 
-      - name: Install cibuildwheel
-        run: |
-          python -m pip install cibuildwheel
-
-      - name: Install Visual C++ for Python 2.7
-        if: runner.os == 'Windows'
-        run: |
-          choco install vcpython27 -f -y
+      # Configure compilers for Windows. Does nothing on Linux/Mac.
+      - name: Enable Developer Command Prompt
+        uses: ilammy/msvc-dev-cmd@v1
 
-      - name: Build wheels
+      - name: Configure Environment
         shell: bash
         run: |
           echo $TAG_NAME
@@ -46,11 +41,16 @@ jobs:
           cp -r ../third_party .
           mkdir app
           cp -r ../app/tng app
-          python -m cibuildwheel --output-dir wheelhouse
         env:
-          CIBW_BUILD_VERBOSITY: 3
           TAG_NAME: ${{ steps.build_names.outputs.TAG_NAME }}
 
+      - name: Build wheels
+        uses: joerick/cibuildwheel@v1.11.0
+        with:
+          package-dir: python 
+        env:
+          CIBW_BUILD_VERBOSITY: 3
+
       - uses: actions/upload-artifact@v2
         with:
           path: python/wheelhouse/*.whl

lib/pkcs11/pkcs11_key.c

@@ -244,14 +244,16 @@ static CK_RV pkcs11_key_get_ec_point(CK_VOID_PTR pObject, CK_ATTRIBUTE_PTR pAttr
 
     if (obj_ptr)
     {
+        ATCA_STATUS status = ATCA_SUCCESS;
+        CK_UTF8CHAR ec_asn1_key[3 + ATCA_ECCP256_PUBKEY_SIZE] = { 0x04, 0x41, 0x04 };
+
         if (pAttribute->pValue)
         {
             CK_BBOOL is_private;
 
             if (CKR_OK == (rv = pkcs11_object_is_private(obj_ptr, &is_private)))
             {
-                CK_UTF8CHAR ec_asn1_key[3 + ATCA_ECCP256_PUBKEY_SIZE] = { 0x04, 0x41, 0x04 };
-                ATCA_STATUS status;
+                
 
                 if (is_private)
                 {
@@ -263,17 +265,17 @@ static CK_RV pkcs11_key_get_ec_point(CK_VOID_PTR pObject, CK_ATTRIBUTE_PTR pAttr
                     status = atcab_read_pubkey(obj_ptr->slot, &ec_asn1_key[3]);
                     PKCS11_DEBUG("atcab_read_pubkey: %x\r\n", status);
                 }
-
-                if (ATCA_SUCCESS == status)
-                {
-                    rv = pkcs11_attrib_fill(pAttribute, ec_asn1_key, sizeof(ec_asn1_key));
-                }
-                else
-                {
-                    rv = CKR_FUNCTION_FAILED;
-                }
             }
         }
+
+        if (ATCA_SUCCESS == status)
+        {
+            rv = pkcs11_attrib_fill(pAttribute, ec_asn1_key, sizeof(ec_asn1_key));
+        }
+        else
+        {
+            rv = CKR_FUNCTION_FAILED;
+        }
     }
 
     return rv;

python/cryptoauthlib/atcab.py

@@ -21,7 +21,7 @@
 # THE AMOUNT OF FEES, IF ANY, THAT YOU HAVE PAID DIRECTLY TO MICROCHIP FOR
 # THIS SOFTWARE.
 
-from ctypes import c_uint8, c_uint32, byref, create_string_buffer, Structure, c_char, c_uint16, c_bool
+from ctypes import c_uint8, c_uint32, byref, create_string_buffer, Structure, c_char, c_uint16, c_bool, c_void_p
 from .status import Status
 from .library import get_cryptoauthlib, AtcaReference