From 248282849e9b287fe817e64ccf53e09fa3991cbe Mon Sep 17 00:00:00 2001 From: jadep Date: Thu, 28 Apr 2016 10:21:25 -0400 Subject: Completed encoding reorganization; factored sign_bit out of PointEncodings and finished encoding admits. --- src/Specific/Ed25519.v | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Specific') diff --git a/src/Specific/Ed25519.v b/src/Specific/Ed25519.v index 320200218..d14e8ea30 100644 --- a/src/Specific/Ed25519.v +++ b/src/Specific/Ed25519.v @@ -123,7 +123,7 @@ Proof. apply weqb_true_iff in Heqb. subst. rewrite encoding_valid in H; discriminate. } Qed. -Definition enc' : F q * F q -> word (S (b - 1)). +Definition enc' : F q * F q -> word b. Proof. intro x. let enc' := (eval hnf in (@enc (@E.point curve25519params) _ _)) in @@ -296,7 +296,7 @@ Proof. { do 2 (eapply option_rect_Proper_nd; [intro|reflexivity..]). symmetry; apply decode_test_encode_test. } Unfocus. - + rewrite enc'_correct. cbv [unExtendedPoint unifiedAddM1 negateExtended scalarMultM1]. (* Why does this take too long? @@ -349,7 +349,7 @@ Proof. reflexivity. } Unfocus. - cbv iota beta delta [point_dec_coordinates sign_bit dec FqEncoding modular_word_encoding E.solve_for_x2 sqrt_mod_q]. + cbv iota beta delta [point_dec_coordinates ModularWordEncodingTheorems.sign_bit dec FqEncoding modular_word_encoding E.solve_for_x2 sqrt_mod_q]. etransitivity. Focus 2. { -- cgit v1.2.3