1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

crypto: migrate setEngine to internal/errors

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/16429
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
This commit is contained in:
James M Snell 2017-10-23 23:06:53 -07:00
parent d2e44d5e7f
commit a78327f48b
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/api/errors.md
View File

@ -637,6 +637,12 @@ Used when the native call from `process.cpuUsage` cannot be processed properly.
Used when an invalid value for the `format` argument has been passed to the Used when an invalid value for the `format` argument has been passed to the
`crypto.ECDH()` class `getPublicKey()` method. `crypto.ECDH()` class `getPublicKey()` method.
<a id="ERR_CRYPTO_ENGINE_UNKNOWN"></a>
### ERR_CRYPTO_ENGINE_UNKNOWN
Used when an invalid crypto engine identifier is passed to
[`require('crypto').setEngine()`][].
<a id="ERR_CRYPTO_INVALID_DIGEST"></a> <a id="ERR_CRYPTO_INVALID_DIGEST"></a>
### ERR_CRYPTO_INVALID_DIGEST ### ERR_CRYPTO_INVALID_DIGEST
@ -1357,6 +1363,7 @@ closed.
[`new URLSearchParams(iterable)`]: url.html#url_constructor_new_urlsearchparams_iterable [`new URLSearchParams(iterable)`]: url.html#url_constructor_new_urlsearchparams_iterable
[`process.on('uncaughtException')`]: process.html#process_event_uncaughtexception [`process.on('uncaughtException')`]: process.html#process_event_uncaughtexception
[`process.send()`]: process.html#process_process_send_message_sendhandle_options_callback [`process.send()`]: process.html#process_process_send_message_sendhandle_options_callback
[`require('crypto').setEngine()`]: crypto.html#crypto_crypto_setengine_engine_flags
[Node.js Error Codes]: #nodejs-error-codes [Node.js Error Codes]: #nodejs-error-codes
[V8's stack trace API]: https://github.com/v8/v8/wiki/Stack-Trace-API [V8's stack trace API]: https://github.com/v8/v8/wiki/Stack-Trace-API
[WHATWG URL API]: url.html#url_the_whatwg_url_api [WHATWG URL API]: url.html#url_the_whatwg_url_api

3
lib/internal/crypto/util.js
View File

@ -56,7 +56,8 @@ function setEngine(id, flags) {
if (flags === 0) if (flags === 0)
flags = ENGINE_METHOD_ALL; flags = ENGINE_METHOD_ALL;
return _setEngine(id, flags); if (!_setEngine(id, flags))
throw new errors.Error('ERR_CRYPTO_ENGINE_UNKNOWN', id);
} }
module.exports = { module.exports = {

1
lib/internal/errors.js
View File

@ -154,6 +154,7 @@ E('ERR_CONSOLE_WRITABLE_STREAM',
'Console expects a writable stream instance for %s'); 'Console expects a writable stream instance for %s');
E('ERR_CPU_USAGE', 'Unable to obtain cpu usage %s'); E('ERR_CPU_USAGE', 'Unable to obtain cpu usage %s');
E('ERR_CRYPTO_ECDH_INVALID_FORMAT', 'Invalid ECDH format: %s'); E('ERR_CRYPTO_ECDH_INVALID_FORMAT', 'Invalid ECDH format: %s');
E('ERR_CRYPTO_ENGINE_UNKNOWN', 'Engine "%s" was not found');
E('ERR_CRYPTO_HASH_DIGEST_NO_UTF16', 'hash.digest() does not support UTF-16'); E('ERR_CRYPTO_HASH_DIGEST_NO_UTF16', 'hash.digest() does not support UTF-16');
E('ERR_CRYPTO_HASH_FINALIZED', 'Digest already called'); E('ERR_CRYPTO_HASH_FINALIZED', 'Digest already called');
E('ERR_CRYPTO_HASH_UPDATE_FAILED', 'Hash update failed'); E('ERR_CRYPTO_HASH_UPDATE_FAILED', 'Hash update failed');

12
src/node_crypto.cc
View File

@ -5946,19 +5946,17 @@ void SetEngine(const FunctionCallbackInfo<Value>& args) {
if (engine == nullptr) { if (engine == nullptr) {
int err = ERR_get_error(); int err = ERR_get_error();
if (err == 0) { if (err == 0)
char tmp[1024]; return args.GetReturnValue().Set(false);
snprintf(tmp, sizeof(tmp), "Engine \"%s\" was not found", *engine_id); return ThrowCryptoError(env, err);
return env->ThrowError(tmp);
} else {
return ThrowCryptoError(env, err);
}
} }
int r = ENGINE_set_default(engine, flags); int r = ENGINE_set_default(engine, flags);
ENGINE_free(engine); ENGINE_free(engine);
if (r == 0) if (r == 0)
return ThrowCryptoError(env, ERR_get_error()); return ThrowCryptoError(env, ERR_get_error());
args.GetReturnValue().Set(true);
} }
#endif // !OPENSSL_NO_ENGINE #endif // !OPENSSL_NO_ENGINE