summaryrefslogtreecommitdiff
path: root/kex.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2019-10-09 22:59:48 +0100
committerColin Watson <cjwatson@debian.org>2019-10-09 22:59:48 +0100
commit4213eec74e74de6310c27a40c3e9759a08a73996 (patch)
treee97a6dcafc6763aea7c804e4e113c2750cb1400d /kex.h
parent102062f825fb26a74295a1c089c00c4c4c76b68a (diff)
parentcdf1d0a9f5d18535e0a18ff34860e81a6d83aa5c (diff)
Import openssh_8.1p1.orig.tar.gz
Diffstat (limited to 'kex.h')
-rw-r--r--kex.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/kex.h b/kex.h
index 6d446d1cc..a5ae6ac05 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: kex.h,v 1.107 2019/01/23 00:30:41 djm Exp $ */ 1/* $OpenBSD: kex.h,v 1.109 2019/09/06 05:23:55 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.
@@ -29,11 +29,10 @@
29#include "mac.h" 29#include "mac.h"
30#include "crypto_api.h" 30#include "crypto_api.h"
31 31
32#ifdef WITH_LEAKMALLOC
33#include "leakmalloc.h"
34#endif
35
36#ifdef WITH_OPENSSL 32#ifdef WITH_OPENSSL
33# include <openssl/bn.h>
34# include <openssl/dh.h>
35# include <openssl/ecdsa.h>
37# ifdef OPENSSL_HAS_ECC 36# ifdef OPENSSL_HAS_ECC
38# include <openssl/ec.h> 37# include <openssl/ec.h>
39# else /* OPENSSL_HAS_ECC */ 38# else /* OPENSSL_HAS_ECC */