authorgravatar for 124872+jedisct1@users.noreply.github.comFrank Denis <124872+jedisct1@users.noreply.github.com> 2022-11-01 07:10:40+01:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2022-11-01 07:10:40+01:00
log9e44710fc441613a85785204808ffa579f10a093
treef6beee0f15845e911be19b90a702f5226d81459b
parent0bbb000359107e25dccf2411ea7bea7f5cf52684
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

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

Fixes #13378

1 files changed, 14 insertions(+), 7 deletions(-)

lib/std/crypto/25519/ed25519.zig+14-7
......@@ -1,3 +1,4 @@
1const builtin = @import("builtin");
12const std = @import("std");
23const crypto = std.crypto;
34const debug = std.debug;
......@@ -268,18 +269,17 @@ pub const Ed25519 = struct {
268269 }
269270
270271 /// Create a KeyPair from a secret key.
271 pub fn fromSecretKey(secret_key: SecretKey) IdentityElementError!KeyPair {
272 const pk_p = try Curve.fromBytes(secret_key.publicKeyBytes());
273
272 pub fn fromSecretKey(secret_key: SecretKey) (NonCanonicalError || EncodingError || IdentityElementError)!KeyPair {
274273 // It is critical for EdDSA to use the correct public key.
275274 // In order to enforce this, a SecretKey implicitly includes a copy of the public key.
276275 // In Debug mode, we can still afford checking that the public key is correct for extra safety.
277 if (std.builtin.mode == .Debug) {
278 const recomputed_kp = try create(secret_key[0..seed_length].*);
279 debug.assert(recomputed_kp.public_key.p.toBytes() == pk_p.toBytes());
276 if (builtin.mode == .Debug) {
277 const pk_p = try Curve.fromBytes(secret_key.publicKeyBytes());
278 const recomputed_kp = try create(secret_key.seed());
279 debug.assert(mem.eql(u8, &recomputed_kp.public_key.toBytes(), &pk_p.toBytes()));
280280 }
281281 return KeyPair{
282 .public_key = PublicKey{ .p = pk_p },
282 .public_key = try PublicKey.fromBytes(secret_key.publicKeyBytes()),
283283 .secret_key = secret_key,
284284 };
285285 }
......@@ -674,3 +674,10 @@ test "ed25519 signatures with streaming" {
674674 verifier.update("age");
675675 try verifier.verify();
676676}
677
678test "ed25519 key pair from secret key" {
679 const kp = try Ed25519.KeyPair.create(null);
680 const kp2 = try Ed25519.KeyPair.fromSecretKey(kp.secret_key);
681 try std.testing.expectEqualSlices(u8, &kp.secret_key.toBytes(), &kp2.secret_key.toBytes());
682 try std.testing.expectEqualSlices(u8, &kp.public_key.toBytes(), &kp2.public_key.toBytes());
683}