From dd8f7b396c24d78168d9582364ab5b3b4606ccc5 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Fri, 14 Aug 2020 16:45:03 +0200
Subject: [PATCH] Rename the field and scalar modules

Suggested by @kubkon
---
 lib/std/crypto.zig                                   | 4 ++--
 lib/std/crypto/25519/curve25519.zig                  | 4 ++--
 lib/std/crypto/25519/edwards25519.zig                | 4 ++--
 lib/std/crypto/25519/{field25519.zig => field.zig}   | 0
 lib/std/crypto/25519/{scalar25519.zig => scalar.zig} | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename lib/std/crypto/25519/{field25519.zig => field.zig} (100%)
 rename lib/std/crypto/25519/{scalar25519.zig => scalar.zig} (99%)

diff --git a/lib/std/crypto.zig b/lib/std/crypto.zig
index d15ec2cff216dde7e9660ea1f12658b4cdb0e3ce..9fbe70f815e0f322347f4729a6438152831f83a7 100644
--- a/lib/std/crypto.zig
+++ b/lib/std/crypto.zig
@@ -63,8 +63,8 @@ test "crypto" {
     _ = @import("crypto/25519/curve25519.zig");
     _ = @import("crypto/25519/ed25519.zig");
     _ = @import("crypto/25519/edwards25519.zig");
-    _ = @import("crypto/25519/field25519.zig");
-    _ = @import("crypto/25519/scalar25519.zig");
+    _ = @import("crypto/25519/field.zig");
+    _ = @import("crypto/25519/scalar.zig");
     _ = @import("crypto/25519/x25519.zig");
     _ = @import("crypto/25519/ristretto255.zig");
 }
diff --git a/lib/std/crypto/25519/curve25519.zig b/lib/std/crypto/25519/curve25519.zig
index 011c926f64e7670626beca95de44799afd761c7a..4fb569ccfb7b5ed9480fb852f9601fd4ed956454 100644
--- a/lib/std/crypto/25519/curve25519.zig
+++ b/lib/std/crypto/25519/curve25519.zig
@@ -3,9 +3,9 @@ const std = @import("std");
 /// Group operations over Curve25519.
 pub const Curve25519 = struct {
     /// The underlying prime field.
-    pub const Fe = @import("field25519.zig").Fe;
+    pub const Fe = @import("field.zig").Fe;
     /// Field arithmetic mod the order of the main subgroup.
-    pub const scalar = @import("scalar25519.zig");
+    pub const scalar = @import("scalar.zig");
 
     x: Fe,
 
diff --git a/lib/std/crypto/25519/edwards25519.zig b/lib/std/crypto/25519/edwards25519.zig
index c28ed6865d3410dbc75e6a123863d91b6554a129..3d21af40e5645109e8bb8f9c0994bef871a3bd39 100644
--- a/lib/std/crypto/25519/edwards25519.zig
+++ b/lib/std/crypto/25519/edwards25519.zig
@@ -4,9 +4,9 @@ const fmt = std.fmt;
 /// Group operations over Edwards25519.
 pub const Edwards25519 = struct {
     /// The underlying prime field.
-    pub const Fe = @import("field25519.zig").Fe;
+    pub const Fe = @import("field.zig").Fe;
     /// Field arithmetic mod the order of the main subgroup.
-    pub const scalar = @import("scalar25519.zig");
+    pub const scalar = @import("scalar.zig");
 
     x: Fe,
     y: Fe,
diff --git a/lib/std/crypto/25519/field25519.zig b/lib/std/crypto/25519/field.zig
similarity index 100%
rename from lib/std/crypto/25519/field25519.zig
rename to lib/std/crypto/25519/field.zig
diff --git a/lib/std/crypto/25519/scalar25519.zig b/lib/std/crypto/25519/scalar.zig
similarity index 99%
rename from lib/std/crypto/25519/scalar25519.zig
rename to lib/std/crypto/25519/scalar.zig
index a94e6531dc02325c08fd172ea4467ca321fb36e3..6971b43489ada66af18c9b7540a5e4b82e3fc6c7 100644
--- a/lib/std/crypto/25519/scalar25519.zig
+++ b/lib/std/crypto/25519/scalar.zig
@@ -174,7 +174,7 @@ test "non-canonical scalar25519" {
     std.testing.expectError(error.NonCanonical, rejectNonCanonical(too_targe));
 }
 
-test "mulAdd overflow check" {
+test "scalar25519 mulAdd overflow check" {
     const a: [32]u8 = [_]u8{0xff} ** 32;
     const b: [32]u8 = [_]u8{0xff} ** 32;
     const c: [32]u8 = [_]u8{0xff} ** 32;
-- 
2.54.0