diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-01-21 10:33:49 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-01-21 23:13:03 +1100 |
commit | 4b83e2a2cc0c12e671a77eaba1c1245894f4e884 (patch) | |
tree | 3c92c9e93f8646892452838296ca819b8f2fc44a /kex.c | |
parent | 92dda34e373832f34a1944e5d9ebbebb184dedc1 (diff) |
upstream: remove kex_derive_keys_bn wrapper; no unused since the
DH-like KEX methods have moved to KEM
from markus@ ok djm@
OpenBSD-Commit-ID: bde9809103832f349545e4f5bb733d316db9a060
Diffstat (limited to 'kex.c')
-rw-r--r-- | kex.c | 19 |
1 files changed, 1 insertions, 18 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.c,v 1.147 2019/01/21 10:20:12 djm Exp $ */ | 1 | /* $OpenBSD: kex.c,v 1.148 2019/01/21 10:33:49 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -1038,23 +1038,6 @@ kex_derive_keys(struct ssh *ssh, u_char *hash, u_int hashlen, | |||
1038 | return 0; | 1038 | return 0; |
1039 | } | 1039 | } |
1040 | 1040 | ||
1041 | #ifdef WITH_OPENSSL | ||
1042 | int | ||
1043 | kex_derive_keys_bn(struct ssh *ssh, u_char *hash, u_int hashlen, | ||
1044 | const BIGNUM *secret) | ||
1045 | { | ||
1046 | struct sshbuf *shared_secret; | ||
1047 | int r; | ||
1048 | |||
1049 | if ((shared_secret = sshbuf_new()) == NULL) | ||
1050 | return SSH_ERR_ALLOC_FAIL; | ||
1051 | if ((r = sshbuf_put_bignum2(shared_secret, secret)) == 0) | ||
1052 | r = kex_derive_keys(ssh, hash, hashlen, shared_secret); | ||
1053 | sshbuf_free(shared_secret); | ||
1054 | return r; | ||
1055 | } | ||
1056 | #endif | ||
1057 | |||
1058 | int | 1041 | int |
1059 | kex_load_hostkey(struct ssh *ssh, struct sshkey **pubp, struct sshkey **prvp) | 1042 | kex_load_hostkey(struct ssh *ssh, struct sshkey **pubp, struct sshkey **prvp) |
1060 | { | 1043 | { |