diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2019-01-21 11:03:37 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-01-21 11:47:28 +0100 |
| commit | dec5e9d33891e3bc3f1395d7db0e56fdc7f86dfc (patch) | |
| tree | a91c7543cc726563651cc9eb2603f205ab7b27b1 /kex.h | |
| parent | upstream: factor out DH keygen; it's identical between the client (diff) | |
| download | openssh-dec5e9d33891e3bc3f1395d7db0e56fdc7f86dfc.tar.xz openssh-dec5e9d33891e3bc3f1395d7db0e56fdc7f86dfc.zip | |
upstream: factor out kex_dh_compute_key() - it's shared between
plain DH KEX and DH GEX in both the client and server implementations
from markus@ ok djm@
OpenBSD-Commit-ID: 12186e18791fffcd4642c82e7e0cfdd7ea37e2ec
Diffstat (limited to 'kex.h')
| -rw-r--r-- | kex.h | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: kex.h,v 1.95 2019/01/21 10:00:23 djm Exp $ */ +/* $OpenBSD: kex.h,v 1.96 2019/01/21 10:03:37 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -203,15 +203,16 @@ int kexc25519_client(struct ssh *); int kexc25519_server(struct ssh *); 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 *, const u_char *, size_t, const u_char *, size_t, const u_char *, size_t, - const BIGNUM *, const BIGNUM *, const BIGNUM *, u_char *, size_t *); + const BIGNUM *, const BIGNUM *, const u_char *, size_t, u_char *, size_t *); int kexgex_hash(int, const struct sshbuf *, const struct sshbuf *, const u_char *, size_t, const u_char *, size_t, const u_char *, size_t, int, int, int, const BIGNUM *, const BIGNUM *, const BIGNUM *, - const BIGNUM *, const BIGNUM *, + const BIGNUM *, const u_char *, size_t, u_char *, size_t *); int kex_ecdh_hash(int, const EC_GROUP *, |