mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-14 13:30:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ed25519.KeyPair.fromSecretKey() didn't compile after the API changes (#13386)

Browse Source 
Fixes #13378
This commit is contained in:
Frank Denis 2022-11-01 07:10:40 +01:00 committed by Andrew Kelley
parent f366f381f5
commit 26e7d4c9a3
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,4 @@
const builtin = @import("builtin");
const std = @import("std");
const crypto = std.crypto;
const debug = std.debug;
@ -268,18 +269,17 @@ pub const Ed25519 = struct {
}
/// Create a KeyPair from a secret key.
pub fn fromSecretKey(secret_key: SecretKey) IdentityElementError!KeyPair {
const pk_p = try Curve.fromBytes(secret_key.publicKeyBytes());
pub fn fromSecretKey(secret_key: SecretKey) (NonCanonicalError || EncodingError || IdentityElementError)!KeyPair {
// It is critical for EdDSA to use the correct public key.
// In order to enforce this, a SecretKey implicitly includes a copy of the public key.
// In Debug mode, we can still afford checking that the public key is correct for extra safety.
if (std.builtin.mode == .Debug) {
const recomputed_kp = try create(secret_key[0..seed_length].*);
debug.assert(recomputed_kp.public_key.p.toBytes() == pk_p.toBytes());
if (builtin.mode == .Debug) {
const pk_p = try Curve.fromBytes(secret_key.publicKeyBytes());
const recomputed_kp = try create(secret_key.seed());
debug.assert(mem.eql(u8, &recomputed_kp.public_key.toBytes(), &pk_p.toBytes()));
}
return KeyPair{
.public_key = PublicKey{ .p = pk_p },
.public_key = try PublicKey.fromBytes(secret_key.publicKeyBytes()),
.secret_key = secret_key,
};
}
@ -674,3 +674,10 @@ test "ed25519 signatures with streaming" {
verifier.update("age");
try verifier.verify();
}
test "ed25519 key pair from secret key" {
const kp = try Ed25519.KeyPair.create(null);
const kp2 = try Ed25519.KeyPair.fromSecretKey(kp.secret_key);
try std.testing.expectEqualSlices(u8, &kp.secret_key.toBytes(), &kp2.secret_key.toBytes());
try std.testing.expectEqualSlices(u8, &kp.public_key.toBytes(), &kp2.public_key.toBytes());
}