Skip to content

Commit 609d4f3

Browse files
sjaeckelsjaeckel
committed
We can now also decrypt PEM files encrypted in CFB1 and CFB8 mode
Signed-off-by: Steffen Jaeckel <s@jaeckel.eu>
1 parent 01e3fd0 commit 609d4f3

19 files changed

+101
-57
lines changed

‎doc/crypt.tex‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7644,6 +7644,12 @@ \subsection{PKCS PEM files}
76447644
\hline \texttt{AES-128-CFB} & AES & 128 & CFB \\
76457645
\hline \texttt{AES-192-CFB} & AES & 192 & CFB \\
76467646
\hline \texttt{AES-256-CFB} & AES & 256 & CFB \\
7647+
\hline \texttt{AES-128-CFB1} & AES & 128 & CFB \\
7648+
\hline \texttt{AES-192-CFB1} & AES & 192 & CFB \\
7649+
\hline \texttt{AES-256-CFB1} & AES & 256 & CFB \\
7650+
\hline \texttt{AES-128-CFB8} & AES & 128 & CFB \\
7651+
\hline \texttt{AES-192-CFB8} & AES & 192 & CFB \\
7652+
\hline \texttt{AES-256-CFB8} & AES & 256 & CFB \\
76477653
\hline \texttt{AES-128-CTR} & AES & 128 & CTR \\
76487654
\hline \texttt{AES-192-CTR} & AES & 192 & CTR \\
76497655
\hline \texttt{AES-256-CTR} & AES & 256 & CTR \\
@@ -7659,6 +7665,12 @@ \subsection{PKCS PEM files}
76597665
\hline \texttt{CAMELLIA-128-CFB} & Camellia & 128 & CFB \\
76607666
\hline \texttt{CAMELLIA-192-CFB} & Camellia & 192 & CFB \\
76617667
\hline \texttt{CAMELLIA-256-CFB} & Camellia & 256 & CFB \\
7668+
\hline \texttt{CAMELLIA-128-CFB1} & Camellia & 128 & CFB \\
7669+
\hline \texttt{CAMELLIA-192-CFB1} & Camellia & 192 & CFB \\
7670+
\hline \texttt{CAMELLIA-256-CFB1} & Camellia & 256 & CFB \\
7671+
\hline \texttt{CAMELLIA-128-CFB8} & Camellia & 128 & CFB \\
7672+
\hline \texttt{CAMELLIA-192-CFB8} & Camellia & 192 & CFB \\
7673+
\hline \texttt{CAMELLIA-256-CFB8} & Camellia & 256 & CFB \\
76627674
\hline \texttt{CAMELLIA-128-CTR} & Camellia & 128 & CTR \\
76637675
\hline \texttt{CAMELLIA-192-CTR} & Camellia & 192 & CTR \\
76647676
\hline \texttt{CAMELLIA-256-CTR} & Camellia & 256 & CTR \\
@@ -7674,9 +7686,13 @@ \subsection{PKCS PEM files}
76747686
\hline \texttt{DES-EDE-OFB} & 3DES (EDE) & 128 & OFB \\
76757687
\hline \texttt{DES-EDE3-CBC} & 3DES (EDE) & 192 & CBC \\
76767688
\hline \texttt{DES-EDE3-CFB} & 3DES (EDE) & 192 & CFB \\
7689+
\hline \texttt{DES-EDE3-CFB1} & 3DES (EDE) & 192 & CFB \\
7690+
\hline \texttt{DES-EDE3-CFB8} & 3DES (EDE) & 192 & CFB \\
76777691
\hline \texttt{DES-EDE3-OFB} & 3DES (EDE) & 192 & OFB \\
76787692
\hline \texttt{DES-CBC} & DES & 64 & CBC \\
76797693
\hline \texttt{DES-CFB} & DES & 64 & CFB \\
7694+
\hline \texttt{DES-CFB1} & DES & 64 & CFB \\
7695+
\hline \texttt{DES-CFB8} & DES & 64 & CFB \\
76807696
\hline \texttt{DES-OFB} & DES & 64 & OFB \\
76817697
\hline \texttt{DESX-CBC} & DES-X & 192 & CBC \\
76827698
\hline \texttt{IDEA-CBC} & IDEA & 128 & CBC \\

‎src/headers/tomcrypt_private.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,8 @@ enum cipher_mode {
267267
cm_flags = 0xff00,
268268
/* Flags */
269269
cm_openssh = 0x0100,
270+
cm_1bit = 0x0200,
271+
cm_8bit = 0x0400,
270272
/* Modes */
271273
cm_none = 0x0000,
272274
cm_cbc = 0x0001,
@@ -275,6 +277,8 @@ enum cipher_mode {
275277
cm_ofb = 0x0004,
276278
cm_stream = 0x0005,
277279
cm_gcm = 0x0006,
280+
cm_cfb1 = cm_cfb | cm_1bit,
281+
cm_cfb8 = cm_cfb | cm_8bit,
278282
cm_stream_openssh = cm_stream | cm_openssh,
279283
};
280284

‎src/misc/pem/pem.c‎

Lines changed: 81 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -75,61 +75,77 @@ const struct str pem_ssh_comment = { SET_CSTR(, "Comment: ") };
7575
const struct str pem_dek_info_start = { SET_CSTR(, "DEK-Info: ") };
7676
const struct blockcipher_info pem_dek_infos[] =
7777
{
78-
{ .name = "AES-128-CBC,", .algo = "aes", .keylen = 128 / 8, .mode = cm_cbc, },
79-
{ .name = "AES-192-CBC,", .algo = "aes", .keylen = 192 / 8, .mode = cm_cbc, },
80-
{ .name = "AES-256-CBC,", .algo = "aes", .keylen = 256 / 8, .mode = cm_cbc, },
81-
{ .name = "AES-128-CFB,", .algo = "aes", .keylen = 128 / 8, .mode = cm_cfb, },
82-
{ .name = "AES-192-CFB,", .algo = "aes", .keylen = 192 / 8, .mode = cm_cfb, },
83-
{ .name = "AES-256-CFB,", .algo = "aes", .keylen = 256 / 8, .mode = cm_cfb, },
84-
{ .name = "AES-128-CTR,", .algo = "aes", .keylen = 128 / 8, .mode = cm_ctr, },
85-
{ .name = "AES-192-CTR,", .algo = "aes", .keylen = 192 / 8, .mode = cm_ctr, },
86-
{ .name = "AES-256-CTR,", .algo = "aes", .keylen = 256 / 8, .mode = cm_ctr, },
87-
{ .name = "AES-128-OFB,", .algo = "aes", .keylen = 128 / 8, .mode = cm_ofb, },
88-
{ .name = "AES-192-OFB,", .algo = "aes", .keylen = 192 / 8, .mode = cm_ofb, },
89-
{ .name = "AES-256-OFB,", .algo = "aes", .keylen = 256 / 8, .mode = cm_ofb, },
90-
{ .name = "BF-CBC,", .algo = "blowfish", .keylen = 128 / 8, .mode = cm_cbc, },
91-
{ .name = "BF-CFB,", .algo = "blowfish", .keylen = 128 / 8, .mode = cm_cfb, },
92-
{ .name = "BF-OFB,", .algo = "blowfish", .keylen = 128 / 8, .mode = cm_ofb, },
93-
{ .name = "CAMELLIA-128-CBC,", .algo = "camellia", .keylen = 128 / 8, .mode = cm_cbc, },
94-
{ .name = "CAMELLIA-192-CBC,", .algo = "camellia", .keylen = 192 / 8, .mode = cm_cbc, },
95-
{ .name = "CAMELLIA-256-CBC,", .algo = "camellia", .keylen = 256 / 8, .mode = cm_cbc, },
96-
{ .name = "CAMELLIA-128-CFB,", .algo = "camellia", .keylen = 128 / 8, .mode = cm_cfb, },
97-
{ .name = "CAMELLIA-192-CFB,", .algo = "camellia", .keylen = 192 / 8, .mode = cm_cfb, },
98-
{ .name = "CAMELLIA-256-CFB,", .algo = "camellia", .keylen = 256 / 8, .mode = cm_cfb, },
99-
{ .name = "CAMELLIA-128-CTR,", .algo = "camellia", .keylen = 128 / 8, .mode = cm_ctr, },
100-
{ .name = "CAMELLIA-192-CTR,", .algo = "camellia", .keylen = 192 / 8, .mode = cm_ctr, },
101-
{ .name = "CAMELLIA-256-CTR,", .algo = "camellia", .keylen = 256 / 8, .mode = cm_ctr, },
102-
{ .name = "CAMELLIA-128-OFB,", .algo = "camellia", .keylen = 128 / 8, .mode = cm_ofb, },
103-
{ .name = "CAMELLIA-192-OFB,", .algo = "camellia", .keylen = 192 / 8, .mode = cm_ofb, },
104-
{ .name = "CAMELLIA-256-OFB,", .algo = "camellia", .keylen = 256 / 8, .mode = cm_ofb, },
105-
{ .name = "CAST5-CBC,", .algo = "cast5", .keylen = 128 / 8, .mode = cm_cbc, },
106-
{ .name = "CAST5-CFB,", .algo = "cast5", .keylen = 128 / 8, .mode = cm_cfb, },
107-
{ .name = "CAST5-OFB,", .algo = "cast5", .keylen = 128 / 8, .mode = cm_ofb, },
108-
{ .name = "ChaCha20,", .algo = "chacha20", .keylen = 256 / 8, .mode = cm_stream, },
109-
{ .name = "DES-EDE-CBC,", .algo = "3des", .keylen = 128 / 8, .mode = cm_cbc, },
110-
{ .name = "DES-EDE-CFB,", .algo = "3des", .keylen = 128 / 8, .mode = cm_cfb, },
111-
{ .name = "DES-EDE-OFB,", .algo = "3des", .keylen = 128 / 8, .mode = cm_ofb, },
112-
{ .name = "DES-EDE3-CBC,", .algo = "3des", .keylen = 192 / 8, .mode = cm_cbc, },
113-
{ .name = "DES-EDE3-CFB,", .algo = "3des", .keylen = 192 / 8, .mode = cm_cfb, },
114-
{ .name = "DES-EDE3-OFB,", .algo = "3des", .keylen = 192 / 8, .mode = cm_ofb, },
115-
{ .name = "DES-CBC,", .algo = "des", .keylen = 64 / 8, .mode = cm_cbc, },
116-
{ .name = "DES-CFB,", .algo = "des", .keylen = 64 / 8, .mode = cm_cfb, },
117-
{ .name = "DES-OFB,", .algo = "des", .keylen = 64 / 8, .mode = cm_ofb, },
118-
{ .name = "DESX-CBC,", .algo = "desx", .keylen = 192 / 8, .mode = cm_cbc, },
119-
{ .name = "IDEA-CBC,", .algo = "idea", .keylen = 128 / 8, .mode = cm_cbc, },
120-
{ .name = "IDEA-CFB,", .algo = "idea", .keylen = 128 / 8, .mode = cm_cfb, },
121-
{ .name = "IDEA-OFB,", .algo = "idea", .keylen = 128 / 8, .mode = cm_ofb, },
122-
{ .name = "RC5-CBC,", .algo = "rc5", .keylen = 128 / 8, .mode = cm_cbc, },
123-
{ .name = "RC5-CFB,", .algo = "rc5", .keylen = 128 / 8, .mode = cm_cfb, },
124-
{ .name = "RC5-OFB,", .algo = "rc5", .keylen = 128 / 8, .mode = cm_ofb, },
125-
{ .name = "RC2-40-CBC,", .algo = "rc2", .keylen = 40 / 8, .mode = cm_cbc, },
126-
{ .name = "RC2-64-CBC,", .algo = "rc2", .keylen = 64 / 8, .mode = cm_cbc, },
127-
{ .name = "RC2-CBC,", .algo = "rc2", .keylen = 128 / 8, .mode = cm_cbc, },
128-
{ .name = "RC2-CFB,", .algo = "rc2", .keylen = 128 / 8, .mode = cm_cfb, },
129-
{ .name = "RC2-OFB,", .algo = "rc2", .keylen = 128 / 8, .mode = cm_ofb, },
130-
{ .name = "SEED-CBC,", .algo = "seed", .keylen = 128 / 8, .mode = cm_cbc, },
131-
{ .name = "SEED-CFB,", .algo = "seed", .keylen = 128 / 8, .mode = cm_cfb, },
132-
{ .name = "SEED-OFB,", .algo = "seed", .keylen = 128 / 8, .mode = cm_ofb, },
78+
{ .name = "AES-128-CBC,", .algo = "aes", .keylen = 128 / 8, .mode = cm_cbc, },
79+
{ .name = "AES-192-CBC,", .algo = "aes", .keylen = 192 / 8, .mode = cm_cbc, },
80+
{ .name = "AES-256-CBC,", .algo = "aes", .keylen = 256 / 8, .mode = cm_cbc, },
81+
{ .name = "AES-128-CFB,", .algo = "aes", .keylen = 128 / 8, .mode = cm_cfb, },
82+
{ .name = "AES-192-CFB,", .algo = "aes", .keylen = 192 / 8, .mode = cm_cfb, },
83+
{ .name = "AES-256-CFB,", .algo = "aes", .keylen = 256 / 8, .mode = cm_cfb, },
84+
{ .name = "AES-128-CFB1,", .algo = "aes", .keylen = 128 / 8, .mode = cm_cfb1, },
85+
{ .name = "AES-192-CFB1,", .algo = "aes", .keylen = 192 / 8, .mode = cm_cfb1, },
86+
{ .name = "AES-256-CFB1,", .algo = "aes", .keylen = 256 / 8, .mode = cm_cfb1, },
87+
{ .name = "AES-128-CFB8,", .algo = "aes", .keylen = 128 / 8, .mode = cm_cfb8, },
88+
{ .name = "AES-192-CFB8,", .algo = "aes", .keylen = 192 / 8, .mode = cm_cfb8, },
89+
{ .name = "AES-256-CFB8,", .algo = "aes", .keylen = 256 / 8, .mode = cm_cfb8, },
90+
{ .name = "AES-128-CTR,", .algo = "aes", .keylen = 128 / 8, .mode = cm_ctr, },
91+
{ .name = "AES-192-CTR,", .algo = "aes", .keylen = 192 / 8, .mode = cm_ctr, },
92+
{ .name = "AES-256-CTR,", .algo = "aes", .keylen = 256 / 8, .mode = cm_ctr, },
93+
{ .name = "AES-128-OFB,", .algo = "aes", .keylen = 128 / 8, .mode = cm_ofb, },
94+
{ .name = "AES-192-OFB,", .algo = "aes", .keylen = 192 / 8, .mode = cm_ofb, },
95+
{ .name = "AES-256-OFB,", .algo = "aes", .keylen = 256 / 8, .mode = cm_ofb, },
96+
{ .name = "BF-CBC,", .algo = "blowfish", .keylen = 128 / 8, .mode = cm_cbc, },
97+
{ .name = "BF-CFB,", .algo = "blowfish", .keylen = 128 / 8, .mode = cm_cfb, },
98+
{ .name = "BF-OFB,", .algo = "blowfish", .keylen = 128 / 8, .mode = cm_ofb, },
99+
{ .name = "CAMELLIA-128-CBC,", .algo = "camellia", .keylen = 128 / 8, .mode = cm_cbc, },
100+
{ .name = "CAMELLIA-192-CBC,", .algo = "camellia", .keylen = 192 / 8, .mode = cm_cbc, },
101+
{ .name = "CAMELLIA-256-CBC,", .algo = "camellia", .keylen = 256 / 8, .mode = cm_cbc, },
102+
{ .name = "CAMELLIA-128-CFB,", .algo = "camellia", .keylen = 128 / 8, .mode = cm_cfb, },
103+
{ .name = "CAMELLIA-192-CFB,", .algo = "camellia", .keylen = 192 / 8, .mode = cm_cfb, },
104+
{ .name = "CAMELLIA-256-CFB,", .algo = "camellia", .keylen = 256 / 8, .mode = cm_cfb, },
105+
{ .name = "CAMELLIA-128-CFB1,", .algo = "camellia", .keylen = 128 / 8, .mode = cm_cfb1, },
106+
{ .name = "CAMELLIA-192-CFB1,", .algo = "camellia", .keylen = 192 / 8, .mode = cm_cfb1, },
107+
{ .name = "CAMELLIA-256-CFB1,", .algo = "camellia", .keylen = 256 / 8, .mode = cm_cfb1, },
108+
{ .name = "CAMELLIA-128-CFB8,", .algo = "camellia", .keylen = 128 / 8, .mode = cm_cfb8, },
109+
{ .name = "CAMELLIA-192-CFB8,", .algo = "camellia", .keylen = 192 / 8, .mode = cm_cfb8, },
110+
{ .name = "CAMELLIA-256-CFB8,", .algo = "camellia", .keylen = 256 / 8, .mode = cm_cfb8, },
111+
{ .name = "CAMELLIA-128-CTR,", .algo = "camellia", .keylen = 128 / 8, .mode = cm_ctr, },
112+
{ .name = "CAMELLIA-192-CTR,", .algo = "camellia", .keylen = 192 / 8, .mode = cm_ctr, },
113+
{ .name = "CAMELLIA-256-CTR,", .algo = "camellia", .keylen = 256 / 8, .mode = cm_ctr, },
114+
{ .name = "CAMELLIA-128-OFB,", .algo = "camellia", .keylen = 128 / 8, .mode = cm_ofb, },
115+
{ .name = "CAMELLIA-192-OFB,", .algo = "camellia", .keylen = 192 / 8, .mode = cm_ofb, },
116+
{ .name = "CAMELLIA-256-OFB,", .algo = "camellia", .keylen = 256 / 8, .mode = cm_ofb, },
117+
{ .name = "CAST5-CBC,", .algo = "cast5", .keylen = 128 / 8, .mode = cm_cbc, },
118+
{ .name = "CAST5-CFB,", .algo = "cast5", .keylen = 128 / 8, .mode = cm_cfb, },
119+
{ .name = "CAST5-OFB,", .algo = "cast5", .keylen = 128 / 8, .mode = cm_ofb, },
120+
{ .name = "ChaCha20,", .algo = "chacha20", .keylen = 256 / 8, .mode = cm_stream, },
121+
{ .name = "DES-EDE-CBC,", .algo = "3des", .keylen = 128 / 8, .mode = cm_cbc, },
122+
{ .name = "DES-EDE-CFB,", .algo = "3des", .keylen = 128 / 8, .mode = cm_cfb, },
123+
{ .name = "DES-EDE-OFB,", .algo = "3des", .keylen = 128 / 8, .mode = cm_ofb, },
124+
{ .name = "DES-EDE3-CBC,", .algo = "3des", .keylen = 192 / 8, .mode = cm_cbc, },
125+
{ .name = "DES-EDE3-CFB,", .algo = "3des", .keylen = 192 / 8, .mode = cm_cfb, },
126+
{ .name = "DES-EDE3-CFB1,", .algo = "3des", .keylen = 192 / 8, .mode = cm_cfb1, },
127+
{ .name = "DES-EDE3-CFB8,", .algo = "3des", .keylen = 192 / 8, .mode = cm_cfb8, },
128+
{ .name = "DES-EDE3-OFB,", .algo = "3des", .keylen = 192 / 8, .mode = cm_ofb, },
129+
{ .name = "DES-CBC,", .algo = "des", .keylen = 64 / 8, .mode = cm_cbc, },
130+
{ .name = "DES-CFB,", .algo = "des", .keylen = 64 / 8, .mode = cm_cfb, },
131+
{ .name = "DES-CFB1,", .algo = "des", .keylen = 64 / 8, .mode = cm_cfb1, },
132+
{ .name = "DES-CFB8,", .algo = "des", .keylen = 64 / 8, .mode = cm_cfb8, },
133+
{ .name = "DES-OFB,", .algo = "des", .keylen = 64 / 8, .mode = cm_ofb, },
134+
{ .name = "DESX-CBC,", .algo = "desx", .keylen = 192 / 8, .mode = cm_cbc, },
135+
{ .name = "IDEA-CBC,", .algo = "idea", .keylen = 128 / 8, .mode = cm_cbc, },
136+
{ .name = "IDEA-CFB,", .algo = "idea", .keylen = 128 / 8, .mode = cm_cfb, },
137+
{ .name = "IDEA-OFB,", .algo = "idea", .keylen = 128 / 8, .mode = cm_ofb, },
138+
{ .name = "RC5-CBC,", .algo = "rc5", .keylen = 128 / 8, .mode = cm_cbc, },
139+
{ .name = "RC5-CFB,", .algo = "rc5", .keylen = 128 / 8, .mode = cm_cfb, },
140+
{ .name = "RC5-OFB,", .algo = "rc5", .keylen = 128 / 8, .mode = cm_ofb, },
141+
{ .name = "RC2-40-CBC,", .algo = "rc2", .keylen = 40 / 8, .mode = cm_cbc, },
142+
{ .name = "RC2-64-CBC,", .algo = "rc2", .keylen = 64 / 8, .mode = cm_cbc, },
143+
{ .name = "RC2-CBC,", .algo = "rc2", .keylen = 128 / 8, .mode = cm_cbc, },
144+
{ .name = "RC2-CFB,", .algo = "rc2", .keylen = 128 / 8, .mode = cm_cfb, },
145+
{ .name = "RC2-OFB,", .algo = "rc2", .keylen = 128 / 8, .mode = cm_ofb, },
146+
{ .name = "SEED-CBC,", .algo = "seed", .keylen = 128 / 8, .mode = cm_cbc, },
147+
{ .name = "SEED-CFB,", .algo = "seed", .keylen = 128 / 8, .mode = cm_cfb, },
148+
{ .name = "SEED-OFB,", .algo = "seed", .keylen = 128 / 8, .mode = cm_ofb, },
133149
};
134150
const unsigned long pem_dek_infos_num = sizeof(pem_dek_infos)/sizeof(pem_dek_infos[0]);
135151

@@ -189,9 +205,17 @@ int pem_decrypt(unsigned char *data, unsigned long *datalen,
189205
#endif
190206
break;
191207
case cm_cfb:
208+
case cm_cfb1:
209+
case cm_cfb8:
192210
#ifdef LTC_CFB_MODE
193-
if ((err = cfb_start(cipher, iv, key, keylen, 0, &s.ctx.cfb)) != CRYPT_OK) {
194-
goto error_out;
211+
if (info->mode == cm_cfb) {
212+
if ((err = cfb_start(cipher, iv, key, keylen, 0, &s.ctx.cfb)) != CRYPT_OK) {
213+
goto error_out;
214+
}
215+
} else {
216+
if ((err = cfb_start_ex(cipher, iv, key, keylen, 0, info->mode == cm_cfb1 ? 1 : 8, &s.ctx.cfb)) != CRYPT_OK) {
217+
goto error_out;
218+
}
195219
}
196220
if ((err = cfb_decrypt(data, data, *datalen, &s.ctx.cfb)) != CRYPT_OK) {
197221
goto error_out;

‎tests/pem/pkcs/unsupported/rsa-aes-128-cfb1.pem‎ renamed to ‎tests/pem/pkcs/rsa-aes-128-cfb1.pem‎

File renamed without changes.

‎tests/pem/pkcs/unsupported/rsa-aes-128-cfb8.pem‎ renamed to ‎tests/pem/pkcs/rsa-aes-128-cfb8.pem‎

File renamed without changes.

‎tests/pem/pkcs/unsupported/rsa-aes-192-cfb1.pem‎ renamed to ‎tests/pem/pkcs/rsa-aes-192-cfb1.pem‎

File renamed without changes.

‎tests/pem/pkcs/unsupported/rsa-aes-192-cfb8.pem‎ renamed to ‎tests/pem/pkcs/rsa-aes-192-cfb8.pem‎

File renamed without changes.

‎tests/pem/pkcs/unsupported/rsa-aes-256-cfb1.pem‎ renamed to ‎tests/pem/pkcs/rsa-aes-256-cfb1.pem‎

File renamed without changes.

‎tests/pem/pkcs/unsupported/rsa-aes-256-cfb8.pem‎ renamed to ‎tests/pem/pkcs/rsa-aes-256-cfb8.pem‎

File renamed without changes.

‎tests/pem/pkcs/unsupported/rsa-camellia-128-cfb1.pem‎ renamed to ‎tests/pem/pkcs/rsa-camellia-128-cfb1.pem‎

File renamed without changes.

0 commit comments

Comments
 (0)