From de5cc82b5b29a47b0cc7de08800fe38860228850 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Mon, 16 Sep 2013 19:25:31 +0000 Subject: Build fix to eliminate strict aliasing warnings, and a bug fix. --- node/C25519.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'node/C25519.cpp') diff --git a/node/C25519.cpp b/node/C25519.cpp index eab7d110..7b933e23 100644 --- a/node/C25519.cpp +++ b/node/C25519.cpp @@ -33,6 +33,7 @@ #include "C25519.hpp" #include "Utils.hpp" #include "SHA512.hpp" +#include "Buffer.hpp" namespace ZeroTier { @@ -1895,9 +1896,16 @@ static void p1p1_to_p2(ge25519_p2 *r, const ge25519_p1p1 *p) fe25519_mul(&r->z, &p->z, &p->t); } +static void p1p1_to_p2_2(ge25519_p3 *r, const ge25519_p1p1 *p) +{ + fe25519_mul(&r->x, &p->x, &p->t); + fe25519_mul(&r->y, &p->y, &p->z); + fe25519_mul(&r->z, &p->z, &p->t); +} + static void p1p1_to_p3(ge25519_p3 *r, const ge25519_p1p1 *p) { - p1p1_to_p2((ge25519_p2 *)r, p); + p1p1_to_p2_2(r, p); fe25519_mul(&r->t, &p->x, &p->y); } -- cgit v1.2.3