BTCPrivate
/
bitcore
mirror of https://github.com/BTCPrivate/bitcore.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #765 from maraoz/test/sig_noncanonical 

add sig_noncanonical.json tests
This commit is contained in:
Esteban Ordano 2014-12-16 18:02:40 -03:00
parent 1b9ac8243d c272412df2
commit 20fc304f44
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/script_interpreter.js
View File

@ -127,12 +127,12 @@ ScriptInterpreter.castToBool = function(buf) {
ScriptInterpreter.prototype.checkSignatureEncoding = function(buf) {
var sig;
if ((this.flags & (ScriptInterpreter.SCRIPT_VERIFY_DERSIG | ScriptInterpreter.SCRIPT_VERIFY_LOW_S | ScriptInterpreter.SCRIPT_VERIFY_STRICTENC)) !== 0 && !Signature.isTxDER(buf)) {
this.errstr = 'SCRIPT_ERR_SIG_DER';
this.errstr = 'SCRIPT_ERR_SIG_DER_INVALID_FORMAT';
return false;
} else if ((this.flags & ScriptInterpreter.SCRIPT_VERIFY_LOW_S) !== 0) {
sig = Signature().fromTxFormat(buf);
sig = Signature.fromTxFormat(buf);
if (!sig.hasLowS()) {
this.errstr = 'SCRIPT_ERR_SIG_DER';
this.errstr = 'SCRIPT_ERR_SIG_DER_HIGH_S';
return false;
}
} else if ((this.flags & ScriptInterpreter.SCRIPT_VERIFY_STRICTENC) !== 0) {

9
test/crypto/signature.js
View File

@ -5,6 +5,7 @@ var bitcore = require('../..');
var BN = bitcore.crypto.BN;
var Signature = bitcore.crypto.Signature;
var JSUtil = bitcore.util.js;
var ScriptInterpreter = bitcore.ScriptInterpreter;
var sig_canonical = require('../data/bitcoind/sig_canonical');
var sig_noncanonical = require('../data/bitcoind/sig_noncanonical');
@ -217,13 +218,17 @@ describe('Signature', function() {
}
it('should be ' + (expected ? '' : 'in') + 'valid for fixture #' + i, function() {
var sighex = vector;
Signature.isTxDER(new Buffer(sighex, 'hex')).should.equal(expected);
var interp = ScriptInterpreter();
interp.flags = ScriptInterpreter.SCRIPT_VERIFY_DERSIG |
ScriptInterpreter.SCRIPT_VERIFY_STRICTENC;
var result = interp.checkSignatureEncoding(new Buffer(sighex, 'hex'));
result.should.equal(expected);
});
i++;
});
};
test_sigs(sig_canonical, true);
//test_sigs(sig_noncanonical, false);
test_sigs(sig_noncanonical, false);
});
});