NTAG21x Pk reused on NTAG 5...

Author: doegox

client/src/crypto/originality.c

@@ -44,7 +44,12 @@ const ecdsa_publickey_ng_t manufacturer_public_keys[] = {
     },
     // ref: AN11350 NTAG 21x Originality Signature Validation
     {
-        PK_MFUL,    MBEDTLS_ECP_DP_SECP128R1, 33, "NXP NTAG21x (2013)",
+        PK_MFUL,    MBEDTLS_ECP_DP_SECP128R1, 33, "NXP NTAG21x",
+        "04494E1A386D3D3CFE3DC10E5DE68A499B1C202DB5B132393E89ED19FE5BE8BC61"
+    },
+    // same key used on NTAG 5
+    {
+        PK_15,    MBEDTLS_ECP_DP_SECP128R1, 33, "NXP NTAG 5 link, NTAG 5 boost",
         "04494E1A386D3D3CFE3DC10E5DE68A499B1C202DB5B132393E89ED19FE5BE8BC61"
     },
 

tools/recover_pk.py

@@ -93,9 +93,11 @@ def selftests():
                      "04C2285A373080", "A561506723D422D29ED9F93E60D20B9ED1E05CC1BF81DA19FE500CA0B81CC0ED"],
          'pk': "0490933BDCD6E99B4E255E3DA55389A827564E11718E017292FAF23226A96614B8"},
 
-        {'name': "NTAG21x",
+        {'name': "NTAG21x, NTAG 5 link, NTAG 5 boost",
          'samples': ["04E10CDA993C80", "8B76052EE42F5567BEB53238B3E3F9950707C0DCC956B5C5EFCFDB709B2D82B3",
-                     "04DB0BDA993C80", "6048EFD9417CD10F6B7F1818D471A7FE5B46868D2EABDC6307A1E0AAE139D8D0"],
+                     "04DB0BDA993C80", "6048EFD9417CD10F6B7F1818D471A7FE5B46868D2EABDC6307A1E0AAE139D8D0",
+                     "0003FC2A580104E0", "A2AF1B088305152EA9197BA9446647BD8195EB75F3A19B31A2B9AE2274FA29A3",
+                     "0003EECE580104E0", "D29D7B55B2F90494E9A886B939B580857BE5C1471D448D56D40ACD38143010C8"],
          'pk': "04494E1A386D3D3CFE3DC10E5DE68A499B1C202DB5B132393E89ED19FE5BE8BC61"},
 
         {'name': "Mifare Classic EV1",