zx2c4
/
wireguard-freebsd
mirror of git://git.zx2c4.com/wireguard-freebsd
1
Fork 0
Code Releases Activity

crypto: use curve25519 API from the kernel when available 

Signed-off-by: John Baldwin <jhb@FreeBSD.org>
This commit is contained in:
John Baldwin 2021-11-22 10:39:20 -08:00 committed by Jason A. Donenfeld
parent f59e60e369
commit 613c964ee9
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/crypto.c
View File

@ -33,12 +33,15 @@ static crypto_session_t chacha20_poly1305_sid;
#define cpu_to_le32(a) htole32(a)
#define cpu_to_le64(a) htole64(a)
#if !defined(OCF_CHACHA20_POLY1305) || !defined(KERNEL_CHACHA20_POLY1305) || \
!defined(KERNEL_CURVE25519)
static inline uint32_t get_unaligned_le32(const uint8_t *a)
{
uint32_t l;
__builtin_memcpy(&l, a, sizeof(l));
return le32_to_cpup(&l);
}
#endif
#if !defined(OCF_CHACHA20_POLY1305) || !defined(KERNEL_CHACHA20_POLY1305)
static inline uint64_t get_unaligned_le64(const uint8_t *a)
{
@ -1000,6 +1003,7 @@ void blake2s_hmac(uint8_t *out, const uint8_t *in, const uint8_t *key, const siz
}
#ifndef KERNEL_CURVE25519
/* Below here is fiat's implementation of x25519.
*
* Copyright (C) 2015-2016 The fiat-crypto Authors.
@ -1858,6 +1862,7 @@ bool curve25519(uint8_t out[CURVE25519_KEY_SIZE],
return timingsafe_bcmp(out, curve25519_null_point, CURVE25519_KEY_SIZE) != 0;
}
#endif
int
crypto_init(void)

8
src/crypto.h
View File

@ -18,6 +18,10 @@
#define KERNEL_CHACHA20_POLY1305
#endif
#if __FreeBSD_version >= 1400049
#define KERNEL_CURVE25519
#endif
enum chacha20poly1305_lengths {
XCHACHA20POLY1305_NONCE_SIZE = 24,
CHACHA20POLY1305_KEY_SIZE = 32,
@ -141,6 +145,9 @@ void blake2s(uint8_t *out, const uint8_t *in, const uint8_t *key,
void blake2s_hmac(uint8_t *out, const uint8_t *in, const uint8_t *key,
const size_t outlen, const size_t inlen, const size_t keylen);
#ifdef KERNEL_CURVE25519
#include <crypto/curve25519.h>
#else
enum curve25519_lengths {
CURVE25519_KEY_SIZE = 32
};
@ -169,6 +176,7 @@ static inline void curve25519_generate_secret(uint8_t secret[CURVE25519_KEY_SIZE
arc4random_buf(secret, CURVE25519_KEY_SIZE);
curve25519_clamp_secret(secret);
}
#endif
int crypto_init(void);
void crypto_deinit(void);