From 4b83e2a2cc0c12e671a77eaba1c1245894f4e884 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Mon, 21 Jan 2019 10:33:49 +0000 Subject: [PATCH] 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 --- kex.c | 19 +------------------ kex.h | 3 +-- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/kex.c b/kex.c index 0dba2cefa..4fb087863 100644 --- a/kex.c +++ b/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. * @@ -1038,23 +1038,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/kex.h b/kex.h index 9b4c23670..e3be30403 100644 --- a/kex.h +++ b/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. @@ -196,7 +196,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 *);