diff --git a/lib/std/crypto/pcurves/p256.zig b/lib/std/crypto/pcurves/p256.zig index c7dac55b24615a341cb71acda14161d4b8cc164a..5898f83c108aac8a4221ba091a9910f49ec39041 100644 --- a/lib/std/crypto/pcurves/p256.zig +++ b/lib/std/crypto/pcurves/p256.zig @@ -437,7 +437,7 @@ pub const P256 = struct { const e1 = slide(s1); const e2 = slide(s2); var q = P256.identityElement; - var pos: usize = 2 * 32 - 1; + var pos: usize = 2 * 32; while (true) : (pos -= 1) { const slot1 = e1[pos]; if (slot1 > 0) { diff --git a/lib/std/crypto/pcurves/p384.zig b/lib/std/crypto/pcurves/p384.zig index 854343c1e4127b44391e0917c858a6c9203d2c3d..0694d4f259a3a46c3af7c69859a216a6e9da66fa 100644 --- a/lib/std/crypto/pcurves/p384.zig +++ b/lib/std/crypto/pcurves/p384.zig @@ -437,7 +437,7 @@ pub const P384 = struct { const e1 = slide(s1); const e2 = slide(s2); var q = P384.identityElement; - var pos: usize = 2 * 48 - 1; + var pos: usize = 2 * 48; while (true) : (pos -= 1) { const slot1 = e1[pos]; if (slot1 > 0) { diff --git a/lib/std/crypto/pcurves/tests/p256.zig b/lib/std/crypto/pcurves/tests/p256.zig index ce21ac8ba08d02cf08bb1f4a01657a42154ff0b0..eab69d351e3b99095353efd0b66e364b7bd79cd6 100644 --- a/lib/std/crypto/pcurves/tests/p256.zig +++ b/lib/std/crypto/pcurves/tests/p256.zig @@ -112,6 +112,16 @@ test "p256 double base multiplication" { try testing.expect(pr1.equivalent(pr2)); } +test "p256 double base multiplication with large scalars" { + const p1 = P256.basePoint; + const p2 = P256.basePoint.dbl(); + const s1 = [_]u8{0xee} ** 32; + const s2 = [_]u8{0xdd} ** 32; + const pr1 = try P256.mulDoubleBasePublic(p1, s1, p2, s2, .Little); + const pr2 = (try p1.mul(s1, .Little)).add(try p2.mul(s2, .Little)); + try testing.expect(pr1.equivalent(pr2)); +} + test "p256 scalar inverse" { const expected = "3b549196a13c898a6f6e84dfb3a22c40a8b9b17fb88e408ea674e451cd01d0a6"; var out: [32]u8 = undefined; diff --git a/lib/std/crypto/pcurves/tests/p384.zig b/lib/std/crypto/pcurves/tests/p384.zig index 54c5148ae0246dfa72d0054059a50dfafc501d33..cba1d91a81522a57748a5f0a974f5a9b9f3d1651 100644 --- a/lib/std/crypto/pcurves/tests/p384.zig +++ b/lib/std/crypto/pcurves/tests/p384.zig @@ -115,6 +115,16 @@ test "p384 double base multiplication" { try testing.expect(pr1.equivalent(pr2)); } +test "p384 double base multiplication with large scalars" { + const p1 = P384.basePoint; + const p2 = P384.basePoint.dbl(); + const s1 = [_]u8{0xee} ** 48; + const s2 = [_]u8{0xdd} ** 48; + const pr1 = try P384.mulDoubleBasePublic(p1, s1, p2, s2, .Little); + const pr2 = (try p1.mul(s1, .Little)).add(try p2.mul(s2, .Little)); + try testing.expect(pr1.equivalent(pr2)); +} + test "p384 scalar inverse" { const expected = "a3cc705f33b5679a66e76ce66e68055c927c5dba531b2837b18fe86119511091b54d733f26b2e7a0f6fa2e7ea21ca806"; var out: [48]u8 = undefined;