Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Branch: 9-x-y
Branches Tags
electron
/
patches
/
boringssl
/
expose_aes-cfb.patch

expose_aes-cfb.patch 3.6 KB
Permalink History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Jeremy Apthorp <[email protected]>
    3. 

  3. Date: Fri, 18 Jan 2019 14:23:28 -0800
    4. 

  4. Subject: expose aes-{128,256}-cfb
    5. 

  5. 

  6. This exposes AES-CFB ciphers through the EVP APIs. BoringSSL has
    7. 

  7. implementations for these ciphers, but Node doesn't realise that because
    8. 

  8. without this patch, they're not listed in the APIs that Node uses.
    9. 

  9. 

  10. This should be upstreamed. See e.g.
    11. 

  11. https://boringssl-review.googlesource.com/c/boringssl/+/33984 for a
    12. 

  12. similar patch that was merged upstream.
    13. 

  13. 

  14. diff --git a/crypto/cipher_extra/cipher_extra.c b/crypto/cipher_extra/cipher_extra.c
    15. 

  15. index b132265bc103658dba3de6e0c3dc50d3634da5b0..588a4773437c311877f275bf3679f9688cda3c46 100644
    16. 

  16. --- a/crypto/cipher_extra/cipher_extra.c
    17. 

  17. +++ b/crypto/cipher_extra/cipher_extra.c
    18. 

  18. @@ -101,10 +101,14 @@ const EVP_CIPHER *EVP_get_cipherbyname(const char *name) {
    19. 

  19.      return EVP_des_ede3_cbc();
    20. 

  20.    } else if (OPENSSL_strcasecmp(name, "aes-128-cbc") == 0) {
    21. 

  21.      return EVP_aes_128_cbc();
    22. 

  22. +  } else if (OPENSSL_strcasecmp(name, "aes-128-cfb") == 0) {
    23. 

  23. +    return EVP_aes_128_cfb128();
    24. 

  24.    } else if (OPENSSL_strcasecmp(name, "aes-192-cbc") == 0) {
    25. 

  25.      return EVP_aes_192_cbc();
    26. 

  26.    } else if (OPENSSL_strcasecmp(name, "aes-256-cbc") == 0) {
    27. 

  27.      return EVP_aes_256_cbc();
    28. 

  28. +  } else if (OPENSSL_strcasecmp(name, "aes-256-cfb") == 0) {
    29. 

  29. +    return EVP_aes_256_cfb128();
    30. 

  30.    } else if (OPENSSL_strcasecmp(name, "aes-128-ctr") == 0) {
    31. 

  31.      return EVP_aes_128_ctr();
    32. 

  32.    } else if (OPENSSL_strcasecmp(name, "aes-192-ctr") == 0) {
    33. 

  33. diff --git a/decrepit/evp/evp_do_all.c b/decrepit/evp/evp_do_all.c
    34. 

  34. index 53cb9d2dc8f1962a70dc12b648d27c32be8aca4b..84af06fc56e4aa72d4d48801d7c037add0221747 100644
    35. 

  35. --- a/decrepit/evp/evp_do_all.c
    36. 

  36. +++ b/decrepit/evp/evp_do_all.c
    37. 

  37. @@ -20,8 +20,10 @@ void EVP_CIPHER_do_all_sorted(void (*callback)(const EVP_CIPHER *cipher,
    38. 

  38.                                                 const char *unused, void *arg),
    39. 

  39.                                void *arg) {
    40. 

  40.    callback(EVP_aes_128_cbc(), "AES-128-CBC", NULL, arg);
    41. 

  41. +  callback(EVP_aes_128_cfb128(), "AES-128-CFB", NULL, arg);
    42. 

  42.    callback(EVP_aes_192_cbc(), "AES-192-CBC", NULL, arg);
    43. 

  43.    callback(EVP_aes_256_cbc(), "AES-256-CBC", NULL, arg);
    44. 

  44. +  callback(EVP_aes_256_cfb128(), "AES-256-CFB", NULL, arg);
    45. 

  45.    callback(EVP_aes_128_ctr(), "AES-128-CTR", NULL, arg);
    46. 

  46.    callback(EVP_aes_192_ctr(), "AES-192-CTR", NULL, arg);
    47. 

  47.    callback(EVP_aes_256_ctr(), "AES-256-CTR", NULL, arg);
    48. 

  48. @@ -44,8 +46,10 @@ void EVP_CIPHER_do_all_sorted(void (*callback)(const EVP_CIPHER *cipher,
    49. 

  49.  
    50. 

  50.    // OpenSSL returns everything twice, the second time in lower case.
    51. 

  51.    callback(EVP_aes_128_cbc(), "aes-128-cbc", NULL, arg);
    52. 

  52. +  callback(EVP_aes_128_cfb128(), "aes-128-cfb", NULL, arg);
    53. 

  53.    callback(EVP_aes_192_cbc(), "aes-192-cbc", NULL, arg);
    54. 

  54.    callback(EVP_aes_256_cbc(), "aes-256-cbc", NULL, arg);
    55. 

  55. +  callback(EVP_aes_256_cfb128(), "aes-256-cfb", NULL, arg);
    56. 

  56.    callback(EVP_aes_128_ctr(), "aes-128-ctr", NULL, arg);
    57. 

  57.    callback(EVP_aes_192_ctr(), "aes-192-ctr", NULL, arg);
    58. 

  58.    callback(EVP_aes_256_ctr(), "aes-256-ctr", NULL, arg);
    59. 

  59. diff --git a/include/openssl/cipher.h b/include/openssl/cipher.h
    60. 

  60. index d22a6c216a2afe29f9507c90a190a4c6992c06a5..0bde0af4b25fbc24ee479b0ffffa037481c71e53 100644
    61. 

  61. --- a/include/openssl/cipher.h
    62. 

  62. +++ b/include/openssl/cipher.h
    63. 

  63. @@ -424,6 +424,7 @@ OPENSSL_EXPORT const EVP_CIPHER *EVP_des_ede3_ecb(void);
    64. 

  64.  
    65. 

  65.  // EVP_aes_128_cfb128 is only available in decrepit.
    66. 

  66.  OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_128_cfb128(void);
    67. 

  67. +OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_256_cfb128(void);
    68. 

  68.  
    69. 

  69.  // EVP_aes_256_cfb128 is only available in decrepit.
    70. 

  70.  OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_256_cfb128(void);
    71.