highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-10 22:18:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make CPubKey statically allocated

Browse Source
This commit is contained in:
Pieter Wuille
2013-04-30 21:56:04 +02:00
committed by Pieter Wuille
parent ec0004aca0
commit 5d891489ab
7 changed files with 98 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/key.cpp
View File

@@ -258,11 +258,11 @@ CPrivKey CKey::GetPrivKey() const
bool CKey::SetPubKey(const CPubKey& vchPubKey)
{
const unsigned char* pbegin = &vchPubKey.vchPubKey[0];
if (o2i_ECPublicKey(&pkey, &pbegin, vchPubKey.vchPubKey.size()))
const unsigned char* pbegin = vchPubKey.begin();
if (o2i_ECPublicKey(&pkey, &pbegin, vchPubKey.size()))
{
fSet = true;
if (vchPubKey.vchPubKey.size() == 33)
if (vchPubKey.size() == 33)
SetCompressedPubKey();
return true;
}
@@ -276,11 +276,13 @@ CPubKey CKey::GetPubKey() const
int nSize = i2o_ECPublicKey(pkey, NULL);
if (!nSize)
throw key_error("CKey::GetPubKey() : i2o_ECPublicKey failed");
std::vector<unsigned char> vchPubKey(nSize, 0);
unsigned char* pbegin = &vchPubKey[0];
assert(nSize <= 65);
CPubKey ret;
unsigned char *pbegin = ret.begin();
if (i2o_ECPublicKey(pkey, &pbegin) != nSize)
throw key_error("CKey::GetPubKey() : i2o_ECPublicKey returned unexpected size");
return CPubKey(vchPubKey);
assert((int)ret.size() == nSize);
return ret;
}
bool CKey::Sign(uint256 hash, std::vector<unsigned char>& vchSig)