diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
commit | 1b816ea846aca3ee89e7995373ace609e9518424 (patch) | |
tree | b41cdc8495cae7fa9c2e0f98a5f2e71656b61f9a /myproposal.h | |
parent | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (diff) | |
parent | 086ea76990b1e6287c24b6db74adffd4605eb3b0 (diff) |
import openssh-4.6p1-gsskex-20070312.patch
Diffstat (limited to 'myproposal.h')
-rw-r--r-- | myproposal.h | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/myproposal.h b/myproposal.h index d8cba1caf..e246e0dd9 100644 --- a/myproposal.h +++ b/myproposal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: myproposal.h,v 1.18 2005/07/25 11:59:39 markus Exp $ */ | 1 | /* $OpenBSD: myproposal.h,v 1.21 2006/03/25 22:22:43 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -23,9 +23,23 @@ | |||
23 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 23 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
24 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
25 | */ | 25 | */ |
26 | #define KEX_DEFAULT_KEX "diffie-hellman-group-exchange-sha1," \ | 26 | |
27 | #include <openssl/opensslv.h> | ||
28 | |||
29 | /* Old OpenSSL doesn't support what we need for DHGEX-sha256 */ | ||
30 | #if OPENSSL_VERSION_NUMBER < 0x00907000L | ||
31 | # define KEX_DEFAULT_KEX \ | ||
32 | "diffie-hellman-group-exchange-sha1," \ | ||
27 | "diffie-hellman-group14-sha1," \ | 33 | "diffie-hellman-group14-sha1," \ |
28 | "diffie-hellman-group1-sha1" | 34 | "diffie-hellman-group1-sha1" |
35 | #else | ||
36 | # define KEX_DEFAULT_KEX \ | ||
37 | "diffie-hellman-group-exchange-sha256," \ | ||
38 | "diffie-hellman-group-exchange-sha1," \ | ||
39 | "diffie-hellman-group14-sha1," \ | ||
40 | "diffie-hellman-group1-sha1" | ||
41 | #endif | ||
42 | |||
29 | #define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" | 43 | #define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" |
30 | #define KEX_DEFAULT_ENCRYPT \ | 44 | #define KEX_DEFAULT_ENCRYPT \ |
31 | "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ | 45 | "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ |