Skip to content

Commit 28c19da

Browse files
trop[bot]codebytere
trop[bot]
authored and
codebytere
committed
fix: expose aes-cfb ciphers from boringssl (electron#16617)
Ref electron#16195
1 parent ada60a9 commit 28c19da

File tree

3 files changed

+97
-0
lines changed

3 files changed

+97
-0
lines changed

‎patches/common/boringssl/.patches‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
implement_ssl_get_tlsext_status_type.patch
22
expose_ripemd160.patch
3+
expose_aes-cfb.patch

‎patches/common/boringssl/expose_aes-cfb.patch‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Jeremy Apthorp <nornagon@nornagon.net>
3+
Date: Fri, 18 Jan 2019 14:23:28 -0800
4+
Subject: expose aes-{128,256}-cfb
5+
6+
7+
diff --git a/crypto/cipher_extra/cipher_extra.c b/crypto/cipher_extra/cipher_extra.c
8+
index 1b23ad32f8cff2a00512ba58d24b47b628e7920c..be7ef07b2c188a76890deb0f305cf92fcc57a64e 100644
9+
--- a/crypto/cipher_extra/cipher_extra.c
10+
+++ b/crypto/cipher_extra/cipher_extra.c
11+
@@ -101,10 +101,14 @@ const EVP_CIPHER *EVP_get_cipherbyname(const char *name) {
12+
return EVP_des_ede3_cbc();
13+
} else if (OPENSSL_strcasecmp(name, "aes-128-cbc") == 0) {
14+
return EVP_aes_128_cbc();
15+
+ } else if (OPENSSL_strcasecmp(name, "aes-128-cfb") == 0) {
16+
+ return EVP_aes_128_cfb128();
17+
} else if (OPENSSL_strcasecmp(name, "aes-192-cbc") == 0) {
18+
return EVP_aes_192_cbc();
19+
} else if (OPENSSL_strcasecmp(name, "aes-256-cbc") == 0) {
20+
return EVP_aes_256_cbc();
21+
+ } else if (OPENSSL_strcasecmp(name, "aes-256-cfb") == 0) {
22+
+ return EVP_aes_256_cfb128();
23+
} else if (OPENSSL_strcasecmp(name, "aes-128-ctr") == 0) {
24+
return EVP_aes_128_ctr();
25+
} else if (OPENSSL_strcasecmp(name, "aes-192-ctr") == 0) {
26+
diff --git a/decrepit/cfb/cfb.c b/decrepit/cfb/cfb.c
27+
index d3a176163303a202baeb1f95727c6ed3525439d6..21d108a7b73d454aa6b0e324df4b67088d60302a 100644
28+
--- a/decrepit/cfb/cfb.c
29+
+++ b/decrepit/cfb/cfb.c
30+
@@ -57,4 +57,12 @@ static const EVP_CIPHER aes_128_cfb128 = {
31+
NULL /* cleanup */, NULL /* ctrl */,
32+
};
33+
34+
+static const EVP_CIPHER aes_256_cfb128 = {
35+
+ NID_aes_128_cfb128, 1 /* block_size */, 32 /* key_size */,
36+
+ 16 /* iv_len */, sizeof(EVP_CFB_CTX), EVP_CIPH_CFB_MODE,
37+
+ NULL /* app_data */, aes_cfb_init_key, aes_cfb128_cipher,
38+
+ NULL /* cleanup */, NULL /* ctrl */,
39+
+};
40+
+
41+
const EVP_CIPHER *EVP_aes_128_cfb128(void) { return &aes_128_cfb128; }
42+
+const EVP_CIPHER *EVP_aes_256_cfb128(void) { return &aes_256_cfb128; }
43+
diff --git a/decrepit/evp/evp_do_all.c b/decrepit/evp/evp_do_all.c
44+
index acc4719b7e9c4c4461fc6142f2ae9156b407915b..8b008a401ec2f2d0673f6876609dd5786cace4c2 100644
45+
--- a/decrepit/evp/evp_do_all.c
46+
+++ b/decrepit/evp/evp_do_all.c
47+
@@ -20,10 +20,12 @@ void EVP_CIPHER_do_all_sorted(void (*callback)(const EVP_CIPHER *cipher,
48+
const char *unused, void *arg),
49+
void *arg) {
50+
callback(EVP_aes_128_cbc(), "AES-128-CBC", NULL, arg);
51+
+ callback(EVP_aes_128_cfb128(), "AES-128-CFB", NULL, arg);
52+
callback(EVP_aes_128_ctr(), "AES-128-CTR", NULL, arg);
53+
callback(EVP_aes_128_ecb(), "AES-128-ECB", NULL, arg);
54+
callback(EVP_aes_128_ofb(), "AES-128-OFB", NULL, arg);
55+
callback(EVP_aes_256_cbc(), "AES-256-CBC", NULL, arg);
56+
+ callback(EVP_aes_256_cfb128(), "AES-256-CFB", NULL, arg);
57+
callback(EVP_aes_256_ctr(), "AES-256-CTR", NULL, arg);
58+
callback(EVP_aes_256_ecb(), "AES-256-ECB", NULL, arg);
59+
callback(EVP_aes_256_ofb(), "AES-256-OFB", NULL, arg);
60+
@@ -38,10 +40,12 @@ void EVP_CIPHER_do_all_sorted(void (*callback)(const EVP_CIPHER *cipher,
61+
62+
// OpenSSL returns everything twice, the second time in lower case.
63+
callback(EVP_aes_128_cbc(), "aes-128-cbc", NULL, arg);
64+
+ callback(EVP_aes_128_cfb128(), "aes-128-cfb", NULL, arg);
65+
callback(EVP_aes_128_ctr(), "aes-128-ctr", NULL, arg);
66+
callback(EVP_aes_128_ecb(), "aes-128-ecb", NULL, arg);
67+
callback(EVP_aes_128_ofb(), "aes-128-ofb", NULL, arg);
68+
callback(EVP_aes_256_cbc(), "aes-256-cbc", NULL, arg);
69+
+ callback(EVP_aes_256_cfb128(), "aes-256-cfb", NULL, arg);
70+
callback(EVP_aes_256_ctr(), "aes-256-ctr", NULL, arg);
71+
callback(EVP_aes_256_ecb(), "aes-256-ecb", NULL, arg);
72+
callback(EVP_aes_256_ofb(), "aes-256-ofb", NULL, arg);
73+
diff --git a/include/openssl/cipher.h b/include/openssl/cipher.h
74+
index 59634138cb60237f008eb99e7d8df54da7629c1a..b30b8434b301fb5b8630ae954698b6fee255df77 100644
75+
--- a/include/openssl/cipher.h
76+
+++ b/include/openssl/cipher.h
77+
@@ -421,6 +421,7 @@ OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_192_ofb(void);
78+
79+
// EVP_aes_128_cfb128 is only available in decrepit.
80+
OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_128_cfb128(void);
81+
+OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_256_cfb128(void);
82+
83+
// The following flags do nothing and are included only to make it easier to
84+
// compile code with BoringSSL.

‎spec/node-spec.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,18 @@ describe('node feature', () => {
430430
hash.update('electron-ripemd160')
431431
expect(hash.digest('hex')).to.equal('fa7fec13c624009ab126ebb99eda6525583395fe')
432432
})
433+
434+
it('should list aes-{128,256}-cfb in getCiphers', () => {
435+
expect(require('crypto').getCiphers()).to.include.members(['aes-128-cfb', 'aes-256-cfb'])
436+
})
437+
438+
it('should be able to create an aes-128-cfb cipher', () => {
439+
require('crypto').createCipheriv('aes-128-cfb', '0123456789abcdef', '0123456789abcdef')
440+
})
441+
442+
it('should be able to create an aes-256-cfb cipher', () => {
443+
require('crypto').createCipheriv('aes-256-cfb', '0123456789abcdef0123456789abcdef', '0123456789abcdef')
444+
})
433445
})
434446

435447
it('includes the electron version in process.versions', () => {

0 commit comments

Comments
 (0)