diff options
-rw-r--r-- | kex.c | 19 | ||||
-rw-r--r-- | kex.h | 3 |
2 files changed, 2 insertions, 20 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 | { |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.h,v 1.102 2019/01/21 10:29:56 djm Exp $ */ | 1 | /* $OpenBSD: kex.h,v 1.103 2019/01/21 10:33:49 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. |
@@ -196,7 +196,6 @@ int kex_send_kexinit(struct ssh *); | |||
196 | int kex_input_kexinit(int, u_int32_t, struct ssh *); | 196 | int kex_input_kexinit(int, u_int32_t, struct ssh *); |
197 | int kex_input_ext_info(int, u_int32_t, struct ssh *); | 197 | int kex_input_ext_info(int, u_int32_t, struct ssh *); |
198 | int kex_derive_keys(struct ssh *, u_char *, u_int, const struct sshbuf *); | 198 | int kex_derive_keys(struct ssh *, u_char *, u_int, const struct sshbuf *); |
199 | int kex_derive_keys_bn(struct ssh *, u_char *, u_int, const BIGNUM *); | ||
200 | int kex_send_newkeys(struct ssh *); | 199 | int kex_send_newkeys(struct ssh *); |
201 | int kex_start_rekex(struct ssh *); | 200 | int kex_start_rekex(struct ssh *); |
202 | 201 | ||