cracklib: new package
Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Stefan Sørensen
Thomas Petazzoni
parent
7e2fd9eeb9
commit
d4718319b7
@ -1498,6 +1498,7 @@ F: package/proxychains-ng/
|
||||
F: package/yasm/
|
||||
|
||||
N: Stefan Sørensen <stefan.sorensen@spectralink.com>
|
||||
F: package/cracklib/
|
||||
F: package/libscrypt/
|
||||
|
||||
N: Stephan Hoffmann <sho@relinux.de>
|
||||
|
||||
@ -1349,6 +1349,7 @@ menu "Other"
|
||||
source "package/clapack/Config.in"
|
||||
source "package/classpath/Config.in"
|
||||
source "package/cppcms/Config.in"
|
||||
source "package/cracklib/Config.in"
|
||||
source "package/dawgdic/Config.in"
|
||||
source "package/ding-libs/Config.in"
|
||||
source "package/eigen/Config.in"
|
||||
|
||||
106
package/cracklib/0001-Apply-patch-to-fix-CVE-2016-6318.patch
Normal file
106
package/cracklib/0001-Apply-patch-to-fix-CVE-2016-6318.patch
Normal file
@ -0,0 +1,106 @@
|
||||
From 47e5dec521ab6243c9b249dd65b93d232d90d6b1 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Dittberner <jan@dittberner.info>
|
||||
Date: Thu, 25 Aug 2016 17:13:49 +0200
|
||||
Subject: [PATCH] Apply patch to fix CVE-2016-6318
|
||||
|
||||
This patch fixes an issue with a stack-based buffer overflow whne
|
||||
parsing large GECOS field. See
|
||||
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-6318 and
|
||||
https://security-tracker.debian.org/tracker/CVE-2016-6318 for more
|
||||
information.
|
||||
|
||||
Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
|
||||
---
|
||||
|
||||
Status: upstream, not yet released.
|
||||
|
||||
lib/fascist.c | 57 ++++++++++++++++++++++++++++++++-----------------------
|
||||
2 files changed, 34 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/lib/fascist.c b/lib/fascist.c
|
||||
index a996509..d4deb15 100644
|
||||
--- a/lib/fascist.c
|
||||
+++ b/lib/fascist.c
|
||||
@@ -502,7 +502,7 @@ FascistGecosUser(char *password, const char *user, const char *gecos)
|
||||
char gbuffer[STRINGSIZE];
|
||||
char tbuffer[STRINGSIZE];
|
||||
char *uwords[STRINGSIZE];
|
||||
- char longbuffer[STRINGSIZE * 2];
|
||||
+ char longbuffer[STRINGSIZE];
|
||||
|
||||
if (gecos == NULL)
|
||||
gecos = "";
|
||||
@@ -583,38 +583,47 @@ FascistGecosUser(char *password, const char *user, const char *gecos)
|
||||
{
|
||||
for (i = 0; i < j; i++)
|
||||
{
|
||||
- strcpy(longbuffer, uwords[i]);
|
||||
- strcat(longbuffer, uwords[j]);
|
||||
-
|
||||
- if (GTry(longbuffer, password))
|
||||
+ if (strlen(uwords[i]) + strlen(uwords[j]) < STRINGSIZE)
|
||||
{
|
||||
- return _("it is derived from your password entry");
|
||||
- }
|
||||
+ strcpy(longbuffer, uwords[i]);
|
||||
+ strcat(longbuffer, uwords[j]);
|
||||
|
||||
- strcpy(longbuffer, uwords[j]);
|
||||
- strcat(longbuffer, uwords[i]);
|
||||
+ if (GTry(longbuffer, password))
|
||||
+ {
|
||||
+ return _("it is derived from your password entry");
|
||||
+ }
|
||||
|
||||
- if (GTry(longbuffer, password))
|
||||
- {
|
||||
- return _("it's derived from your password entry");
|
||||
- }
|
||||
+ strcpy(longbuffer, uwords[j]);
|
||||
+ strcat(longbuffer, uwords[i]);
|
||||
|
||||
- longbuffer[0] = uwords[i][0];
|
||||
- longbuffer[1] = '\0';
|
||||
- strcat(longbuffer, uwords[j]);
|
||||
+ if (GTry(longbuffer, password))
|
||||
+ {
|
||||
+ return _("it's derived from your password entry");
|
||||
+ }
|
||||
+ }
|
||||
|
||||
- if (GTry(longbuffer, password))
|
||||
+ if (strlen(uwords[j]) < STRINGSIZE - 1)
|
||||
{
|
||||
- return _("it is derivable from your password entry");
|
||||
+ longbuffer[0] = uwords[i][0];
|
||||
+ longbuffer[1] = '\0';
|
||||
+ strcat(longbuffer, uwords[j]);
|
||||
+
|
||||
+ if (GTry(longbuffer, password))
|
||||
+ {
|
||||
+ return _("it is derivable from your password entry");
|
||||
+ }
|
||||
}
|
||||
|
||||
- longbuffer[0] = uwords[j][0];
|
||||
- longbuffer[1] = '\0';
|
||||
- strcat(longbuffer, uwords[i]);
|
||||
-
|
||||
- if (GTry(longbuffer, password))
|
||||
+ if (strlen(uwords[i]) < STRINGSIZE - 1)
|
||||
{
|
||||
- return _("it's derivable from your password entry");
|
||||
+ longbuffer[0] = uwords[j][0];
|
||||
+ longbuffer[1] = '\0';
|
||||
+ strcat(longbuffer, uwords[i]);
|
||||
+
|
||||
+ if (GTry(longbuffer, password))
|
||||
+ {
|
||||
+ return _("it's derivable from your password entry");
|
||||
+ }
|
||||
}
|
||||
}
|
||||
}
|
||||
--
|
||||
2.9.3
|
||||
|
||||
@ -0,0 +1,40 @@
|
||||
From 33d7fa4585247cd2247a1ffa032ad245836c6edb Mon Sep 17 00:00:00 2001
|
||||
From: Jan Dittberner <jan@dittberner.info>
|
||||
Date: Thu, 25 Aug 2016 17:17:53 +0200
|
||||
Subject: [PATCH] Fix a buffer overflow processing long words
|
||||
|
||||
A buffer overflow processing long words has been discovered. This commit
|
||||
applies the patch from
|
||||
https://build.opensuse.org/package/view_file/Base:System/cracklib/0004-overflow-processing-long-words.patch
|
||||
by Howard Guo.
|
||||
|
||||
See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835386 and
|
||||
http://www.openwall.com/lists/oss-security/2016/08/23/8
|
||||
|
||||
Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
|
||||
---
|
||||
|
||||
Status: upstream, not yet released.
|
||||
|
||||
lib/rules.c | 5 ++---
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/lib/rules.c b/lib/rules.c
|
||||
index d193cc0..3a2aa46 100644
|
||||
--- a/lib/rules.c
|
||||
+++ b/lib/rules.c
|
||||
@@ -434,9 +434,8 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */
|
||||
{
|
||||
int limit;
|
||||
register char *ptr;
|
||||
- static char area[STRINGSIZE];
|
||||
- char area2[STRINGSIZE];
|
||||
- area[0] = '\0';
|
||||
+ static char area[STRINGSIZE * 2] = {0};
|
||||
+ char area2[STRINGSIZE * 2] = {0};
|
||||
strcpy(area, input);
|
||||
|
||||
for (ptr = control; *ptr; ptr++)
|
||||
--
|
||||
2.9.3
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
From d27062fe7a520d5791f7a56d175a5cb6a39bae61 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= <stefan.sorensen@spectralink.com>
|
||||
Date: Tue, 18 Apr 2017 12:00:39 +0200
|
||||
Subject: [PATCH] Force grep to treat the input as text when formatting word
|
||||
files.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
|
||||
---
|
||||
util/cracklib-format | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/util/cracklib-format b/util/cracklib-format
|
||||
index 1d7be5b..b1de8e8 100644
|
||||
--- a/util/cracklib-format
|
||||
+++ b/util/cracklib-format
|
||||
@@ -4,7 +4,7 @@
|
||||
# into cracklib-packer
|
||||
#
|
||||
gzip -cdf "$@" |
|
||||
- grep -v '^\(#\|$\)' |
|
||||
+ grep -a -v '^\(#\|$\)' |
|
||||
tr '[A-Z]' '[a-z]' |
|
||||
tr -cd '\012[a-z][0-9]' |
|
||||
env LC_ALL=C sort -u
|
||||
--
|
||||
2.9.3
|
||||
|
||||
28
package/cracklib/Config.in
Normal file
28
package/cracklib/Config.in
Normal file
@ -0,0 +1,28 @@
|
||||
config BR2_PACKAGE_CRACKLIB
|
||||
bool "cracklib"
|
||||
help
|
||||
CrackLib tests passwords to determine whether they match
|
||||
certain security-oriented characteristics, with the purpose
|
||||
of stopping users from choosing passwords that are easy to
|
||||
guess. CrackLib performs several tests on passwords: it
|
||||
tries to generate words from a username and gecos entry and
|
||||
checks those words against the password; it checks for
|
||||
simplistic patterns in passwords; and it checks for the
|
||||
password in a dictionary.
|
||||
|
||||
https://github.com/cracklib/cracklib
|
||||
|
||||
if BR2_PACKAGE_CRACKLIB
|
||||
|
||||
config BR2_PACKAGE_CRACKLIB_TOOLS
|
||||
bool "install tools"
|
||||
help
|
||||
Install cracklib command line tools for creating dicts.
|
||||
|
||||
config BR2_PACKAGE_CRACKLIB_FULL_DICT
|
||||
bool "full dict"
|
||||
help
|
||||
Install the full cracklib dict (requires about 8Mb extra
|
||||
target space).
|
||||
|
||||
endif
|
||||
3
package/cracklib/cracklib.hash
Normal file
3
package/cracklib/cracklib.hash
Normal file
@ -0,0 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 17cf76943de272fd579ed831a1fd85339b393f8d00bf9e0d17c91e972f583343 cracklib-2.9.6.tar.gz
|
||||
sha256 27973245225eeb9d0090e97f3dea4197dec99b64d9d3a791a60298f3b021824c cracklib-words-2.9.6.gz
|
||||
52
package/cracklib/cracklib.mk
Normal file
52
package/cracklib/cracklib.mk
Normal file
@ -0,0 +1,52 @@
|
||||
################################################################################
|
||||
#
|
||||
# cracklib
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CRACKLIB_VERSION = 2.9.6
|
||||
CRACKLIB_SITE = https://github.com/cracklib/cracklib/releases/download/cracklib-$(CRACKLIB_VERSION)
|
||||
CRACKLIB_LICENSE = LGPL-2.1
|
||||
CRACKLIB_LICENSE_FILES = COPYING.LIB
|
||||
CRACKLIB_INSTALL_STAGING = YES
|
||||
CRACKLIB_DEPENDENCIES = host-cracklib
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
CRACKLIB_CONF_OPTS += --with-zlib
|
||||
CRACKLIB_DEPENDENCIES += zlib
|
||||
else
|
||||
CRACKLIB_CONF_OPTS += --without-zlib
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PYTHON),y)
|
||||
CRACKLIB_CONF_OPTS += --with-python
|
||||
CRACKLIB_DEPENDENCIES += python
|
||||
else
|
||||
CRACKLIB_CONF_OPTS += --without-python
|
||||
endif
|
||||
|
||||
HOST_CRACKLIB_CONF_OPTS += --without-python --without-zlib
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CRACKLIB_FULL_DICT),y)
|
||||
CRACKLIB_EXTRA_DOWNLOADS = cracklib-words-$(CRACKLIB_VERSION).gz
|
||||
CRACKLIB_DICT_SOURCE = $(DL_DIR)/cracklib-words-$(CRACKLIB_VERSION).gz
|
||||
else
|
||||
CRACKLIB_DICT_SOURCE = $(@D)/dicts/cracklib-small
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CRACKLIB_TOOLS),)
|
||||
define CRACKLIB_REMOVE_TOOLS
|
||||
rm -f $(TARGET_DIR)/usr/sbin/*cracklib*
|
||||
endef
|
||||
CRACKLIB_POST_INSTALL_TARGET_HOOKS += CRACKLIB_REMOVE_TOOLS
|
||||
endif
|
||||
|
||||
define CRACKLIB_BUILD_DICT
|
||||
$(HOST_MAKE_ENV) cracklib-format $(CRACKLIB_DICT_SOURCE) | \
|
||||
$(HOST_MAKE_ENV) cracklib-packer $(TARGET_DIR)/usr/share/cracklib/pw_dict
|
||||
rm $(TARGET_DIR)/usr/share/cracklib/cracklib-small
|
||||
endef
|
||||
CRACKLIB_POST_INSTALL_TARGET_HOOKS += CRACKLIB_BUILD_DICT
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
Loading…
Reference in New Issue
Block a user