From e7594f7d6a3671846daf2c06196e095c0121882c Mon Sep 17 00:00:00 2001 From: Daniel Huigens Date: Thu, 25 Mar 2021 22:38:00 +0100 Subject: [PATCH] Remove unused util functions --- src/type/keyid.js | 2 +- src/util.js | 130 --------------------------------- test/crypto/aes_kw.js | 4 +- test/crypto/cipher/blowfish.js | 4 +- test/crypto/cipher/cast5.js | 4 +- test/crypto/cipher/des.js | 6 +- test/crypto/cipher/twofish.js | 2 +- test/crypto/hash/md5.js | 12 +-- test/crypto/hash/ripemd.js | 8 +- test/crypto/hash/sha.js | 20 ++--- test/general/x25519.js | 12 +-- 11 files changed, 37 insertions(+), 167 deletions(-) diff --git a/src/type/keyid.js b/src/type/keyid.js index 0132d977..1470bd1f 100644 --- a/src/type/keyid.js +++ b/src/type/keyid.js @@ -57,7 +57,7 @@ class KeyID { * @returns {String} Key ID as a hexadecimal string. */ toHex() { - return util.stringToHex(this.bytes); + return util.uint8ArrayToHex(util.stringToUint8Array(this.bytes)); } /** diff --git a/src/util.js b/src/util.js index 4b3ea34e..262d2eeb 100644 --- a/src/util.js +++ b/src/util.js @@ -37,62 +37,10 @@ const util = { return Array.prototype.isPrototypeOf(data); }, - isBigInteger: function(data) { - return data !== null && typeof data === 'object' && data.value && - // eslint-disable-next-line valid-typeof - (typeof data.value === 'bigint' || this.isBN(data.value)); - }, - - isBN: function(data) { - return data !== null && typeof data === 'object' && - (data.constructor.name === 'BN' || - (data.constructor.wordSize === 26 && Array.isArray(data.words))); // taken from BN.isBN() - }, - isUint8Array: stream.isUint8Array, isStream: stream.isStream, - /** - * Convert MessagePorts back to ReadableStreams - * @param {Object} obj - * @returns {Object} - */ - restoreStreams: function(obj, streaming) { - if (Object.prototype.toString.call(obj) === '[object MessagePort]') { - return new (streaming === 'web' ? globalThis.ReadableStream : stream.ReadableStream)({ - pull(controller) { - return new Promise(resolve => { - obj.onmessage = evt => { - const { done, value, error } = evt.data; - if (error) { - controller.error(new Error(error)); - } else if (!done) { - controller.enqueue(value); - } else { - controller.close(); - } - resolve(); - }; - obj.postMessage({ action: 'read' }); - }); - }, - cancel() { - return new Promise(resolve => { - obj.onmessage = resolve; - obj.postMessage({ action: 'cancel' }); - }); - } - }, { highWaterMark: 0 }); - } - if (Object.prototype.isPrototypeOf(obj) && !Uint8Array.prototype.isPrototypeOf(obj)) { - Object.entries(obj).forEach(([key, value]) => { // recursively search all children - obj[key] = util.restoreStreams(value, streaming); - }); - } - return obj; - }, - readNumber: function (bytes) { let n = 0; for (let i = 0; i < bytes.length; i++) { @@ -126,42 +74,6 @@ const util = { return time === null || time === Infinity ? time : new Date(Math.floor(+time / 1000) * 1000); }, - /** - * Create hex string from a binary - * @param {String} str - String to convert - * @returns {String} String containing the hexadecimal values. - */ - stringToHex: function (str) { - if (str === null) { - return ""; - } - const r = []; - const e = str.length; - let c = 0; - let h; - while (c < e) { - h = str.charCodeAt(c++).toString(16); - while (h.length < 2) { - h = "0" + h; - } - r.push("" + h); - } - return r.join(''); - }, - - /** - * Create binary string from a hex encoded string - * @param {String} str - Hex string to convert - * @returns {String} - */ - hexToString: function (hex) { - let str = ''; - for (let i = 0; i < hex.length; i += 2) { - str += String.fromCharCode(parseInt(hex.substr(i, 2), 16)); - } - return str; - }, - /** * Read one MPI from bytes in input * @param {Uint8Array} bytes - Input data to parse @@ -376,32 +288,6 @@ const util = { } }, - /** - * Helper function to print a debug message. Debug - * messages are only printed if - * Different than printDebug because will call Uint8ArrayToHex iff necessary. - * @param {String} str - String of the debug message - */ - printDebugHexArrayDump: function (str, arrToHex) { - if (debugMode) { - str += ': ' + util.uint8ArrayToHex(arrToHex); - console.log(str); - } - }, - - /** - * Helper function to print a debug message. Debug - * messages are only printed if - * Different than printDebug because will call stringToHex iff necessary. - * @param {String} str - String of the debug message - */ - printDebugHexStrDump: function (str, stringToHex) { - if (debugMode) { - str += util.stringToHex(stringToHex); - console.log(str); - } - }, - /** * Helper function to print a debug error. Debug * messages are only printed if @@ -413,18 +299,6 @@ const util = { } }, - /** - * Read a stream to the end and print it to the console when it's closed. - * @param {String} str - String of the debug message - * @param {ReadableStream|Uint8array|String} input - Stream to print - * @param {Function} concat - Function to concatenate chunks of the stream (defaults to util.concat). - */ - printEntireStream: function (str, input, concat) { - stream.readToEnd(stream.clone(input), concat).then(result => { - console.log(str + ': ', result); - }); - }, - // returns bit length of the integer x nbits: function (x) { let r = 1; @@ -545,10 +419,6 @@ const util = { return (require('buffer') || {}).Buffer; }, - getNodeStream: function() { - return (require('stream') || {}).Readable; - }, - getHardwareConcurrency: function() { if (util.detectNode()) { const os = require('os'); diff --git a/test/crypto/aes_kw.js b/test/crypto/aes_kw.js index d27e468b..5e519617 100644 --- a/test/crypto/aes_kw.js +++ b/test/crypto/aes_kw.js @@ -47,9 +47,9 @@ module.exports = () => describe('AES Key Wrap and Unwrap', function () { it(test[0], function(done) { const kek = util.hexToUint8Array(test[1]); const input = test[2].replace(/\s/g, ""); - const input_bin = util.hexToString(input); + const input_bin = util.uint8ArrayToString(util.hexToUint8Array(input)); const output = test[3].replace(/\s/g, ""); - const output_bin = util.hexToString(output); + const output_bin = util.uint8ArrayToString(util.hexToUint8Array(output)); expect(util.uint8ArrayToHex(aesKW.wrap(kek, input_bin)).toUpperCase()).to.equal(output); expect(util.uint8ArrayToHex(aesKW.unwrap(kek, output_bin)).toUpperCase()).to.equal(input); done(); diff --git a/test/crypto/cipher/blowfish.js b/test/crypto/cipher/blowfish.js index f7757584..ae75a014 100644 --- a/test/crypto/cipher/blowfish.js +++ b/test/crypto/cipher/blowfish.js @@ -8,9 +8,9 @@ const { expect } = chai; module.exports = () => it('Blowfish cipher test with test vectors from https://www.schneier.com/code/vectors.txt', function(done) { function test_bf(input, key, output) { const blowfish = new BF(util.uint8ArrayToString(key)); - const result = util.uint8ArrayToString(blowfish.encrypt(input)); + const result = blowfish.encrypt(input); - return (util.stringToHex(result) === util.stringToHex(util.uint8ArrayToString(output))); + return util.equalsUint8Array(new Uint8Array(result), new Uint8Array(output)); } const testvectors = [[[0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00],[0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00],[0x4E,0xF9,0x97,0x45,0x61,0x98,0xDD,0x78]], diff --git a/test/crypto/cipher/cast5.js b/test/crypto/cipher/cast5.js index 583dcf92..05e956df 100644 --- a/test/crypto/cipher/cast5.js +++ b/test/crypto/cipher/cast5.js @@ -8,9 +8,9 @@ const { expect } = chai; module.exports = () => it('CAST-128 cipher test with test vectors from RFC2144', function (done) { function test_cast(input, key, output) { const cast5 = new CAST5(key); - const result = util.uint8ArrayToString(cast5.encrypt(input)); + const result = cast5.encrypt(input); - return util.stringToHex(result) === util.stringToHex(util.uint8ArrayToString(output)); + return util.equalsUint8Array(new Uint8Array(result), new Uint8Array(output)); } const testvectors = [[[0x01,0x23,0x45,0x67,0x12,0x34,0x56,0x78,0x23,0x45,0x67,0x89,0x34,0x56,0x78,0x9A],[0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF],[0x23,0x8B,0x4F,0xE5,0x84,0x7E,0x44,0xB2]]]; diff --git a/test/crypto/cipher/des.js b/test/crypto/cipher/des.js index 12f386ad..ccac9345 100644 --- a/test/crypto/cipher/des.js +++ b/test/crypto/cipher/des.js @@ -80,7 +80,7 @@ module.exports = () => describe('TripleDES (EDE) cipher test with test vectors f const encr = util.uint8ArrayToString(des.encrypt(testvectors[i][0], key)); expect(encr, 'vector with block ' + util.uint8ArrayToHex(testvectors[i][0]) + - ' and key ' + util.stringToHex(util.uint8ArrayToString(key)) + + ' and key ' + util.uint8ArrayToHex(key) + ' should be ' + util.uint8ArrayToHex(testvectors[i][1]) + ' != ' + util.uint8ArrayToHex(encr)).to.be.equal(util.uint8ArrayToString(testvectors[i][1])); } @@ -125,13 +125,13 @@ module.exports = () => describe('TripleDES (EDE) cipher test with test vectors f const decrypted = des.decrypt(encrypted, padding); expect(util.uint8ArrayToString(encrypted), 'vector with block [' + util.uint8ArrayToHex(thisVectorSet[i][0]) + - '] and key [' + util.stringToHex(util.uint8ArrayToString(key)) + + '] and key [' + util.uint8ArrayToHex(key) + '] and padding [' + padding + '] should be ' + util.uint8ArrayToHex(thisVectorSet[i][1]) + ' - Actually [' + util.uint8ArrayToHex(encrypted) + ']').to.equal(util.uint8ArrayToString(thisVectorSet[i][1])); expect(util.uint8ArrayToString(decrypted), 'vector with block [' + util.uint8ArrayToHex(thisVectorSet[i][0]) + - '] and key [' + util.stringToHex(util.uint8ArrayToString(key)) + + '] and key [' + util.uint8ArrayToHex(key) + '] and padding [' + padding + '] should be ' + util.uint8ArrayToHex(thisVectorSet[i][0]) + ' - Actually [' + util.uint8ArrayToHex(decrypted) + diff --git a/test/crypto/cipher/twofish.js b/test/crypto/cipher/twofish.js index 77d3cd4c..ebe7c263 100644 --- a/test/crypto/cipher/twofish.js +++ b/test/crypto/cipher/twofish.js @@ -63,7 +63,7 @@ module.exports = () => it('Twofish with test vectors from https://www.schneier.c continue; } expect(res, 'vector with block ' + util.uint8ArrayToHex(blk) + - ' with key ' + util.stringToHex(key) + + ' with key ' + util.uint8ArrayToHex(util.stringToUint8Array(key)) + ' should be ' + util.uint8ArrayToHex(ct) + ' but is ' + util.uint8ArrayToHex(tfencrypt(blk,key))).to.equal(exp); } diff --git a/test/crypto/hash/md5.js b/test/crypto/hash/md5.js index d6d1dbb3..7df36b8b 100644 --- a/test/crypto/hash/md5.js +++ b/test/crypto/hash/md5.js @@ -6,10 +6,10 @@ const chai = require('chai'); const { expect } = chai; module.exports = () => it('MD5 with test vectors from RFC 1321', async function() { - expect(util.stringToHex(util.uint8ArrayToString(await md5(util.stringToUint8Array(''))), 'MD5("") = d41d8cd98f00b204e9800998ecf8427e')).to.equal('d41d8cd98f00b204e9800998ecf8427e'); - expect(util.stringToHex(util.uint8ArrayToString(await md5(util.stringToUint8Array('abc'))), 'MD5("a") = 0cc175b9c0f1b6a831c399e269772661')).to.equal('900150983cd24fb0d6963f7d28e17f72'); - expect(util.stringToHex(util.uint8ArrayToString(await md5(util.stringToUint8Array('message digest'))), 'MD5("message digest") = f96b697d7cb7938d525a2f31aaf161d0')).to.equal('f96b697d7cb7938d525a2f31aaf161d0'); - expect(util.stringToHex(util.uint8ArrayToString(await md5(util.stringToUint8Array('abcdefghijklmnopqrstuvwxyz'))), 'MD5("abcdefghijklmnopqrstuvwxyz") = c3fcd3d76192e4007dfb496cca67e13b')).to.equal('c3fcd3d76192e4007dfb496cca67e13b'); - expect(util.stringToHex(util.uint8ArrayToString(await md5(util.stringToUint8Array('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'))), 'MD5("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") = d174ab98d277d9f5a5611c2c9f419d9f')).to.equal('d174ab98d277d9f5a5611c2c9f419d9f'); - expect(util.stringToHex(util.uint8ArrayToString(await md5(util.stringToUint8Array('12345678901234567890123456789012345678901234567890123456789012345678901234567890'))), 'MD5("12345678901234567890123456789012345678901234567890123456789012345678901234567890") = 57edf4a22be3c955ac49da2e2107b67a')).to.equal('57edf4a22be3c955ac49da2e2107b67a'); + expect(util.uint8ArrayToHex(await md5(util.stringToUint8Array('')), 'MD5("") = d41d8cd98f00b204e9800998ecf8427e')).to.equal('d41d8cd98f00b204e9800998ecf8427e'); + expect(util.uint8ArrayToHex(await md5(util.stringToUint8Array('abc')), 'MD5("a") = 0cc175b9c0f1b6a831c399e269772661')).to.equal('900150983cd24fb0d6963f7d28e17f72'); + expect(util.uint8ArrayToHex(await md5(util.stringToUint8Array('message digest')), 'MD5("message digest") = f96b697d7cb7938d525a2f31aaf161d0')).to.equal('f96b697d7cb7938d525a2f31aaf161d0'); + expect(util.uint8ArrayToHex(await md5(util.stringToUint8Array('abcdefghijklmnopqrstuvwxyz')), 'MD5("abcdefghijklmnopqrstuvwxyz") = c3fcd3d76192e4007dfb496cca67e13b')).to.equal('c3fcd3d76192e4007dfb496cca67e13b'); + expect(util.uint8ArrayToHex(await md5(util.stringToUint8Array('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789')), 'MD5("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") = d174ab98d277d9f5a5611c2c9f419d9f')).to.equal('d174ab98d277d9f5a5611c2c9f419d9f'); + expect(util.uint8ArrayToHex(await md5(util.stringToUint8Array('12345678901234567890123456789012345678901234567890123456789012345678901234567890')), 'MD5("12345678901234567890123456789012345678901234567890123456789012345678901234567890") = 57edf4a22be3c955ac49da2e2107b67a')).to.equal('57edf4a22be3c955ac49da2e2107b67a'); }); diff --git a/test/crypto/hash/ripemd.js b/test/crypto/hash/ripemd.js index 12ec1dd5..c301e025 100644 --- a/test/crypto/hash/ripemd.js +++ b/test/crypto/hash/ripemd.js @@ -6,8 +6,8 @@ const chai = require('chai'); const { expect } = chai; module.exports = () => it("RIPE-MD 160 bits with test vectors from https://homes.esat.kuleuven.be/~bosselae/ripemd160.html", async function() { - expect(util.stringToHex(util.uint8ArrayToString(await rmdString(util.stringToUint8Array(''))), 'RMDstring("") = 9c1185a5c5e9fc54612808977ee8f548b2258d31')).to.equal('9c1185a5c5e9fc54612808977ee8f548b2258d31'); - expect(util.stringToHex(util.uint8ArrayToString(await rmdString(util.stringToUint8Array('a'))), 'RMDstring("a") = 0bdc9d2d256b3ee9daae347be6f4dc835a467ffe')).to.equal('0bdc9d2d256b3ee9daae347be6f4dc835a467ffe'); - expect(util.stringToHex(util.uint8ArrayToString(await rmdString(util.stringToUint8Array('abc'))), 'RMDstring("abc") = 8eb208f7e05d987a9b044a8e98c6b087f15a0bfc')).to.equal('8eb208f7e05d987a9b044a8e98c6b087f15a0bfc'); - expect(util.stringToHex(util.uint8ArrayToString(await rmdString(util.stringToUint8Array('message digest'))), 'RMDstring("message digest") = 5d0689ef49d2fae572b881b123a85ffa21595f36')).to.equal('5d0689ef49d2fae572b881b123a85ffa21595f36'); + expect(util.uint8ArrayToHex(await rmdString(util.stringToUint8Array('')), 'RMDstring("") = 9c1185a5c5e9fc54612808977ee8f548b2258d31')).to.equal('9c1185a5c5e9fc54612808977ee8f548b2258d31'); + expect(util.uint8ArrayToHex(await rmdString(util.stringToUint8Array('a')), 'RMDstring("a") = 0bdc9d2d256b3ee9daae347be6f4dc835a467ffe')).to.equal('0bdc9d2d256b3ee9daae347be6f4dc835a467ffe'); + expect(util.uint8ArrayToHex(await rmdString(util.stringToUint8Array('abc')), 'RMDstring("abc") = 8eb208f7e05d987a9b044a8e98c6b087f15a0bfc')).to.equal('8eb208f7e05d987a9b044a8e98c6b087f15a0bfc'); + expect(util.uint8ArrayToHex(await rmdString(util.stringToUint8Array('message digest')), 'RMDstring("message digest") = 5d0689ef49d2fae572b881b123a85ffa21595f36')).to.equal('5d0689ef49d2fae572b881b123a85ffa21595f36'); }); diff --git a/test/crypto/hash/sha.js b/test/crypto/hash/sha.js index faf78ef0..6055ed41 100644 --- a/test/crypto/hash/sha.js +++ b/test/crypto/hash/sha.js @@ -6,14 +6,14 @@ const chai = require('chai'); const { expect } = chai; module.exports = () => it('SHA* with test vectors from NIST FIPS 180-2', async function() { - expect(util.stringToHex(util.uint8ArrayToString(await hash.sha1(util.stringToUint8Array('abc'))), 'hash.sha1("abc") = a9993e364706816aba3e25717850c26c9cd0d89d')).to.equal('a9993e364706816aba3e25717850c26c9cd0d89d'); - expect(util.stringToHex(util.uint8ArrayToString(await hash.sha1(util.stringToUint8Array('abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq'))), 'hash.sha1("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq") = 84983e441c3bd26ebaae4aa1f95129e5e54670f1')).to.equal('84983e441c3bd26ebaae4aa1f95129e5e54670f1'); - expect(util.stringToHex(util.uint8ArrayToString(await hash.sha224(util.stringToUint8Array('abc'))), 'hash.sha224("abc") = 23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7')).to.equal('23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7'); - expect(util.stringToHex(util.uint8ArrayToString(await hash.sha224(util.stringToUint8Array('abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq'))), 'hash.sha224("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq") = 75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525')).to.equal('75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525'); - expect(util.stringToHex(util.uint8ArrayToString(await hash.sha256(util.stringToUint8Array('abc'))), 'hash.sha256("abc") = ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad')).to.equal('ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad'); - expect(util.stringToHex(util.uint8ArrayToString(await hash.sha256(util.stringToUint8Array('abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq'))), 'hash.sha256("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq") = 248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1')).to.equal('248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1'); - expect(util.stringToHex(util.uint8ArrayToString(await hash.sha384(util.stringToUint8Array('abc'))), 'hash.sha384("abc") = cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7')).to.equal('cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7'); - expect(util.stringToHex(util.uint8ArrayToString(await hash.sha384(util.stringToUint8Array('abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq'))), 'hash.sha384("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq") = 3391fdddfc8dc7393707a65b1b4709397cf8b1d162af05abfe8f450de5f36bc6b0455a8520bc4e6f5fe95b1fe3c8452b')).to.equal('3391fdddfc8dc7393707a65b1b4709397cf8b1d162af05abfe8f450de5f36bc6b0455a8520bc4e6f5fe95b1fe3c8452b'); - expect(util.stringToHex(util.uint8ArrayToString(await hash.sha512(util.stringToUint8Array('abc'))), 'hash.sha512("abc") = ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f')).to.equal('ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f'); - expect(util.stringToHex(util.uint8ArrayToString(await hash.sha512(util.stringToUint8Array('abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq'))), 'hash.sha512("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq") = 204a8fc6dda82f0a0ced7beb8e08a41657c16ef468b228a8279be331a703c33596fd15c13b1b07f9aa1d3bea57789ca031ad85c7a71dd70354ec631238ca3445')).to.equal('204a8fc6dda82f0a0ced7beb8e08a41657c16ef468b228a8279be331a703c33596fd15c13b1b07f9aa1d3bea57789ca031ad85c7a71dd70354ec631238ca3445'); + expect(util.uint8ArrayToHex(await hash.sha1(util.stringToUint8Array('abc')), 'hash.sha1("abc") = a9993e364706816aba3e25717850c26c9cd0d89d')).to.equal('a9993e364706816aba3e25717850c26c9cd0d89d'); + expect(util.uint8ArrayToHex(await hash.sha1(util.stringToUint8Array('abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq')), 'hash.sha1("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq") = 84983e441c3bd26ebaae4aa1f95129e5e54670f1')).to.equal('84983e441c3bd26ebaae4aa1f95129e5e54670f1'); + expect(util.uint8ArrayToHex(await hash.sha224(util.stringToUint8Array('abc')), 'hash.sha224("abc") = 23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7')).to.equal('23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7'); + expect(util.uint8ArrayToHex(await hash.sha224(util.stringToUint8Array('abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq')), 'hash.sha224("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq") = 75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525')).to.equal('75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525'); + expect(util.uint8ArrayToHex(await hash.sha256(util.stringToUint8Array('abc')), 'hash.sha256("abc") = ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad')).to.equal('ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad'); + expect(util.uint8ArrayToHex(await hash.sha256(util.stringToUint8Array('abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq')), 'hash.sha256("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq") = 248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1')).to.equal('248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1'); + expect(util.uint8ArrayToHex(await hash.sha384(util.stringToUint8Array('abc')), 'hash.sha384("abc") = cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7')).to.equal('cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7'); + expect(util.uint8ArrayToHex(await hash.sha384(util.stringToUint8Array('abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq')), 'hash.sha384("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq") = 3391fdddfc8dc7393707a65b1b4709397cf8b1d162af05abfe8f450de5f36bc6b0455a8520bc4e6f5fe95b1fe3c8452b')).to.equal('3391fdddfc8dc7393707a65b1b4709397cf8b1d162af05abfe8f450de5f36bc6b0455a8520bc4e6f5fe95b1fe3c8452b'); + expect(util.uint8ArrayToHex(await hash.sha512(util.stringToUint8Array('abc')), 'hash.sha512("abc") = ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f')).to.equal('ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f'); + expect(util.uint8ArrayToHex(await hash.sha512(util.stringToUint8Array('abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq')), 'hash.sha512("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq") = 204a8fc6dda82f0a0ced7beb8e08a41657c16ef468b228a8279be331a703c33596fd15c13b1b07f9aa1d3bea57789ca031ad85c7a71dd70354ec631238ca3445')).to.equal('204a8fc6dda82f0a0ced7beb8e08a41657c16ef468b228a8279be331a703c33596fd15c13b1b07f9aa1d3bea57789ca031ad85c7a71dd70354ec631238ca3445'); }); diff --git a/test/general/x25519.js b/test/general/x25519.js index 9dc67896..cebc98e1 100644 --- a/test/general/x25519.js +++ b/test/general/x25519.js @@ -220,7 +220,7 @@ module.exports = () => (openpgp.config.ci ? describe.skip : describe)('X25519 Cr const curve = new elliptic.Curve('ed25519'); const { publicKey } = nacl.sign.keyPair.fromSeed(util.hexToUint8Array(vector.SECRET_KEY)); expect(publicKey).to.deep.equal(util.hexToUint8Array(vector.PUBLIC_KEY)); - const data = util.stringToUint8Array(vector.MESSAGE); + const data = vector.MESSAGE; const privateParams = { seed: util.hexToUint8Array(vector.SECRET_KEY) }; @@ -245,7 +245,7 @@ module.exports = () => (openpgp.config.ci ? describe.skip : describe)('X25519 Cr return testVector({ SECRET_KEY: '9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60', PUBLIC_KEY: 'd75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a', - MESSAGE: '', + MESSAGE: util.hexToUint8Array(''), SIGNATURE: { R: 'e5564300c360ac729086e2cc806e828a84877f1eb8e5d974d873e06522490155', S: '5fb8821590a33bacc61e39701cf9b46bd25bf5f0595bbe24655141438e7a100b' @@ -257,7 +257,7 @@ module.exports = () => (openpgp.config.ci ? describe.skip : describe)('X25519 Cr return testVector({ SECRET_KEY: '4ccd089b28ff96da9db6c346ec114e0f5b8a319f35aba624da8cf6ed4fb8a6fb', PUBLIC_KEY: '3d4017c3e843895a92b70aa74d1b7ebc9c982ccf2ec4968cc0cd55f12af4660c', - MESSAGE: util.hexToString('72'), + MESSAGE: util.hexToUint8Array('72'), SIGNATURE: { R: '92a009a9f0d4cab8720e820b5f642540a2b27b5416503f8fb3762223ebdb69da', S: '085ac1e43e15996e458f3613d0f11d8c387b2eaeb4302aeeb00d291612bb0c00' @@ -269,7 +269,7 @@ module.exports = () => (openpgp.config.ci ? describe.skip : describe)('X25519 Cr return testVector({ SECRET_KEY: 'c5aa8df43f9f837bedb7442f31dcb7b166d38535076f094b85ce3a2e0b4458f7', PUBLIC_KEY: 'fc51cd8e6218a1a38da47ed00230f0580816ed13ba3303ac5deb911548908025', - MESSAGE: util.hexToString('af82'), + MESSAGE: util.hexToUint8Array('af82'), SIGNATURE: { R: '6291d657deec24024827e69c3abe01a30ce548a284743a445e3680d7db5ac3ac', S: '18ff9b538d16f290ae67f760984dc6594a7c15e9716ed28dc027beceea1ec40a' @@ -281,7 +281,7 @@ module.exports = () => (openpgp.config.ci ? describe.skip : describe)('X25519 Cr return testVector({ SECRET_KEY: 'f5e5767cf153319517630f226876b86c8160cc583bc013744c6bf255f5cc0ee5', PUBLIC_KEY: '278117fc144c72340f67d0f2316e8386ceffbf2b2428c9c51fef7c597f1d426e', - MESSAGE: util.hexToString([ + MESSAGE: util.hexToUint8Array([ '08b8b2b733424243760fe426a4b54908', '632110a66c2f6591eabd3345e3e4eb98', 'fa6e264bf09efe12ee50f8f54e9f77b1', @@ -358,7 +358,7 @@ module.exports = () => (openpgp.config.ci ? describe.skip : describe)('X25519 Cr return testVector({ SECRET_KEY: '833fe62409237b9d62ec77587520911e9a759cec1d19755b7da901b96dca3d42', PUBLIC_KEY: 'ec172b93ad5e563bf4932c70e1245034c35467ef2efd4d64ebf819683467e2bf', - MESSAGE: util.hexToString([ + MESSAGE: util.hexToUint8Array([ 'ddaf35a193617abacc417349ae204131', '12e6fa4e89a97ea20a9eeee64b55d39a', '2192992a274fc1a836ba3c23a3feebbd',