diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-09-13 09:59:12 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-09-13 09:59:39 +0200 |
| commit | 81b3f3c7a3d4e68db6587d5be91c54135ffaa176 (patch) | |
| tree | a4a2f7e6e7c0b24c096c73053d989de23506297a /src | |
| parent | 1bfcc0696c4638e1323ab7529f28b604d713067b (diff) | |
| parent | 9a565a8282236f29334a6ec2de6a03358f5ce86e (diff) | |
| download | bitcoin-81b3f3c7a3d4e68db6587d5be91c54135ffaa176.tar.xz | |
Merge #14195: Pass privkey export DER compression flag correctly
9a565a8282236f29334a6ec2de6a03358f5ce86e Pass export privkey DER compression flag correctly (liuyujun)
Tree-SHA512: 3fa1d7568ce133cd22708f453f3252c1138b1c40a821e90546d83bee4aac117ac8d848fa46cb45efad1031ce03cd5ba2d6c89b459abca6703aa2a957531e7edf
Diffstat (limited to 'src')
| -rw-r--r-- | src/key.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/key.cpp b/src/key.cpp index df452cd330..80d6589a3c 100644 --- a/src/key.cpp +++ b/src/key.cpp @@ -89,7 +89,7 @@ static int ec_privkey_import_der(const secp256k1_context* ctx, unsigned char *ou * 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, int compressed) { +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::PRIVATE_KEY_SIZE); secp256k1_pubkey pubkey; size_t pubkeylen = 0; @@ -170,7 +170,7 @@ CPrivKey CKey::GetPrivKey() const { size_t privkeylen; privkey.resize(PRIVATE_KEY_SIZE); privkeylen = PRIVATE_KEY_SIZE; - ret = ec_privkey_export_der(secp256k1_context_sign, privkey.data(), &privkeylen, begin(), fCompressed ? SECP256K1_EC_COMPRESSED : SECP256K1_EC_UNCOMPRESSED); + ret = ec_privkey_export_der(secp256k1_context_sign, privkey.data(), &privkeylen, begin(), fCompressed); assert(ret); privkey.resize(privkeylen); return privkey; |