Skip to content
This repository has been archived by the owner on Jun 7, 2019. It is now read-only.

Commit

Permalink
Merge pull request #113 from LiskHQ/112-improve-signed-message-output
Browse files Browse the repository at this point in the history 
Formats signed messages print functions in clear sections - Fixes #112
  • Loading branch information
@karmacoma
karmacoma committed Apr 27, 2017
2 parents f38e806 + e3eb71f commit 45d50c9
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 15 deletions.
16 changes: 10 additions & 6 deletions dist/lisk-js.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1963,30 +1963,34 @@ function signMessageWithSecret (message, secret) {
}

function signAndPrintMessage (message, secret) {
var messageHeader = '-----BEGIN LISK SIGNED MESSAGE-----';
var signedMessageHeader = '-----BEGIN LISK SIGNED MESSAGE-----';
var messageHeader = '-----MESSAGE-----';
var plainMessage = message;
var signatureHeader = '-----BEGIN SIGNATURE-----';
var pubklicKeyHeader = '-----PUBLIC KEY-----';
var publicKey = keys.getPrivateAndPublicKeyFromSecret(secret).publicKey;
var signatureHeader = '-----SIGNATURE-----';
var signedMessage = signMessageWithSecret(message, secret);
var signatureFooter = '-----END LISK SIGNED MESSAGE-----';

var outputArray = [
messageHeader, plainMessage, signatureHeader, publicKey, signedMessage, signatureFooter
signedMessageHeader, messageHeader, plainMessage, pubklicKeyHeader, publicKey, signatureHeader, signedMessage, signatureFooter
];

return outputArray.join('\n');
}

function printSignedMessage (message, signedMessage, publicKey) {
var messageHeader = '-----BEGIN LISK SIGNED MESSAGE-----';
var signedMessageHeader = '-----BEGIN LISK SIGNED MESSAGE-----';
var messageHeader = '-----MESSAGE-----';
var plainMessage = message;
var signatureHeader = '-----BEGIN SIGNATURE-----';
var publicKeyHeader = '-----PUBLIC KEY-----';
var printPublicKey = publicKey;
var signatureHeader = '-----SIGNATURE-----';
var printSignedMessage = signedMessage;
var signatureFooter = '-----END LISK SIGNED MESSAGE-----';

var outputArray = [
messageHeader, plainMessage, signatureHeader, printPublicKey, printSignedMessage, signatureFooter
signedMessageHeader, messageHeader, plainMessage, publicKeyHeader, printPublicKey, signatureHeader, printSignedMessage, signatureFooter
];

return outputArray.join('\n');
Expand Down
2 changes: 1 addition & 1 deletion dist/lisk-js.min.js
View file

Large diffs are not rendered by default.

16 changes: 10 additions & 6 deletions lib/transactions/crypto/sign.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,30 +28,34 @@ function signMessageWithSecret (message, secret) {
}

function signAndPrintMessage (message, secret) {
var messageHeader = '-----BEGIN LISK SIGNED MESSAGE-----';
var signedMessageHeader = '-----BEGIN LISK SIGNED MESSAGE-----';
var messageHeader = '-----MESSAGE-----';
var plainMessage = message;
var signatureHeader = '-----BEGIN SIGNATURE-----';
var pubklicKeyHeader = '-----PUBLIC KEY-----';
var publicKey = keys.getPrivateAndPublicKeyFromSecret(secret).publicKey;
var signatureHeader = '-----SIGNATURE-----';
var signedMessage = signMessageWithSecret(message, secret);
var signatureFooter = '-----END LISK SIGNED MESSAGE-----';

var outputArray = [
messageHeader, plainMessage, signatureHeader, publicKey, signedMessage, signatureFooter
signedMessageHeader, messageHeader, plainMessage, pubklicKeyHeader, publicKey, signatureHeader, signedMessage, signatureFooter
];

return outputArray.join('\n');
}

function printSignedMessage (message, signedMessage, publicKey) {
var messageHeader = '-----BEGIN LISK SIGNED MESSAGE-----';
var signedMessageHeader = '-----BEGIN LISK SIGNED MESSAGE-----';
var messageHeader = '-----MESSAGE-----';
var plainMessage = message;
var signatureHeader = '-----BEGIN SIGNATURE-----';
var publicKeyHeader = '-----PUBLIC KEY-----';
var printPublicKey = publicKey;
var signatureHeader = '-----SIGNATURE-----';
var printSignedMessage = signedMessage;
var signatureFooter = '-----END LISK SIGNED MESSAGE-----';

var outputArray = [
messageHeader, plainMessage, signatureHeader, printPublicKey, printSignedMessage, signatureFooter
signedMessageHeader, messageHeader, plainMessage, publicKeyHeader, printPublicKey, signatureHeader, printSignedMessage, signatureFooter
];

return outputArray.join('\n');
Expand Down
8 changes: 6 additions & 2 deletions test/transactions/crypto/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,11 @@ describe('crypto/index.js', function () {
var printedMessage = newcrypto.printSignedMessage(message, signedMessage, keypair.publicKey);

var signedMessageExample = '-----BEGIN LISK SIGNED MESSAGE-----\n'+
'-----MESSAGE-----\n'+
'not secret message\n'+
'-----BEGIN SIGNATURE-----\n'+
'-----PUBLIC KEY-----\n'+
'a4465fd76c16fcc458448076372abf1912cc5b150663a64dffefe550f96feadd\n'+
'-----SIGNATURE-----\n'+
'27859f913636aa3e9f7000c07b86c4b1eff17b415c5772619e05d86eabf07724551d96685c44533df3682a9b3c229df27b17a282516100d3f1eae4581cd6cd026e6f7420736563726574206d657373616765\n'+
'-----END LISK SIGNED MESSAGE-----';

Expand All @@ -185,9 +187,11 @@ describe('crypto/index.js', function () {
var printSignedMessage = newcrypto.signAndPrintMessage(message, secret);

var signedMessageExample = '-----BEGIN LISK SIGNED MESSAGE-----\n'+
'-----MESSAGE-----\n'+
'not secret message\n'+
'-----BEGIN SIGNATURE-----\n'+
'-----PUBLIC KEY-----\n'+
'a4465fd76c16fcc458448076372abf1912cc5b150663a64dffefe550f96feadd\n'+
'-----SIGNATURE-----\n'+
'27859f913636aa3e9f7000c07b86c4b1eff17b415c5772619e05d86eabf07724551d96685c44533df3682a9b3c229df27b17a282516100d3f1eae4581cd6cd026e6f7420736563726574206d657373616765\n'+
'-----END LISK SIGNED MESSAGE-----';

Expand Down

0 comments on commit 45d50c9

Please sign in to comment.