bateast
/
wireguard-tools
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crypto: make constant naming scheme consistent 

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2018-09-24 22:02:13 +02:00
parent cef7ac9ef9
commit 646d7a5c78
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/keygen-html/src/curve25519_generate.c
View File

@ -10,7 +10,7 @@ typedef unsigned int u32;
typedef unsigned char u8; typedef unsigned char u8;
typedef u32 __le32; typedef u32 __le32;
enum { CURVE25519_POINT_SIZE = 32 }; enum { CURVE25519_KEY_SIZE = 32 };
#ifndef __always_inline #ifndef __always_inline
#define __always_inline __inline __attribute__((__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. */ /* We don't even attempt to deal with this in javascript. */
#define memzero_explicit(a, b) #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[0] &= 248;
secret[31] &= 127; secret[31] &= 127;

6
src/curve25519.c
View File

@ -58,14 +58,14 @@ static noinline void memzero_explicit(void *s, size_t count)
#include "../crypto/zinc/curve25519/curve25519-fiat32.h" #include "../crypto/zinc/curve25519/curve25519-fiat32.h"
#endif #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); 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); curve25519_generic(mypublic, secret, basepoint);
} }

8
src/curve25519.h
View File

@ -10,12 +10,12 @@
#include <sys/types.h> #include <sys/types.h>
enum curve25519_lengths { 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(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_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 inline void curve25519_normalize_secret(uint8_t secret[static CURVE25519_POINT_SIZE]) static inline void curve25519_normalize_secret(uint8_t secret[static CURVE25519_KEY_SIZE])
{ {
secret[0] &= 248; secret[0] &= 248;
secret[31] &= 127; secret[31] &= 127;