Merge pull request bitcoin#169

sipa · sipa · commit cf0c48bea574 · 2014-12-18T21:59:15.000+01:00
603c33b Make signing fail if a too small buffer is passed. (Pieter Wuille)
diff --git a/src/secp256k1.c b/src/secp256k1.c
@@ -88,7 +88,7 @@ int secp256k1_ecdsa_sign(const unsigned char *msg32, unsigned char *signature, i
         ret = secp256k1_ecdsa_sig_sign(&sig, &sec, &msg, &non, NULL);
     }
     if (ret) {
-        secp256k1_ecdsa_sig_serialize(signature, signaturelen, &sig);
+        ret = secp256k1_ecdsa_sig_serialize(signature, signaturelen, &sig);
     }
     secp256k1_scalar_clear(&msg);
     secp256k1_scalar_clear(&non);
diff --git a/src/tests.c b/src/tests.c
@@ -1298,6 +1298,8 @@ void test_ecdsa_edge_cases(void) {
         msg[31] = 0xaa;
         siglen = 72;
         CHECK(secp256k1_ecdsa_sign(msg, sig, &siglen, key, nonce) == 1);
+        siglen = 10;
+        CHECK(secp256k1_ecdsa_sign(msg, sig, &siglen, key, nonce) != 1);
     }
 
     /* Privkey export where pubkey is the point at infinity. */

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ int secp256k1_ecdsa_sign(const unsigned char msg32, unsigned char signature, i`
`88`	`88`	`ret = secp256k1_ecdsa_sig_sign(&sig, &sec, &msg, &non, NULL);`
`89`	`89`	`}`
`90`	`90`	`if (ret) {`
`91`		`- secp256k1_ecdsa_sig_serialize(signature, signaturelen, &sig);`
	`91`	`+ ret = secp256k1_ecdsa_sig_serialize(signature, signaturelen, &sig);`
`92`	`92`	`}`
`93`	`93`	`secp256k1_scalar_clear(&msg);`
`94`	`94`	`secp256k1_scalar_clear(&non);`
Original file line number	Diff line number	Diff line change
`@@ -1298,6 +1298,8 @@ void test_ecdsa_edge_cases(void) {`
`1298`	`1298`	`msg[31] = 0xaa;`
`1299`	`1299`	`siglen = 72;`
`1300`	`1300`	`CHECK(secp256k1_ecdsa_sign(msg, sig, &siglen, key, nonce) == 1);`
	`1301`	`+ siglen = 10;`
	`1302`	`+ CHECK(secp256k1_ecdsa_sign(msg, sig, &siglen, key, nonce) != 1);`
`1301`	`1303`	`}`
`1302`	`1304`
`1303`	`1305`	`/* Privkey export where pubkey is the point at infinity. */`