Browse Source

Use key recovery for message signatures

Instead of encoding the public key inside the signature string, use
key recovery to do verification. This allows 88-character base64-encoded
signature strings instead of 188-character ones.
0.8
Pieter Wuille 13 years ago
parent
commit
3a570dc80a
  1. 32
      src/bitcoinrpc.cpp

32
src/bitcoinrpc.cpp

@ -554,15 +554,10 @@ Value signmessage(const Array& params, bool fHelp)
ss << strMessage; ss << strMessage;
vector<unsigned char> vchSig; vector<unsigned char> vchSig;
if (!key.Sign(Hash(ss.begin(), ss.end()), vchSig)) if (!key.SignCompact(Hash(ss.begin(), ss.end()), vchSig))
throw JSONRPCError(-5, "Sign failed"); throw JSONRPCError(-5, "Sign failed");
CDataStream sres(SER_NETWORK); return EncodeBase64(&vchSig[0], vchSig.size());
sres << key.GetPubKey(); // public key
sres << vchSig; // signature;
vector<unsigned char> vchRet(sres.begin(), sres.end());
return EncodeBase64(&vchRet[0], vchRet.size());
} }
Value verifymessage(const Array& params, bool fHelp) Value verifymessage(const Array& params, bool fHelp)
@ -581,31 +576,20 @@ Value verifymessage(const Array& params, bool fHelp)
throw JSONRPCError(-3, "Invalid address"); throw JSONRPCError(-3, "Invalid address");
bool fInvalid = false; bool fInvalid = false;
vector<unsigned char> vchResult = DecodeBase64(strSign.c_str(), &fInvalid); vector<unsigned char> vchSig = DecodeBase64(strSign.c_str(), &fInvalid);
if (fInvalid) if (fInvalid)
throw JSONRPCError(-5, "Malformed base64 encoding"); throw JSONRPCError(-5, "Malformed base64 encoding");
CDataStream sres(vchResult);
std::vector<unsigned char> vchPubKey;
sres >> vchPubKey;
std::vector<unsigned char> vchSig;
sres >> vchSig;
CKey key;
if (!key.SetPubKey(vchPubKey))
throw JSONRPCError(-5, "Invalid public key in signature");
if (key.GetAddress() == addr)
{
CDataStream ss(SER_GETHASH); CDataStream ss(SER_GETHASH);
ss << strMessageMagic; ss << strMessageMagic;
ss << strMessage; ss << strMessage;
return key.Verify(Hash(ss.begin(), ss.end()), vchSig);
} CKey key;
else if (!key.SetCompactSignature(Hash(ss.begin(), ss.end()), vchSig))
return false; return false;
return (key.GetAddress() == addr);
} }

Loading…
Cancel
Save