Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 4ce9dd3a79
Branches Tags
electron
/
patches
/
node
/
fix_comment_out_incompatible_crypto_modules.patch

fix_comment_out_incompatible_crypto_modules.patch 3.6 KB
History Raw

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

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

  3. Date: Wed, 27 May 2020 13:02:13 -0700
    4. 

  4. Subject: fix: comment out incompatible crypto modules
    5. 

  5. 

  6. Node.js introduced some functionality in https://github.com/nodejs/node/pull/32739
    7. 

  7. and https://github.com/nodejs/node/pull/31178 that is not currently compatible
    8. 

  8. with what's exposed through BoringSSL. I plan to upstream parts of this or
    9. 

  9. otherwise introduce shims to reduce friction.
    10. 

  10. 

  11. diff --git a/src/node_crypto.cc b/src/node_crypto.cc
    12. 

  12. index 91cb94d8dbe9db0adbee5e005649188e1ccbcbf9..2000c789d9daac835c0ecc1e4144179575c9b502 100644
    13. 

  13. --- a/src/node_crypto.cc
    14. 

  14. +++ b/src/node_crypto.cc
    15. 

  15. @@ -5192,11 +5192,11 @@ bool DiffieHellman::Init(int primeLength, int g) {
    16. 

  16.  bool DiffieHellman::Init(const char* p, int p_len, int g) {
    17. 

  17.    dh_.reset(DH_new());
    18. 

  18.    if (p_len <= 0) {
    19. 

  19. -    BNerr(BN_F_BN_GENERATE_PRIME_EX, BN_R_BITS_TOO_SMALL);
    20. 

  20. +    OPENSSL_PUT_ERROR(BN, BN_R_BITS_TOO_SMALL);
    21. 

  21.      return false;
    22. 

  22.    }
    23. 

  23.    if (g <= 1) {
    24. 

  24. -    DHerr(DH_F_DH_BUILTIN_GENPARAMS, DH_R_BAD_GENERATOR);
    25. 

  25. +    OPENSSL_PUT_ERROR(DH, DH_R_BAD_GENERATOR);
    26. 

  26.      return false;
    27. 

  27.    }
    28. 

  28.    BIGNUM* bn_p =
    29. 

  29. @@ -5215,18 +5215,18 @@ bool DiffieHellman::Init(const char* p, int p_len, int g) {
    30. 

  30.  bool DiffieHellman::Init(const char* p, int p_len, const char* g, int g_len) {
    31. 

  31.    dh_.reset(DH_new());
    32. 

  32.    if (p_len <= 0) {
    33. 

  33. -    BNerr(BN_F_BN_GENERATE_PRIME_EX, BN_R_BITS_TOO_SMALL);
    34. 

  34. +    OPENSSL_PUT_ERROR(BN, BN_R_BITS_TOO_SMALL);
    35. 

  35.      return false;
    36. 

  36.    }
    37. 

  37.    if (g_len <= 0) {
    38. 

  38. -    DHerr(DH_F_DH_BUILTIN_GENPARAMS, DH_R_BAD_GENERATOR);
    39. 

  39. +    OPENSSL_PUT_ERROR(DH, DH_R_BAD_GENERATOR);
    40. 

  40.      return false;
    41. 

  41.    }
    42. 

  42.    BIGNUM* bn_g =
    43. 

  43.        BN_bin2bn(reinterpret_cast<const unsigned char*>(g), g_len, nullptr);
    44. 

  44.    if (BN_is_zero(bn_g) || BN_is_one(bn_g)) {
    45. 

  45.      BN_free(bn_g);
    46. 

  46. -    DHerr(DH_F_DH_BUILTIN_GENPARAMS, DH_R_BAD_GENERATOR);
    47. 

  47. +    OPENSSL_PUT_ERROR(DH, DH_R_BAD_GENERATOR);
    48. 

  48.      return false;
    49. 

  49.    }
    50. 

  50.    BIGNUM* bn_p =
    51. 

  51. @@ -5719,7 +5719,7 @@ void ECDH::SetPrivateKey(const FunctionCallbackInfo<Value>& args) {
    52. 

  52.    if (!EC_KEY_set_public_key(new_key.get(), pub.get()))
    53. 

  53.      return env->ThrowError("Failed to set generated public key");
    54. 

  54.  
    55. 

  55. -  EC_KEY_copy(ecdh->key_.get(), new_key.get());
    56. 

  56. +  ecdh->key_.reset(EC_KEY_dup(new_key.get()));
    57. 

  57.    ecdh->group_ = EC_KEY_get0_group(ecdh->key_.get());
    58. 

  58.  }
    59. 

  59.  
    60. 

  60. @@ -6207,6 +6207,7 @@ class DHKeyPairGenerationConfig : public KeyPairGenerationConfig {
    61. 

  61.    EVPKeyCtxPointer Setup() override {
    62. 

  62.      EVPKeyPointer params;
    63. 

  63.      if (prime_info_.fixed_value_) {
    64. 

  64. +#if 0
    65. 

  65.        DHPointer dh(DH_new());
    66. 

  66.        if (!dh)
    67. 

  67.          return nullptr;
    68. 

  68. @@ -6223,6 +6224,7 @@ class DHKeyPairGenerationConfig : public KeyPairGenerationConfig {
    69. 

  69.        params = EVPKeyPointer(EVP_PKEY_new());
    70. 

  70.        CHECK(params);
    71. 

  71.        EVP_PKEY_assign_DH(params.get(), dh.release());
    72. 

  72. +#endif
    73. 

  73.      } else {
    74. 

  74.        EVPKeyCtxPointer param_ctx(EVP_PKEY_CTX_new_id(EVP_PKEY_DH, nullptr));
    75. 

  75.        if (!param_ctx)
    76. 

  76. @@ -6230,7 +6232,7 @@ class DHKeyPairGenerationConfig : public KeyPairGenerationConfig {
    77. 

  77.  
    78. 

  78.        if (EVP_PKEY_paramgen_init(param_ctx.get()) <= 0)
    79. 

  79.          return nullptr;
    80. 

  80. -
    81. 

  81. +#if 0
    82. 

  82.        if (EVP_PKEY_CTX_set_dh_paramgen_prime_len(param_ctx.get(),
    83. 

  83.                                                   prime_info_.prime_size_) <= 0)
    84. 

  84.          return nullptr;
    85. 

  85. @@ -6238,7 +6240,7 @@ class DHKeyPairGenerationConfig : public KeyPairGenerationConfig {
    86. 

  86.        if (EVP_PKEY_CTX_set_dh_paramgen_generator(param_ctx.get(),
    87. 

  87.                                                   generator_) <= 0)
    88. 

  88.          return nullptr;
    89. 

  89. -
    90. 

  90. +#endif
    91. 

  91.        EVP_PKEY* raw_params = nullptr;
    92. 

  92.        if (EVP_PKEY_paramgen(param_ctx.get(), &raw_params) <= 0)
    93. 

  93.          return nullptr;
    94.