diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2019-01-21 10:33:50 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2019-01-21 10:33:50 +0000 |
| commit | ee855fc2368d839d4724cede0813b4d05453fc9b (patch) | |
| tree | 5b8feea29e9db5836e6a458ef0f02addc2bd2044 /usr.bin | |
| parent | 01b9d42161b10f35051f04a9be2d85bd3af8a71b (diff) | |
remove kex_derive_keys_bn wrapper; no unused since the DH-like KEX
methods have moved to KEM
from markus@ ok djm@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/kex.c | 19 | ||||
| -rw-r--r-- | usr.bin/ssh/kex.h | 3 |
2 files changed, 2 insertions, 20 deletions
diff --git a/usr.bin/ssh/kex.c b/usr.bin/ssh/kex.c index cab03175a07..07c7f29de8d 100644 --- a/usr.bin/ssh/kex.c +++ b/usr.bin/ssh/kex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kex.c,v 1.147 2019/01/21 10:20:12 djm Exp $ */ +/* $OpenBSD: kex.c,v 1.148 2019/01/21 10:33:49 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * @@ -1025,23 +1025,6 @@ kex_derive_keys(struct ssh *ssh, u_char *hash, u_int hashlen, return 0; } -#ifdef WITH_OPENSSL -int -kex_derive_keys_bn(struct ssh *ssh, u_char *hash, u_int hashlen, - const BIGNUM *secret) -{ - struct sshbuf *shared_secret; - int r; - - if ((shared_secret = sshbuf_new()) == NULL) - return SSH_ERR_ALLOC_FAIL; - if ((r = sshbuf_put_bignum2(shared_secret, secret)) == 0) - r = kex_derive_keys(ssh, hash, hashlen, shared_secret); - sshbuf_free(shared_secret); - return r; -} -#endif - int kex_load_hostkey(struct ssh *ssh, struct sshkey **pubp, struct sshkey **prvp) { diff --git a/usr.bin/ssh/kex.h b/usr.bin/ssh/kex.h index a5af98995f7..60146ac9a98 100644 --- a/usr.bin/ssh/kex.h +++ b/usr.bin/ssh/kex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kex.h,v 1.102 2019/01/21 10:29:56 djm Exp $ */ +/* $OpenBSD: kex.h,v 1.103 2019/01/21 10:33:49 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -180,7 +180,6 @@ int kex_send_kexinit(struct ssh *); int kex_input_kexinit(int, u_int32_t, struct ssh *); int kex_input_ext_info(int, u_int32_t, struct ssh *); int kex_derive_keys(struct ssh *, u_char *, u_int, const struct sshbuf *); -int kex_derive_keys_bn(struct ssh *, u_char *, u_int, const BIGNUM *); int kex_send_newkeys(struct ssh *); int kex_start_rekex(struct ssh *); |