2019-01-30 18:34:14 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Jeremy Apthorp <nornagon@nornagon.net>
|
|
|
|
|
Date: Fri, 18 Jan 2019 14:23:28 -0800
|
|
|
|
|
Subject: expose aes-{128,256}-cfb
|
|
|
|
|
|
2019-12-13 17:18:45 +00:00
|
|
|
This exposes AES-CFB ciphers through the EVP APIs. BoringSSL has
|
|
|
|
|
implementations for these ciphers, but Node doesn't realise that because
|
|
|
|
|
without this patch, they're not listed in the APIs that Node uses.
|
|
|
|
|
|
|
|
|
|
This should be upstreamed. See e.g.
|
|
|
|
|
https://boringssl-review.googlesource.com/c/boringssl/+/33984 for a
|
|
|
|
|
similar patch that was merged upstream.
|
2019-01-30 18:34:14 +00:00
|
|
|
|
|
|
|
|
diff --git a/crypto/cipher_extra/cipher_extra.c b/crypto/cipher_extra/cipher_extra.c
|
2019-02-14 16:30:44 +00:00
|
|
|
index b132265bc103658dba3de6e0c3dc50d3634da5b0..588a4773437c311877f275bf3679f9688cda3c46 100644
|
2019-01-30 18:34:14 +00:00
|
|
|
--- a/crypto/cipher_extra/cipher_extra.c
|
|
|
|
|
+++ b/crypto/cipher_extra/cipher_extra.c
|
|
|
|
|
@@ -101,10 +101,14 @@ const EVP_CIPHER *EVP_get_cipherbyname(const char *name) {
|
|
|
|
|
return EVP_des_ede3_cbc();
|
|
|
|
|
} else if (OPENSSL_strcasecmp(name, "aes-128-cbc") == 0) {
|
|
|
|
|
return EVP_aes_128_cbc();
|
|
|
|
|
+ } else if (OPENSSL_strcasecmp(name, "aes-128-cfb") == 0) {
|
|
|
|
|
+ return EVP_aes_128_cfb128();
|
|
|
|
|
} else if (OPENSSL_strcasecmp(name, "aes-192-cbc") == 0) {
|
|
|
|
|
return EVP_aes_192_cbc();
|
|
|
|
|
} else if (OPENSSL_strcasecmp(name, "aes-256-cbc") == 0) {
|
|
|
|
|
return EVP_aes_256_cbc();
|
|
|
|
|
+ } else if (OPENSSL_strcasecmp(name, "aes-256-cfb") == 0) {
|
|
|
|
|
+ return EVP_aes_256_cfb128();
|
|
|
|
|
} else if (OPENSSL_strcasecmp(name, "aes-128-ctr") == 0) {
|
|
|
|
|
return EVP_aes_128_ctr();
|
|
|
|
|
} else if (OPENSSL_strcasecmp(name, "aes-192-ctr") == 0) {
|
|
|
|
|
diff --git a/decrepit/evp/evp_do_all.c b/decrepit/evp/evp_do_all.c
|
2019-02-14 16:30:44 +00:00
|
|
|
index 53cb9d2dc8f1962a70dc12b648d27c32be8aca4b..84af06fc56e4aa72d4d48801d7c037add0221747 100644
|
2019-01-30 18:34:14 +00:00
|
|
|
--- a/decrepit/evp/evp_do_all.c
|
|
|
|
|
+++ b/decrepit/evp/evp_do_all.c
|
2019-02-14 16:30:44 +00:00
|
|
|
@@ -20,8 +20,10 @@ void EVP_CIPHER_do_all_sorted(void (*callback)(const EVP_CIPHER *cipher,
|
2019-01-30 18:34:14 +00:00
|
|
|
const char *unused, void *arg),
|
|
|
|
|
void *arg) {
|
|
|
|
|
callback(EVP_aes_128_cbc(), "AES-128-CBC", NULL, arg);
|
|
|
|
|
+ callback(EVP_aes_128_cfb128(), "AES-128-CFB", NULL, arg);
|
2019-02-14 16:30:44 +00:00
|
|
|
callback(EVP_aes_192_cbc(), "AES-192-CBC", NULL, arg);
|
2019-01-30 18:34:14 +00:00
|
|
|
callback(EVP_aes_256_cbc(), "AES-256-CBC", NULL, arg);
|
|
|
|
|
+ callback(EVP_aes_256_cfb128(), "AES-256-CFB", NULL, arg);
|
2019-02-14 16:30:44 +00:00
|
|
|
callback(EVP_aes_128_ctr(), "AES-128-CTR", NULL, arg);
|
|
|
|
|
callback(EVP_aes_192_ctr(), "AES-192-CTR", NULL, arg);
|
2019-01-30 18:34:14 +00:00
|
|
|
callback(EVP_aes_256_ctr(), "AES-256-CTR", NULL, arg);
|
2019-02-14 16:30:44 +00:00
|
|
|
@@ -44,8 +46,10 @@ void EVP_CIPHER_do_all_sorted(void (*callback)(const EVP_CIPHER *cipher,
|
2019-01-30 18:34:14 +00:00
|
|
|
|
|
|
|
|
// OpenSSL returns everything twice, the second time in lower case.
|
|
|
|
|
callback(EVP_aes_128_cbc(), "aes-128-cbc", NULL, arg);
|
|
|
|
|
+ callback(EVP_aes_128_cfb128(), "aes-128-cfb", NULL, arg);
|
2019-02-14 16:30:44 +00:00
|
|
|
callback(EVP_aes_192_cbc(), "aes-192-cbc", NULL, arg);
|
2019-01-30 18:34:14 +00:00
|
|
|
callback(EVP_aes_256_cbc(), "aes-256-cbc", NULL, arg);
|
|
|
|
|
+ callback(EVP_aes_256_cfb128(), "aes-256-cfb", NULL, arg);
|
2019-02-14 16:30:44 +00:00
|
|
|
callback(EVP_aes_128_ctr(), "aes-128-ctr", NULL, arg);
|
|
|
|
|
callback(EVP_aes_192_ctr(), "aes-192-ctr", NULL, arg);
|
2019-01-30 18:34:14 +00:00
|
|
|
callback(EVP_aes_256_ctr(), "aes-256-ctr", NULL, arg);
|
|
|
|
|
diff --git a/include/openssl/cipher.h b/include/openssl/cipher.h
|
2020-10-16 01:30:41 +00:00
|
|
|
index 31390a3f63a1e88d50c22fa8c0d3b53610ebda68..792ae8feaa53229e3f6f9130269b268f43ded8d6 100644
|
2019-01-30 18:34:14 +00:00
|
|
|
--- a/include/openssl/cipher.h
|
|
|
|
|
+++ b/include/openssl/cipher.h
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -430,6 +430,7 @@ OPENSSL_EXPORT const EVP_CIPHER *EVP_des_ede3_ecb(void);
|
2019-01-30 18:34:14 +00:00
|
|
|
|
|
|
|
|
// EVP_aes_128_cfb128 is only available in decrepit.
|
|
|
|
|
OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_128_cfb128(void);
|
|
|
|
|
+OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_256_cfb128(void);
|
|
|
|
|
|
2019-09-21 14:51:28 +00:00
|
|
|
// EVP_aes_256_cfb128 is only available in decrepit.
|
|
|
|
|
OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_256_cfb128(void);
|
