diff --git a/inc/zuc256.h b/inc/zuc256.h index 9a4d91b..1ff94ac 100644 --- a/inc/zuc256.h +++ b/inc/zuc256.h @@ -9,29 +9,40 @@ typedef uint32_t ZUC_UINT31; // 31位无符号整数 typedef uint8_t ZUC_UINT7; // 7位无符号整数 typedef uint8_t ZUC_UINT6; // 6位无符号整数 - +typedef uint32_t ZUC_UINT32; // 32位无符号整数 // ZUC状态结构体 typedef struct { ZUC_UINT31 LFSR[16]; // 线性反馈移位寄存器 uint32_t R1; // 寄存器1 uint32_t R2; // 寄存器2 -} ZUC256_STATE; - +} ZUC_STATE; +typedef ZUC_STATE ZUC256_STATE; // 加密上下文结构体(用于分阶段处理) typedef struct { - ZUC256_STATE state; // 基础ZUC状态 + ZUC_STATE state; // 基础ZUC状态 uint8_t buf[4]; // 输入缓冲区(处理非4字节对齐数据) size_t buflen; // 缓冲区中有效字节数 } ZUC256_ENCRYPT_CTX; +// ZUC256 MAC 上下文结构体 +typedef struct { + ZUC_UINT31 LFSR[16]; // ZUC256 线性反馈移位寄存器 + uint32_t R1; // 非线性函数寄存器R1 + uint32_t R2; // 非线性函数寄存器R2 + uint8_t buf[4]; // 数据缓存（处理不足4字节的待认证数据） + size_t buflen; // 缓存中有效数据长度（0~3） + uint32_t T[4]; // MAC 累加器（支持最大128位MAC，4个32位字） + uint32_t K0[4]; // MAC 初始密钥字（与T长度匹配） + int macbits; // MAC 输出位数（32/64/128，按32位对齐） +} ZUC256_MAC_CTX; // 初始化ZUC256状态 -void zuc256_init(ZUC256_STATE *state, const uint8_t K[32], const uint8_t IV[23]); +void zuc256_init(ZUC_STATE *state, const uint8_t K[32], const uint8_t IV[23]); // 生成单个密钥字 -uint32_t zuc256_generate_keyword(ZUC256_STATE *state); +uint32_t zuc256_generate_keyword(ZUC_STATE *state); // 生成指定长度的密钥流 -void zuc256_generate_keystream(ZUC256_STATE *state, size_t nwords, uint32_t *keystream); +void zuc256_generate_keystream(ZUC_STATE *state, size_t nwords, uint32_t *keystream); // 初始化加密上下文 void zuc256_encrypt_init(ZUC256_ENCRYPT_CTX *ctx, const uint8_t K[32], const uint8_t IV[23]); @@ -43,8 +54,7 @@ void zuc256_encrypt_update(ZUC256_ENCRYPT_CTX *ctx, const uint8_t *in, size_t in void zuc256_encrypt_finish(ZUC256_ENCRYPT_CTX *ctx, uint8_t *out); // 一次性加密函数 -void zuc256_crypt(ZUC256_STATE *state, const uint8_t *in, size_t inlen, uint8_t *out); - +void zuc256_crypt(ZUC_STATE *state, const uint8_t *in, size_t inlen, uint8_t *out); void extract_iv(const uint8_t *input_25byte, uint8_t *output_23byte); #endif /*__ZUC256_H */ \ No newline at end of file diff --git a/src/main.c b/src/main.c index e24f70c..18fd0ae 100644 --- a/src/main.c +++ b/src/main.c @@ -12,7 +12,7 @@ void print_hex(const char *label, const uint8_t *data, size_t len) { } int main() { - // 1. 明文 +// 1. 明文 uint8_t plaintext[] = "ZUC256对称加解密测试:1234567890"; size_t plaintext_len = strlen((char*)plaintext); printf("明文: %s\n", plaintext); @@ -38,7 +38,7 @@ int main() { } // 5. 加密 - ZUC256_STATE state; + ZUC_STATE state; zuc256_init(&state, key, iv); zuc256_crypt(&state, plaintext, plaintext_len, ciphertext); print_hex("密文", ciphertext, plaintext_len); @@ -61,4 +61,4 @@ int main() { free(decryptedtext); return 0; -} \ No newline at end of file +} diff --git a/src/zuc256.c b/src/zuc256.c index 5b5612d..0fd22f3 100644 --- a/src/zuc256.c +++ b/src/zuc256.c @@ -42,74 +42,81 @@ static const uint8_t S1[256] = { }; // 常量数组D -static const ZUC_UINT7 ZUC256_D[][16] = { - {0x22,0x2F,0x24,0x2A,0x6D,0x40,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x52,0x10,0x30}, - {0x22,0x2F,0x25,0x2A,0x6D,0x40,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x52,0x10,0x30}, - {0x23,0x2F,0x24,0x2A,0x6D,0x40,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x52,0x10,0x30}, - {0x23,0x2F,0x25,0x2A,0x6D,0x40,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x52,0x10,0x30}, -}; -// 核心宏定义 -#define ADD31(a,b) a += (b); a = (a & 0x7fffffff) + (a >> 31) -#define ROT31(a,k) ((((a) << (k)) | ((a) >> (31 - (k)))) & 0x7FFFFFFF) -#define ROT32(a,k) (((a) << (k)) | ((a) >> (32 - (k)))) +#define F_(X1,X2) \ + W1 = R1 + X1; \ + W2 = R2 ^ X2; \ + U = L1((W1 << 16) | (W2 >> 16)); \ + V = L2((W2 << 16) | (W1 >> 16)); \ + R1 = MAKEU32( S0[U >> 24], \ + S1[(U >> 16) & 0xFF], \ + S0[(U >> 8) & 0xFF], \ + S1[U & 0xFF]); \ + R2 = MAKEU32( S0[V >> 24], \ + S1[(V >> 16) & 0xFF], \ + S0[(V >> 8) & 0xFF], \ + S1[V & 0xFF]) -#define L1(X) \ - ((X) ^ \ - ROT32((X), 2) ^ \ - ROT32((X), 10) ^ \ - ROT32((X), 18) ^ \ - ROT32((X), 24)) +#define F(X0,X1,X2) \ + ((X0 ^ R1) + R2); \ + F_(X1, X2) +#define ADD31(a,b) a += (b); a = (a & 0x7fffffff) + (a >> 31) +#define ROT31(a,k) ((((a) << (k)) | ((a) >> (31 - (k)))) & 0x7FFFFFFF) +#define ROT32(a,k) (((a) << (k)) | ((a) >> (32 - (k)))) -#define L2(X) \ - ((X) ^ \ - ROT32((X), 8) ^ \ - ROT32((X), 14) ^ \ - ROT32((X), 22) ^ \ - ROT32((X), 30)) +#define L1(X) \ + ((X) ^ \ + ROT32((X), 2) ^ \ + ROT32((X), 10) ^ \ + ROT32((X), 18) ^ \ + ROT32((X), 24)) -#define LFSRWithInitialisationMode(u, LFSR, V) \ - V = LFSR[0]; \ - ADD31(V, ROT31(LFSR[ 0], 8)); \ - ADD31(V, ROT31(LFSR[ 4], 20)); \ - ADD31(V, ROT31(LFSR[10], 21)); \ - ADD31(V, ROT31(LFSR[13], 17)); \ - ADD31(V, ROT31(LFSR[15], 15)); \ - ADD31(V, (u)); \ - {int j; for (j=0; j<15;j++) LFSR[j]=LFSR[j+1];} \ - LFSR[15] = V +#define L2(X) \ + ((X) ^ \ + ROT32((X), 8) ^ \ + ROT32((X), 14) ^ \ + ROT32((X), 22) ^ \ + ROT32((X), 30)) -#define LFSRWithWorkMode(LFSR, V) \ - { \ - int j; \ - uint64_t a = LFSR[0]; \ - a += ((uint64_t)LFSR[ 0]) << 8; \ - a += ((uint64_t)LFSR[ 4]) << 20; \ - a += ((uint64_t)LFSR[10]) << 21; \ - a += ((uint64_t)LFSR[13]) << 17; \ - a += ((uint64_t)LFSR[15]) << 15; \ - a = (a & 0x7fffffff) + (a >> 31); \ - V = (uint32_t)((a & 0x7fffffff) + (a >> 31)); \ - for (j = 0; j < 15; j++) \ - LFSR[j] = LFSR[j+1]; \ - LFSR[15] = V; \ - } -#define BitReconstruction2(X1,X2, LFSR) \ - X1 = ((LFSR[11] & 0xFFFF) << 16) | (LFSR[9] >> 15); \ - X2 = ((LFSR[7] & 0xFFFF) << 16) | (LFSR[5] >> 15) +#define LFSRWithInitialisationMode(u) \ + V = LFSR[0]; \ + ADD31(V, ROT31(LFSR[ 0], 8)); \ + ADD31(V, ROT31(LFSR[ 4], 20)); \ + ADD31(V, ROT31(LFSR[10], 21)); \ + ADD31(V, ROT31(LFSR[13], 17)); \ + ADD31(V, ROT31(LFSR[15], 15)); \ + ADD31(V, (u)); \ + {int j; for (j=0; j<15;j++) LFSR[j]=LFSR[j+1];} \ + LFSR[15] = V -#define BitReconstruction3(X0,X1,X2, LFSR) \ - X0 = ((LFSR[15] & 0x7FFF8000) << 1) | (LFSR[14] & 0xFFFF); \ - BitReconstruction2(X1,X2, LFSR) +#define LFSRWithWorkMode() \ + { \ + int j; \ + uint64_t a = LFSR[0]; \ + a += ((uint64_t)LFSR[ 0]) << 8; \ + a += ((uint64_t)LFSR[ 4]) << 20; \ + a += ((uint64_t)LFSR[10]) << 21; \ + a += ((uint64_t)LFSR[13]) << 17; \ + a += ((uint64_t)LFSR[15]) << 15; \ + a = (a & 0x7fffffff) + (a >> 31); \ + V = (uint32_t)((a & 0x7fffffff) + (a >> 31)); \ + for (j = 0; j < 15; j++) \ + LFSR[j] = LFSR[j+1]; \ + LFSR[15] = V; \ + } -#define BitReconstruction4(X0,X1,X2,X3, LFSR) \ - BitReconstruction3(X0,X1,X2, LFSR); \ - X3 = ((LFSR[2] & 0xFFFF) << 16) | (LFSR[0] >> 15) +#define BitReconstruction2(X1,X2) \ + X1 = ((LFSR[11] & 0xFFFF) << 16) | (LFSR[9] >> 15); \ + X2 = ((LFSR[7] & 0xFFFF) << 16) | (LFSR[5] >> 15) + +#define BitReconstruction3(X0,X1,X2) \ + X0 = ((LFSR[15] & 0x7FFF8000) << 1) | (LFSR[14] & 0xFFFF); \ + BitReconstruction2(X1,X2) + +#define BitReconstruction4(X0,X1,X2,X3) \ + BitReconstruction3(X0,X1,X2); \ + X3 = ((LFSR[2] & 0xFFFF) << 16) | (LFSR[0] >> 15) #define MAKEU32(a, b, c, d) \ (((uint32_t)(a) << 24) | \ @@ -117,36 +124,13 @@ static const ZUC_UINT7 ZUC256_D[][16] = { ((uint32_t)(c) << 8) | \ ((uint32_t)(d))) -#define ZUC256_MAKEU31(a,b,c,d) \ - (((uint32_t)(a) << 23) | \ - ((uint32_t)(b) << 16) | \ - ((uint32_t)(c) << 8) | \ - (uint32_t)(d)) & 0x7FFFFFFF /* 确保31位 */ +#define ZUC256_MAKEU31(a,b,c,d) \ + (((uint32_t)(a) << 23) | \ + ((uint32_t)(b) << 16) | \ + ((uint32_t)(c) << 8) | \ + (uint32_t)(d)) & 0x7FFFFFFF /* 确保31位 */ -//F_函数宏 -#define F_(X1,X2) do { \ - uint32_t W1, W2, U, V; \ - W1 = R1 + X1; \ - W2 = R2 ^ X2; \ - U = L1((W1 << 16) | (W2 >> 16)); \ - V = L2((W2 << 16) | (W1 >> 16)); \ - R1 = MAKEU32(S0[U >> 24], \ - S1[(U >> 16) & 0xFF], \ - S0[(U >> 8) & 0xFF], \ - S1[U & 0xFF]); \ - R2 = MAKEU32(S0[V >> 24], \ - S1[(V >> 16) & 0xFF], \ - S0[(V >> 8) & 0xFF], \ - S1[V & 0xFF]); \ -} while(0) -//F函数宏 -#define F(X0,X1,X2) ({ \ - uint32_t result; \ - result = ((X0 ^ R1) + R2) & 0xFFFFFFFF; \ - F_(X1, X2); \ - result; \ -}) // 辅助函数:字节序转换 static inline uint32_t GETU32(const uint8_t *p) { return ((uint32_t)p[0] << 24) | ((uint32_t)p[1] << 16) | @@ -158,118 +142,164 @@ static inline void PUTU32(uint8_t *p, uint32_t v) { p[2] = (uint8_t)(v >> 8); p[3] = (uint8_t)v; } -// 设置MAC密钥(内部使用) -static void zuc256_set_mac_key(ZUC256_STATE *key, const uint8_t K[32], - const uint8_t IV[23], int macbits) + + +static const ZUC_UINT7 ZUC256_D[][16] = { + {0x22,0x2F,0x24,0x2A,0x6D,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x52,0x10,0x30}, + {0x22,0x2F,0x25,0x2A,0x6D,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x52,0x10,0x30}, + {0x23,0x2F,0x24,0x2A,0x6D,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x52,0x10,0x30}, + {0x23,0x2F,0x25,0x2A,0x6D,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x52,0x10,0x30}, +}; + +static void zuc256_set_mac_key(ZUC_STATE *key, const uint8_t K[32], + const uint8_t IV[23], int macbits) { - ZUC_UINT31 *LFSR = key->LFSR; - uint32_t R1 = 0, R2 = 0; - uint32_t X0, X1, X2, W; - const ZUC_UINT7 *D; - int i; - uint32_t V; + ZUC_UINT31 *LFSR = key->LFSR; + uint32_t R1, R2; + uint32_t X0, X1, X2; + uint32_t W, W1, W2, U, V; + const ZUC_UINT7 *D; + int i; - // 从IV中提取扩展位 - ZUC_UINT6 IV17 = (IV[17] >> 2) & 0x3F; - ZUC_UINT6 IV18 = (((IV[17] & 0x3) << 4) | (IV[18] >> 4)) & 0x3F; - ZUC_UINT6 IV19 = (((IV[18] & 0xF) << 2) | (IV[19] >> 6)) & 0x3F; - ZUC_UINT6 IV20 = (IV[19] & 0x3F) & 0x3F; - ZUC_UINT6 IV21 = (IV[20] >> 2) & 0x3F; - ZUC_UINT6 IV22 = (((IV[20] & 0x3) << 4) | (IV[21] >> 4)) & 0x3F; - ZUC_UINT6 IV23 = (((IV[21] & 0xF) << 2) | (IV[22] >> 6)) & 0x3F; - ZUC_UINT6 IV24 = (IV[22] & 0x3F) & 0x3F; + ZUC_UINT6 IV17 = IV[17] >> 2; + ZUC_UINT6 IV18 = ((IV[17] & 0x3) << 4) | (IV[18] >> 4); + ZUC_UINT6 IV19 = ((IV[18] & 0xf) << 2) | (IV[19] >> 6); + ZUC_UINT6 IV20 = IV[19] & 0x3f; + ZUC_UINT6 IV21 = IV[20] >> 2; + ZUC_UINT6 IV22 = ((IV[20] & 0x3) << 4) | (IV[21] >> 4); + ZUC_UINT6 IV23 = ((IV[21] & 0xf) << 2) | (IV[22] >> 6); + ZUC_UINT6 IV24 = IV[22] & 0x3f; - // 选择合适的D数组 - D = (macbits/32 < 3) ? ZUC256_D[macbits/32] : ZUC256_D[3]; + D = macbits/32 < 3 ? ZUC256_D[macbits/32] : ZUC256_D[3]; + LFSR[0] = ZUC256_MAKEU31(K[0], D[0], K[21], K[16]); + LFSR[1] = ZUC256_MAKEU31(K[1], D[1], K[22], K[17]); + LFSR[2] = ZUC256_MAKEU31(K[2], D[2], K[23], K[18]); + LFSR[3] = ZUC256_MAKEU31(K[3], D[3], K[24], K[19]); + LFSR[4] = ZUC256_MAKEU31(K[4], D[4], K[25], K[20]); + LFSR[5] = ZUC256_MAKEU31(IV[0], (D[5] | IV17), K[5], K[26]); + LFSR[6] = ZUC256_MAKEU31(IV[1], (D[6] | IV18), K[6], K[27]); + LFSR[7] = ZUC256_MAKEU31(IV[10], (D[7] | IV19), K[7], IV[2]); + LFSR[8] = ZUC256_MAKEU31(K[8], (D[8] | IV20), IV[3], IV[11]); + LFSR[9] = ZUC256_MAKEU31(K[9], (D[9] | IV21), IV[12], IV[4]); + LFSR[10] = ZUC256_MAKEU31(IV[5], (D[10] | IV22), K[10], K[28]); + LFSR[11] = ZUC256_MAKEU31(K[11], (D[11] | IV23), IV[6], IV[13]); + LFSR[12] = ZUC256_MAKEU31(K[12], (D[12] | IV24), IV[7], IV[14]); + LFSR[13] = ZUC256_MAKEU31(K[13], D[13], IV[15], IV[8]); + LFSR[14] = ZUC256_MAKEU31(K[14], (D[14] | (K[31] >> 4)), IV[16], IV[9]); + LFSR[15] = ZUC256_MAKEU31(K[15], (D[15] | (K[31] & 0x0F)), K[30], K[29]); - // 初始化LFSR状态 - LFSR[0] = ZUC256_MAKEU31(K[0], D[0], K[21], K[16]); - LFSR[1] = ZUC256_MAKEU31(K[1], D[1], K[22], K[17]); - LFSR[2] = ZUC256_MAKEU31(K[2], D[2], K[23], K[18]); - LFSR[3] = ZUC256_MAKEU31(K[3], D[3], K[24], K[19]); - LFSR[4] = ZUC256_MAKEU31(K[4], D[4], K[25], K[20]); - LFSR[5] = ZUC256_MAKEU31(IV[0], (D[5] | IV17), K[5], K[26]); - LFSR[6] = ZUC256_MAKEU31(IV[1], (D[6] | IV18), K[6], K[27]); - LFSR[7] = ZUC256_MAKEU31(IV[10], (D[7] | IV19), K[7], IV[2]); - LFSR[8] = ZUC256_MAKEU31(K[8], (D[8] | IV20), IV[3], IV[11]); - LFSR[9] = ZUC256_MAKEU31(K[9], (D[9] | IV21), IV[12], IV[4]); - LFSR[10] = ZUC256_MAKEU31(IV[5], (D[10] | IV22), K[10], K[28]); - LFSR[11] = ZUC256_MAKEU31(K[11], (D[11] | IV23), IV[6], IV[13]); - LFSR[12] = ZUC256_MAKEU31(K[12], (D[12] | IV24), IV[7], IV[14]); - LFSR[13] = ZUC256_MAKEU31(K[13], D[13], IV[15], IV[8]); - LFSR[14] = ZUC256_MAKEU31(K[14], (D[14] | ((K[31] >> 4) & 0x0F)), IV[16], IV[9]); - LFSR[15] = ZUC256_MAKEU31(K[15], (D[15] | (K[31] & 0x0F)), K[30], K[29]); + R1 = 0; + R2 = 0; + for (i = 0; i < 32; i++) { + BitReconstruction3(X0, X1, X2); + W = F(X0, X1, X2); + LFSRWithInitialisationMode(W >> 1); + } + BitReconstruction2(X1, X2); + F_(X1, X2); + LFSRWithWorkMode(); - // 32轮初始迭代 - for (i = 0; i < 32; i++) { - BitReconstruction3(X0, X1, X2, LFSR); - W = F(X0, X1, X2); - LFSRWithInitialisationMode(W >> 1, LFSR, V); - } - - // 切换到工作模式 - BitReconstruction2(X1, X2, LFSR); - F_(X1, X2); - LFSRWithWorkMode(LFSR, V); - - // 保存寄存器状态 - key->R1 = R1; - key->R2 = R2; + key->R1 = R1; + key->R2 = R2; } + + // 初始化ZUC256状态 -void zuc256_init(ZUC256_STATE *state, const uint8_t K[32], const uint8_t IV[23]) { - if (!state || !K || !IV) return; - zuc256_set_mac_key(state, K, IV, 0); +void zuc256_init(ZUC_STATE *key, const uint8_t K[32], + const uint8_t IV[23]) +{ + if (!key || !K || !IV) return; + zuc256_set_mac_key(key, K, IV, 0); } - // 生成单个密钥字 -uint32_t zuc256_generate_keyword(ZUC256_STATE *state) { - if (!state) return 0; +uint32_t zuc256_generate_keyword(ZUC_STATE *state) { + ZUC_UINT31 *LFSR = state->LFSR; + uint32_t R1 = state->R1; + uint32_t R2 = state->R2; + uint32_t X0, X1, X2, X3; + uint32_t W1, W2, U, V; + uint32_t Z; - ZUC_UINT31 *LFSR = state->LFSR; - uint32_t R1 = state->R1; - uint32_t R2 = state->R2; - uint32_t X0, X1, X2, X3; - uint32_t Z, V; + BitReconstruction4(X0, X1, X2, X3); + Z = X3 ^ F(X0, X1, X2); + LFSRWithWorkMode(); - BitReconstruction4(X0, X1, X2, X3, LFSR); - Z = X3 ^ F(X0, X1, X2); - LFSRWithWorkMode(LFSR, V); + state->R1 = R1; + state->R2 = R2; - // 更新状态 - state->R1 = R1; - state->R2 = R2; - - - return Z; + return Z; } -// 生成指定长度的密钥流 -void zuc256_generate_keystream(ZUC256_STATE *state, size_t nwords, uint32_t *keystream) { - if (!state || !keystream || nwords == 0) return; +void zuc256_generate_keystream(ZUC_STATE *state, size_t nwords, uint32_t *keystream) { + ZUC_UINT31 *LFSR = state->LFSR; + uint32_t R1 = state->R1; + uint32_t R2 = state->R2; + uint32_t X0, X1, X2, X3; + uint32_t W1, W2, U, V; + size_t i; - ZUC_UINT31 *LFSR = state->LFSR; - uint32_t R1 = state->R1; - uint32_t R2 = state->R2; - uint32_t X0, X1, X2, X3; - uint32_t V; - size_t i; + for (i = 0; i < nwords; i ++) { + /* + BitReconstruction4(X0, X1, X2, X3); + keystream[i] = X3 ^ F(X0, X1, X2); + LFSRWithWorkMode(); + */ + uint32_t T0, T1, T2, T3, T4, T5, T6, T7; + uint64_t a; + int j; - for (i = 0; i < nwords; i++) { - BitReconstruction4(X0, X1, X2, X3, LFSR); - keystream[i] = X3 ^ F(X0, X1, X2); - LFSRWithWorkMode(LFSR, V); - } + // expand BitReconstruction4(X0, X1, X2, X3) + X0 = ((LFSR[15] & 0x7FFF8000) << 1) | (LFSR[14] & 0xFFFF); + X1 = ((LFSR[11] & 0x0000FFFF) << 16) | (LFSR[ 9] >> 15); + X2 = ((LFSR[ 7] & 0x0000FFFF) << 16) | (LFSR[ 5] >> 15); + X3 = ((LFSR[ 2] & 0x0000FFFF) << 16) | (LFSR[ 0] >> 15); - // 更新状态 - state->R1 = R1; - state->R2 = R2; + //keystream[i] = X3 ^ F(X0, X1, X2); + keystream[i] = X3 ^ ((X0 ^ R1) + R2); + W1 = R1 + X1; + W2 = R2 ^ X2; + U = L1((W1 << 16) | (W2 >> 16)); + V = L2((W2 << 16) | (W1 >> 16)); + + // table lookup together makes 10% faster + T0 = S0[(U >> 24) ]; + T2 = S0[(U >> 8) & 0xFF]; + T4 = S0[(V >> 24) ]; + T6 = S0[(V >> 8) & 0xFF]; + + T1 = S1[(U >> 16) & 0xFF]; + T3 = S1[(U ) & 0xFF]; + T5 = S1[(V >> 16) & 0xFF]; + T7 = S1[(V ) & 0xFF]; + + R1 = MAKEU32(T0, T1, T2, T3); + R2 = MAKEU32(T4, T5, T6, T7); + + // expand LFSRWithWorkMode() + a = LFSR[0]; + a += ((uint64_t)LFSR[ 0]) << 8; + a += ((uint64_t)LFSR[ 4]) << 20; + a += ((uint64_t)LFSR[10]) << 21; + a += ((uint64_t)LFSR[13]) << 17; + a += ((uint64_t)LFSR[15]) << 15; + a = (a & 0x7fffffff) + (a >> 31); + V = (uint32_t)((a & 0x7fffffff) + (a >> 31)); + + for (j = 0; j < 15; j++) { + LFSR[j] = LFSR[j+1]; + } + LFSR[15] = V; + } + + state->R1 = R1; + state->R2 = R2; } + // 初始化加密上下文 void zuc256_encrypt_init(ZUC256_ENCRYPT_CTX *ctx, const uint8_t K[32], const uint8_t IV[23]) { if (!ctx) return; @@ -352,17 +382,23 @@ void zuc256_encrypt_finish(ZUC256_ENCRYPT_CTX *ctx, uint8_t *out) { } // 一次性加密函数(ZUC加密和解密相同) -void zuc256_crypt(ZUC256_STATE *state, const uint8_t *in, size_t inlen, uint8_t *out) { +void zuc256_crypt(ZUC_STATE *state, const uint8_t *in, size_t inlen, uint8_t *out) { if (!state || !in || !out) return; ZUC256_ENCRYPT_CTX ctx; - zuc256_encrypt_init(&ctx, NULL, NULL); - memcpy(&ctx.state, state, sizeof(ZUC256_STATE)); // 复制当前状态 - + // 修复1：初始化ctx内存（仅清空，不调用zuc256_encrypt_init） + memset(&ctx, 0, sizeof(ZUC256_ENCRYPT_CTX)); + // 修复2：将传入的合法state复制到ctx->state，复用已有状态（含K/IV对应的初始化结果） + memcpy(&ctx.state, state, sizeof(ZUC_STATE)); + + // 正常执行加解密（使用复用的state） zuc256_encrypt_update(&ctx, in, inlen, out); - zuc256_encrypt_finish(&ctx, out + (inlen / 4) * 4); + // 计算剩余数据的偏移：(inlen / 4)*4 是完整4字节块的长度，剩余数据从这里开始 + size_t remaining_offset = (inlen / 4) * 4; + zuc256_encrypt_finish(&ctx, out + remaining_offset); - memcpy(state, &ctx.state, sizeof(ZUC256_STATE)); // 回写状态 + // 修复3：将ctx->state的最新状态回写到传入的state（确保后续连续加解密的状态正确） + memcpy(state, &ctx.state, sizeof(ZUC_STATE)); } void extract_iv(const uint8_t *input_25byte, uint8_t *output_23byte) { if (!input_25byte || !output_23byte) return; @@ -380,4 +416,171 @@ void extract_iv(const uint8_t *input_25byte, uint8_t *output_23byte) { output_23byte[21] = ((src[5] & 0x0F) << 4) | (src[6] >> 2); output_23byte[22] = ((src[6] & 0x03) << 6) | src[7]; +} + +/** + * @brief 初始化ZUC256 MAC上下文 + * @param ctx：MAC上下文指针（输出） + * @param key：256位密钥（32字节，输入） + * @param iv：23字节初始向量（输入） + * @param macbits：期望MAC输出位数（32/64/128，自动调整范围：<32→32，>128→128） + */ +void zuc256_mac_init(ZUC256_MAC_CTX *ctx, const uint8_t key[32], + const uint8_t iv[23], int macbits) +{ + if (macbits < 32) + macbits = 32; + else if (macbits > 64) + macbits = 128; + memset(ctx, 0, sizeof(*ctx)); + zuc256_set_mac_key((ZUC256_STATE *)ctx, key, iv, macbits); + zuc256_generate_keystream((ZUC256_STATE *)ctx, macbits/32, ctx->T); + zuc256_generate_keystream((ZUC256_STATE *)ctx, macbits/32, ctx->K0); + ctx->macbits = (macbits/32) * 32; +} +/** + * @brief 更新ZUC256 MAC待认证数据（支持分块输入） + * @param ctx：已初始化的MAC上下文（输入/输出） + * @param data：待认证数据块（输入，可NULL） + * @param len：待认证数据长度（字节，输入，0则无操作） + */ +void zuc256_mac_update(ZUC256_MAC_CTX *ctx, const uint8_t *data, size_t len) +{ + ZUC_UINT32 K1, M; + size_t n = ctx->macbits / 32; + size_t i, j; + + if (!data || !len) { + return; + } + + if (ctx->buflen) { + size_t num = sizeof(ctx->buf) - ctx->buflen; + if (len < num) { + memcpy(ctx->buf + ctx->buflen, data, len); + ctx->buflen += len; + return; + } + + memcpy(ctx->buf + ctx->buflen, data, num); + M = GETU32(ctx->buf); + ctx->buflen = 0; + + K1 = zuc256_generate_keyword((ZUC_STATE *)ctx); + + for (i = 0; i < 32; i++) { + if (M & 0x80000000) { + for (j = 0; j < n; j++) { + ctx->T[j] ^= ctx->K0[j]; + } + } + M <<= 1; + for (j = 0; j < n - 1; j++) { + ctx->K0[j] = (ctx->K0[j] << 1) | (ctx->K0[j + 1] >> 31); + } + ctx->K0[j] = (ctx->K0[j] << 1) | (K1 >> 31); + K1 <<= 1; + } + + data += num; + len -= num; + } + + while (len >= 4) { + M = GETU32(data); + K1 = zuc256_generate_keyword((ZUC_STATE *)ctx); + + for (i = 0; i < 32; i++) { + if (M & 0x80000000) { + for (j = 0; j < n; j++) { + ctx->T[j] ^= ctx->K0[j]; + } + } + M <<= 1; + for (j = 0; j < n - 1; j++) { + ctx->K0[j] = (ctx->K0[j] << 1) | (ctx->K0[j + 1] >> 31); + } + ctx->K0[j] = (ctx->K0[j] << 1) | (K1 >> 31); + K1 <<= 1; + } + + data += 4; + len -= 4; + } + + if (len) { + memcpy(ctx->buf, data, len); + ctx->buflen = len; + } +} +/** + * @brief 完成ZUC256 MAC计算，输出最终认证码 + * @param ctx：已更新数据的MAC上下文（输入/输出，调用后清空） + * @param data：最后一块待认证数据（可NULL，若需补充不足1字节的比特） + * @param nbits：最后一块数据的额外比特数（0~7，仅当data非NULL时有效） + * @param mac：MAC输出缓冲区（需提前分配至少 ctx->macbits/8 字节空间） + */ +void zuc256_mac_finish(ZUC256_MAC_CTX *ctx, const uint8_t *data, size_t nbits, uint8_t *mac) +{ + ZUC_UINT32 K1, M; + size_t n = ctx->macbits/32; + size_t i, j; + + + if (!data) + nbits = 0; + + if (nbits >= 8) { + zuc256_mac_update(ctx, data, nbits/8); + data += nbits/8; + nbits %= 8; + } + + if (nbits) + ctx->buf[ctx->buflen] = *data; + + if (ctx->buflen || nbits) { + M = GETU32(ctx->buf); + K1 = zuc256_generate_keyword((ZUC_STATE *)ctx); + + + for (i = 0; i < ctx->buflen * 8 + nbits; i++) { + if (M & 0x80000000) { + for (j = 0; j < n; j++) { + ctx->T[j] ^= ctx->K0[j]; + } + } + M <<= 1; + for (j = 0; j < n - 1; j++) { + ctx->K0[j] = (ctx->K0[j] << 1) | (ctx->K0[j + 1] >> 31); + } + ctx->K0[j] = (ctx->K0[j] << 1) | (K1 >> 31); + K1 <<= 1; + } + } + + for (j = 0; j < n; j++) { + ctx->T[j] ^= ctx->K0[j]; + PUTU32(mac, ctx->T[j]); + mac += 4; + } + + memset(ctx, 0, sizeof(*ctx)); +} +/** + * @brief 一次性ZUC256 MAC计算（简化接口，适用于非流式数据） + * @param K：256位密钥（32字节，输入） + * @param IV：23字节初始向量（输入） + * @param data：待认证数据（输入，可NULL） + * @param len：待认证数据长度（字节，输入） + * @param macbits：MAC输出位数（32/64/128，输入） + * @param mac：MAC输出缓冲区（输出，需提前分配空间） + */ +void zuc256_mac(const uint8_t K[32], const uint8_t IV[23], const uint8_t *data, size_t len, int macbits, uint8_t *mac) { + ZUC256_MAC_CTX ctx; + zuc256_mac_init(&ctx, K, IV, macbits); + if (data && len > 0) { + zuc256_mac_update(&ctx, data, len); + } + zuc256_mac_finish(&ctx, NULL, 0, mac); } \ No newline at end of file