MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SHA204 personalizer updated to handle HMAC key better

Browse Source 
HMAC key is now configured and printed exactly as it is set
in MyConfig.h. This makes it easier to move the key around.
This commit is contained in:
Patrick Fallberg
2015-03-09 00:20:17 +01:00
parent 5b034cf064
commit a21715d415
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/MyConfig.h
+1 -1
View File
@@ -22,7 +22,7 @@
#define MY_RANDOMSEED_PIN 7 // A7 - Pin used for random generation (do not connect anything to this)
// Key to use for HMAC calculation in MySigningDriverAtsha204Soft (32 bytes)
#define MY_HMAC_KEY 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
/**********************************
libraries/MySensors/examples/Sha204Personalizer/Sha204Personalizer.ino
+7 -9
View File
@@ -57,12 +57,9 @@
#endif
#ifdef USER_KEY_DATA
const uint8_t user_key_data[32] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
};
#define MY_HMAC_KEY 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
const uint8_t user_key_data[32] = {MY_HMAC_KEY};
#endif
const int sha204Pin = ATSHA204_PIN;
@@ -796,7 +793,7 @@ void setup()
}
#endif //not SKIP_UART_CONFIRMATION
#else //LOCK_CONFIGURATION
Serial.println(F("Dry-run. Configuration not locked. Define LOCK_CONFIGURATION to lock for real."));
Serial.println(F("Configuration not locked. Define LOCK_CONFIGURATION to lock for real."));
#endif
}
else
@@ -833,6 +830,7 @@ void setup()
Serial.println(F("Key is not randomized (configuration not locked):"));
}
#endif
Serial.print("#define MY_HMAC_KEY ");
for (int i=0; i<32; i++)
{
Serial.print("0x");
@@ -842,7 +840,7 @@ void setup()
}
Serial.print(key[i], HEX);
if (i < 31) Serial.print(',');
if (!((i+1) % 8)) Serial.println();
if (i+1 == 16) Serial.print("\\\n ");
}
Serial.println();
@@ -937,7 +935,7 @@ void setup()
}
#endif //not SKIP_UART_CONFIRMATION
#else //LOCK_DATA
Serial.println(F("Dry-run. Data not locked. Define LOCK_DATA to lock for real."));
Serial.println(F("Data not locked. Define LOCK_DATA to lock for real."));
#endif
}
else