Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: fix opchecksig bug #223

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+16 −9
Open

fix: fix opchecksig bug #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02e0c8c
fix opchecksig bug
bloomingpeach Sep 18, 2024
091cd5b
add pubkey length check
bloomingpeach Sep 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/engine/src/opcodes/crypto.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ pub fn opcode_checksig<
let pk_bytes = engine.dstack.pop_byte_array()?;
let full_sig_bytes = engine.dstack.pop_byte_array()?;

if full_sig_bytes.len() < 1 {
if full_sig_bytes.len() < 1 || pk_bytes.len() < 1 {
engine.dstack.push_bool(false);
return Result::Ok(());
}
Expand Down
23 changes: 15 additions & 8 deletions packages/engine/src/signature/signature.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ pub fn check_pub_key_encoding<T, +Drop<T>>(
//
// @param pk_bytes The byte array representing the public key to be parsed.
// @return A `Secp256k1Point` representing the public key on the secp256k1 elliptic curve.
pub fn parse_pub_key(pk_bytes: @ByteArray) -> Secp256k1Point {
pub fn parse_pub_key(pk_bytes: @ByteArray) -> Result<Secp256k1Point, felt252> {
let mut pk_bytes_uncompressed = pk_bytes.clone();

if is_compressed_pub_key(pk_bytes) {
Expand All @@ -289,17 +289,24 @@ pub fn parse_pub_key(pk_bytes: @ByteArray) -> Secp256k1Point {
if pk_bytes[0] == 0x03 {
parity = true;
}
return Secp256Trait::<Secp256k1Point>::secp256_ec_get_point_from_x_syscall(pub_key, parity)
.unwrap_syscall()
.expect('Secp256k1Point: Invalid point.');
return Result::Ok(
Secp256Trait::<Secp256k1Point>::secp256_ec_get_point_from_x_syscall(pub_key, parity)
.unwrap_syscall()
.expect('Secp256k1Point: Invalid point.')
);
} else {
// Extract X coordinate and determine parity from last byte.
if pk_bytes_uncompressed.len() != 65 {
return Result::Err('invalid compressed pub key');
}
let pub_key: u256 = u256_from_byte_array_with_offset(@pk_bytes_uncompressed, 1, 32);
let parity = !(pk_bytes_uncompressed[64] & 1 == 0);

return Secp256Trait::<Secp256k1Point>::secp256_ec_get_point_from_x_syscall(pub_key, parity)
.unwrap_syscall()
.expect('Secp256k1Point: Invalid point.');
return Result::Ok(
Secp256Trait::<Secp256k1Point>::secp256_ec_get_point_from_x_syscall(pub_key, parity)
.unwrap_syscall()
.expect('Secp256k1Point: Invalid point.')
);
}
}

Expand Down Expand Up @@ -378,7 +385,7 @@ pub fn parse_base_sig_and_pk<T, +Drop<T>>(
check_signature_encoding(ref vm, sig_bytes)?;
check_pub_key_encoding(ref vm, pk_bytes)?;

let pub_key = parse_pub_key(pk_bytes);
let pub_key = parse_pub_key(pk_bytes)?;
let sig = parse_signature(sig_bytes)?;

Result::Ok((pub_key, sig, hash_type))
Expand Down