crypto: fix default encoding of LazyTransform [2]

lib/crypto.js

@@ -21,7 +21,7 @@ const timingSafeEqual = binding.timingSafeEqual;
 const Buffer = require('buffer').Buffer;
 const stream = require('stream');
 const util = require('util');
-const LazyTransform = require('internal/streams/lazy_transform');
+const LazyTransform = require('internal/crypto/lazy_transform');
 
 const DH_GENERATOR = 2;
 

lib/internal/streams/lazy_transform.js → lib/internal/crypto/lazy_transform.js

@@ -5,6 +5,7 @@
 
 const stream = require('stream');
 const util = require('util');
+const crypto = require('crypto');
 
 module.exports = LazyTransform;
 
@@ -22,7 +23,11 @@ util.inherits(LazyTransform, stream.Transform);
     get: function() {
       stream.Transform.call(this, this._options);
       this._writableState.decodeStrings = false;
-      this._writableState.defaultEncoding = 'latin1';
+
+      if (!this._options || !this._options.defaultEncoding) {
+        this._writableState.defaultEncoding = crypto.DEFAULT_ENCODING;
+      }
+
       return this[prop];
     },
     set: function(val) {

node.gyp

@@ -92,7 +92,7 @@
       'lib/internal/util.js',
       'lib/internal/v8_prof_polyfill.js',
       'lib/internal/v8_prof_processor.js',
-      'lib/internal/streams/lazy_transform.js',
+      'lib/internal/crypto/lazy_transform.js',
       'lib/internal/streams/BufferList.js',
       'deps/v8/tools/splaytree.js',
       'deps/v8/tools/codemap.js',

test/parallel/test-crypto-lazy-transform.js

@@ -0,0 +1,69 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+
+if (!common.hasCrypto) {
+  common.skip('missing crypto');
+  return;
+}
+
+const crypto = require('crypto');
+
+const UTF_INPUT = 'öäü';
+const TEST_CASES = [
+  {
+    options: undefined,
+    // Hash of "öäü" in default format (utf8)
+    output: '4f53d15bee524f082380e6d7247cc541e7cb0d10c64efdcc935ceeb1e7ea345c',
+  },
+  {
+    options: {},
+    // Hash of "öäü" in default format (utf8)
+    output: '4f53d15bee524f082380e6d7247cc541e7cb0d10c64efdcc935ceeb1e7ea345c',
+  },
+  {
+    options: {
+      defaultEncoding: 'latin1',
+    },
+    // Hash of "öäü" in latin1 format
+    output: 'cd37bccd5786e2e76d9b18c871e919e6eb11cc12d868f5ae41c40ccff8e44830',
+  },
+  {
+    options: {
+      defaultEncoding: 'utf8',
+    },
+    // Hash of "öäü" in utf8 format
+    output: '4f53d15bee524f082380e6d7247cc541e7cb0d10c64efdcc935ceeb1e7ea345c',
+  },
+  {
+    options: {
+      defaultEncoding: 'ascii',
+    },
+    // Hash of "öäü" in ascii format
+    output: 'cd37bccd5786e2e76d9b18c871e919e6eb11cc12d868f5ae41c40ccff8e44830',
+  },
+];
+
+for (const test of TEST_CASES) {
+  const hashValue = crypto.createHash('sha256')
+    .update(UTF_INPUT, test.options && test.options.defaultEncoding)
+    .digest('hex');
+
+  assert.equal(hashValue, test.output);
+}
+
+for (const test of TEST_CASES) {
+  const hash = crypto.createHash('sha256', test.options);
+  let hashValue = '';
+
+  hash.on('data', (data) => {
+    hashValue += data.toString('hex');
+  });
+
+  hash.on('end', common.mustCall(() => {
+    assert.equal(hashValue, test.output);
+  }));
+
+  hash.write(UTF_INPUT);
+  hash.end();
+}

test/parallel/test-crypto.js

@@ -53,7 +53,6 @@ assert.throws(function() {
   crypto.createHash('sha1').update({foo: 'bar'});
 }, /buffer/);
 
-
 function assertSorted(list) {
   // Array#sort() modifies the list in place so make a copy.
   var sorted = util._extend([], list).sort();