mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-20 14:25:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid logic where we return success in case of an error (#25251)

Browse Source 
In ed25519.zig, we checked if a test succeeds, in which case we
returned an error. This was confusing, and Andrew pointed out that
Zig weights branches against errors by default.
This commit is contained in:
Frank Denis 2025-09-17 12:09:35 +02:00 committed by GitHub
parent 9819f53453
commit 8e8a143d62
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/std/crypto/25519/ed25519.zig
View File

@ -175,6 +175,10 @@ pub const Ed25519 = struct {
self.h.update(msg);
}
fn isIdentity(p: Curve) bool {
return p.x.isZero() and p.y.equivalent(p.z);
}
pub const VerifyError = WeakPublicKeyError || IdentityElementError ||
SignatureVerificationError;
@ -195,9 +199,9 @@ pub const Ed25519 = struct {
hram,
));
const check = sb_ah.sub(self.expected_r.clearCofactor());
if (check.rejectIdentity()) |_| {
if (!isIdentity(check)) {
return error.SignatureVerificationFailed;
} else |_| {}
}
}
/// Verify that the signature is valid for the entire message using cofactorless verification.
@ -221,9 +225,9 @@ pub const Ed25519 = struct {
hram,
));
const check = sb_ah.sub(self.expected_r);
if (check.rejectIdentity()) |_| {
if (!isIdentity(check)) {
return error.SignatureVerificationFailed;
} else |_| {}
}
}
};