:recylce: Change signatures encoding from base64 to hex

LiskArchive · Jan 30, 2018 · fd1a5fb · fd1a5fb
1 parent 4eaea23
commit fd1a5fb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/crypto/sign.js b/src/crypto/sign.js
@@ -34,7 +34,7 @@ export const signMessageWithPassphrase = (message, passphrase) => {
 	return {
 		message,
 		publicKey: bufferToHex(publicKey),
-		signature: Buffer.from(signature).toString('base64'),
+		signature: bufferToHex(signature),
 	};
 };
 
@@ -43,8 +43,8 @@ export const verifyMessageWithPublicKey = ({
 	signature,
 	publicKey,
 }) => {
-	const msgBytes = Buffer.from(message);
-	const signatureBytes = Buffer.from(signature, 'base64');
+	const msgBytes = Buffer.from(message, 'utf8');
+	const signatureBytes = hexToBuffer(signature);
 	const publicKeyBytes = hexToBuffer(publicKey);
 
 	if (publicKeyBytes.length !== 32) {
@@ -86,8 +86,8 @@ export const signMessageWithTwoPassphrases = (
 		message,
 		publicKey: bufferToHex(keypairBytes.publicKey),
 		secondPublicKey: bufferToHex(secondKeypairBytes.publicKey),
-		signature: Buffer.from(signature).toString('base64'),
-		secondSignature: Buffer.from(secondSignature).toString('base64'),
+		signature: bufferToHex(signature),
+		secondSignature: bufferToHex(secondSignature),
 	};
 };
 
@@ -98,11 +98,11 @@ export const verifyMessageWithTwoPublicKeys = ({
 	publicKey,
 	secondPublicKey,
 }) => {
-	const messageBytes = Buffer.from(message);
-	const signatureBytes = Buffer.from(signature, 'base64');
-	const secondSignatureBytes = Buffer.from(secondSignature, 'base64');
-	const publicKeyBytes = Buffer.from(hexToBuffer(publicKey));
-	const secondPublicKeyBytes = Buffer.from(hexToBuffer(secondPublicKey));
+	const messageBytes = Buffer.from(message, 'utf8');
+	const signatureBytes = hexToBuffer(signature);
+	const secondSignatureBytes = hexToBuffer(secondSignature);
+	const publicKeyBytes = hexToBuffer(publicKey);
+	const secondPublicKeyBytes = hexToBuffer(secondPublicKey);
 
 	if (signatureBytes.length !== naclInstance.crypto_sign_BYTES) {
 		throw new Error(

diff --git a/test/crypto/sign.js b/test/crypto/sign.js
@@ -46,9 +46,9 @@ describe('sign', () => {
 		'0401c8ac9f29ded9e1e4d5b6b43051cb25b22f27c7b7b35092161e851946f82f';
 	const defaultMessage = 'Some default text.';
 	const defaultSignature =
-		'l07qwsfn2dpCqic8jKro5ut2b6KaMbN3MvIubS5h6EAhBoSeYeNVH/cNfTWRcKYZhmnhBhtrSqYZl+Jrh+OnBA==';
+		'974eeac2c7e7d9da42aa273c8caae8e6eb766fa29a31b37732f22e6d2e61e8402106849e61e3551ff70d7d359170a6198669e1061b6b4aa61997e26b87e3a704';
 	const defaultSecondSignature =
-		'/ZOPadM9cMlAu5lFeeEfTl7hjnFWNJl6uXUzBdXsDQMa7gP22owcJZwf3sNLTvVG5inAe7PHekvO6dsBfayIDQ==';
+		'fd938f69d33d70c940bb994579e11f4e5ee18e715634997ab9753305d5ec0d031aee03f6da8c1c259c1fdec34b4ef546e629c07bb3c77a4bcee9db017dac880d';
 	const defaultPrintedMessage = `
 -----BEGIN LISK SIGNED MESSAGE-----
 -----MESSAGE-----