Mercurial > hg > bitcoin
changeset 2856:0ad65efc636c draft
Minimal support for compressed-key signature recovery (for verifymessage)
Upstream commits:
11529c6e4f7288d8a64c488a726ee3821c7adefe
d4d9c734c315e99136fe245c5733ca75cab9f8bf
author | Luke Dashjr <luke-jr+git@utopios.org> |
---|---|
date | Tue, 27 Mar 2012 20:03:28 -0400 |
parents | bdff5864eff3 |
children | b5c673335b60 |
files | src/key.h |
diffstat | 1 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/key.h +++ b/src/key.h @@ -169,6 +169,11 @@ EC_KEY* pkey; bool fSet; + void SetCompressedPubKey() + { + EC_KEY_set_conv_form(pkey, POINT_CONVERSION_COMPRESSED); + } + public: CKey() { @@ -346,7 +351,8 @@ { if (vchSig.size() != 65) return false; - if (vchSig[0]<27 || vchSig[0]>=31) + int nV = vchSig[0]; + if (nV<27 || nV>=35) return false; ECDSA_SIG *sig = ECDSA_SIG_new(); BN_bin2bn(&vchSig[1],32,sig->r); @@ -354,7 +360,12 @@ EC_KEY_free(pkey); pkey = EC_KEY_new_by_curve_name(NID_secp256k1); - if (ECDSA_SIG_recover_key_GFp(pkey, sig, (unsigned char*)&hash, sizeof(hash), vchSig[0] - 27, 0) == 1) + if (nV >= 31) + { + SetCompressedPubKey(); + nV -= 4; + } + if (ECDSA_SIG_recover_key_GFp(pkey, sig, (unsigned char*)&hash, sizeof(hash), nV - 27, 0) == 1) { fSet = true; ECDSA_SIG_free(sig);