author | Jan Parcel <jan.parcel@oracle.com> |
Wed, 16 Nov 2016 12:17:49 -0800 | |
branch | s11u3-sru |
changeset 7320 | edeb951aa980 |
permissions | -rw-r--r-- |
7320
edeb951aa980
24525860 upgrade OpenSSH to 7.3p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
1 |
# |
edeb951aa980
24525860 upgrade OpenSSH to 7.3p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
2 |
# Unregister the KEXINIT handler after message has been received. |
edeb951aa980
24525860 upgrade OpenSSH to 7.3p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
3 |
# |
edeb951aa980
24525860 upgrade OpenSSH to 7.3p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
4 |
# CVE-2016-8858 |
edeb951aa980
24525860 upgrade OpenSSH to 7.3p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
5 |
# |
edeb951aa980
24525860 upgrade OpenSSH to 7.3p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
6 |
# Patch source: upstream |
edeb951aa980
24525860 upgrade OpenSSH to 7.3p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
7 |
# https://github.com/openssh/openssh-portable/commit/ec165c392ca54317dbe |
edeb951aa980
24525860 upgrade OpenSSH to 7.3p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
8 |
# |
edeb951aa980
24525860 upgrade OpenSSH to 7.3p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
9 |
# We will drop this patch when upgrading to OpenSSH 7.4 or later. |
edeb951aa980
24525860 upgrade OpenSSH to 7.3p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
10 |
# |
edeb951aa980
24525860 upgrade OpenSSH to 7.3p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
11 |
diff -pur old/kex.c new/kex.c |
edeb951aa980
24525860 upgrade OpenSSH to 7.3p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
12 |
--- old/kex.c |
edeb951aa980
24525860 upgrade OpenSSH to 7.3p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
13 |
+++ new/kex.c |
edeb951aa980
24525860 upgrade OpenSSH to 7.3p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
14 |
@@ -517,6 +517,7 @@ kex_input_kexinit(int type, u_int32_t se |
edeb951aa980
24525860 upgrade OpenSSH to 7.3p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
15 |
if (kex == NULL) |
edeb951aa980
24525860 upgrade OpenSSH to 7.3p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
16 |
return SSH_ERR_INVALID_ARGUMENT; |
edeb951aa980
24525860 upgrade OpenSSH to 7.3p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
17 |
|
edeb951aa980
24525860 upgrade OpenSSH to 7.3p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
18 |
+ ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL); |
edeb951aa980
24525860 upgrade OpenSSH to 7.3p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
19 |
ptr = sshpkt_ptr(ssh, &dlen); |
edeb951aa980
24525860 upgrade OpenSSH to 7.3p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
20 |
if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0) |
edeb951aa980
24525860 upgrade OpenSSH to 7.3p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
21 |
return r; |