src/usr.bin/ssh/kex.h - diff

Return to kex.h CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/kex.h between version 1.98 and 1.99

version 1.98, 2019/01/21 10:07:22

version 1.99, 2019/01/21 10:20:12

Line 27

#define KEX_H

#include "mac.h"

#include "crypto_api.h"

#ifdef WITH_LEAKMALLOC

#include "leakmalloc.h"

Line 46

Line 47

#define KEX_ECDH_SHA2_NISTP521 "ecdh-sha2-nistp521"

#define KEX_CURVE25519_SHA256 "curve25519-sha256"

#define KEX_CURVE25519_SHA256_OLD "curve25519-sha256@libssh.org"

#define KEX_SNTRUP4591761X25519_SHA512 "sntrup4591761x25519-sha512@tinyssh.org"

#define COMP_NONE 0

/* pre-auth compression (COMP_ZLIB) is only supported in the client */

Line 84

Line 86

KEX_DH_GEX_SHA256,

KEX_ECDH_SHA2,

KEX_C25519_SHA256,

KEX_KEM_SNTRUP4591761X25519_SHA512,

KEX_MAX

};

Line 148

Line 151

u_int min, max, nbits; /* GEX */

EC_KEY *ec_client_key; /* ECDH */

const EC_GROUP *ec_group; /* ECDH */

u_char c25519_client_key[CURVE25519_SIZE]; /* 25519 */

u_char c25519_client_key[CURVE25519_SIZE]; /* 25519 + KEM */

u_char c25519_client_pubkey[CURVE25519_SIZE]; /* 25519 */

u_char sntrup4591761_client_key[crypto_kem_sntrup4591761_SECRETKEYBYTES]; /* KEM */

struct sshbuf *kem_client_pub; /* KEM */

};

int kex_names_valid(const char *);

Line 187

Line 192

int kexecdh_server(struct ssh *);

int kexc25519_client(struct ssh *);

int kexc25519_server(struct ssh *);

int kex_kem_client(struct ssh *);

int kex_kem_server(struct ssh *);

int kex_kem_sntrup4591761x25519_keypair(struct kex *);

int kex_kem_sntrup4591761x25519_enc(struct kex *, const u_char *, size_t,

struct sshbuf **, struct sshbuf **);

int kex_kem_sntrup4591761x25519_dec(struct kex *, const u_char *, size_t,

struct sshbuf **);

int kex_dh_keygen(struct kex *);

int kex_dh_compute_key(struct kex *, BIGNUM *, struct sshbuf *);

int kex_dh_hash(int, const struct sshbuf *, const struct sshbuf *,

Line 208

Line 221

int kex_c25519_hash(int, const struct sshbuf *, const struct sshbuf *,

const u_char *, size_t, const u_char *, size_t,

const u_char *, size_t, const u_char *, const u_char *,

const u_char *, size_t, const u_char *, size_t, const u_char *, size_t,

const u_char *, size_t, u_char *, size_t *);

void kexc25519_keygen(u_char key[CURVE25519_SIZE], u_char pub[CURVE25519_SIZE])

Line 218

Line 231

const u_char pub[CURVE25519_SIZE], struct sshbuf *out)

__attribute__((__bounded__(__minbytes__, 1, CURVE25519_SIZE)))

__attribute__((__bounded__(__minbytes__, 2, CURVE25519_SIZE)));

int kexc25519_shared_key_ext(const u_char key[CURVE25519_SIZE],

const u_char pub[CURVE25519_SIZE], struct sshbuf *out, int)

__attribute__((__bounded__(__minbytes__, 1, CURVE25519_SIZE)))

__attribute__((__bounded__(__minbytes__, 2, CURVE25519_SIZE)));

#if defined(DEBUG_KEX) || defined(DEBUG_KEXDH) || defined(DEBUG_KEXECDH)

void dump_digest(char *, u_char *, int);

void dump_digest(const char *, const u_char *, int);

#endif