Skip to content

patch openssh for CVE-2019-16905 #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anphel31 merged 1 commit into from
Oct 20, 2020
Merged

patch openssh for CVE-2019-16905 #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions SPECS/openssh/CVE-2019-16905.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
--- ./sshkey-xmss-orig.c 2020-10-19 13:08:05.657397679 -0700
+++ ./sshkey-xmss.c 2020-10-19 13:07:42.953419382 -0700
@@ -977,7 +977,8 @@
goto out;
}
/* check that an appropriate amount of auth data is present */
- if (sshbuf_len(encoded) < encrypted_len + authlen) {
+ if (sshbuf_len(encoded) < authlen ||
+ sshbuf_len(encoded) - authlen < encrypted_len) {
r = SSH_ERR_INVALID_FORMAT;
goto out;
}
6 changes: 5 additions & 1 deletion SPECS/openssh/openssh.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: Free version of the SSH connectivity tools
Name: openssh
Version: 8.0p1
Release: 8%{?dist}
Release: 9%{?dist}
License: BSD
URL: https://www.openssh.com/
Group: System Environment/Security
Expand All @@ -13,6 +13,7 @@ Source1: http://www.linuxfromscratch.org/blfs/downloads/stable-systemd/bl
Source2: sshd.service
Source3: sshd-keygen.service
Patch0: blfs_systemd_fixes.patch
Patch1: CVE-2019-16905.patch
BuildRequires: openssl-devel
BuildRequires: pam-devel
BuildRequires: krb5-devel
Expand Down Expand Up @@ -49,6 +50,7 @@ This provides the ssh server daemons, utilities, configuration and service files
%setup -q
tar xf %{SOURCE1} --no-same-owner
%patch0 -p0
%patch1 -p0
%build
%configure \
--sysconfdir=/etc/ssh \
Expand Down Expand Up @@ -171,6 +173,8 @@ rm -rf %{buildroot}/*
%{_mandir}/man8/ssh-pkcs11-helper.8.gz

%changelog
* Mon Oct 19 2020 Andrew Phelps <anphel@microsoft.com> 8.0p1-9
- Add patch for CVE-2019-16905
* Wed Sep 02 2020 Jim Perrin <jim.perrin@microsoft.com> 8.0p1-8
- Add wants=sshd-keygen.service to sshd.service for easier service starting
* Thu Jun 04 2020 Chris Co <chrco@microsoft.com> 8.0p1-7
Expand Down