Skip to content

Commit 0ffffad

Browse files
committed
secureId: simplify code
1 parent b8005de commit 0ffffad

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

src/secureId.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
*/
1010

1111
#include "secureId.h"
12-
#include <Arduino_HEX.h>
1312

1413
bool secureId::begin() {
1514
return !!_se.begin();
@@ -24,7 +23,7 @@ bool secureId::get(uint8_t *in, uint32_t size) {
2423
if (size < CRYPTO_SN_SIZE) {
2524
return false;
2625
}
27-
if (!THEXT::decode((_se.serialNumber()).substring(0, CRYPTO_SN_SIZE*2), in, size)) {
26+
if (!_se.serialNumber(in, size)) {
2827
return false;
2928
}
3029
return true;

src/secureId.h

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,15 @@
1717
defined(ARDUINO_SAMD_MKRWAN1300) || \
1818
defined(ARDUINO_SAMD_MKRWAN1310) || \
1919
defined(ARDUINO_SAMD_MKRNB1500) || \
20-
defined(ARDUINO_SAMD_MKR1000) || \
2120
defined(ARDUINO_PORTENTA_H7_M7) || \
21+
defined(ARDUINO_SAMD_MKR1000) || \
22+
defined(ARDUINO_PORTENTA_C33) || \
23+
defined(ARDUINO_NICLA_VISION) || \
24+
defined(ARDUINO_UNOR4_WIFI) || \
2225
defined(ARDUINO_OPTA) || \
2326
defined(ARDUINO_GIGA)
2427
#include <Arduino_SecureElement.h>
25-
#define CRYPTO_SN_SIZE 9
26-
#elif defined(ARDUINO_PORTENTA_C33) || \
27-
defined(ARDUINO_NICLA_VISION)
28-
#include <Arduino_SecureElement.h>
29-
#define CRYPTO_SN_SIZE 18
30-
#elif defined(ARDUINO_UNOR4_WIFI)
31-
#include <Arduino_SecureElement.h>
32-
#define CRYPTO_SN_SIZE 6
28+
#define CRYPTO_SN_SIZE SE_SN_LENGTH
3329
#else
3430
#define CRYPTO_SN_SIZE 0
3531
#endif

0 commit comments

Comments
 (0)