GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — crypto: merge CipherBase.initiv into constructor · nodejs/node@6403aa4

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
  • lib/internal/crypto
    • cipher.js
  • src/crypto
    • crypto_cipher.cc
    • crypto_cipher.h
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎lib/internal/crypto/cipher.js‎

Copy file name to clipboardExpand all lines: lib/internal/crypto/cipher.js
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,7 @@ function getUIntOption(options, key) {
114114

115115
function createCipherBase(cipher, credential, options, isEncrypt, iv) {
116116
const authTagLength = getUIntOption(options, 'authTagLength');
117-
this[kHandle] = new CipherBase(isEncrypt);
118-
this[kHandle].initiv(cipher, credential, iv, authTagLength);
117+
this[kHandle] = new CipherBase(isEncrypt, cipher, credential, iv, authTagLength);
119118
this._decoder = null;
120119

121120
ReflectApply(LazyTransform, this, [options]);
Collapse file

‎src/crypto/crypto_cipher.cc‎

Copy file name to clipboardExpand all lines: src/crypto/crypto_cipher.cc
+33-40Lines changed: 33 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ void CipherBase::Initialize(Environment* env, Local<Object> target) {
231231

232232
t->InstanceTemplate()->SetInternalFieldCount(CipherBase::kInternalFieldCount);
233233

234-
SetProtoMethod(isolate, t, "initiv", InitIv);
235234
SetProtoMethod(isolate, t, "update", Update);
236235
SetProtoMethod(isolate, t, "final", Final);
237236
SetProtoMethod(isolate, t, "setAutoPadding", SetAutoPadding);
@@ -274,7 +273,6 @@ void CipherBase::RegisterExternalReferences(
274273
ExternalReferenceRegistry* registry) {
275274
registry->Register(New);
276275

277-
registry->Register(InitIv);
278276
registry->Register(Update);
279277
registry->Register(Final);
280278
registry->Register(SetAutoPadding);
@@ -300,7 +298,39 @@ void CipherBase::RegisterExternalReferences(
300298
void CipherBase::New(const FunctionCallbackInfo<Value>& args) {
301299
CHECK(args.IsConstructCall());
302300
Environment* env = Environment::GetCurrent(args);
303-
new CipherBase(env, args.This(), args[0]->IsTrue() ? kCipher : kDecipher);
301+
CHECK_EQ(args.Length(), 5);
302+
303+
CipherBase* cipher =
304+
new CipherBase(env, args.This(), args[0]->IsTrue() ? kCipher : kDecipher);
305+
306+
const Utf8Value cipher_type(env->isolate(), args[1]);
307+
308+
// The argument can either be a KeyObjectHandle or a byte source
309+
// (e.g. ArrayBuffer, TypedArray, etc). Whichever it is, grab the
310+
// raw bytes and proceed...
311+
const ByteSource key_buf = ByteSource::FromSecretKeyBytes(env, args[2]);
312+
313+
if (key_buf.size() > INT_MAX) [[unlikely]] {
314+
return THROW_ERR_OUT_OF_RANGE(env, "key is too big");
315+
}
316+
317+
ArrayBufferOrViewContents<unsigned char> iv_buf(
318+
!args[3]->IsNull() ? args[3] : Local<Value>());
319+
320+
if (!iv_buf.CheckSizeInt32()) [[unlikely]] {
321+
return THROW_ERR_OUT_OF_RANGE(env, "iv is too big");
322+
}
323+
// Don't assign to cipher->auth_tag_len_ directly; the value might not
324+
// represent a valid length at this point.
325+
unsigned int auth_tag_len;
326+
if (args[4]->IsUint32()) {
327+
auth_tag_len = args[4].As<Uint32>()->Value();
328+
} else {
329+
CHECK(args[4]->IsInt32() && args[4].As<Int32>()->Value() == -1);
330+
auth_tag_len = kNoAuthTagLength;
331+
}
332+
333+
cipher->InitIv(*cipher_type, key_buf, iv_buf, auth_tag_len);
304334
}
305335

306336
void CipherBase::CommonInit(const char* cipher_type,
@@ -391,43 +421,6 @@ void CipherBase::InitIv(const char* cipher_type,
391421
auth_tag_len);
392422
}
393423

394-
void CipherBase::InitIv(const FunctionCallbackInfo<Value>& args) {
395-
CipherBase* cipher;
396-
ASSIGN_OR_RETURN_UNWRAP(&cipher, args.This());
397-
Environment* env = cipher->env();
398-
399-
CHECK_GE(args.Length(), 4);
400-
401-
const Utf8Value cipher_type(env->isolate(), args[0]);
402-
403-
// The argument can either be a KeyObjectHandle or a byte source
404-
// (e.g. ArrayBuffer, TypedArray, etc). Whichever it is, grab the
405-
// raw bytes and proceed...
406-
const ByteSource key_buf = ByteSource::FromSecretKeyBytes(env, args[1]);
407-
408-
if (key_buf.size() > INT_MAX) [[unlikely]] {
409-
return THROW_ERR_OUT_OF_RANGE(env, "key is too big");
410-
}
411-
412-
ArrayBufferOrViewContents<unsigned char> iv_buf(
413-
!args[2]->IsNull() ? args[2] : Local<Value>());
414-
415-
if (!iv_buf.CheckSizeInt32()) [[unlikely]] {
416-
return THROW_ERR_OUT_OF_RANGE(env, "iv is too big");
417-
}
418-
// Don't assign to cipher->auth_tag_len_ directly; the value might not
419-
// represent a valid length at this point.
420-
unsigned int auth_tag_len;
421-
if (args[3]->IsUint32()) {
422-
auth_tag_len = args[3].As<Uint32>()->Value();
423-
} else {
424-
CHECK(args[3]->IsInt32() && args[3].As<Int32>()->Value() == -1);
425-
auth_tag_len = kNoAuthTagLength;
426-
}
427-
428-
cipher->InitIv(*cipher_type, key_buf, iv_buf, auth_tag_len);
429-
}
430-
431424
bool CipherBase::InitAuthenticated(const char* cipher_type,
432425
int iv_len,
433426
unsigned int auth_tag_len) {
Collapse file

‎src/crypto/crypto_cipher.h‎

Copy file name to clipboardExpand all lines: src/crypto/crypto_cipher.h
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ class CipherBase : public BaseObject {
7070
bool MaybePassAuthTagToOpenSSL();
7171

7272
static void New(const v8::FunctionCallbackInfo<v8::Value>& args);
73-
static void InitIv(const v8::FunctionCallbackInfo<v8::Value>& args);
7473
static void Update(const v8::FunctionCallbackInfo<v8::Value>& args);
7574
static void Final(const v8::FunctionCallbackInfo<v8::Value>& args);
7675
static void SetAutoPadding(const v8::FunctionCallbackInfo<v8::Value>& args);

0 commit comments

Comments
0 (0)
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.