Commit a6486492bed6ec840203cc88e0b30149dc72ad62 | zig

author	Jakub Dóka <60517552+jakubDoka@users.noreply.github.com> 2024-08-07 10:06:15+02:00
committer	GitHub <noreply@github.com> 2024-08-07 01:06:15-07:00
log	a6486492bed6ec840203cc88e0b30149dc72ad62
tree	1fa230421f07d3264a9a88789c5686a5aa3f52c6
parent	ebd0c6ffd0eb91f7a2838d6a17bf5344d539d3c6
signature	Signed by PGP key B5690EEEBB952194

std.crypto.ecdsa: use separate function for null seed (#20953)

Due to the `std.crypto.ecdsa.KeyPair.create` taking and optional of seed, even if the seed is generated, cross-compiling to the environments without standard random source (eg. wasm) (`std.crypto.random.bytes`) will fail to compile.

This commit changes the API of the problematic function and moves the random seed generation to a new utility function.

1 files changed, 13 insertions(+), 13 deletions(-)

lib
- std
  - crypto
    ecdsa.zig

lib/std/crypto/ecdsa.zig+13-13

 @@ -289,18 +289,18 @@ pub fn Ecdsa(comptime Curve: type, comptime Hash: type) type {
             /// Secret scalar.
             secret_key: SecretKey,
+            /// Create a new random key pair. `crypto.random.bytes` must be supported for the target.
+            pub fn generate() IdentityElementError!KeyPair {
+                var random_seed: [seed_length]u8 = undefined;
+                crypto.random.bytes(&random_seed);
+                return create(random_seed);
+            }
             /// Create a new key pair. The seed must be secret and indistinguishable from random.
-            /// The seed can also be left to null in order to generate a random key pair.
+            pub fn create(seed: [seed_length]u8) IdentityElementError!KeyPair {
-            pub fn create(seed: ?[seed_length]u8) IdentityElementError!KeyPair {
-                var seed_ = seed;
-                if (seed_ == null) {
-                    var random_seed: [seed_length]u8 = undefined;
-                    crypto.random.bytes(&random_seed);
-                    seed_ = random_seed;
-                }
                 const h = [_]u8{0x00} ** Hash.digest_length;
                 const k0 = [_]u8{0x01} ** SecretKey.encoded_length;
-                const secret_key = deterministicScalar(h, k0, seed_).toBytes(.big);
+                const secret_key = deterministicScalar(h, k0, seed).toBytes(.big);
                 return fromSecretKey(SecretKey{ .bytes = secret_key });
             }
 @@ -380,7 +380,7 @@ test "Basic operations over EcdsaP384Sha384" {
     if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
     const Scheme = EcdsaP384Sha384;
-    const kp = try Scheme.KeyPair.create(null);
+    const kp = try Scheme.KeyPair.generate();
     const msg = "test";
     var noise: [Scheme.noise_length]u8 = undefined;
 @@ -396,7 +396,7 @@ test "Basic operations over Secp256k1" {
     if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
     const Scheme = EcdsaSecp256k1Sha256oSha256;
-    const kp = try Scheme.KeyPair.create(null);
+    const kp = try Scheme.KeyPair.generate();
     const msg = "test";
     var noise: [Scheme.noise_length]u8 = undefined;
 @@ -412,7 +412,7 @@ test "Basic operations over EcdsaP384Sha256" {
     if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
     const Scheme = Ecdsa(crypto.ecc.P384, crypto.hash.sha2.Sha256);
-    const kp = try Scheme.KeyPair.create(null);
+    const kp = try Scheme.KeyPair.generate();
     const msg = "test";
     var noise: [Scheme.noise_length]u8 = undefined;
 @@ -886,7 +886,7 @@ test "Sec1 encoding/decoding" {
     if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
     const Scheme = EcdsaP384Sha384;
-    const kp = try Scheme.KeyPair.create(null);
+    const kp = try Scheme.KeyPair.generate();
     const pk = kp.public_key;
     const pk_compressed_sec1 = pk.toCompressedSec1();
     const pk_recovered1 = try Scheme.PublicKey.fromSec1(&pk_compressed_sec1);