Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 49078100f4
Branches Tags
electron
/
patches
/
boringssl
/
feat_expose_several_extra_cipher_functions.patch

feat_expose_several_extra_cipher_functions.patch 6.3 KB
History Raw

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

  2. From: Shelley Vohr <[email protected]>
    3. 

  3. Date: Wed, 31 May 2023 11:36:48 +0200
    4. 

  4. Subject: feat: expose several extra cipher functions
    5. 

  5. 

  6. This patch exposes the following ciphers:
    7. 

  7. 

  8. AES_CFB Ciphers: aes-128-cfb, aes-256-cfb
    9. 

  9. 

  10. Implementations for these ciphers exist but aren't exposed, so they're
    11. 

  11. unusable without this patch. We should upstream this as similar
    12. 

  12. patches for implemented cipher functions have been accepted.
    13. 

  13. 

  14. Blowfish Ciphers: bf-cbc, bf-cfb, bf-ecb
    15. 

  15. 

  16. The addition of Blowfish ciphers adds references decrepit code
    17. 

  17. from non-decrepit code, so upstream is unlikely to take the patch.
    18. 

  18. 

  19. DES Ciphers: des-ede3
    20. 

  20. 

  21. An implementation for this cipher exists but isn't exposed, so it's
    22. 

  22. unusable without this patch. Akin to the AES_CFB exposures, we should
    23. 

  23. upstream this as similar patches for implemented cipher functions have
    24. 

  24. been accepted.
    25. 

  25. 

  26. RC2 Ciphers: rc2-40-cbc
    27. 

  27. 

  28. It's unclear whether this would be accepted upstream. We should try regardless.
    29. 

  29. 

  30. diff --git a/crypto/cipher/get_cipher.cc b/crypto/cipher/get_cipher.cc
    31. 

  31. index 2d0f369bdeba84b157db82bd87c293ae2344c560..9088a0f29a95fe7abbb98cbf7e8be2577e5617ac 100644
    32. 

  32. --- a/crypto/cipher/get_cipher.cc
    33. 

  33. +++ b/crypto/cipher/get_cipher.cc
    34. 

  34. @@ -26,6 +26,7 @@ static const struct {
    35. 

  35.    const EVP_CIPHER *(*func)(void);
    36. 

  36.  } kCiphers[] = {
    37. 

  37.      {NID_aes_128_cbc, "aes-128-cbc", EVP_aes_128_cbc},
    38. 

  38. +    {NID_aes_128_cfb128, "aes-128-cfb", EVP_aes_128_cfb128},
    39. 

  39.      {NID_aes_128_ctr, "aes-128-ctr", EVP_aes_128_ctr},
    40. 

  40.      {NID_aes_128_ecb, "aes-128-ecb", EVP_aes_128_ecb},
    41. 

  41.      {NID_aes_128_gcm, "aes-128-gcm", EVP_aes_128_gcm},
    42. 

  42. @@ -36,17 +37,23 @@ static const struct {
    43. 

  43.      {NID_aes_192_gcm, "aes-192-gcm", EVP_aes_192_gcm},
    44. 

  44.      {NID_aes_192_ofb128, "aes-192-ofb", EVP_aes_192_ofb},
    45. 

  45.      {NID_aes_256_cbc, "aes-256-cbc", EVP_aes_256_cbc},
    46. 

  46. +    {NID_aes_256_cfb128, "aes-256-cfb", EVP_aes_256_cfb128},
    47. 

  47.      {NID_aes_256_ctr, "aes-256-ctr", EVP_aes_256_ctr},
    48. 

  48.      {NID_aes_256_ecb, "aes-256-ecb", EVP_aes_256_ecb},
    49. 

  49.      {NID_aes_256_gcm, "aes-256-gcm", EVP_aes_256_gcm},
    50. 

  50.      {NID_aes_256_ofb128, "aes-256-ofb", EVP_aes_256_ofb},
    51. 

  51. +    {NID_bf_cbc, "bf-cbc", EVP_bf_cbc},
    52. 

  52. +    {NID_bf_cfb64, "bf-cfb", EVP_bf_cfb},
    53. 

  53. +    {NID_bf_ecb, "bf-ecb", EVP_bf_ecb},
    54. 

  54.      {NID_des_cbc, "des-cbc", EVP_des_cbc},
    55. 

  55.      {NID_des_ecb, "des-ecb", EVP_des_ecb},
    56. 

  56.      {NID_des_ede_cbc, "des-ede-cbc", EVP_des_ede_cbc},
    57. 

  57.      {NID_des_ede_ecb, "des-ede", EVP_des_ede},
    58. 

  58. +    {NID_des_ede3_ecb, "des-ede3", EVP_des_ede3},
    59. 

  59.      {NID_des_ede3_cbc, "des-ede3-cbc", EVP_des_ede3_cbc},
    60. 

  60.      {NID_rc2_cbc, "rc2-cbc", EVP_rc2_cbc},
    61. 

  61.      {NID_rc4, "rc4", EVP_rc4},
    62. 

  62. +    {NID_rc2_40_cbc, "rc2-40-cbc", EVP_rc2_40_cbc}
    63. 

  63.  };
    64. 

  64.  
    65. 

  65.  const EVP_CIPHER *EVP_get_cipherbynid(int nid) {
    66. 

  66. diff --git a/decrepit/evp/evp_do_all.cc b/decrepit/evp/evp_do_all.cc
    67. 

  67. index 9fd0e0225fa48b0afb90b525236e54cff17c1c84..dded715011ac8c1dd9e4525f0bdd64088f8007cf 100644
    68. 

  68. --- a/decrepit/evp/evp_do_all.cc
    69. 

  69. +++ b/decrepit/evp/evp_do_all.cc
    70. 

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

  71.                                                 const char *unused, void *arg),
    72. 

  72.                                void *arg) {
    73. 

  73.    callback(EVP_aes_128_cbc(), "AES-128-CBC", NULL, arg);
    74. 

  74. +  callback(EVP_aes_128_cfb128(), "AES-128-CFB", NULL, arg);
    75. 

  75.    callback(EVP_aes_192_cbc(), "AES-192-CBC", NULL, arg);
    76. 

  76.    callback(EVP_aes_256_cbc(), "AES-256-CBC", NULL, arg);
    77. 

  77. +  callback(EVP_aes_256_cfb128(), "AES-256-CFB", NULL, arg);
    78. 

  78.    callback(EVP_aes_128_ctr(), "AES-128-CTR", NULL, arg);
    79. 

  79.    callback(EVP_aes_192_ctr(), "AES-192-CTR", NULL, arg);
    80. 

  80.    callback(EVP_aes_256_ctr(), "AES-256-CTR", NULL, arg);
    81. 

  81. @@ -34,9 +36,13 @@ void EVP_CIPHER_do_all_sorted(void (*callback)(const EVP_CIPHER *cipher,
    82. 

  82.    callback(EVP_aes_128_gcm(), "AES-128-GCM", NULL, arg);
    83. 

  83.    callback(EVP_aes_192_gcm(), "AES-192-GCM", NULL, arg);
    84. 

  84.    callback(EVP_aes_256_gcm(), "AES-256-GCM", NULL, arg);
    85. 

  85. +  callback(EVP_bf_cbc(), "BF-CBC", NULL, arg);
    86. 

  86. +  callback(EVP_bf_cfb(), "BF-CFB", NULL, arg);
    87. 

  87. +  callback(EVP_bf_ecb(), "BF-ECB", NULL, arg);
    88. 

  88.    callback(EVP_des_cbc(), "DES-CBC", NULL, arg);
    89. 

  89.    callback(EVP_des_ecb(), "DES-ECB", NULL, arg);
    90. 

  90.    callback(EVP_des_ede(), "DES-EDE", NULL, arg);
    91. 

  91. +  callback(EVP_des_ede3(), "DES-EDE3", NULL, arg);
    92. 

  92.    callback(EVP_des_ede_cbc(), "DES-EDE-CBC", NULL, arg);
    93. 

  93.    callback(EVP_des_ede3_cbc(), "DES-EDE3-CBC", NULL, arg);
    94. 

  94.    callback(EVP_rc2_cbc(), "RC2-CBC", NULL, arg);
    95. 

  95. @@ -44,8 +50,10 @@ void EVP_CIPHER_do_all_sorted(void (*callback)(const EVP_CIPHER *cipher,
    96. 

  96.  
    97. 

  97.    // OpenSSL returns everything twice, the second time in lower case.
    98. 

  98.    callback(EVP_aes_128_cbc(), "aes-128-cbc", NULL, arg);
    99. 

  99. +  callback(EVP_aes_128_cfb128(), "aes-128-cfb", NULL, arg);
    100. 

  100.    callback(EVP_aes_192_cbc(), "aes-192-cbc", NULL, arg);
    101. 

  101.    callback(EVP_aes_256_cbc(), "aes-256-cbc", NULL, arg);
    102. 

  102. +  callback(EVP_aes_256_cfb128(), "aes-256-cfb", NULL, arg);
    103. 

  103.    callback(EVP_aes_128_ctr(), "aes-128-ctr", NULL, arg);
    104. 

  104.    callback(EVP_aes_192_ctr(), "aes-192-ctr", NULL, arg);
    105. 

  105.    callback(EVP_aes_256_ctr(), "aes-256-ctr", NULL, arg);
    106. 

  106. @@ -58,9 +66,13 @@ void EVP_CIPHER_do_all_sorted(void (*callback)(const EVP_CIPHER *cipher,
    107. 

  107.    callback(EVP_aes_128_gcm(), "aes-128-gcm", NULL, arg);
    108. 

  108.    callback(EVP_aes_192_gcm(), "aes-192-gcm", NULL, arg);
    109. 

  109.    callback(EVP_aes_256_gcm(), "aes-256-gcm", NULL, arg);
    110. 

  110. +  callback(EVP_bf_cbc(), "bf-cbc", NULL, arg);
    111. 

  111. +  callback(EVP_bf_cfb(), "bf-cfb", NULL, arg);
    112. 

  112. +  callback(EVP_bf_ecb(), "bf-ecb", NULL, arg);
    113. 

  113.    callback(EVP_des_cbc(), "des-cbc", NULL, arg);
    114. 

  114.    callback(EVP_des_ecb(), "des-ecb", NULL, arg);
    115. 

  115.    callback(EVP_des_ede(), "des-ede", NULL, arg);
    116. 

  116. +  callback(EVP_des_ede3(), "des-ede3", NULL, arg);
    117. 

  117.    callback(EVP_des_ede_cbc(), "des-ede-cbc", NULL, arg);
    118. 

  118.    callback(EVP_des_ede3_cbc(), "des-ede3-cbc", NULL, arg);
    119. 

  119.    callback(EVP_rc2_cbc(), "rc2-cbc", NULL, arg);
    120. 

  120. diff --git a/include/openssl/cipher.h b/include/openssl/cipher.h
    121. 

  121. index ad0f13919299a036d1e1121a05f62e096406a6c5..7baea6a73d3da02e2834c33e5579b8ad2b984221 100644
    122. 

  122. --- a/include/openssl/cipher.h
    123. 

  123. +++ b/include/openssl/cipher.h
    124. 

  124. @@ -429,6 +429,7 @@ OPENSSL_EXPORT const EVP_CIPHER *EVP_des_ede3_ecb(void);
    125. 

  125.  
    126. 

  126.  // EVP_aes_128_cfb128 is only available in decrepit.
    127. 

  127.  OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_128_cfb128(void);
    128. 

  128. +OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_256_cfb128(void);
    129. 

  129.  
    130. 

  130.  // EVP_aes_128_cfb is an alias for |EVP_aes_128_cfb128| and is only available in
    131. 

  131.  // decrepit.
    132.