me/guix
Archived
1
0
Fork 0
Code Activity

gnu: mcrypt: Fix patches for CVE-2012-{4409,4527}.

Browse source 
This fixes CVE-2012-{4409,4527}.

This is a followup to commit fd1461879c.

* gnu/packages/patches/mcrypt-CVE-2012-4409.patch,
gnu/packages/patches/mcrypt-CVE-2012-4527.patch: Apply the patches to the mcrypt
source code.
This commit is contained in:
Leo Famulari 2017-01-04 02:37:51 -05:00
parent 37e8a2e219
commit 324f4fc559
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
2 changed files with 104 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
gnu/packages/patches/mcrypt-CVE-2012-4409.patch
View file

@ -3,30 +3,17 @@ From: Tom Callaway <spot@fedoraproject.org>
Date: Fri, 7 Sep 2012 11:39:29 -0400 Date: Fri, 7 Sep 2012 11:39:29 -0400
Subject: apply fix for CVE-2012-4409 (thanks to Raphael Geissert) Subject: apply fix for CVE-2012-4409 (thanks to Raphael Geissert)
--- --- mcrypt-2.6.8/src/extra.c.CVE-2012-4409 2012-09-07 11:00:55.906870746 -0400
mcrypt-CVE-2012-4409.patch | 12 ++++++++++++ +++ mcrypt-2.6.8/src/extra.c 2012-09-07 11:00:27.967858365 -0400
mcrypt.spec | 10 +++++++++- @@ -242,6 +242,8 @@ int check_file_head(FILE * fstream, char
2 files changed, 21 insertions(+), 1 deletion(-) if (m_getbit(0, sflag) != 0) { /* if the first bit is set */
create mode 100644 mcrypt-CVE-2012-4409.patch *salt_size = m_setbit(0, sflag, 0);
if (*salt_size > 0) {
diff --git a/mcrypt-CVE-2012-4409.patch b/mcrypt-CVE-2012-4409.patch + if (*salt_size > sizeof(tmp_buf))
new file mode 100644 + err_quit(_("Salt is too long\n"));
index 0000000..747f428 fread(tmp_buf, 1, *salt_size,
--- /dev/null fstream);
+++ b/mcrypt-CVE-2012-4409.patch memmove(salt, tmp_buf, *salt_size);
@@ -0,0 +1,12 @@
+diff -up mcrypt-2.6.8/src/extra.c.CVE-2012-4409 mcrypt-2.6.8/src/extra.c
+--- mcrypt-2.6.8/src/extra.c.CVE-2012-4409 2012-09-07 11:00:55.906870746 -0400
++++ mcrypt-2.6.8/src/extra.c 2012-09-07 11:00:27.967858365 -0400
+@@ -242,6 +242,8 @@ int check_file_head(FILE * fstream, char
+ if (m_getbit(0, sflag) != 0) { /* if the first bit is set */
+ *salt_size = m_setbit(0, sflag, 0);
+ if (*salt_size > 0) {
++ if (*salt_size > sizeof(tmp_buf))
++ err_quit(_("Salt is too long\n"));
+ fread(tmp_buf, 1, *salt_size,
+ fstream);
+ memmove(salt, tmp_buf, *salt_size);
-- --
cgit v0.12 cgit v0.12

198
gnu/packages/patches/mcrypt-CVE-2012-4527.patch
View file

@ -3,109 +3,97 @@ From: Tom Callaway <spot@fedoraproject.org>
Date: Tue, 30 Oct 2012 15:39:24 -0400 Date: Tue, 30 Oct 2012 15:39:24 -0400
Subject: apply workaround to CVE-2012-4527 Subject: apply workaround to CVE-2012-4527
--- --- mcrypt-2.6.8.orig/src/mcrypt.c
mcrypt-CVE-2012-4527-80-width-patch | 91 +++++++++++++++++++++++++++++++++++++ +++ mcrypt-2.6.8/src/mcrypt.c
mcrypt.spec | 10 +++- @@ -41,6 +41,8 @@
2 files changed, 100 insertions(+), 1 deletion(-) # include <time.h>
create mode 100644 mcrypt-CVE-2012-4527-80-width-patch #endif
diff --git a/mcrypt-CVE-2012-4527-80-width-patch b/mcrypt-CVE-2012-4527-80-width-patch +#define WIDTH 80
new file mode 100644 +
index 0000000..0eb94d8 static char rcsid[] =
--- /dev/null "$Id: mcrypt.c,v 1.2 2007/11/07 17:10:21 nmav Exp $";
+++ b/mcrypt-CVE-2012-4527-80-width-patch
@@ -0,0 +1,91 @@ @@ -482,7 +484,7 @@
+--- mcrypt-2.6.8.orig/src/mcrypt.c #ifdef HAVE_STAT
++++ mcrypt-2.6.8/src/mcrypt.c if (stream_flag == FALSE) {
+@@ -41,6 +41,8 @@ if (is_normal_file(file[i]) == FALSE) {
+ # include <time.h> - sprintf(tmperr,
+ #endif + snprintf(tmperr, WIDTH,
+ _
++#define WIDTH 80 ("%s: %s is not a regular file. Skipping...\n"),
++ program_name, file[i]);
+ static char rcsid[] = @@ -501,7 +503,7 @@
+ "$Id: mcrypt.c,v 1.2 2007/11/07 17:10:21 nmav Exp $"; dinfile = file[i];
+ if ((isatty(fileno((FILE *) (stdin))) == 1)
+@@ -482,7 +484,7 @@ && (stream_flag == TRUE) && (force == 0)) { /* not a tty */
+ #ifdef HAVE_STAT - sprintf(tmperr,
+ if (stream_flag == FALSE) { + snprintf(tmperr, WIDTH,
+ if (is_normal_file(file[i]) == FALSE) { _
+- sprintf(tmperr, ("%s: Encrypted data will not be read from a terminal.\n"),
++ snprintf(tmperr, WIDTH, program_name);
+ _ @@ -520,7 +522,7 @@
+ ("%s: %s is not a regular file. Skipping...\n"), einfile = file[i];
+ program_name, file[i]); if ((isatty(fileno((FILE *) (stdout))) == 1)
+@@ -501,7 +503,7 @@ && (stream_flag == TRUE) && (force == 0)) { /* not a tty */
+ dinfile = file[i]; - sprintf(tmperr,
+ if ((isatty(fileno((FILE *) (stdin))) == 1) + snprintf(tmperr, WIDTH,
+ && (stream_flag == TRUE) && (force == 0)) { /* not a tty */ _
+- sprintf(tmperr, ("%s: Encrypted data will not be written to a terminal.\n"),
++ snprintf(tmperr, WIDTH, program_name);
+ _ @@ -544,7 +546,7 @@
+ ("%s: Encrypted data will not be read from a terminal.\n"), strcpy(outfile, einfile);
+ program_name); /* if file has already the .nc ignore it */
+@@ -520,7 +522,7 @@ if (strstr(outfile, ".nc") != NULL) {
+ einfile = file[i]; - sprintf(tmperr,
+ if ((isatty(fileno((FILE *) (stdout))) == 1) + snprintf(tmperr, WIDTH,
+ && (stream_flag == TRUE) && (force == 0)) { /* not a tty */ _
+- sprintf(tmperr, ("%s: file %s has the .nc suffix... skipping...\n"),
++ snprintf(tmperr, WIDTH, program_name, outfile);
+ _ @@ -590,10 +592,10 @@
+ ("%s: Encrypted data will not be written to a terminal.\n"),
+ program_name); if (x == 0) {
+@@ -544,7 +546,7 @@ if (stream_flag == FALSE) {
+ strcpy(outfile, einfile); - sprintf(tmperr, _("File %s was decrypted.\n"), dinfile);
+ /* if file has already the .nc ignore it */ + snprintf(tmperr, WIDTH, _("File %s was decrypted.\n"), dinfile);
+ if (strstr(outfile, ".nc") != NULL) { err_warn(tmperr);
+- sprintf(tmperr, } else {
++ snprintf(tmperr, WIDTH, - sprintf(tmperr, _("Stdin was decrypted.\n"));
+ _ + snprintf(tmperr, WIDTH, _("Stdin was decrypted.\n"));
+ ("%s: file %s has the .nc suffix... skipping...\n"), err_warn(tmperr);
+ program_name, outfile); }
+@@ -590,10 +592,10 @@ #ifdef HAVE_STAT
+ @@ -610,7 +612,7 @@
+ if (x == 0) {
+ if (stream_flag == FALSE) { } else {
+- sprintf(tmperr, _("File %s was decrypted.\n"), dinfile); if (stream_flag == FALSE) {
++ snprintf(tmperr, WIDTH, _("File %s was decrypted.\n"), dinfile); - sprintf(tmperr,
+ err_warn(tmperr); + snprintf(tmperr, WIDTH,
+ } else { _
+- sprintf(tmperr, _("Stdin was decrypted.\n")); ("File %s was NOT decrypted successfully.\n"),
++ snprintf(tmperr, WIDTH, _("Stdin was decrypted.\n")); dinfile);
+ err_warn(tmperr); @@ -636,10 +638,10 @@
+ }
+ #ifdef HAVE_STAT if (x == 0) {
+@@ -610,7 +612,7 @@ if (stream_flag == FALSE) {
+ - sprintf(tmperr, _("File %s was encrypted.\n"), einfile);
+ } else { + snprintf(tmperr, WIDTH, _("File %s was encrypted.\n"), einfile);
+ if (stream_flag == FALSE) { err_warn(tmperr);
+- sprintf(tmperr, } else {
++ snprintf(tmperr, WIDTH, - sprintf(tmperr, _("Stdin was encrypted.\n"));
+ _ + snprintf(tmperr, WIDTH, _("Stdin was encrypted.\n"));
+ ("File %s was NOT decrypted successfully.\n"), err_warn(tmperr);
+ dinfile); }
+@@ -636,10 +638,10 @@ #ifdef HAVE_STAT
+ @@ -655,7 +657,7 @@
+ if (x == 0) {
+ if (stream_flag == FALSE) { } else {
+- sprintf(tmperr, _("File %s was encrypted.\n"), einfile); if (stream_flag == FALSE) {
++ snprintf(tmperr, WIDTH, _("File %s was encrypted.\n"), einfile); - sprintf(tmperr,
+ err_warn(tmperr); + snprintf(tmperr, WIDTH,
+ } else { _
+- sprintf(tmperr, _("Stdin was encrypted.\n")); ("File %s was NOT encrypted successfully.\n"),
++ snprintf(tmperr, WIDTH, _("Stdin was encrypted.\n")); einfile);
+ err_warn(tmperr); -
+ } git v0.12
+ #ifdef HAVE_STAT
+@@ -655,7 +657,7 @@
+
+ } else {
+ if (stream_flag == FALSE) {
+- sprintf(tmperr,
++ snprintf(tmperr, WIDTH,
+ _
+ ("File %s was NOT encrypted successfully.\n"),
+ einfile);
--
cgit v0.12