diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | kexdhs.c | 3 | ||||
-rw-r--r-- | kexecdhs.c | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -8,6 +8,9 @@ | |||
8 | [kex.c kex.h myproposal.h ssh-keyscan.c sshconnect2.c sshd.c] | 8 | [kex.c kex.h myproposal.h ssh-keyscan.c sshconnect2.c sshd.c] |
9 | use curve25519 for default key exchange (curve25519-sha256@libssh.org); | 9 | use curve25519 for default key exchange (curve25519-sha256@libssh.org); |
10 | initial patch from Aris Adamantiadis; ok djm@ | 10 | initial patch from Aris Adamantiadis; ok djm@ |
11 | - markus@cvs.openbsd.org 2013/11/02 22:10:15 | ||
12 | [kexdhs.c kexecdhs.c] | ||
13 | no need to include monitor_wrap.h | ||
11 | 14 | ||
12 | 20131103 | 15 | 20131103 |
13 | - (dtucker) [openbsd-compat/bsd-misc.c] Include time.h for nanosleep. | 16 | - (dtucker) [openbsd-compat/bsd-misc.c] Include time.h for nanosleep. |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexdhs.c,v 1.14 2013/07/19 07:37:48 markus Exp $ */ | 1 | /* $OpenBSD: kexdhs.c,v 1.15 2013/11/02 22:10:15 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -45,7 +45,6 @@ | |||
45 | #ifdef GSSAPI | 45 | #ifdef GSSAPI |
46 | #include "ssh-gss.h" | 46 | #include "ssh-gss.h" |
47 | #endif | 47 | #endif |
48 | #include "monitor_wrap.h" | ||
49 | 48 | ||
50 | void | 49 | void |
51 | kexdh_server(Kex *kex) | 50 | kexdh_server(Kex *kex) |
diff --git a/kexecdhs.c b/kexecdhs.c index 3a580aacf..ab8a2b1f9 100644 --- a/kexecdhs.c +++ b/kexecdhs.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexecdhs.c,v 1.5 2013/07/19 07:37:48 markus Exp $ */ | 1 | /* $OpenBSD: kexecdhs.c,v 1.6 2013/11/02 22:10:15 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2010 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2010 Damien Miller. All rights reserved. |
@@ -37,12 +37,10 @@ | |||
37 | #include "kex.h" | 37 | #include "kex.h" |
38 | #include "log.h" | 38 | #include "log.h" |
39 | #include "packet.h" | 39 | #include "packet.h" |
40 | #include "dh.h" | ||
41 | #include "ssh2.h" | 40 | #include "ssh2.h" |
42 | #ifdef GSSAPI | 41 | #ifdef GSSAPI |
43 | #include "ssh-gss.h" | 42 | #include "ssh-gss.h" |
44 | #endif | 43 | #endif |
45 | #include "monitor_wrap.h" | ||
46 | 44 | ||
47 | #ifdef OPENSSL_HAS_ECC | 45 | #ifdef OPENSSL_HAS_ECC |
48 | 46 | ||