[M] Change in osmo-tetra[master]: Added TA61 to the TAA1 suite - gerrit-log

16 Dec 2025

wbokslag has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-tetra/+/41683?usp=email )
Change subject: Added TA61 to the TAA1 suite
......................................................................
Added TA61 to the TAA1 suite
Change-Id: I79e93d6863ab6c044a8e19bba85c7447095f5e11
---
M src/crypto/hurdle.c
M src/crypto/hurdle.h
M src/crypto/taa1.c
M src/crypto/taa1.h
4 files changed, 149 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/83/41683/1

diff --git a/src/crypto/hurdle.c b/src/crypto/hurdle.c
index 58a1bb0..a7b1f8d 100644
--- a/src/crypto/hurdle.c
+++ b/src/crypto/hurdle.c
@@ -45,6 +45,24 @@
    0xF0, 0xE6, 0x3F, 0x14, 0xF1, 0xE2, 0xB1, 0x86, 0xB4, 0xF3, 0x74, 0xFA, 0x6A, 0xB2, 0x21, 0x6D,
    0xEA, 0xB5, 0xE7, 0xE3, 0xC9, 0xD3, 0x8F, 0x03, 0x75, 0xE8, 0xD4, 0x42, 0xFD, 0x7E, 0xFF, 0x7F};
+const uint8_t g_abHurdleInvSbox[256] = {
+	0x03, 0x02, 0x8D, 0xF7, 0x44, 0xA4, 0x79, 0xB9, 0xAE, 0x9E, 0xDE, 0x9B, 0x3E, 0xA9, 0x5E, 0x95,
+	0xDB, 0x71, 0xC3, 0x5B, 0xE3, 0x3D, 0x4F, 0x65, 0x93, 0xDD, 0x56, 0x83, 0xA3, 0x80, 0x48, 0x29,
+	0x6F, 0xEE, 0x3A, 0x52, 0x63, 0x55, 0x2F, 0x89, 0x73, 0xD3, 0x1C, 0x49, 0x25, 0x88, 0x30, 0x6D,
+	0x4B, 0x8A, 0x6C, 0x2D, 0xA7, 0xC0, 0x43, 0x5D, 0x53, 0x21, 0xCC, 0xAA, 0xA8, 0x0F, 0x16, 0xE2,
+	0x35, 0x5C, 0xFB, 0xD6, 0x91, 0x4D, 0xA5, 0x07, 0x33, 0x8B, 0x28, 0x1D, 0x15, 0x64, 0x46, 0x90,
+	0x3B, 0x20, 0x6B, 0x8F, 0x82, 0x19, 0x26, 0x62, 0x10, 0xC2, 0xC8, 0x60, 0x94, 0x0D, 0x34, 0x42,
+	0x27, 0x54, 0xCA, 0x58, 0xBA, 0x01, 0x14, 0x4E, 0x51, 0x8E, 0xEC, 0xB0, 0x23, 0xEF, 0x2C, 0x31,
+	0x2B, 0xD2, 0x12, 0xDA, 0xEA, 0xF8, 0xD9, 0x7A, 0xD8, 0x74, 0x05, 0xB8, 0x87, 0xCE, 0xFD, 0xFF,
+	0x18, 0x57, 0xA2, 0x1E, 0x7F, 0xCF, 0xE7, 0xB3, 0x4A, 0x32, 0x24, 0x2E, 0x50, 0x6A, 0xC7, 0xF6,
+	0x1B, 0xDC, 0x47, 0x4C, 0x98, 0xBF, 0x0C, 0x5F, 0x08, 0xDF, 0xBE, 0x97, 0xAF, 0x0A, 0xC4, 0xA1,
+	0x1F, 0x81, 0x9C, 0xC5, 0x37, 0xC1, 0x45, 0x06, 0xCD, 0x38, 0x0E, 0x3F, 0x9F, 0x0B, 0xBD, 0xB4,
+	0x84, 0xE6, 0xED, 0x68, 0xE8, 0xF1, 0xBC, 0xAC, 0xC6, 0x67, 0x04, 0x78, 0x96, 0x99, 0xAD, 0xB5,
+	0x11, 0x5A, 0xA6, 0x36, 0x66, 0xBB, 0xA0, 0x9D, 0xD1, 0xF4, 0x61, 0x59, 0x86, 0x7E, 0xAB, 0x39,
+	0x2A, 0x72, 0xCB, 0xF5, 0xFA, 0x40, 0xD4, 0xD5, 0x13, 0x70, 0x75, 0x7B, 0x9A, 0x09, 0x1A, 0x92,
+	0x17, 0x3C, 0xE5, 0xF3, 0x85, 0xB2, 0xE1, 0xF2, 0xF9, 0x77, 0xF0, 0xB7, 0x6E, 0x22, 0xB1, 0x69,
+	0xE0, 0xE4, 0xB6, 0xE9, 0x00, 0x8C, 0xD0, 0xC9, 0x41, 0xD7, 0xEB, 0x76, 0x7C, 0xFC, 0x7D, 0xFE};
+
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 static const uint32_t g_adwReorder[16] = {
    0x00000000, 0x80000000, 0x00800000, 0x80800000,
diff --git a/src/crypto/hurdle.h b/src/crypto/hurdle.h
index bbd641c..123a5d3 100644
--- a/src/crypto/hurdle.h
+++ b/src/crypto/hurdle.h
@@ -16,5 +16,6 @@
 void HURDLE_dec_cts(uint8_t abPlaintext[15], const uint8_t abCiphertext[15], uint8_t abKey[16]);
extern const uint8_t g_abHurdleSbox[256];
+extern const uint8_t g_abHurdleInvSbox[256];
#endif /* HAVE_HURDLE_H */
diff --git a/src/crypto/taa1.c b/src/crypto/taa1.c
index 09e3a4b..71ff45d 100644
--- a/src/crypto/taa1.c
+++ b/src/crypto/taa1.c
@@ -127,6 +127,30 @@
    lpBufferOut[9] = lpBuffer[13];
 }
+void transform_identity(const uint8_t *lpInput, uint8_t *lpOutput)
+{
+	uint8_t abSboxIndexes[3];
+
+	abSboxIndexes[0] = ((lpInput[1] + lpInput[0]) << 1) - lpInput[2];
+	abSboxIndexes[1] = ((lpInput[2] + lpInput[0]) << 1) - lpInput[1];
+	abSboxIndexes[2] = ((lpInput[2] + lpInput[1]) << 1) - lpInput[0];
+
+	lpOutput[0] = g_abHurdleSbox[abSboxIndexes[0]];
+	lpOutput[1] = g_abHurdleSbox[abSboxIndexes[1]];
+	lpOutput[2] = g_abHurdleSbox[abSboxIndexes[2]];
+}
+
+void transform_identity_inverse(const uint8_t *lpInput, uint8_t *lpOutput)
+{
+	uint8_t x = g_abHurdleInvSbox[lpInput[0]];
+	uint8_t y = g_abHurdleInvSbox[lpInput[1]];
+	uint8_t z = g_abHurdleInvSbox[lpInput[2]];
+
+	lpOutput[0] = (114*x + 114*y -  57*z);
+	lpOutput[1] = (114*x -  57*y + 114*z);
+	lpOutput[2] = (-57*x + 114*y + 114*z);
+}
+
 void ta11_ta41(uint8_t *lpKeyK, uint8_t *lpChallengeRs, uint8_t *lpKsOut)
 {
    uint8_t abChallengeExpanded[16];
@@ -261,6 +285,103 @@
    	abUnsealed[10] & 0xe0;
 }
+void ta61_compute_c(const uint8_t *lpKey, uint8_t *lpIntermediateKeyOut)
+{
+	struct hurdle_ctx stCipher;
+	uint8_t abKeyExpanded[16];
+
+	transform_80_to_128(lpKey, abKeyExpanded);
+
+	hurdle_set_key(abKeyExpanded, &stCipher);
+
+	uint8_t abPlaintext[8];
+	abPlaintext[0] = lpKey[0] ^ lpKey[2];
+	abPlaintext[1] = lpKey[1] ^ lpKey[3];
+	abPlaintext[2] = lpKey[2] ^ lpKey[4];
+	abPlaintext[3] = lpKey[3] ^ lpKey[5];
+	abPlaintext[4] = lpKey[4] ^ lpKey[6];
+	abPlaintext[5] = lpKey[5] ^ lpKey[7];
+	abPlaintext[6] = lpKey[6] ^ lpKey[8];
+	abPlaintext[7] = lpKey[7] ^ lpKey[9];
+
+	HURDLE_encrypt(
+		lpIntermediateKeyOut,
+		abPlaintext,
+		&stCipher,
+		HURDLE_ENCRYPT
+	);
+}
+
+void ta61(const uint8_t *lpKey, const uint8_t *lpIdentity, uint8_t *lpEncIdentityOut)
+{
+	uint8_t abIntermediateKey[8];
+	ta61_compute_c(lpKey, abIntermediateKey);
+	ta61_inner(abIntermediateKey, lpIdentity, lpEncIdentityOut);
+}
+
+void ta61_inner(const uint8_t *lpIntermediateKey, const uint8_t *lpIdentity, uint8_t *lpEncIdentityOut)
+{
+	uint8_t abIdentity[3];
+	abIdentity[0] = lpIdentity[0];
+	abIdentity[1] = lpIdentity[1];
+	abIdentity[2] = lpIdentity[2];
+
+	abIdentity[0] ^= lpIntermediateKey[0];
+	abIdentity[1] ^= lpIntermediateKey[3];
+	abIdentity[2] ^= lpIntermediateKey[6];
+
+	transform_identity(abIdentity, abIdentity);
+
+	abIdentity[0] ^= lpIntermediateKey[1];
+	abIdentity[1] ^= lpIntermediateKey[4];
+	abIdentity[2] ^= lpIntermediateKey[7];
+
+	transform_identity(abIdentity, abIdentity);
+
+	abIdentity[0] ^= lpIntermediateKey[2];
+	abIdentity[1] ^= lpIntermediateKey[5];
+	abIdentity[2] ^= lpIntermediateKey[0];
+
+	lpEncIdentityOut[0] = abIdentity[0];
+	lpEncIdentityOut[1] = abIdentity[1];
+	lpEncIdentityOut[2] = abIdentity[2];
+}
+
+void ta61_inv(uint8_t *lpKey, uint8_t *lpIdentity, uint8_t *lpDecIdentityOut)
+{
+	uint8_t abIntermediateKey[8];
+	ta61_compute_c(lpKey, abIntermediateKey);
+	ta61_inner_inv(abIntermediateKey, lpIdentity, lpDecIdentityOut);
+}
+
+void ta61_inner_inv(uint8_t *lpIntermediateKey, uint8_t *lpIdentity, uint8_t *lpDecIdentityOut)
+{
+	uint8_t abIdentity[3];
+	abIdentity[0] = lpIdentity[0];
+	abIdentity[1] = lpIdentity[1];
+	abIdentity[2] = lpIdentity[2];
+
+	abIdentity[0] ^= lpIntermediateKey[2];
+	abIdentity[1] ^= lpIntermediateKey[5];
+	abIdentity[2] ^= lpIntermediateKey[0];
+
+	transform_identity_inverse(abIdentity, abIdentity);
+
+	abIdentity[0] ^= lpIntermediateKey[1];
+	abIdentity[1] ^= lpIntermediateKey[4];
+	abIdentity[2] ^= lpIntermediateKey[7];
+
+	transform_identity_inverse(abIdentity, abIdentity);
+
+	abIdentity[0] ^= lpIntermediateKey[0];
+	abIdentity[1] ^= lpIntermediateKey[3];
+	abIdentity[2] ^= lpIntermediateKey[6];
+
+	lpDecIdentityOut[0] = abIdentity[0];
+	lpDecIdentityOut[1] = abIdentity[1];
+	lpDecIdentityOut[2] = abIdentity[2];
+}
+
 void ta71(uint8_t *lpGck, uint8_t *lpCck, uint8_t *lpMgckOut)
 {
    uint8_t abCiphertext[16];
diff --git a/src/crypto/taa1.h b/src/crypto/taa1.h
index 4baff6e..84d287e 100644
--- a/src/crypto/taa1.h
+++ b/src/crypto/taa1.h
@@ -36,6 +36,8 @@
 void ta32(uint8_t *lpSealedCck, uint8_t *lpCckId, uint8_t *lpDck, uint8_t *lpUnsealedCckOut, uint8_t *lpMfOut);
 void ta51(uint8_t *lpUnsealed, uint8_t *lpVn, uint8_t *lpKey, uint8_t *lpKeyN, uint8_t *lpSealedOut);
 void ta52(uint8_t *lpSealed, uint8_t *lpKey, uint8_t *lpVn, uint8_t *lpUnsealedOut, uint8_t *lpMfOut, uint8_t *lpKeyNOut);
+void ta61(const uint8_t *lpKey, const uint8_t *lpIdentity, uint8_t *lpEncIdentityOut);
+void ta61_inv(uint8_t *lpKey, uint8_t *lpIdentity, uint8_t *lpDecIdentityOut);
 void ta71(uint8_t *lpGck, uint8_t *lpCck, uint8_t *lpMgckOut);
 void ta81(uint8_t *lpUnsealedGck, uint8_t *lpGckVn, uint8_t *lpGckN, uint8_t *lpKey, uint8_t *lpSealedGckOut);
 void ta82(uint8_t *lpSealedGck, uint8_t *lpGckVn, uint8_t *lpKey, uint8_t *lpUnsealedGckOut, uint8_t *lpMfOut, uint8_t *lpGckNOut);
@@ -43,6 +45,13 @@
 void ta92(uint8_t *lpSealedGsko, uint8_t *lpGskoVn, uint8_t *lpKey, uint8_t *lpUnsealedGskoOut, uint8_t *lpMfOut);
/*
+ * TA61 internals
+ */
+void ta61_compute_c(const uint8_t *lpKey, uint8_t *lpIntermediateKeyOut);
+void ta61_inner(const uint8_t *lpIntermediateKey, const uint8_t *lpIdentity, uint8_t *lpEncIdentityOut);
+void ta61_inner_inv(uint8_t *lpIntermediateKey, uint8_t *lpIdentity, uint8_t *lpDecIdentityOut);
+
+/*
  * TBxx non-cryptographic primitives also used for authentication and key derivation
  */
 void tb4(uint8_t *lpDck1, uint8_t *lpDck2, uint8_t *lpDckOut);
-- 
To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/41683?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email

Gerrit-MessageType: newchange
Gerrit-Project: osmo-tetra
Gerrit-Branch: master
Gerrit-Change-Id: I79e93d6863ab6c044a8e19bba85c7447095f5e11
Gerrit-Change-Number: 41683
Gerrit-PatchSet: 1
Gerrit-Owner: wbokslag w.bokslag@midnightblue.nl



    