Skip to content

Commit 6368281

Browse files
committed
fixup! Add SM4 block cipher
Document SM4 in the table with all other cipher descriptors. Also, give it a lower cipher ID, simply picking the next available.
1 parent 1ce2bf9 commit 6368281

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

doc/crypt.tex

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ \subsection{Simple Encryption Demonstration}
600600
\index{Cipher descriptor table}
601601
\index{blowfish\_desc} \index{xtea\_desc} \index{rc2\_desc} \index{rc5\_desc} \index{rc6\_desc} \index{saferp\_desc} \index{aes\_desc} \index{twofish\_desc}
602602
\index{des\_desc} \index{des3\_desc} \index{noekeon\_desc} \index{skipjack\_desc} \index{anubis\_desc} \index{khazad\_desc} \index{kseed\_desc} \index{kasumi\_desc} \index{camellia\_desc} \index{aes\_enc\_desc}
603-
\index{idea\_desc} \index{serpent\_desc} \index{tea\_desc}
603+
\index{idea\_desc} \index{serpent\_desc} \index{tea\_desc} \index{sm4\_desc}
604604
\begin{figure}[hpbt]
605605
\begin{small}
606606
\begin{center}
@@ -632,6 +632,7 @@ \subsection{Simple Encryption Demonstration}
632632
\hline IDEA & idea\_desc & 8 & 16 & 8 & 24 \\
633633
\hline Serpent & serpent\_desc & 16 & 16, 24, 32 & 32 & 25 \\
634634
\hline TEA & tea\_desc & 8 & 16 & 32 & 26 \\
635+
\hline SM4 & sm4\_desc & 16 & 16 & 32 & 27 \\
635636
\hline
636637
\end{tabular}
637638
\end{center}

src/ciphers/sm4.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,8 +470,8 @@ int sm4_test(void)
470470

471471
const struct ltc_cipher_descriptor sm4_desc = {
472472
"sm4",
473-
127,
474-
16, 16, 16, 32,
473+
27,
474+
16, 16, 16, 32, /* min_key_len, max_key_len, block_len, default_rounds */
475475
&sm4_setup,
476476
&sm4_ecb_encrypt,
477477
&sm4_ecb_decrypt,

0 commit comments

Comments
 (0)