Initialize the standard zero key in the soft-se itself.

Author: mluis1

src/mac/LoRaMacClassB.c

@@ -190,7 +190,6 @@ static LoRaMacClassBCtx_t Ctx;
  */
 static void ComputePingOffset( uint64_t beaconTime, uint32_t address, uint16_t pingPeriod, uint16_t *pingOffset )
 {
-    uint8_t zeroKey[16];
     uint8_t buffer[16];
     uint8_t cipher[16];
     uint32_t result = 0;
@@ -199,7 +198,6 @@ static void ComputePingOffset( uint64_t beaconTime, uint32_t address, uint16_t p
      */
     uint32_t time = ( beaconTime % ( ( ( uint64_t ) 1 ) << 32 ) );
 
-    memset1( zeroKey, 0, 16 );
     memset1( buffer, 0, 16 );
     memset1( cipher, 0, 16 );
 
@@ -213,8 +211,6 @@ static void ComputePingOffset( uint64_t beaconTime, uint32_t address, uint16_t p
     buffer[6] = ( address >> 16 ) & 0xFF;
     buffer[7] = ( address >> 24 ) & 0xFF;
 
-    SecureElementSetKey( SLOT_RAND_ZERO_KEY, zeroKey );
-
     SecureElementAesEncrypt( buffer, 16, SLOT_RAND_ZERO_KEY, cipher );
 
     result = ( ( ( uint32_t ) cipher[0] ) + ( ( ( uint32_t ) cipher[1] ) * 256 ) );

src/peripherals/soft-se/soft-se.c

@@ -159,8 +159,10 @@ static SecureElementStatus_t ComputeCmac( uint8_t *micBxBuffer, uint8_t *buffer,
 
 SecureElementStatus_t SecureElementInit( SecureElementNvmEvent seNvmCtxChanged )
 {
-    // Initialize with defaults
     uint8_t itr = 0;
+    uint8_t zeroKey[16] = { 0 };
+
+    // Initialize with defaults
     SeNvmCtx.KeyList[itr++].KeyID = APP_KEY;
     SeNvmCtx.KeyList[itr++].KeyID = GEN_APP_KEY;
     SeNvmCtx.KeyList[itr++].KeyID = NWK_KEY;
@@ -184,7 +186,10 @@ SecureElementStatus_t SecureElementInit( SecureElementNvmEvent seNvmCtxChanged )
     SeNvmCtx.KeyList[itr++].KeyID = MC_KEY_3;
     SeNvmCtx.KeyList[itr++].KeyID = MC_APP_S_KEY_3;
     SeNvmCtx.KeyList[itr++].KeyID = MC_NWK_S_KEY_3;
-    SeNvmCtx.KeyList[itr++].KeyID = SLOT_RAND_ZERO_KEY;
+    SeNvmCtx.KeyList[itr].KeyID = SLOT_RAND_ZERO_KEY;
+
+    // Set standard keys
+    memcpy1( SeNvmCtx.KeyList[itr].KeyValue, zeroKey, KEY_SIZE );
 
     // Assign callback
     if( seNvmCtxChanged != 0 )