summaryrefslogtreecommitdiff
path: root/kex.h
diff options
context:
space:
mode:
Diffstat (limited to 'kex.h')
-rw-r--r--kex.h19
1 files changed, 4 insertions, 15 deletions
diff --git a/kex.h b/kex.h
index 6798e33f9..44e6d1972 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: kex.h,v 1.104 2019/01/21 10:35:09 djm Exp $ */ 1/* $OpenBSD: kex.h,v 1.106 2019/01/21 10:40:11 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -170,7 +170,7 @@ struct kex {
170 u_char c25519_client_key[CURVE25519_SIZE]; /* 25519 + KEM */ 170 u_char c25519_client_key[CURVE25519_SIZE]; /* 25519 + KEM */
171 u_char c25519_client_pubkey[CURVE25519_SIZE]; /* 25519 */ 171 u_char c25519_client_pubkey[CURVE25519_SIZE]; /* 25519 */
172 u_char sntrup4591761_client_key[crypto_kem_sntrup4591761_SECRETKEYBYTES]; /* KEM */ 172 u_char sntrup4591761_client_key[crypto_kem_sntrup4591761_SECRETKEYBYTES]; /* KEM */
173 struct sshbuf *kem_client_pub; /* KEM */ 173 struct sshbuf *client_pub;
174}; 174};
175 175
176int kex_names_valid(const char *); 176int kex_names_valid(const char *);
@@ -199,16 +199,10 @@ int kex_derive_keys(struct ssh *, u_char *, u_int, const struct sshbuf *);
199int kex_send_newkeys(struct ssh *); 199int kex_send_newkeys(struct ssh *);
200int kex_start_rekex(struct ssh *); 200int kex_start_rekex(struct ssh *);
201 201
202int kexdh_client(struct ssh *);
203int kexdh_server(struct ssh *);
204int kexgex_client(struct ssh *); 202int kexgex_client(struct ssh *);
205int kexgex_server(struct ssh *); 203int kexgex_server(struct ssh *);
206int kexecdh_client(struct ssh *); 204int kex_gen_client(struct ssh *);
207int kexecdh_server(struct ssh *); 205int kex_gen_server(struct ssh *);
208int kexc25519_client(struct ssh *);
209int kexc25519_server(struct ssh *);
210int kex_kem_client(struct ssh *);
211int kex_kem_server(struct ssh *);
212 206
213int kex_dh_keypair(struct kex *); 207int kex_dh_keypair(struct kex *);
214int kex_dh_enc(struct kex *, const struct sshbuf *, struct sshbuf **, 208int kex_dh_enc(struct kex *, const struct sshbuf *, struct sshbuf **,
@@ -241,11 +235,6 @@ int kexgex_hash(int, const struct sshbuf *, const struct sshbuf *,
241 const BIGNUM *, const u_char *, size_t, 235 const BIGNUM *, const u_char *, size_t,
242 u_char *, size_t *); 236 u_char *, size_t *);
243 237
244int kex_c25519_hash(int, const struct sshbuf *, const struct sshbuf *,
245 const u_char *, size_t, const u_char *, size_t,
246 const u_char *, size_t, const struct sshbuf *, const struct sshbuf *,
247 const struct sshbuf *, u_char *, size_t *);
248
249void kexc25519_keygen(u_char key[CURVE25519_SIZE], u_char pub[CURVE25519_SIZE]) 238void kexc25519_keygen(u_char key[CURVE25519_SIZE], u_char pub[CURVE25519_SIZE])
250 __attribute__((__bounded__(__minbytes__, 1, CURVE25519_SIZE))) 239 __attribute__((__bounded__(__minbytes__, 1, CURVE25519_SIZE)))
251 __attribute__((__bounded__(__minbytes__, 2, CURVE25519_SIZE))); 240 __attribute__((__bounded__(__minbytes__, 2, CURVE25519_SIZE)));