Mercurial > hg > bitcoin
changeset 2858:89639789e5b9 draft
Merge branch '0.5.0.x' into 0.5.x
author | Luke Dashjr <luke-jr+git@utopios.org> |
---|---|
date | Mon, 02 Apr 2012 09:37:09 -0400 |
parents | 19387f8154a8 (current diff) b5c673335b60 (diff) |
children | b220c4fc4903 |
files | |
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() { @@ -350,7 +355,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); @@ -358,7 +364,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);