From da2ba20d5b344ab9fa6ef6d2ae36584ae9b3ddf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 26 Nov 2018 11:32:40 +0100 Subject: [PATCH] Backport upstream commit to require less rbytes for NT gensalt --- ...4.4.0-set_minimum_rbytes_for_NT_to_2.patch | 22 +++++++++++++++++++ libxcrypt.spec | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 libxcrypt-4.4.0-set_minimum_rbytes_for_NT_to_2.patch diff --git a/libxcrypt-4.4.0-set_minimum_rbytes_for_NT_to_2.patch b/libxcrypt-4.4.0-set_minimum_rbytes_for_NT_to_2.patch new file mode 100644 index 0000000..a5db771 --- /dev/null +++ b/libxcrypt-4.4.0-set_minimum_rbytes_for_NT_to_2.patch @@ -0,0 +1,22 @@ +From f6fe5e6faf4a681984e5bb9d830c8006bba8dab7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Wed, 21 Nov 2018 19:05:16 +0100 +Subject: [PATCH] Set minimum rbytes for NT to 2. + +--- + hashes.lst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hashes.lst b/hashes.lst +index eb46e14..d8e2ccc 100644 +--- a/hashes.lst ++++ b/hashes.lst +@@ -51,7 +51,7 @@ sha256crypt $5$ 15 GLIBC,FREEBSD,SOLARIS + sha1crypt $sha1 20 NETBSD + sunmd5 $md5 8 SOLARIS + md5crypt $1$ 9 GLIBC,FREEBSD,NETBSD,OPENBSD,SOLARIS +-nt $3$ 7 FREEBSD ++nt $3$ 2 FREEBSD + bsdicrypt _ 3 FREEBSD,NETBSD,OPENBSD,OSX + bigcrypt : 2 : + descrypt : 2 GLIBC,FREEBSD,NETBSD,OPENBSD,SOLARIS,OSX diff --git a/libxcrypt.spec b/libxcrypt.spec index 1bdfa71..03febfa 100644 --- a/libxcrypt.spec +++ b/libxcrypt.spec @@ -102,6 +102,7 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Patch0: %{url}/commit/a60130b2211c6666bee69051b2b76413af2d679f.patch#/%{name}-4.4.0-fix_manual-page-warning_list-type-stack0.patch Patch1: %{url}/commit/664bfda5a51dbaa75904b29a7cd3c51888db6bd9.patch#/%{name}-4.4.0-use_XCRYPT_STRCPY_OR_ABORT_in_crypt_nt_rn.patch Patch2: %{url}/commit/fdeddd908b6c659b281bbef7e535f9060b5b6186.patch#/%{name}-4.4.0-use_base64_output_gensalt_nt_rn.patch +Patch3: %{url}/commit/f6fe5e6faf4a681984e5bb9d830c8006bba8dab7.patch#/%{name}-4.4.0-set_minimum_rbytes_for_NT_to_2.patch # Patch 3000 - 5999: Backported patches from pull requests. @@ -332,6 +333,7 @@ done * Mon Nov 26 2018 Björn Esser - 4.4.0-2 - Backport upstream commit to use a safer strcpy for the NT method - Backport upstream generating base64 encoded output for NT gensalt +- Backport upstream commit to require less rbytes for NT gensalt * Tue Nov 20 2018 Björn Esser - 4.4.0-1 - New upstream release