fixup! fixup! fixup! src: move more crypto_dh.cc code to ncrypto

Author: jasnell

src/crypto/crypto_dh.cc

@@ -87,11 +87,9 @@ void New(const FunctionCallbackInfo<Value>& args) {
  int32_t bits = args[0].As<Int32>()->Value();
  if (bits < 2) {
 #if OPENSSL_VERSION_MAJOR >= 3
- ERR_put_error(ERR_LIB_DH, 0,
- DH_MODULUS_TOO_SMALL, __FILE__, __LINE__);
+ ERR_put_error(ERR_LIB_DH, 0, DH_MODULUS_TOO_SMALL, __FILE__, __LINE__);
 #else
- ERR_put_error(ERR_LIB_BN, 0,
- BN_R_BITS_TOO_SMALL, __FILE__, __LINE__);
+ ERR_put_error(ERR_LIB_BN, 0, BN_R_BITS_TOO_SMALL, __FILE__, __LINE__);
 #endif
  return ThrowCryptoError(env, ERR_get_error(), "Invalid prime length");
  }
@@ -105,8 +103,7 @@ void New(const FunctionCallbackInfo<Value>& args) {
  }
  int32_t generator = args[1].As<Int32>()->Value();
  if (generator < 2) {
- ERR_put_error(ERR_LIB_DH, 0,
- DH_R_BAD_GENERATOR, __FILE__, __LINE__);
+ ERR_put_error(ERR_LIB_DH, 0, DH_R_BAD_GENERATOR, __FILE__, __LINE__);
  return ThrowCryptoError(env, ERR_get_error(), "Invalid generator");
  }
 
@@ -135,14 +132,12 @@ void New(const FunctionCallbackInfo<Value>& args) {
  if (args[1]->IsInt32()) {
  int32_t generator = args[1].As<Int32>()->Value();
  if (generator < 2) {
- ERR_put_error(ERR_LIB_DH, 0,
- DH_R_BAD_GENERATOR, __FILE__, __LINE__);
+ ERR_put_error(ERR_LIB_DH, 0, DH_R_BAD_GENERATOR, __FILE__, __LINE__);
  return ThrowCryptoError(env, ERR_get_error(), "Invalid generator");
  }
  bn_g = BignumPointer::New();
  if (!bn_g.setWord(generator)) {
- ERR_put_error(ERR_LIB_DH, 0,
- DH_R_BAD_GENERATOR, __FILE__, __LINE__);
+ ERR_put_error(ERR_LIB_DH, 0, DH_R_BAD_GENERATOR, __FILE__, __LINE__);
  return ThrowCryptoError(env, ERR_get_error(), "Invalid generator");
  }
  } else {
@@ -151,13 +146,11 @@ void New(const FunctionCallbackInfo<Value>& args) {
  return THROW_ERR_OUT_OF_RANGE(env, "generator is too big");
  bn_g = BignumPointer(reinterpret_cast<uint8_t*>(arg1.data()), arg1.size());
  if (!bn_g) {
- ERR_put_error(ERR_LIB_DH, 0,
- DH_R_BAD_GENERATOR, __FILE__, __LINE__);
+ ERR_put_error(ERR_LIB_DH, 0, DH_R_BAD_GENERATOR, __FILE__, __LINE__);
  return ThrowCryptoError(env, ERR_get_error(), "Invalid generator");
  }
  if (bn_g.getWord() < 2) {
- ERR_put_error(ERR_LIB_DH, 0,
- DH_R_BAD_GENERATOR, __FILE__, __LINE__);
+ ERR_put_error(ERR_LIB_DH, 0, DH_R_BAD_GENERATOR, __FILE__, __LINE__);
  return ThrowCryptoError(env, ERR_get_error(), "Invalid generator");
  }
  }
@@ -426,8 +419,7 @@ EVPKeyCtxPointer DhKeyGenTraits::Setup(DhKeyPairGenConfig* params) {
  }
 
  EVPKeyCtxPointer ctx(EVP_PKEY_CTX_new(key_params.get(), nullptr));
- if (!ctx || EVP_PKEY_keygen_init(ctx.get()) <= 0)
- return {};
+ if (!ctx || EVP_PKEY_keygen_init(ctx.get()) <= 0) return {};
 
  return ctx;
 }