mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-16 13:01:19 +02:00
Merge 8c97780db8 into merged_master (Bitcoin PR #19228)
This commit updates libsecp; I didn't take the update (since I had already updated to a more recent version of secp-zkp several commits ago) but did take Pieter's cleanups in the rest of the codebase.
This commit is contained in:
Andrew Poelstra
commit
b9a74b0aeb
3 changed files with 43 additions and 40 deletions
|
|
@ -26,4 +26,7 @@
|
|||
#define USE_FIELD_10X26 1
|
||||
#define USE_SCALAR_8X32 1
|
||||
|
||||
#define ECMULT_GEN_PREC_BITS 4
|
||||
#define ECMULT_WINDOW_SIZE 15
|
||||
|
||||
#endif /* BITCOIN_LIBSECP256K1_CONFIG_H */
|
||||
|
|
|
|||
|
|
@ -1748,7 +1748,7 @@ if test x$need_bundled_univalue = xyes; then
|
|||
AC_CONFIG_SUBDIRS([src/univalue])
|
||||
fi
|
||||
|
||||
ac_configure_args="${ac_configure_args} --disable-shared --with-pic --enable-benchmark=no --with-bignum=no --enable-module-recovery --disable-jni --enable-experimental --enable-module-whitelist --enable-module-rangeproof --enable-module-generator --enable-module-surjectionproof --enable-module-ecdh"
|
||||
ac_configure_args="${ac_configure_args} --disable-shared --with-pic --enable-benchmark=no --with-bignum=no --enable-module-recovery --enable-experimental --enable-module-whitelist --enable-module-rangeproof --enable-module-generator --enable-module-surjectionproof --enable-module-ecdh"
|
||||
AC_CONFIG_SUBDIRS([src/secp256k1])
|
||||
|
||||
AC_OUTPUT
|
||||
|
|
|
|||
78
src/key.cpp
78
src/key.cpp
|
|
@ -32,46 +32,46 @@ static secp256k1_context* secp256k1_context_sign = nullptr;
|
|||
*
|
||||
* out32 must point to an output buffer of length at least 32 bytes.
|
||||
*/
|
||||
static int ec_privkey_import_der(const secp256k1_context* ctx, unsigned char *out32, const unsigned char *privkey, size_t privkeylen) {
|
||||
const unsigned char *end = privkey + privkeylen;
|
||||
static int ec_seckey_import_der(const secp256k1_context* ctx, unsigned char *out32, const unsigned char *seckey, size_t seckeylen) {
|
||||
const unsigned char *end = seckey + seckeylen;
|
||||
memset(out32, 0, 32);
|
||||
/* sequence header */
|
||||
if (end - privkey < 1 || *privkey != 0x30u) {
|
||||
if (end - seckey < 1 || *seckey != 0x30u) {
|
||||
return 0;
|
||||
}
|
||||
privkey++;
|
||||
seckey++;
|
||||
/* sequence length constructor */
|
||||
if (end - privkey < 1 || !(*privkey & 0x80u)) {
|
||||
if (end - seckey < 1 || !(*seckey & 0x80u)) {
|
||||
return 0;
|
||||
}
|
||||
ptrdiff_t lenb = *privkey & ~0x80u; privkey++;
|
||||
ptrdiff_t lenb = *seckey & ~0x80u; seckey++;
|
||||
if (lenb < 1 || lenb > 2) {
|
||||
return 0;
|
||||
}
|
||||
if (end - privkey < lenb) {
|
||||
if (end - seckey < lenb) {
|
||||
return 0;
|
||||
}
|
||||
/* sequence length */
|
||||
ptrdiff_t len = privkey[lenb-1] | (lenb > 1 ? privkey[lenb-2] << 8 : 0u);
|
||||
privkey += lenb;
|
||||
if (end - privkey < len) {
|
||||
ptrdiff_t len = seckey[lenb-1] | (lenb > 1 ? seckey[lenb-2] << 8 : 0u);
|
||||
seckey += lenb;
|
||||
if (end - seckey < len) {
|
||||
return 0;
|
||||
}
|
||||
/* sequence element 0: version number (=1) */
|
||||
if (end - privkey < 3 || privkey[0] != 0x02u || privkey[1] != 0x01u || privkey[2] != 0x01u) {
|
||||
if (end - seckey < 3 || seckey[0] != 0x02u || seckey[1] != 0x01u || seckey[2] != 0x01u) {
|
||||
return 0;
|
||||
}
|
||||
privkey += 3;
|
||||
seckey += 3;
|
||||
/* sequence element 1: octet string, up to 32 bytes */
|
||||
if (end - privkey < 2 || privkey[0] != 0x04u) {
|
||||
if (end - seckey < 2 || seckey[0] != 0x04u) {
|
||||
return 0;
|
||||
}
|
||||
ptrdiff_t oslen = privkey[1];
|
||||
privkey += 2;
|
||||
if (oslen > 32 || end - privkey < oslen) {
|
||||
ptrdiff_t oslen = seckey[1];
|
||||
seckey += 2;
|
||||
if (oslen > 32 || end - seckey < oslen) {
|
||||
return 0;
|
||||
}
|
||||
memcpy(out32 + (32 - oslen), privkey, oslen);
|
||||
memcpy(out32 + (32 - oslen), seckey, oslen);
|
||||
if (!secp256k1_ec_seckey_verify(ctx, out32)) {
|
||||
memset(out32, 0, 32);
|
||||
return 0;
|
||||
|
|
@ -84,17 +84,17 @@ static int ec_privkey_import_der(const secp256k1_context* ctx, unsigned char *ou
|
|||
* <http://www.secg.org/sec1-v2.pdf>. The optional parameters and publicKey fields are
|
||||
* included.
|
||||
*
|
||||
* privkey must point to an output buffer of length at least CKey::SIZE bytes.
|
||||
* privkeylen must initially be set to the size of the privkey buffer. Upon return it
|
||||
* seckey must point to an output buffer of length at least CKey::SIZE bytes.
|
||||
* seckeylen must initially be set to the size of the seckey buffer. Upon return it
|
||||
* will be set to the number of bytes used in the buffer.
|
||||
* key32 must point to a 32-byte raw private key.
|
||||
*/
|
||||
static int ec_privkey_export_der(const secp256k1_context *ctx, unsigned char *privkey, size_t *privkeylen, const unsigned char *key32, bool compressed) {
|
||||
assert(*privkeylen >= CKey::SIZE);
|
||||
static int ec_seckey_export_der(const secp256k1_context *ctx, unsigned char *seckey, size_t *seckeylen, const unsigned char *key32, bool compressed) {
|
||||
assert(*seckeylen >= CKey::SIZE);
|
||||
secp256k1_pubkey pubkey;
|
||||
size_t pubkeylen = 0;
|
||||
if (!secp256k1_ec_pubkey_create(ctx, &pubkey, key32)) {
|
||||
*privkeylen = 0;
|
||||
*seckeylen = 0;
|
||||
return 0;
|
||||
}
|
||||
if (compressed) {
|
||||
|
|
@ -112,15 +112,15 @@ static int ec_privkey_export_der(const secp256k1_context *ctx, unsigned char *pr
|
|||
0xFF,0xFF,0xFF,0xFF,0xFE,0xBA,0xAE,0xDC,0xE6,0xAF,0x48,0xA0,0x3B,0xBF,0xD2,0x5E,
|
||||
0x8C,0xD0,0x36,0x41,0x41,0x02,0x01,0x01,0xA1,0x24,0x03,0x22,0x00
|
||||
};
|
||||
unsigned char *ptr = privkey;
|
||||
unsigned char *ptr = seckey;
|
||||
memcpy(ptr, begin, sizeof(begin)); ptr += sizeof(begin);
|
||||
memcpy(ptr, key32, 32); ptr += 32;
|
||||
memcpy(ptr, middle, sizeof(middle)); ptr += sizeof(middle);
|
||||
pubkeylen = CPubKey::COMPRESSED_SIZE;
|
||||
secp256k1_ec_pubkey_serialize(ctx, ptr, &pubkeylen, &pubkey, SECP256K1_EC_COMPRESSED);
|
||||
ptr += pubkeylen;
|
||||
*privkeylen = ptr - privkey;
|
||||
assert(*privkeylen == CKey::COMPRESSED_SIZE);
|
||||
*seckeylen = ptr - seckey;
|
||||
assert(*seckeylen == CKey::COMPRESSED_SIZE);
|
||||
} else {
|
||||
static const unsigned char begin[] = {
|
||||
0x30,0x82,0x01,0x13,0x02,0x01,0x01,0x04,0x20
|
||||
|
|
@ -138,15 +138,15 @@ static int ec_privkey_export_der(const secp256k1_context *ctx, unsigned char *pr
|
|||
0xFF,0xFF,0xFF,0xFF,0xFE,0xBA,0xAE,0xDC,0xE6,0xAF,0x48,0xA0,0x3B,0xBF,0xD2,0x5E,
|
||||
0x8C,0xD0,0x36,0x41,0x41,0x02,0x01,0x01,0xA1,0x44,0x03,0x42,0x00
|
||||
};
|
||||
unsigned char *ptr = privkey;
|
||||
unsigned char *ptr = seckey;
|
||||
memcpy(ptr, begin, sizeof(begin)); ptr += sizeof(begin);
|
||||
memcpy(ptr, key32, 32); ptr += 32;
|
||||
memcpy(ptr, middle, sizeof(middle)); ptr += sizeof(middle);
|
||||
pubkeylen = CPubKey::SIZE;
|
||||
secp256k1_ec_pubkey_serialize(ctx, ptr, &pubkeylen, &pubkey, SECP256K1_EC_UNCOMPRESSED);
|
||||
ptr += pubkeylen;
|
||||
*privkeylen = ptr - privkey;
|
||||
assert(*privkeylen == CKey::SIZE);
|
||||
*seckeylen = ptr - seckey;
|
||||
assert(*seckeylen == CKey::SIZE);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -166,20 +166,20 @@ void CKey::MakeNewKey(bool fCompressedIn) {
|
|||
bool CKey::Negate()
|
||||
{
|
||||
assert(fValid);
|
||||
return secp256k1_ec_privkey_negate(secp256k1_context_sign, keydata.data());
|
||||
return secp256k1_ec_seckey_negate(secp256k1_context_sign, keydata.data());
|
||||
}
|
||||
|
||||
CPrivKey CKey::GetPrivKey() const {
|
||||
assert(fValid);
|
||||
CPrivKey privkey;
|
||||
CPrivKey seckey;
|
||||
int ret;
|
||||
size_t privkeylen;
|
||||
privkey.resize(SIZE);
|
||||
privkeylen = SIZE;
|
||||
ret = ec_privkey_export_der(secp256k1_context_sign, privkey.data(), &privkeylen, begin(), fCompressed);
|
||||
size_t seckeylen;
|
||||
seckey.resize(SIZE);
|
||||
seckeylen = SIZE;
|
||||
ret = ec_seckey_export_der(secp256k1_context_sign, seckey.data(), &seckeylen, begin(), fCompressed);
|
||||
assert(ret);
|
||||
privkey.resize(privkeylen);
|
||||
return privkey;
|
||||
seckey.resize(seckeylen);
|
||||
return seckey;
|
||||
}
|
||||
|
||||
CPubKey CKey::GetPubKey() const {
|
||||
|
|
@ -268,8 +268,8 @@ bool CKey::SignCompact(const uint256 &hash, std::vector<unsigned char>& vchSig)
|
|||
return true;
|
||||
}
|
||||
|
||||
bool CKey::Load(const CPrivKey &privkey, const CPubKey &vchPubKey, bool fSkipCheck=false) {
|
||||
if (!ec_privkey_import_der(secp256k1_context_sign, (unsigned char*)begin(), privkey.data(), privkey.size()))
|
||||
bool CKey::Load(const CPrivKey &seckey, const CPubKey &vchPubKey, bool fSkipCheck=false) {
|
||||
if (!ec_seckey_import_der(secp256k1_context_sign, (unsigned char*)begin(), seckey.data(), seckey.size()))
|
||||
return false;
|
||||
fCompressed = vchPubKey.IsCompressed();
|
||||
fValid = true;
|
||||
|
|
@ -298,7 +298,7 @@ bool CKey::Derive(CKey& keyChild, ChainCode &ccChild, unsigned int nChild, const
|
|||
}
|
||||
memcpy(ccChild.begin(), vout.data()+32, 32);
|
||||
memcpy((unsigned char*)keyChild.begin(), begin(), 32);
|
||||
bool ret = secp256k1_ec_privkey_tweak_add(secp256k1_context_sign, (unsigned char*)keyChild.begin(), vout.data());
|
||||
bool ret = secp256k1_ec_seckey_tweak_add(secp256k1_context_sign, (unsigned char*)keyChild.begin(), vout.data());
|
||||
keyChild.fCompressed = true;
|
||||
keyChild.fValid = ret;
|
||||
return ret;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue