AaronFiore/electrum
1
0
Fork 0
Code Activity

ecc: "public key could not be parsed" exception to contain pubkey bytes

Browse Source 
also consolidate naming of variables somewhat

related: https://github.com/spesmilo/electrum/issues/9052
This commit is contained in:
SomberNight
2024-05-16 17:29:26 +00:00
parent b9cd61bcde
commit a4bdc90a6b
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
electrum/ecc.py
View File

@@ -124,8 +124,9 @@ def _x_and_y_from_pubkey_bytes(pubkey: bytes) -> Tuple[int, int]:
pubkey_ptr = create_string_buffer(64) pubkey_ptr = create_string_buffer(64)
ret = _libsecp256k1.secp256k1_ec_pubkey_parse( ret = _libsecp256k1.secp256k1_ec_pubkey_parse(
_libsecp256k1.ctx, pubkey_ptr, pubkey, len(pubkey)) _libsecp256k1.ctx, pubkey_ptr, pubkey, len(pubkey))
if not ret: if 1 != ret:
raise InvalidECPointException('public key could not be parsed or is invalid') raise InvalidECPointException(
f'public key could not be parsed or is invalid: {pubkey.hex()!r}')
pubkey_serialized = create_string_buffer(65) pubkey_serialized = create_string_buffer(65)
pubkey_size = c_size_t(65) pubkey_size = c_size_t(65)
@@ -236,13 +237,14 @@ class ECPubkey(object):
return self._y return self._y
def _to_libsecp256k1_pubkey_ptr(self): def _to_libsecp256k1_pubkey_ptr(self):
pubkey = create_string_buffer(64) """pointer to `secp256k1_pubkey` C struct"""
public_pair_bytes = self.get_public_key_bytes(compressed=False) pubkey_ptr = create_string_buffer(64)
pk_bytes = self.get_public_key_bytes(compressed=False)
ret = _libsecp256k1.secp256k1_ec_pubkey_parse( ret = _libsecp256k1.secp256k1_ec_pubkey_parse(
_libsecp256k1.ctx, pubkey, public_pair_bytes, len(public_pair_bytes)) _libsecp256k1.ctx, pubkey_ptr, pk_bytes, len(pk_bytes))
if not ret: if 1 != ret:
raise Exception('public key could not be parsed or is invalid') raise Exception(f'public key could not be parsed or is invalid: {pk_bytes.hex()!r}')
return pubkey return pubkey_ptr
@classmethod @classmethod
def _from_libsecp256k1_pubkey_ptr(cls, pubkey) -> 'ECPubkey': def _from_libsecp256k1_pubkey_ptr(cls, pubkey) -> 'ECPubkey':