From 40cc1d24c747a60458fb515be367ab231a460ee5 Mon Sep 17 00:00:00 2001
From: Michael Hamburg <mike@shiftleft.org>
Date: Sat, 21 Nov 2015 15:41:53 -0800
Subject: [PATCH] recategorize a couple of todos and unbreak arch_ref64

---
 src/decaf_fast.c                    | 2 +-
 src/p25519/arch_ref64/f_impl.c      | 8 ++++----
 src/p448/arch_x86_64/x86-64-arith.h | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/decaf_fast.c b/src/decaf_fast.c
index 990f557..d37876a 100644
--- a/src/decaf_fast.c
+++ b/src/decaf_fast.c
@@ -1497,7 +1497,7 @@ void API_NS(scalar_cond_sel) (
     constant_time_select(out,b,a,sizeof(scalar_t),pick_b);
 }
 
-/* TODO: restore Curve25519 Montgomery ladder? */
+/* FUTURE: restore Curve25519 Montgomery ladder? */
 decaf_error_t API_NS(direct_scalarmul) (
     uint8_t scaled[SER_BYTES],
     const uint8_t base[SER_BYTES],
diff --git a/src/p25519/arch_ref64/f_impl.c b/src/p25519/arch_ref64/f_impl.c
index 8229b8f..19bb15b 100644
--- a/src/p25519/arch_ref64/f_impl.c
+++ b/src/p25519/arch_ref64/f_impl.c
@@ -79,15 +79,15 @@ gf_25519_mulw (
 }
 
 void
-gf_25519_t qr (
+gf_25519_sqr (
     gf_25519_t __restrict__ cs,
     const gf_25519_t as
 ) {
-    gf_25519_mul(cs,as,as); // TODO
+    gf_25519_mul(cs,as,as); // PERF
 }
 
 void
-gf_25519_t trong_reduce (
+gf_25519_strong_reduce (
     gf_25519_t a
 ) {
     uint64_t mask = (1ull<<51)-1;
@@ -128,7 +128,7 @@ gf_25519_t trong_reduce (
 }
 
 void
-gf_25519_t erialize (
+gf_25519_serialize (
     uint8_t serial[32],
     const struct gf_25519_t x
 ) {
diff --git a/src/p448/arch_x86_64/x86-64-arith.h b/src/p448/arch_x86_64/x86-64-arith.h
index 00fcc1e..4f38723 100644
--- a/src/p448/arch_x86_64/x86-64-arith.h
+++ b/src/p448/arch_x86_64/x86-64-arith.h
@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 
-/* TODO: non x86-64 versions of these.
+/* FUTURE: non x86-64 versions of these.
  * FUTURE: autogenerate
  */