mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-28 06:50:38 +01:00
scripted-diff: Rename CPubKey and CKey::*_KEY_SIZE and COMPRESSED_*_KEY_SIZE
To SIZE and COMPRESSED_SIZE -BEGIN VERIFY SCRIPT- sed -i 's/PRIVATE_KEY_SIZE/SIZE/g' src/*.h src/*.cpp src/**/*.h src/**/*.cpp sed -i 's/COMPRESSED_PRIVATE_KEY_SIZE/COMPRESSED_SIZE/g' src/*.h src/**/*.cpp src/**/*.h src/**/*.cpp sed -i 's/PUBLIC_KEY_SIZE/SIZE/g' src/*.h src/*.cpp src/**/*.h src/**/*.cpp sed -i 's/COMPRESSED_PUBLIC_KEY_SIZE/COMPRESSED_SIZE/g' src/*.h src/*.cpp src/**/*.h src/**/*.cpp -END VERIFY SCRIPT-
This commit is contained in:
18
src/pubkey.h
18
src/pubkey.h
@@ -33,8 +33,8 @@ public:
|
||||
/**
|
||||
* secp256k1:
|
||||
*/
|
||||
static constexpr unsigned int PUBLIC_KEY_SIZE = 65;
|
||||
static constexpr unsigned int COMPRESSED_PUBLIC_KEY_SIZE = 33;
|
||||
static constexpr unsigned int SIZE = 65;
|
||||
static constexpr unsigned int COMPRESSED_SIZE = 33;
|
||||
static constexpr unsigned int SIGNATURE_SIZE = 72;
|
||||
static constexpr unsigned int COMPACT_SIGNATURE_SIZE = 65;
|
||||
/**
|
||||
@@ -42,8 +42,8 @@ public:
|
||||
* script supports up to 75 for single byte push
|
||||
*/
|
||||
static_assert(
|
||||
PUBLIC_KEY_SIZE >= COMPRESSED_PUBLIC_KEY_SIZE,
|
||||
"COMPRESSED_PUBLIC_KEY_SIZE is larger than PUBLIC_KEY_SIZE");
|
||||
SIZE >= COMPRESSED_SIZE,
|
||||
"COMPRESSED_SIZE is larger than SIZE");
|
||||
|
||||
private:
|
||||
|
||||
@@ -51,15 +51,15 @@ private:
|
||||
* Just store the serialized data.
|
||||
* Its length can very cheaply be computed from the first byte.
|
||||
*/
|
||||
unsigned char vch[PUBLIC_KEY_SIZE];
|
||||
unsigned char vch[SIZE];
|
||||
|
||||
//! Compute the length of a pubkey with a given first byte.
|
||||
unsigned int static GetLen(unsigned char chHeader)
|
||||
{
|
||||
if (chHeader == 2 || chHeader == 3)
|
||||
return COMPRESSED_PUBLIC_KEY_SIZE;
|
||||
return COMPRESSED_SIZE;
|
||||
if (chHeader == 4 || chHeader == 6 || chHeader == 7)
|
||||
return PUBLIC_KEY_SIZE;
|
||||
return SIZE;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -140,7 +140,7 @@ public:
|
||||
void Unserialize(Stream& s)
|
||||
{
|
||||
unsigned int len = ::ReadCompactSize(s);
|
||||
if (len <= PUBLIC_KEY_SIZE) {
|
||||
if (len <= SIZE) {
|
||||
s.read((char*)vch, len);
|
||||
} else {
|
||||
// invalid pubkey, skip available data
|
||||
@@ -179,7 +179,7 @@ public:
|
||||
//! Check whether this is a compressed public key.
|
||||
bool IsCompressed() const
|
||||
{
|
||||
return size() == COMPRESSED_PUBLIC_KEY_SIZE;
|
||||
return size() == COMPRESSED_SIZE;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user