From 6145edc563a13901cd98057303e4c7235a8ef402 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Fri, 6 Jun 2014 08:19:49 -0700 Subject: [PATCH] Revert "Make curve25519-donna-c64 handle non-canonical points like the ref implementation." This reverts commit bd8cbd3175cd2041945ea28bf0d4521fa79de26b. Conflicts: src/libsodium/crypto_scalarmult/curve25519/donna_c64/smult_curve25519_donna_c64.c test/default/scalarmult7.c test/default/scalarmult8.c --- .../curve25519/donna_c64/smult_curve25519_donna_c64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsodium/crypto_scalarmult/curve25519/donna_c64/smult_curve25519_donna_c64.c b/src/libsodium/crypto_scalarmult/curve25519/donna_c64/smult_curve25519_donna_c64.c index 9a7f9825..c26ea731 100644 --- a/src/libsodium/crypto_scalarmult/curve25519/donna_c64/smult_curve25519_donna_c64.c +++ b/src/libsodium/crypto_scalarmult/curve25519/donna_c64/smult_curve25519_donna_c64.c @@ -226,7 +226,7 @@ fexpand(limb *output, const u8 *in) { output[1] = (U8TO64(in+6) >> 3) & 0x7ffffffffffff; output[2] = (U8TO64(in+12) >> 6) & 0x7ffffffffffff; output[3] = (U8TO64(in+19) >> 1) & 0x7ffffffffffff; - output[4] = (U8TO64(in+25) >> 4) & 0xfffffffffffff; + output[4] = (U8TO64(in+25) >> 4) & 0x7ffffffffffff; } /* Take a fully reduced polynomial form number and contract it into a