diff options
Diffstat (limited to 'debian/patches/gssapi.patch')
-rw-r--r-- | debian/patches/gssapi.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches/gssapi.patch b/debian/patches/gssapi.patch index 8c96afbb0..8bc83cace 100644 --- a/debian/patches/gssapi.patch +++ b/debian/patches/gssapi.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 48424483cbf2232ba849038e02675b2db1ea3a88 Mon Sep 17 00:00:00 2001 | 1 | From 6a0a4b2f79889c9b0d5e2478a6ee5f51be38dcc9 Mon Sep 17 00:00:00 2001 |
2 | From: Simon Wilkinson <simon@sxw.org.uk> | 2 | From: Simon Wilkinson <simon@sxw.org.uk> |
3 | Date: Sun, 9 Feb 2014 16:09:48 +0000 | 3 | Date: Sun, 9 Feb 2014 16:09:48 +0000 |
4 | Subject: GSSAPI key exchange support | 4 | Subject: GSSAPI key exchange support |
@@ -1212,7 +1212,7 @@ index 53993d6..2f6baf7 100644 | |||
1212 | 1212 | ||
1213 | #endif | 1213 | #endif |
1214 | diff --git a/kex.c b/kex.c | 1214 | diff --git a/kex.c b/kex.c |
1215 | index 5100c66..39a6f98 100644 | 1215 | index b777b7d..390bb69 100644 |
1216 | --- a/kex.c | 1216 | --- a/kex.c |
1217 | +++ b/kex.c | 1217 | +++ b/kex.c |
1218 | @@ -55,6 +55,10 @@ | 1218 | @@ -55,6 +55,10 @@ |
@@ -2222,7 +2222,7 @@ index de4a08f..9758290 100644 | |||
2222 | 2222 | ||
2223 | #ifdef USE_PAM | 2223 | #ifdef USE_PAM |
2224 | diff --git a/readconf.c b/readconf.c | 2224 | diff --git a/readconf.c b/readconf.c |
2225 | index 1d03bdf..43b7570 100644 | 2225 | index cd01482..56e0f44 100644 |
2226 | --- a/readconf.c | 2226 | --- a/readconf.c |
2227 | +++ b/readconf.c | 2227 | +++ b/readconf.c |
2228 | @@ -147,6 +147,8 @@ typedef enum { | 2228 | @@ -147,6 +147,8 @@ typedef enum { |
@@ -2801,7 +2801,7 @@ index 7751031..32e9b0d 100644 | |||
2801 | 2801 | ||
2802 | int | 2802 | int |
2803 | diff --git a/sshd.c b/sshd.c | 2803 | diff --git a/sshd.c b/sshd.c |
2804 | index 65ef7e8..839c2e0 100644 | 2804 | index 43d4650..d659a68 100644 |
2805 | --- a/sshd.c | 2805 | --- a/sshd.c |
2806 | +++ b/sshd.c | 2806 | +++ b/sshd.c |
2807 | @@ -126,6 +126,10 @@ | 2807 | @@ -126,6 +126,10 @@ |
@@ -2815,7 +2815,7 @@ index 65ef7e8..839c2e0 100644 | |||
2815 | #ifndef O_NOCTTY | 2815 | #ifndef O_NOCTTY |
2816 | #define O_NOCTTY 0 | 2816 | #define O_NOCTTY 0 |
2817 | #endif | 2817 | #endif |
2818 | @@ -1827,10 +1831,13 @@ main(int ac, char **av) | 2818 | @@ -1833,10 +1837,13 @@ main(int ac, char **av) |
2819 | logit("Disabling protocol version 1. Could not load host key"); | 2819 | logit("Disabling protocol version 1. Could not load host key"); |
2820 | options.protocol &= ~SSH_PROTO_1; | 2820 | options.protocol &= ~SSH_PROTO_1; |
2821 | } | 2821 | } |
@@ -2829,7 +2829,7 @@ index 65ef7e8..839c2e0 100644 | |||
2829 | if (!(options.protocol & (SSH_PROTO_1|SSH_PROTO_2))) { | 2829 | if (!(options.protocol & (SSH_PROTO_1|SSH_PROTO_2))) { |
2830 | logit("sshd: no hostkeys available -- exiting."); | 2830 | logit("sshd: no hostkeys available -- exiting."); |
2831 | exit(1); | 2831 | exit(1); |
2832 | @@ -2145,6 +2152,60 @@ main(int ac, char **av) | 2832 | @@ -2151,6 +2158,60 @@ main(int ac, char **av) |
2833 | remote_ip, remote_port, laddr, get_local_port()); | 2833 | remote_ip, remote_port, laddr, get_local_port()); |
2834 | free(laddr); | 2834 | free(laddr); |
2835 | 2835 | ||
@@ -2890,7 +2890,7 @@ index 65ef7e8..839c2e0 100644 | |||
2890 | /* | 2890 | /* |
2891 | * We don't want to listen forever unless the other side | 2891 | * We don't want to listen forever unless the other side |
2892 | * successfully authenticates itself. So we set up an alarm which is | 2892 | * successfully authenticates itself. So we set up an alarm which is |
2893 | @@ -2563,6 +2624,48 @@ do_ssh2_kex(void) | 2893 | @@ -2569,6 +2630,48 @@ do_ssh2_kex(void) |
2894 | myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal( | 2894 | myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal( |
2895 | list_hostkey_types()); | 2895 | list_hostkey_types()); |
2896 | 2896 | ||
@@ -2939,7 +2939,7 @@ index 65ef7e8..839c2e0 100644 | |||
2939 | /* start key exchange */ | 2939 | /* start key exchange */ |
2940 | if ((r = kex_setup(active_state, myproposal)) != 0) | 2940 | if ((r = kex_setup(active_state, myproposal)) != 0) |
2941 | fatal("kex_setup: %s", ssh_err(r)); | 2941 | fatal("kex_setup: %s", ssh_err(r)); |
2942 | @@ -2577,6 +2680,13 @@ do_ssh2_kex(void) | 2942 | @@ -2583,6 +2686,13 @@ do_ssh2_kex(void) |
2943 | # endif | 2943 | # endif |
2944 | #endif | 2944 | #endif |
2945 | kex->kex[KEX_C25519_SHA256] = kexc25519_server; | 2945 | kex->kex[KEX_C25519_SHA256] = kexc25519_server; |