/* Curve25519 diffie hellman */
void curve25519_dh_new(uchar x[32], uchar y[32]);
-void curve25519_dh_finish(uchar x[32], uchar y[32], uchar z[32]);
+int curve25519_dh_finish(uchar x[32], uchar y[32], uchar z[32]);
/* password-based key derivation function 2 (rfc2898) */
void pbkdf2_x(uchar *p, ulong plen, uchar *s, ulong slen, ulong rounds, uchar *d, ulong dlen,
/* Curve25519 diffie hellman */
void curve25519_dh_new(uchar x[32], uchar y[32]);
-void curve25519_dh_finish(uchar x[32], uchar y[32], uchar z[32]);
+int curve25519_dh_finish(uchar x[32], uchar y[32], uchar z[32]);
/* password-based key derivation function 2 (rfc2898) */
void pbkdf2_x(uchar *p, ulong plen, uchar *s, ulong slen, ulong rounds, uchar *d, ulong dlen,
if((S = ssh2rsasig(sig, nsig)) == nil)
sysfatal("bad server signature");
- curve25519_dh_finish(x, ys, z);
+ if(!curve25519_dh_finish(x, ys, z))
+ sysfatal("unlucky shared key");
K = betomp(z, 32, nil);
nk = (mpsignif(K)+8)/8;
#include <libsec.h>
static uchar nine[32] = {9};
+static uchar zero[32] = {0};
void
curve25519_dh_new(uchar x[32], uchar y[32])
y[31] |= b & 0x80;
}
-void
+int
curve25519_dh_finish(uchar x[32], uchar y[32], uchar z[32])
{
/* remove the random bit */
memset(x, 0, 32);
memset(y, 0, 32);
+
+ return tsmemcmp(z, zero, 32) != 0;
}
static Bytes*
tlsSecECDHEc(TlsSec *sec, int curve, Bytes *Ys)
{
- static char zero[32] = {0};
ECdomain *dom = &sec->ec.dom;
ECpriv *Q = &sec->ec.Q;
ECpub *pub;
Yc = newbytes(32);
curve25519_dh_new(sec->X, Yc->data);
Z = newbytes(32);
- curve25519_dh_finish(sec->X, Ys->data, Z->data);
- // rfc wants us to terminate the connection if
- // shared secret == all zeroes.
- if(tsmemcmp(Z->data, zero, Z->len) == 0){
+ if(!curve25519_dh_finish(sec->X, Ys->data, Z->data)){
freebytes(Yc);
freebytes(Z);
return nil;
static int
tlsSecECDHEs2(TlsSec *sec, Bytes *Yc)
{
- static char zero[32] = {0};
ECdomain *dom = &sec->ec.dom;
ECpriv *Q = &sec->ec.Q;
ECpoint K;
return -1;
}
Z = newbytes(32);
- curve25519_dh_finish(sec->X, Yc->data, Z->data);
- // rfc wants us to terminate the connection if
- // shared secret == all zeroes.
- if(tsmemcmp(Z->data, zero, Z->len) == 0){
+ if(!curve25519_dh_finish(sec->X, Yc->data, Z->data)){
werrstr("unlucky shared key");
freebytes(Z);
return -1;