Merge pull request #12 from k-stachowiak/psa-key-registration

Psa key registration adjustment to new PSA API

Author: AndrzejKurek

atecc608a/main.c

@@ -96,11 +96,12 @@ psa_key_slot_number_t atecc608a_public_key_slot = 9;
 enum {
     key_type = PSA_KEY_TYPE_ECC_PUBLIC_KEY(PSA_ECC_CURVE_SECP256R1),
     keypair_type = PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_CURVE_SECP256R1),
-    key_bits = 256,
+    priv_bits = PSA_BYTES_TO_BITS(32),
+    pub_bits = PSA_BYTES_TO_BITS(64),
     hash_alg = PSA_ALG_SHA_256,
     alg = PSA_ALG_ECDSA(hash_alg),
-    sig_size = PSA_ASYMMETRIC_SIGN_OUTPUT_SIZE(key_type, key_bits, alg),
-    pubkey_size = PSA_KEY_EXPORT_ECC_PUBLIC_KEY_MAX_SIZE(key_bits),
+    sig_size = PSA_ASYMMETRIC_SIGN_OUTPUT_SIZE(key_type, priv_bits, alg),
+    pubkey_size = PSA_KEY_EXPORT_ECC_PUBLIC_KEY_MAX_SIZE(priv_bits),
     hash_size = PSA_HASH_SIZE(hash_alg),
 };
 
@@ -348,13 +349,14 @@ void setup_key_attributes(psa_key_attributes_t *attributes,
     psa_set_key_id(attributes, slot);
     psa_set_key_lifetime(attributes, PSA_ATECC608A_LIFETIME);
     psa_set_key_algorithm(attributes, alg);
-    psa_set_key_bits(attributes, key_bits);
 
     if (is_private) {
+        psa_set_key_bits(attributes, priv_bits);
         psa_set_key_usage_flags(attributes, PSA_KEY_USAGE_SIGN);
         psa_set_key_type(attributes,
                          PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_CURVE_SECP256R1));
     } else {
+        psa_set_key_bits(attributes, pub_bits);
         psa_set_key_usage_flags(attributes, PSA_KEY_USAGE_VERIFY);
         psa_set_key_type(attributes,
                          PSA_KEY_TYPE_ECC_PUBLIC_KEY(PSA_ECC_CURVE_SECP256R1));

atecc608a/mbed_app.json

@@ -14,5 +14,8 @@
             "cryptoauthlib.i2c_scl": "PA09"
         }
     },
-    "macros": ["ATCAPRINTF"]
+    "macros": [
+        "ATCAPRINTF",
+        "MBEDTLS_USER_CONFIG_FILE=\"mbedtls_user_config.h\""
+    ]
 }

atecc608a/mbedtls_user_config.h

@@ -0,0 +1,28 @@
+/*
+ *  Copyright (C) 2006-2019, Arm Limited, All Rights Reserved
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+ *  not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  This file is part of Mbed TLS (https://tls.mbed.org)
+ */
+
+/* Enable PSA APIs, which this example depends on. */
+#if !defined(MBEDTLS_PSA_CRYPTO_C)
+#   define MBEDTLS_PSA_CRYPTO_C
+#endif
+
+/* Enable PSA use of secure elements. */
+#if !defined(MBEDTLS_PSA_CRYPTO_SE_C)
+#    define MBEDTLS_PSA_CRYPTO_SE_C
+#endif