j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Cleanups in ECDH code.

Browse source
This commit is contained in:
Guus Sliepen 2011-07-03 22:13:34 +02:00
parent 895f868714
commit c385d11533
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/openssl/ecdh.c
View file

@ -28,13 +28,6 @@
#include "ecdh.h" #include "ecdh.h"
#include "logger.h" #include "logger.h"
// TODO: proper KDF
static void *kdf(const void *in, size_t inlen, void *out, size_t *outlen) {
memcpy(out, in, inlen);
*outlen = inlen;
return out;
}
bool ecdh_generate_public(ecdh_t *ecdh, void *pubkey) { bool ecdh_generate_public(ecdh_t *ecdh, void *pubkey) {
*ecdh = EC_KEY_new_by_curve_name(NID_secp521r1); *ecdh = EC_KEY_new_by_curve_name(NID_secp521r1);
if(!EC_KEY_generate_key(*ecdh)) { if(!EC_KEY_generate_key(*ecdh)) {
@ -59,14 +52,18 @@ bool ecdh_generate_public(ecdh_t *ecdh, void *pubkey) {
bool ecdh_compute_shared(ecdh_t *ecdh, const void *pubkey, void *shared) { bool ecdh_compute_shared(ecdh_t *ecdh, const void *pubkey, void *shared) {
EC_POINT *point = EC_POINT_new(EC_KEY_get0_group(*ecdh)); EC_POINT *point = EC_POINT_new(EC_KEY_get0_group(*ecdh));
if(!point) {
logger(LOG_ERR, "EC_POINT_new() failed: %s", ERR_error_string(ERR_get_error(), NULL));
abort();
}
int result = EC_POINT_oct2point(EC_KEY_get0_group(*ecdh), point, pubkey, ECDH_SIZE, NULL); int result = EC_POINT_oct2point(EC_KEY_get0_group(*ecdh), point, pubkey, ECDH_SIZE, NULL);
if(!point) { if(!result) {
logger(LOG_ERR, "Converting binary to EC_POINT failed: %s", ERR_error_string(ERR_get_error(), NULL)); logger(LOG_ERR, "Converting binary to EC_POINT failed: %s", ERR_error_string(ERR_get_error(), NULL));
abort(); abort();
} }
result = ECDH_compute_key(shared, ECDH_SIZE, point, *ecdh, kdf); result = ECDH_compute_key(shared, ECDH_SIZE, point, *ecdh, NULL);
EC_POINT_free(point); EC_POINT_free(point);
EC_KEY_free(*ecdh); EC_KEY_free(*ecdh);
*ecdh = NULL; *ecdh = NULL;