Merge branch 'develop'

Author: GOB52

src/unit/atecc608.hpp

@@ -86,7 +86,7 @@ enum Error : uint8_t {
 constexpr uint32_t DELAY_READ{3};
 constexpr uint32_t DELAY_WRITE{4};
 constexpr uint32_t DELAY_INFO{2};
-constexpr uint32_t DELAY_NONCE{15};
+constexpr uint32_t DELAY_NONCE{16};
 constexpr uint32_t DELAY_SELFTEST{200};
 constexpr uint32_t DELAY_RANDOM{23};
 constexpr uint32_t DELAY_COUNTER{20};

src/unit/unit_ATECC608B.cpp

@@ -353,8 +353,6 @@ bool UnitATECC608B::createNonce(uint8_t output[32], const uint8_t input[20], con
     const uint8_t mode    = (updateSeed ? NONCE_MODE_RANDOM_UPDATE_SEED : NONCE_MODE_RANDOM_NOT_UPDATE_SEED);
     const uint16_t param2 = (useRNG ? NONCE_USE_TRNG : NONCE_USE_TEMPKEY);
 
-    M5_LIB_LOGE("createNonec:%02X, %04X", mode, param2);
-
     if (send_command(OPCODE_NONCE, mode, param2, input, 20)) {
         m5::utility::delay(DELAY_NONCE);
         ok = receive_response(output ? output : buf, 32);
@@ -372,9 +370,6 @@ bool UnitATECC608B::write_nonce(const Destination dest, const uint8_t* input, co
     }
 
     bool ok{};
-
-    M5_LIB_LOGE("writeNoncee%u:%02X %04X", ilen, mode, 0x0000);
-
     if (send_command(OPCODE_NONCE, mode, 0x0000, input, ilen)) {
         m5::utility::delay(DELAY_NONCE);
         uint8_t status{};

test/embedded/test_id/id_test.cpp

@@ -284,10 +284,6 @@ TEST_P(TestATECC608B_TNGTLS, Nonce)
     uint8_t nonce32[32]{0x11};
     uint8_t nonce64[64]{0x22};
 
-    //    clear_tempkey(unit.get());
-    //    EXPECT_TRUE(unit->readDeviceState(state));
-    //    M5_LOGW("1S:%04X", state);
-
     // RNG mode: useRNG = true, updateSeed = true
     EXPECT_TRUE(clear_tempkey(unit.get()));
     EXPECT_TRUE(unit->createNonce(output, input20, true, true));
@@ -871,7 +867,7 @@ TEST_P(TestATECC608B_TNGTLS, SignInternal)
     }
 
     // Failed because illegal TempKey (TempKey need to made by GenDlg, GenKey)
-    const uint8_t nin[20]{};
+    const uint8_t nin[20]{0x12};
     EXPECT_TRUE(unit->createNonce(nullptr, nin));
     EXPECT_TRUE(unit->readDeviceState(state));
     EXPECT_TRUE(is_valid_tempkey(state));