crypto: make constant naming scheme consistent

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/contrib/keygen-html/src/curve25519_generate.c b/contrib/keygen-html/src/curve25519_generate.c
index c280b89ece5514c3c72b29ee6ceb6b04f3ed2439..50d35debc796705f25f60cd2e8078fb5da09a070 100644 (file)
--- a/contrib/keygen-html/src/curve25519_generate.c
+++ b/contrib/keygen-html/src/curve25519_generate.c
@@ -10,7 +10,7 @@ typedef unsigned int u32;
 typedef unsigned char u8;
 typedef u32 __le32;
 
-enum { CURVE25519_POINT_SIZE = 32 };
+enum { CURVE25519_KEY_SIZE = 32 };
 
 #ifndef __always_inline
 #define __always_inline __inline __attribute__((__always_inline__))
@@ -37,7 +37,7 @@ enum { CURVE25519_POINT_SIZE = 32 };
 /* We don't even attempt to deal with this in javascript. */
 #define memzero_explicit(a, b)
 
-static __always_inline void normalize_secret(u8 secret[CURVE25519_POINT_SIZE])
+static __always_inline void normalize_secret(u8 secret[CURVE25519_KEY_SIZE])
 {
        secret[0] &= 248;
        secret[31] &= 127;

diff --git a/src/curve25519.c b/src/curve25519.c
index e76588b51be26962987c7b5ffcbe6d3770e2eb86..5367c06589aca4dbd9eea7609d8bcf06b758e587 100644 (file)
--- a/src/curve25519.c
+++ b/src/curve25519.c
@@ -58,14 +58,14 @@ static noinline void memzero_explicit(void *s, size_t count)
 #include "../crypto/zinc/curve25519/curve25519-fiat32.h"
 #endif
 
-void curve25519_generate_public(uint8_t pub[static CURVE25519_POINT_SIZE], const uint8_t secret[static CURVE25519_POINT_SIZE])
+void curve25519_generate_public(uint8_t pub[static CURVE25519_KEY_SIZE], const uint8_t secret[static CURVE25519_KEY_SIZE])
 {
-       static const uint8_t basepoint[CURVE25519_POINT_SIZE] = { 9 };
+       static const uint8_t basepoint[CURVE25519_KEY_SIZE] = { 9 };
 
        curve25519(pub, secret, basepoint);
 }
 
-void curve25519(uint8_t mypublic[static CURVE25519_POINT_SIZE], const uint8_t secret[static CURVE25519_POINT_SIZE], const uint8_t basepoint[static CURVE25519_POINT_SIZE])
+void curve25519(uint8_t mypublic[static CURVE25519_KEY_SIZE], const uint8_t secret[static CURVE25519_KEY_SIZE], const uint8_t basepoint[static CURVE25519_KEY_SIZE])
 {
        curve25519_generic(mypublic, secret, basepoint);
 }

diff --git a/src/curve25519.h b/src/curve25519.h
index 09ca6b98639fbdebd669d1df5254c53d52fe962b..ef0a09f8e72e5fa157a4ee6c71c0b5113f29248e 100644 (file)
--- a/src/curve25519.h
+++ b/src/curve25519.h
@@ -10,12 +10,12 @@
 #include <sys/types.h>
 
 enum curve25519_lengths {
-       CURVE25519_POINT_SIZE = 32,
+       CURVE25519_KEY_SIZE = 32,
 };
 
-void curve25519(uint8_t mypublic[static CURVE25519_POINT_SIZE], const uint8_t secret[static CURVE25519_POINT_SIZE], const uint8_t basepoint[static CURVE25519_POINT_SIZE]);
-void curve25519_generate_public(uint8_t pub[static CURVE25519_POINT_SIZE], const uint8_t secret[static CURVE25519_POINT_SIZE]);
-static inline void curve25519_normalize_secret(uint8_t secret[static CURVE25519_POINT_SIZE])
+void curve25519(uint8_t mypublic[static CURVE25519_KEY_SIZE], const uint8_t secret[static CURVE25519_KEY_SIZE], const uint8_t basepoint[static CURVE25519_KEY_SIZE]);
+void curve25519_generate_public(uint8_t pub[static CURVE25519_KEY_SIZE], const uint8_t secret[static CURVE25519_KEY_SIZE]);
+static inline void curve25519_normalize_secret(uint8_t secret[static CURVE25519_KEY_SIZE])
 {
        secret[0] &= 248;
        secret[31] &= 127;