diff --git a/test/parallel/test-crypto-binary-default.js b/test/parallel/test-crypto-binary-default.js
index b9312ccbe02ad3..2927f141204b78 100644
--- a/test/parallel/test-crypto-binary-default.js
+++ b/test/parallel/test-crypto-binary-default.js
@@ -63,353 +63,365 @@ assert.throws(function() {
 }, /^Error: not enough data$/);
 
 // Test HMAC
-const hmacHash = crypto.createHmac('sha1', 'Node')
-                       .update('some data')
-                       .update('to hmac')
-                       .digest('hex');
-assert.strictEqual(hmacHash, '19fd6e1ba73d9ed2224dd5094a71babe85d9a892');
+{
+  const hmacHash = crypto.createHmac('sha1', 'Node')
+                         .update('some data')
+                         .update('to hmac')
+                         .digest('hex');
+  assert.strictEqual(hmacHash, '19fd6e1ba73d9ed2224dd5094a71babe85d9a892');
+}
 
 // Test HMAC-SHA-* (rfc 4231 Test Cases)
-const rfc4231 = [
-  {
-    key: Buffer.from('0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b', 'hex'),
-    data: Buffer.from('4869205468657265', 'hex'), // 'Hi There'
-    hmac: {
-      sha224: '896fb1128abbdf196832107cd49df33f47b4b1169912ba4f53684b22',
-      sha256:
-          'b0344c61d8db38535ca8afceaf0bf12b881dc200c9833da726e9376c' +
-          '2e32cff7',
-      sha384:
-          'afd03944d84895626b0825f4ab46907f15f9dadbe4101ec682aa034c' +
-          '7cebc59cfaea9ea9076ede7f4af152e8b2fa9cb6',
-      sha512:
-          '87aa7cdea5ef619d4ff0b4241a1d6cb02379f4e2ce4ec2787ad0b305' +
-          '45e17cdedaa833b7d6b8a702038b274eaea3f4e4be9d914eeb61f170' +
-          '2e696c203a126854'
-    }
-  },
-  {
-    key: Buffer.from('4a656665', 'hex'), // 'Jefe'
-    data: Buffer.from('7768617420646f2079612077616e7420666f72206e6f74686' +
-                      '96e673f', 'hex'), // 'what do ya want for nothing?'
-    hmac: {
-      sha224: 'a30e01098bc6dbbf45690f3a7e9e6d0f8bbea2a39e6148008fd05e44',
-      sha256:
-          '5bdcc146bf60754e6a042426089575c75a003f089d2739839dec58b9' +
-          '64ec3843',
-      sha384:
-          'af45d2e376484031617f78d2b58a6b1b9c7ef464f5a01b47e42ec373' +
-          '6322445e8e2240ca5e69e2c78b3239ecfab21649',
-      sha512:
-          '164b7a7bfcf819e2e395fbe73b56e0a387bd64222e831fd610270cd7' +
-          'ea2505549758bf75c05a994a6d034f65f8f0e6fdcaeab1a34d4a6b4b' +
-          '636e070a38bce737'
-    }
-  },
-  {
-    key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
-    data: Buffer.from('ddddddddddddddddddddddddddddddddddddddddddddddddd' +
-                      'ddddddddddddddddddddddddddddddddddddddddddddddddddd',
-                      'hex'),
-    hmac: {
-      sha224: '7fb3cb3588c6c1f6ffa9694d7d6ad2649365b0c1f65d69d1ec8333ea',
-      sha256:
-          '773ea91e36800e46854db8ebd09181a72959098b3ef8c122d9635514' +
-          'ced565fe',
-      sha384:
-          '88062608d3e6ad8a0aa2ace014c8a86f0aa635d947ac9febe83ef4e5' +
-          '5966144b2a5ab39dc13814b94e3ab6e101a34f27',
-      sha512:
-          'fa73b0089d56a284efb0f0756c890be9b1b5dbdd8ee81a3655f83e33' +
-          'b2279d39bf3e848279a722c806b485a47e67c807b946a337bee89426' +
-          '74278859e13292fb'
-    }
-  },
-  {
-    key: Buffer.from('0102030405060708090a0b0c0d0e0f10111213141516171819',
-                     'hex'),
-    data: Buffer.from('cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdc' +
-                      'dcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd',
-                      'hex'),
-    hmac: {
-      sha224: '6c11506874013cac6a2abc1bb382627cec6a90d86efc012de7afec5a',
-      sha256:
-          '82558a389a443c0ea4cc819899f2083a85f0faa3e578f8077a2e3ff4' +
-          '6729665b',
-      sha384:
-          '3e8a69b7783c25851933ab6290af6ca77a9981480850009cc5577c6e' +
-          '1f573b4e6801dd23c4a7d679ccf8a386c674cffb',
-      sha512:
-          'b0ba465637458c6990e5a8c5f61d4af7e576d97ff94b872de76f8050' +
-          '361ee3dba91ca5c11aa25eb4d679275cc5788063a5f19741120c4f2d' +
-          'e2adebeb10a298dd'
-    }
-  },
-
-  {
-    key: Buffer.from('0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c', 'hex'),
-    // 'Test With Truncation'
-    data: Buffer.from('546573742057697468205472756e636174696f6e', 'hex'),
-    hmac: {
-      sha224: '0e2aea68a90c8d37c988bcdb9fca6fa8',
-      sha256: 'a3b6167473100ee06e0c796c2955552b',
-      sha384: '3abf34c3503b2a23a46efc619baef897',
-      sha512: '415fad6271580a531d4179bc891d87a6'
+{
+  const rfc4231 = [
+    {
+      key: Buffer.from('0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b', 'hex'),
+      data: Buffer.from('4869205468657265', 'hex'), // 'Hi There'
+      hmac: {
+        sha224: '896fb1128abbdf196832107cd49df33f47b4b1169912ba4f53684b22',
+        sha256:
+            'b0344c61d8db38535ca8afceaf0bf12b881dc200c9833da726e9376c' +
+            '2e32cff7',
+        sha384:
+            'afd03944d84895626b0825f4ab46907f15f9dadbe4101ec682aa034c' +
+            '7cebc59cfaea9ea9076ede7f4af152e8b2fa9cb6',
+        sha512:
+            '87aa7cdea5ef619d4ff0b4241a1d6cb02379f4e2ce4ec2787ad0b305' +
+            '45e17cdedaa833b7d6b8a702038b274eaea3f4e4be9d914eeb61f170' +
+            '2e696c203a126854'
+      }
+    },
+    {
+      key: Buffer.from('4a656665', 'hex'), // 'Jefe'
+      data: Buffer.from('7768617420646f2079612077616e7420666f72206e6f74686' +
+                        '96e673f', 'hex'), // 'what do ya want for nothing?'
+      hmac: {
+        sha224: 'a30e01098bc6dbbf45690f3a7e9e6d0f8bbea2a39e6148008fd05e44',
+        sha256:
+            '5bdcc146bf60754e6a042426089575c75a003f089d2739839dec58b9' +
+            '64ec3843',
+        sha384:
+            'af45d2e376484031617f78d2b58a6b1b9c7ef464f5a01b47e42ec373' +
+            '6322445e8e2240ca5e69e2c78b3239ecfab21649',
+        sha512:
+            '164b7a7bfcf819e2e395fbe73b56e0a387bd64222e831fd610270cd7' +
+            'ea2505549758bf75c05a994a6d034f65f8f0e6fdcaeab1a34d4a6b4b' +
+            '636e070a38bce737'
+      }
     },
-    truncate: true
-  },
-  {
-    key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
-                     'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
-                     'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
-                     'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
-                     'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
-                     'aaaaaaaaaaaa', 'hex'),
-    // 'Test Using Larger Than Block-Size Key - Hash Key First'
-    data: Buffer.from('54657374205573696e67204c6172676572205468616e20426' +
-                      'c6f636b2d53697a65204b6579202d2048617368204b657920' +
-                      '4669727374', 'hex'),
-    hmac: {
-      sha224: '95e9a0db962095adaebe9b2d6f0dbce2d499f112f2d2b7273fa6870e',
-      sha256:
-          '60e431591ee0b67f0d8a26aacbf5b77f8e0bc6213728c5140546040f' +
-          '0ee37f54',
-      sha384:
-          '4ece084485813e9088d2c63a041bc5b44f9ef1012a2b588f3cd11f05' +
-          '033ac4c60c2ef6ab4030fe8296248df163f44952',
-      sha512:
-          '80b24263c7c1a3ebb71493c1dd7be8b49b46d1f41b4aeec1121b0137' +
-          '83f8f3526b56d037e05f2598bd0fd2215d6a1e5295e64f73f63f0aec' +
-          '8b915a985d786598'
+    {
+      key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
+      data: Buffer.from('ddddddddddddddddddddddddddddddddddddddddddddddddd' +
+                        'ddddddddddddddddddddddddddddddddddddddddddddddddddd',
+                        'hex'),
+      hmac: {
+        sha224: '7fb3cb3588c6c1f6ffa9694d7d6ad2649365b0c1f65d69d1ec8333ea',
+        sha256:
+            '773ea91e36800e46854db8ebd09181a72959098b3ef8c122d9635514' +
+            'ced565fe',
+        sha384:
+            '88062608d3e6ad8a0aa2ace014c8a86f0aa635d947ac9febe83ef4e5' +
+            '5966144b2a5ab39dc13814b94e3ab6e101a34f27',
+        sha512:
+            'fa73b0089d56a284efb0f0756c890be9b1b5dbdd8ee81a3655f83e33' +
+            'b2279d39bf3e848279a722c806b485a47e67c807b946a337bee89426' +
+            '74278859e13292fb'
+      }
+    },
+    {
+      key: Buffer.from('0102030405060708090a0b0c0d0e0f10111213141516171819',
+                       'hex'),
+      data: Buffer.from('cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdc' +
+                        'dcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd',
+                        'hex'),
+      hmac: {
+        sha224: '6c11506874013cac6a2abc1bb382627cec6a90d86efc012de7afec5a',
+        sha256:
+            '82558a389a443c0ea4cc819899f2083a85f0faa3e578f8077a2e3ff4' +
+            '6729665b',
+        sha384:
+            '3e8a69b7783c25851933ab6290af6ca77a9981480850009cc5577c6e' +
+            '1f573b4e6801dd23c4a7d679ccf8a386c674cffb',
+        sha512:
+            'b0ba465637458c6990e5a8c5f61d4af7e576d97ff94b872de76f8050' +
+            '361ee3dba91ca5c11aa25eb4d679275cc5788063a5f19741120c4f2d' +
+            'e2adebeb10a298dd'
+      }
+    },
+    {
+      key: Buffer.from('0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c', 'hex'),
+      // 'Test With Truncation'
+      data: Buffer.from('546573742057697468205472756e636174696f6e', 'hex'),
+      hmac: {
+        sha224: '0e2aea68a90c8d37c988bcdb9fca6fa8',
+        sha256: 'a3b6167473100ee06e0c796c2955552b',
+        sha384: '3abf34c3503b2a23a46efc619baef897',
+        sha512: '415fad6271580a531d4179bc891d87a6'
+      },
+      truncate: true
+    },
+    {
+      key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
+                       'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
+                       'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
+                       'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
+                       'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
+                       'aaaaaaaaaaaa', 'hex'),
+      // 'Test Using Larger Than Block-Size Key - Hash Key First'
+      data: Buffer.from('54657374205573696e67204c6172676572205468616e20426' +
+                        'c6f636b2d53697a65204b6579202d2048617368204b657920' +
+                        '4669727374', 'hex'),
+      hmac: {
+        sha224: '95e9a0db962095adaebe9b2d6f0dbce2d499f112f2d2b7273fa6870e',
+        sha256:
+            '60e431591ee0b67f0d8a26aacbf5b77f8e0bc6213728c5140546040f' +
+            '0ee37f54',
+        sha384:
+            '4ece084485813e9088d2c63a041bc5b44f9ef1012a2b588f3cd11f05' +
+            '033ac4c60c2ef6ab4030fe8296248df163f44952',
+        sha512:
+            '80b24263c7c1a3ebb71493c1dd7be8b49b46d1f41b4aeec1121b0137' +
+            '83f8f3526b56d037e05f2598bd0fd2215d6a1e5295e64f73f63f0aec' +
+            '8b915a985d786598'
+      }
+    },
+    {
+      key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
+                       'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
+                       'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
+                       'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
+                       'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
+                       'aaaaaaaaaaaa', 'hex'),
+      // 'This is a test using a larger than block-size key and a larger ' +
+      // 'than block-size data. The key needs to be hashed before being ' +
+      // 'used by the HMAC algorithm.'
+      data: Buffer.from('5468697320697320612074657374207573696e672061206c6' +
+                        '172676572207468616e20626c6f636b2d73697a65206b6579' +
+                        '20616e642061206c6172676572207468616e20626c6f636b2' +
+                        'd73697a6520646174612e20546865206b6579206e65656473' +
+                        '20746f20626520686173686564206265666f7265206265696' +
+                        'e6720757365642062792074686520484d414320616c676f72' +
+                        '6974686d2e', 'hex'),
+      hmac: {
+        sha224: '3a854166ac5d9f023f54d517d0b39dbd946770db9c2b95c9f6f565d1',
+        sha256:
+            '9b09ffa71b942fcb27635fbcd5b0e944bfdc63644f0713938a7f5153' +
+            '5c3a35e2',
+        sha384:
+            '6617178e941f020d351e2f254e8fd32c602420feb0b8fb9adccebb82' +
+            '461e99c5a678cc31e799176d3860e6110c46523e',
+        sha512:
+            'e37b6a775dc87dbaa4dfa9f96e5e3ffddebd71f8867289865df5a32d' +
+            '20cdc944b6022cac3c4982b10d5eeb55c3e4de15134676fb6de04460' +
+            '65c97440fa8c6a58'
+      }
     }
-  },
-  {
-    key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
-                     'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
-                     'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
-                     'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
-                     'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
-                     'aaaaaaaaaaaa', 'hex'),
-    // 'This is a test using a larger than block-size key and a larger ' +
-    // 'than block-size data. The key needs to be hashed before being ' +
-    // 'used by the HMAC algorithm.'
-    data: Buffer.from('5468697320697320612074657374207573696e672061206c6' +
-                      '172676572207468616e20626c6f636b2d73697a65206b6579' +
-                      '20616e642061206c6172676572207468616e20626c6f636b2' +
-                      'd73697a6520646174612e20546865206b6579206e65656473' +
-                      '20746f20626520686173686564206265666f7265206265696' +
-                      'e6720757365642062792074686520484d414320616c676f72' +
-                      '6974686d2e', 'hex'),
-    hmac: {
-      sha224: '3a854166ac5d9f023f54d517d0b39dbd946770db9c2b95c9f6f565d1',
-      sha256:
-          '9b09ffa71b942fcb27635fbcd5b0e944bfdc63644f0713938a7f5153' +
-          '5c3a35e2',
-      sha384:
-          '6617178e941f020d351e2f254e8fd32c602420feb0b8fb9adccebb82' +
-          '461e99c5a678cc31e799176d3860e6110c46523e',
-      sha512:
-          'e37b6a775dc87dbaa4dfa9f96e5e3ffddebd71f8867289865df5a32d' +
-          '20cdc944b6022cac3c4982b10d5eeb55c3e4de15134676fb6de04460' +
-          '65c97440fa8c6a58'
+  ];
+
+  for (const testCase of rfc4231) {
+    for (const hash in testCase.hmac) {
+      let result = crypto.createHmac(hash, testCase.key)
+                       .update(testCase.data)
+                       .digest('hex');
+      if (testCase.truncate) {
+        result = result.substr(0, 32); // first 128 bits == 32 hex chars
+      }
+      assert.strictEqual(
+        testCase.hmac[hash],
+        result
+      );
     }
   }
-];
-
-for (const testCase of rfc4231) {
-  for (const hash in testCase.hmac) {
-    let result = crypto.createHmac(hash, testCase.key)
-                     .update(testCase.data)
-                     .digest('hex');
-    if (testCase.truncate) {
-      result = result.substr(0, 32); // first 128 bits == 32 hex chars
-    }
-    assert.strictEqual(
-      testCase.hmac[hash],
-      result
-    );
-  }
 }
 
 // Test HMAC-MD5/SHA1 (rfc 2202 Test Cases)
-const rfc2202_md5 = [
-  {
-    key: Buffer.from('0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b', 'hex'),
-    data: 'Hi There',
-    hmac: '9294727a3638bb1c13f48ef8158bfc9d'
-  },
-  {
-    key: 'Jefe',
-    data: 'what do ya want for nothing?',
-    hmac: '750c783e6ab0b503eaa86e310a5db738'
-  },
-  {
-    key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
-    data: Buffer.from('ddddddddddddddddddddddddddddddddddddddddddddddddd' +
-                      'ddddddddddddddddddddddddddddddddddddddddddddddddddd',
-                      'hex'),
-    hmac: '56be34521d144c88dbb8c733f0e8b3f6'
-  },
-  {
-    key: Buffer.from('0102030405060708090a0b0c0d0e0f10111213141516171819',
-                     'hex'),
-    data: Buffer.from('cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdc' +
-                      'dcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd' +
-                      'cdcdcdcdcd',
-                      'hex'),
-    hmac: '697eaf0aca3a3aea3a75164746ffaa79'
-  },
-  {
-    key: Buffer.from('0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c', 'hex'),
-    data: 'Test With Truncation',
-    hmac: '56461ef2342edc00f9bab995690efd4c'
-  },
-  {
-    key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
-                     'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
-                     'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
-                     'aaaaaaaaaaaaaaaaaaaaaa',
-                     'hex'),
-    data: 'Test Using Larger Than Block-Size Key - Hash Key First',
-    hmac: '6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd'
-  },
-  {
-    key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
-                     'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
-                     'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
-                     'aaaaaaaaaaaaaaaaaaaaaa',
-                     'hex'),
-    data:
-        'Test Using Larger Than Block-Size Key and Larger Than One ' +
-        'Block-Size Data',
-    hmac: '6f630fad67cda0ee1fb1f562db3aa53e'
-  }
-];
-const rfc2202_sha1 = [
-  {
-    key: Buffer.from('0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b', 'hex'),
-    data: 'Hi There',
-    hmac: 'b617318655057264e28bc0b6fb378c8ef146be00'
-  },
-  {
-    key: 'Jefe',
-    data: 'what do ya want for nothing?',
-    hmac: 'effcdf6ae5eb2fa2d27416d5f184df9c259a7c79'
-  },
-  {
-    key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
-    data: Buffer.from('ddddddddddddddddddddddddddddddddddddddddddddd' +
-                      'ddddddddddddddddddddddddddddddddddddddddddddd' +
-                      'dddddddddd',
-                      'hex'),
-    hmac: '125d7342b9ac11cd91a39af48aa17b4f63f175d3'
-  },
-  {
-    key: Buffer.from('0102030405060708090a0b0c0d0e0f10111213141516171819',
-                     'hex'),
-    data: Buffer.from('cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdc' +
-                      'dcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd' +
-                      'cdcdcdcdcd',
-                      'hex'),
-    hmac: '4c9007f4026250c6bc8414f9bf50c86c2d7235da'
-  },
-  {
-    key: Buffer.from('0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c', 'hex'),
-    data: 'Test With Truncation',
-    hmac: '4c1a03424b55e07fe7f27be1d58bb9324a9a5a04'
-  },
-  {
-    key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
-                     'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
-                     'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
-                     'aaaaaaaaaaaaaaaaaaaaaa',
-                     'hex'),
-    data: 'Test Using Larger Than Block-Size Key - Hash Key First',
-    hmac: 'aa4ae5e15272d00e95705637ce8a3b55ed402112'
-  },
-  {
-    key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
-                     'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
-                     'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
-                     'aaaaaaaaaaaaaaaaaaaaaa',
-                     'hex'),
-    data:
-        'Test Using Larger Than Block-Size Key and Larger Than One ' +
-        'Block-Size Data',
-    hmac: 'e8e99d0f45237d786d6bbaa7965c7808bbff1a91'
+{
+  const rfc2202_md5 = [
+    {
+      key: Buffer.from('0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b', 'hex'),
+      data: 'Hi There',
+      hmac: '9294727a3638bb1c13f48ef8158bfc9d'
+    },
+    {
+      key: 'Jefe',
+      data: 'what do ya want for nothing?',
+      hmac: '750c783e6ab0b503eaa86e310a5db738'
+    },
+    {
+      key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
+      data: Buffer.from('ddddddddddddddddddddddddddddddddddddddddddddddddd' +
+                        'ddddddddddddddddddddddddddddddddddddddddddddddddddd',
+                        'hex'),
+      hmac: '56be34521d144c88dbb8c733f0e8b3f6'
+    },
+    {
+      key: Buffer.from('0102030405060708090a0b0c0d0e0f10111213141516171819',
+                       'hex'),
+      data: Buffer.from('cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdc' +
+                        'dcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd' +
+                        'cdcdcdcdcd',
+                        'hex'),
+      hmac: '697eaf0aca3a3aea3a75164746ffaa79'
+    },
+    {
+      key: Buffer.from('0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c', 'hex'),
+      data: 'Test With Truncation',
+      hmac: '56461ef2342edc00f9bab995690efd4c'
+    },
+    {
+      key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
+                       'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
+                       'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
+                       'aaaaaaaaaaaaaaaaaaaaaa',
+                       'hex'),
+      data: 'Test Using Larger Than Block-Size Key - Hash Key First',
+      hmac: '6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd'
+    },
+    {
+      key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
+                       'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
+                       'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
+                       'aaaaaaaaaaaaaaaaaaaaaa',
+                       'hex'),
+      data:
+          'Test Using Larger Than Block-Size Key and Larger Than One ' +
+          'Block-Size Data',
+      hmac: '6f630fad67cda0ee1fb1f562db3aa53e'
+    }
+  ];
+  const rfc2202_sha1 = [
+    {
+      key: Buffer.from('0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b', 'hex'),
+      data: 'Hi There',
+      hmac: 'b617318655057264e28bc0b6fb378c8ef146be00'
+    },
+    {
+      key: 'Jefe',
+      data: 'what do ya want for nothing?',
+      hmac: 'effcdf6ae5eb2fa2d27416d5f184df9c259a7c79'
+    },
+    {
+      key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
+      data: Buffer.from('ddddddddddddddddddddddddddddddddddddddddddddd' +
+                        'ddddddddddddddddddddddddddddddddddddddddddddd' +
+                        'dddddddddd',
+                        'hex'),
+      hmac: '125d7342b9ac11cd91a39af48aa17b4f63f175d3'
+    },
+    {
+      key: Buffer.from('0102030405060708090a0b0c0d0e0f10111213141516171819',
+                       'hex'),
+      data: Buffer.from('cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdc' +
+                        'dcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd' +
+                        'cdcdcdcdcd',
+                        'hex'),
+      hmac: '4c9007f4026250c6bc8414f9bf50c86c2d7235da'
+    },
+    {
+      key: Buffer.from('0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c', 'hex'),
+      data: 'Test With Truncation',
+      hmac: '4c1a03424b55e07fe7f27be1d58bb9324a9a5a04'
+    },
+    {
+      key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
+                       'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
+                       'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
+                       'aaaaaaaaaaaaaaaaaaaaaa',
+                       'hex'),
+      data: 'Test Using Larger Than Block-Size Key - Hash Key First',
+      hmac: 'aa4ae5e15272d00e95705637ce8a3b55ed402112'
+    },
+    {
+      key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
+                       'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
+                       'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
+                       'aaaaaaaaaaaaaaaaaaaaaa',
+                       'hex'),
+      data:
+          'Test Using Larger Than Block-Size Key and Larger Than One ' +
+          'Block-Size Data',
+      hmac: 'e8e99d0f45237d786d6bbaa7965c7808bbff1a91'
+    }
+  ];
+
+  if (!common.hasFipsCrypto) {
+    for (const testCase of rfc2202_md5) {
+      assert.strictEqual(
+        testCase.hmac,
+        crypto.createHmac('md5', testCase.key)
+          .update(testCase.data)
+          .digest('hex')
+      );
+    }
   }
-];
-
-if (!common.hasFipsCrypto) {
-  for (const testCase of rfc2202_md5) {
+  for (const testCase of rfc2202_sha1) {
     assert.strictEqual(
       testCase.hmac,
-      crypto.createHmac('md5', testCase.key)
+      crypto.createHmac('sha1', testCase.key)
         .update(testCase.data)
         .digest('hex')
     );
   }
 }
-for (const testCase of rfc2202_sha1) {
-  assert.strictEqual(
-    testCase.hmac,
-    crypto.createHmac('sha1', testCase.key)
-      .update(testCase.data)
-      .digest('hex')
-  );
-}
 
 // Test hashing
-const a1 = crypto.createHash('sha1').update('Test123').digest('hex');
-const a2 = crypto.createHash('sha256').update('Test123').digest('base64');
-const a3 = crypto.createHash('sha512').update('Test123').digest(); // binary
-const a4 = crypto.createHash('sha1').update('Test123').digest('buffer');
+{
+  const a1 = crypto.createHash('sha1').update('Test123').digest('hex');
+  const a2 = crypto.createHash('sha256').update('Test123').digest('base64');
+  const a3 = crypto.createHash('sha512').update('Test123').digest(); // binary
+  const a4 = crypto.createHash('sha1').update('Test123').digest('buffer');
 
-if (!common.hasFipsCrypto) {
-  const a0 = crypto.createHash('md5').update('Test123').digest('latin1');
-  assert.strictEqual(
-    a0,
-    'h\u00ea\u00cb\u0097\u00d8o\fF!\u00fa+\u000e\u0017\u00ca\u00bd\u008c'
-  );
-}
+  if (!common.hasFipsCrypto) {
+    const a0 = crypto.createHash('md5').update('Test123').digest('latin1');
+    assert.strictEqual(
+      a0,
+      'h\u00ea\u00cb\u0097\u00d8o\fF!\u00fa+\u000e\u0017\u00ca\u00bd\u008c'
+    );
+  }
 
-assert.strictEqual(a1, '8308651804facb7b9af8ffc53a33a22d6a1c8ac2');
+  assert.strictEqual(a1, '8308651804facb7b9af8ffc53a33a22d6a1c8ac2');
 
-assert.strictEqual(a2, '2bX1jws4GYKTlxhloUB09Z66PoJZW+y+hq5R8dnx9l4=');
+  assert.strictEqual(a2, '2bX1jws4GYKTlxhloUB09Z66PoJZW+y+hq5R8dnx9l4=');
 
-assert.strictEqual(
-  a3,
-  '\u00c1(4\u00f1\u0003\u001fd\u0097!O\'\u00d4C/&Qz\u00d4' +
-  '\u0094\u0015l\u00b8\u008dQ+\u00db\u001d\u00c4\u00b5}\u00b2' +
-  '\u00d6\u0092\u00a3\u00df\u00a2i\u00a1\u009b\n\n*\u000f' +
-  '\u00d7\u00d6\u00a2\u00a8\u0085\u00e3<\u0083\u009c\u0093' +
-  '\u00c2\u0006\u00da0\u00a1\u00879(G\u00ed\'',
-  'Test SHA512 as assumed latin1'
-);
+  // Test SHA512 as assumed latin1
+  assert.strictEqual(
+    a3,
+    '\u00c1(4\u00f1\u0003\u001fd\u0097!O\'\u00d4C/&Qz\u00d4' +
+    '\u0094\u0015l\u00b8\u008dQ+\u00db\u001d\u00c4\u00b5}\u00b2' +
+    '\u00d6\u0092\u00a3\u00df\u00a2i\u00a1\u009b\n\n*\u000f' +
+    '\u00d7\u00d6\u00a2\u00a8\u0085\u00e3<\u0083\u009c\u0093' +
+    '\u00c2\u0006\u00da0\u00a1\u00879(G\u00ed\''
+  );
 
-assert.deepStrictEqual(
-  a4,
-  Buffer.from('8308651804facb7b9af8ffc53a33a22d6a1c8ac2', 'hex')
-);
+  assert.deepStrictEqual(
+    a4,
+    Buffer.from('8308651804facb7b9af8ffc53a33a22d6a1c8ac2', 'hex')
+  );
+}
 
 // Test multiple updates to same hash
-const h1 = crypto.createHash('sha1').update('Test123').digest('hex');
-const h2 = crypto.createHash('sha1').update('Test').update('123').digest('hex');
-assert.strictEqual(h1, h2);
+{
+  const h1 = crypto.createHash('sha1').update('Test123').digest('hex');
+  const h2 = crypto.createHash('sha1').update('Test').update('123')
+    .digest('hex');
+  assert.strictEqual(h1, h2);
+}
 
 // Test hashing for binary files
-const fn = fixtures.path('sample.png');
-const sha1Hash = crypto.createHash('sha1');
-const fileStream = fs.createReadStream(fn);
-fileStream.on('data', function(data) {
-  sha1Hash.update(data);
-});
-fileStream.on('close', common.mustCall(function() {
-  assert.strictEqual(
-    sha1Hash.digest('hex'),
-    '22723e553129a336ad96e10f6aecdf0f45e4149e'
-  );
-}));
+{
+  const fn = fixtures.path('sample.png');
+  const sha1Hash = crypto.createHash('sha1');
+  const fileStream = fs.createReadStream(fn);
+  fileStream.on('data', function(data) {
+    sha1Hash.update(data);
+  });
+  fileStream.on('close', common.mustCall(function() {
+    assert.strictEqual(
+      sha1Hash.digest('hex'),
+      '22723e553129a336ad96e10f6aecdf0f45e4149e'
+    );
+  }));
+}
 
 // Unknown digest method should throw an error:
 // https://github.com/nodejs/node-v0.x-archive/issues/2227
@@ -418,32 +430,34 @@ assert.throws(function() {
 }, /^Error: Digest method not supported$/);
 
 // Test signing and verifying
-const s1 = crypto.createSign('SHA1')
-               .update('Test123')
-               .sign(keyPem, 'base64');
-const s1Verified = crypto.createVerify('SHA1')
-                       .update('Test')
-                       .update('123')
-                       .verify(certPem, s1, 'base64');
-assert.strictEqual(s1Verified, true);
-
-const s2 = crypto.createSign('SHA256')
-               .update('Test123')
-               .sign(keyPem); // binary
-const s2Verified = crypto.createVerify('SHA256')
-                       .update('Test')
-                       .update('123')
-                       .verify(certPem, s2); // binary
-assert.strictEqual(s2Verified, true);
-
-const s3 = crypto.createSign('SHA1')
-               .update('Test123')
-               .sign(keyPem, 'buffer');
-const s3Verified = crypto.createVerify('SHA1')
-                       .update('Test')
-                       .update('123')
-                       .verify(certPem, s3);
-assert.strictEqual(s3Verified, true);
+{
+  const s1 = crypto.createSign('SHA1')
+                 .update('Test123')
+                 .sign(keyPem, 'base64');
+  const s1Verified = crypto.createVerify('SHA1')
+                         .update('Test')
+                         .update('123')
+                         .verify(certPem, s1, 'base64');
+  assert.strictEqual(s1Verified, true);
+
+  const s2 = crypto.createSign('SHA256')
+                 .update('Test123')
+                 .sign(keyPem); // binary
+  const s2Verified = crypto.createVerify('SHA256')
+                         .update('Test')
+                         .update('123')
+                         .verify(certPem, s2); // binary
+  assert.strictEqual(s2Verified, true);
+
+  const s3 = crypto.createSign('SHA1')
+                 .update('Test123')
+                 .sign(keyPem, 'buffer');
+  const s3Verified = crypto.createVerify('SHA1')
+                         .update('Test')
+                         .update('123')
+                         .verify(certPem, s3);
+  assert.strictEqual(s3Verified, true);
+}
 
 
 function testCipher1(key) {
@@ -566,60 +580,61 @@ assert.throws(function() {
 
 // Test Diffie-Hellman with two parties sharing a secret,
 // using various encodings as we go along
-const dh1 = crypto.createDiffieHellman(common.hasFipsCrypto ? 1024 : 256);
-const p1 = dh1.getPrime('buffer');
-const dh2 = crypto.createDiffieHellman(p1, 'base64');
-const key1 = dh1.generateKeys();
-const key2 = dh2.generateKeys('hex');
-const secret1 = dh1.computeSecret(key2, 'hex', 'base64');
-const secret2 = dh2.computeSecret(key1, 'latin1', 'buffer');
-
-assert.strictEqual(secret1, secret2.toString('base64'));
-
-// Create "another dh1" using generated keys from dh1,
-// and compute secret again
-const dh3 = crypto.createDiffieHellman(p1, 'buffer');
-const privkey1 = dh1.getPrivateKey();
-dh3.setPublicKey(key1);
-dh3.setPrivateKey(privkey1);
-
-assert.strictEqual(dh1.getPrime(), dh3.getPrime());
-assert.strictEqual(dh1.getGenerator(), dh3.getGenerator());
-assert.strictEqual(dh1.getPublicKey(), dh3.getPublicKey());
-assert.strictEqual(dh1.getPrivateKey(), dh3.getPrivateKey());
-
-const secret3 = dh3.computeSecret(key2, 'hex', 'base64');
-
-assert.strictEqual(secret1, secret3);
-
-// https://github.com/joyent/node/issues/2338
-const p = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' +
-          '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' +
-          '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' +
-          'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381FFFFFFFFFFFFFFFF';
-const d = crypto.createDiffieHellman(p, 'hex');
-assert.strictEqual(d.verifyError, DH_NOT_SUITABLE_GENERATOR);
-
-// Test RSA key signing/verification
-const rsaSign = crypto.createSign('SHA1');
-const rsaVerify = crypto.createVerify('SHA1');
-assert.ok(rsaSign instanceof crypto.Sign);
-assert.ok(rsaVerify instanceof crypto.Verify);
-
-rsaSign.update(rsaPubPem);
-const rsaSignature = rsaSign.sign(rsaKeyPem, 'hex');
-assert.strictEqual(
-  rsaSignature,
-  '5c50e3145c4e2497aadb0eabc83b342d0b0021ece0d4c4a064b7c' +
-  '8f020d7e2688b122bfb54c724ac9ee169f83f66d2fe90abeb95e8' +
-  'e1290e7e177152a4de3d944cf7d4883114a20ed0f78e70e25ef0f' +
-  '60f06b858e6af42a2f276ede95bbc6bc9a9bbdda15bd663186a6f' +
-  '40819a7af19e577bb2efa5e579a1f5ce8a0d4ca8b8f6'
-);
-
-rsaVerify.update(rsaPubPem);
-assert.strictEqual(rsaVerify.verify(rsaPubPem, rsaSignature, 'hex'), true);
+{
+  const dh1 = crypto.createDiffieHellman(common.hasFipsCrypto ? 1024 : 256);
+  const p1 = dh1.getPrime('buffer');
+  const dh2 = crypto.createDiffieHellman(p1, 'base64');
+  const key1 = dh1.generateKeys();
+  const key2 = dh2.generateKeys('hex');
+  const secret1 = dh1.computeSecret(key2, 'hex', 'base64');
+  const secret2 = dh2.computeSecret(key1, 'latin1', 'buffer');
+
+  assert.strictEqual(secret1, secret2.toString('base64'));
+
+  // Create "another dh1" using generated keys from dh1,
+  // and compute secret again
+  const dh3 = crypto.createDiffieHellman(p1, 'buffer');
+  const privkey1 = dh1.getPrivateKey();
+  dh3.setPublicKey(key1);
+  dh3.setPrivateKey(privkey1);
+
+  assert.strictEqual(dh1.getPrime(), dh3.getPrime());
+  assert.strictEqual(dh1.getGenerator(), dh3.getGenerator());
+  assert.strictEqual(dh1.getPublicKey(), dh3.getPublicKey());
+  assert.strictEqual(dh1.getPrivateKey(), dh3.getPrivateKey());
+
+  const secret3 = dh3.computeSecret(key2, 'hex', 'base64');
+
+  assert.strictEqual(secret1, secret3);
+
+  // https://github.com/joyent/node/issues/2338
+  const p = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' +
+            '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' +
+            '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' +
+            'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381FFFFFFFFFFFFFFFF';
+  const d = crypto.createDiffieHellman(p, 'hex');
+  assert.strictEqual(d.verifyError, DH_NOT_SUITABLE_GENERATOR);
+
+  // Test RSA key signing/verification
+  const rsaSign = crypto.createSign('SHA1');
+  const rsaVerify = crypto.createVerify('SHA1');
+  assert.ok(rsaSign instanceof crypto.Sign);
+  assert.ok(rsaVerify instanceof crypto.Verify);
+
+  rsaSign.update(rsaPubPem);
+  const rsaSignature = rsaSign.sign(rsaKeyPem, 'hex');
+  assert.strictEqual(
+    rsaSignature,
+    '5c50e3145c4e2497aadb0eabc83b342d0b0021ece0d4c4a064b7c' +
+    '8f020d7e2688b122bfb54c724ac9ee169f83f66d2fe90abeb95e8' +
+    'e1290e7e177152a4de3d944cf7d4883114a20ed0f78e70e25ef0f' +
+    '60f06b858e6af42a2f276ede95bbc6bc9a9bbdda15bd663186a6f' +
+    '40819a7af19e577bb2efa5e579a1f5ce8a0d4ca8b8f6'
+  );
 
+  rsaVerify.update(rsaPubPem);
+  assert.strictEqual(rsaVerify.verify(rsaPubPem, rsaSignature, 'hex'), true);
+}
 
 //
 // Test RSA signing and verification