summaryrefslogtreecommitdiff
path: root/app-crypt/mcrypt
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
committerV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
commit4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
treeba5f07bf3f9d22d82e54a462313f5d244036c768 /app-crypt/mcrypt
reinit the tree, so we can have metadata
Diffstat (limited to 'app-crypt/mcrypt')
-rw-r--r--app-crypt/mcrypt/Manifest11
-rw-r--r--app-crypt/mcrypt/files/mcrypt-2.6.7-qa.patch22
-rw-r--r--app-crypt/mcrypt/files/mcrypt-2.6.8-format-string.patch31
-rw-r--r--app-crypt/mcrypt/files/mcrypt-2.6.8-overflow.patch25
-rw-r--r--app-crypt/mcrypt/files/mcrypt-2.6.8-segv.patch40
-rw-r--r--app-crypt/mcrypt/files/mcrypt-2.6.8-sprintf.patch108
-rw-r--r--app-crypt/mcrypt/files/mcrypt-2.6.8-stdlib.h.patch11
-rw-r--r--app-crypt/mcrypt/mcrypt-2.6.8-r3.ebuild31
-rw-r--r--app-crypt/mcrypt/metadata.xml11
9 files changed, 290 insertions, 0 deletions
diff --git a/app-crypt/mcrypt/Manifest b/app-crypt/mcrypt/Manifest
new file mode 100644
index 000000000000..abc7cab05257
--- /dev/null
+++ b/app-crypt/mcrypt/Manifest
@@ -0,0 +1,11 @@
+AUX mcrypt-2.6.7-qa.patch 736 SHA256 8cf4a65124e6354797e7c37f54a182758d3b24f1789c04948ab71dde6309c643 SHA512 f50e2db738583b5dbca80e7458cc341787b94bd475b699de1333e4839b1bc448c0a6d7c759a71849c60fc97d45dbb0f075ad6c5d67d312865eea26118bba4dee WHIRLPOOL f02ecd9a785d2edd1eb28553f714ff93063d64704f04a522323a7e731264e500b845e7bf314b902265b130849760526f99f72d0b15030f3d14f026043d08aa11
+AUX mcrypt-2.6.8-format-string.patch 518 SHA256 9ccf768febe0f9a376c5d1bab939bf0df9e3485bf0c93e3f0f9687286ebb393b SHA512 3056177ad2bf9cbf7cc9a5b3ae272407c0e38ed495ca665a26a9b36d5a0b5c874aff90a28903a6673e35b2691b036aed71721515cadd80c56a96d7604c4cee4a WHIRLPOOL bace7109a43da80fee90776c86c65bf152c7aa7a2e94e9bd7d49213b663801de186b9fe21d9cd4e0f1a81b72b6073e170386781af4cac58721f56ab4cb92835f
+AUX mcrypt-2.6.8-overflow.patch 810 SHA256 b65c8c66dac700b46f29b36bcef19d20d163651b8e48d3daba5f8fd096fca425 SHA512 c884f67011f07245b7dc3c0a689c9bd33664a402ad5585823319084b74c758046938364372ce0ebf2cc898cb704375ff1f1cbee40d6e3d622641a16193857426 WHIRLPOOL 82eaaa94a8f993835bbaf2c8a517256e7e30e30a5b447d5e19e41ac6d09eaa989b8a08d5664d8b6321f7b84a195f0e5a7f452c0263a062b306fdd78572c2b15e
+AUX mcrypt-2.6.8-segv.patch 1330 SHA256 3d93cbb71c9148fbf01a5ce2fe57bd78c33e93acb6fa2d79b756f4d1132436e9 SHA512 7bea9f7731f39d2fed3920cbf6efaf006681e59eaa5dc3a0e50ac0cd3166c959e1ebd06c449329865501bd525a22c49380c4f72b27693f8bc0b0c0c4141a5af2 WHIRLPOOL 5a2e0f71b5237da83fe15556daa9a109ae0b74d63cce5220a1167e1030da92c3b4a8c80beece96e77974391bb34d262887d8bea4725fbe26a2e7a7981359cf01
+AUX mcrypt-2.6.8-sprintf.patch 3617 SHA256 d1cc7f8768afb0cee2fc84fef4a2e9265edce92935050a055a11fc61658dee9f SHA512 36163d3c782a29ab70527d0389e9ee4fc0fdb6d92300a5a576f3702c4b6a63f598e3832fd704570cd3c8da79182e2c57473b84932c26b08d3c8bd509f475a7d8 WHIRLPOOL 6603699756fa5033993177f5e7dda4f3bfa7e96a57e640f484e1cc92b3eb4fd573ce246dbc28d616a90b9dc683caf4f0135789bf38a7f7a62b24100b4988eac0
+AUX mcrypt-2.6.8-stdlib.h.patch 262 SHA256 4654005774c49ab0e36ff0d48fff1a34439e73d1b5a83ac29c8403b4062a9049 SHA512 6f20fe8982cca9fb448ace79c8b8b04260dc63f6a372da4cbf8a7a5d7458f32527e0f31d32387c9f326906fe6fe98013dc49a388b1c987ccca096c9796b409fd WHIRLPOOL f9f949a51db3f8f7ac9f9f197e821f65b6c772f102ac97665c89b4c1d473290f7e781b17cb447a7e964a820516b5933eb07880213354414df2b9c4b1ad0f60ca
+DIST mcrypt-2.6.8.tar.gz 471915 SHA256 5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098 SHA512 eae5f831e950df69eb93efc8314100b4b5dc8a535b1d00f500e6b25382efcec321346776a92dadf101b878ef46a47de2e9e81f5ddf5c73563ece4741f169c8d1 WHIRLPOOL f0853fd1d244de6310a4236fc0922a7d19e8c418b8d4b9cd0a66c4571843ffaf421dca7064c82ae0fde5f3aae4806fe27aa9dc05a705768f52a80586f941b538
+EBUILD mcrypt-2.6.8-r3.ebuild 707 SHA256 f8fed747dfd8530781332e4eb4558ae0c1d4ee6b486ae9971a7e8ba8f475b4cc SHA512 9378c7d796775b8e1edca96194a8d52663f91455cc6df20b76d79b417b7cb43d7309e9682c70c0fbdcb060b92e7d72c5771b1febdb127956e8282cbf95450893 WHIRLPOOL 30a4aea5329c582547fe1adceb17652f47cf459bf3ce4b830f4788d0258190524a5984d95b1b2c7cb97e1687770578e07d6e56643c6be03e1529f6029479e5b1
+MISC ChangeLog 2647 SHA256 5c815c07612b59c3b278dbfbdffba335105c34e163c6c8738307e521038befba SHA512 58279b94249ddfebcc105a1e7413d63bc32192018c4f5b52e3db58394d2fe035aa53db3b2c0c0bc530065bf63dbde14b74e0a224dbdb47576c24e11a02e89870 WHIRLPOOL ad168980d8bbffa353733ce15e6e2841869474cb3504e6371ff7b3226e490f5a00454f5898e8432a22cef64ffd673541199fbcd53be9589b95fd041367b01e9f
+MISC ChangeLog-2015 5454 SHA256 e4517592aecb4cc7986d02bd7badec590d03af33ae4c262018def592fe6639b1 SHA512 f220c802eeb6d0f703b2d4f556c55579b9ce1c8dfd8081452445a3a6d06f6ce47c97917704dd8a59856255e84612974142eee600563be3f026172ab40b15f6b8 WHIRLPOOL 0d06c332640907a30f0312490ab5643d2de5b0cf71cb78229a6ea62e8175ed5443ffd8abee97a98a45372fa9dcbae3ea13155fbdeafadbd6b48e5541d2d8172f
+MISC metadata.xml 326 SHA256 f71c1849263bd37b84b42e4ccf0a1dd61337c20d107d65d477409de9d62f9aa8 SHA512 a5d7a15b6084aebe038f38dc8003040c42434d415ebdb33b225e2772047950d35b2328dba5a7194533608b74ec47ca6a1bfccb56540f3a67308b499b04774207 WHIRLPOOL d0c24732d78b652c61e7cb5c132d9a5562721384cd9115d362481f22e6a788f51a8db7b94eb62615a9b1ab74046fca7ce60648ae2507cbd0c89a9745f088464a
diff --git a/app-crypt/mcrypt/files/mcrypt-2.6.7-qa.patch b/app-crypt/mcrypt/files/mcrypt-2.6.7-qa.patch
new file mode 100644
index 000000000000..368884f7fecb
--- /dev/null
+++ b/app-crypt/mcrypt/files/mcrypt-2.6.7-qa.patch
@@ -0,0 +1,22 @@
+diff -urNp mcrypt-2.6.7.org/src/gaaout.c mcrypt-2.6.7/src/gaaout.c
+--- mcrypt-2.6.7.org/src/gaaout.c 2007-06-09 11:39:14.000000000 +0300
++++ mcrypt-2.6.7/src/gaaout.c 2007-11-10 14:30:22.000000000 +0200
+@@ -5,6 +5,7 @@
+
+
+ #include <defines.h>
++#include "mcrypt_int.h"
+
+ #include <stdio.h>
+ #include <string.h>
+diff -urNp mcrypt-2.6.7.org/src/mcrypt_int.h mcrypt-2.6.7/src/mcrypt_int.h
+--- mcrypt-2.6.7.org/src/mcrypt_int.h 2003-09-08 20:25:50.000000000 +0300
++++ mcrypt-2.6.7/src/mcrypt_int.h 2007-11-10 14:27:42.000000000 +0200
+@@ -15,3 +15,7 @@ void rol_buf(void * buffer, int buffersi
+ void mcrypt_version();
+ void mcrypt_license();
+ void usage(void);
++
++int print_list(void);
++int print_hashlist(void);
++int print_keylist(void);
diff --git a/app-crypt/mcrypt/files/mcrypt-2.6.8-format-string.patch b/app-crypt/mcrypt/files/mcrypt-2.6.8-format-string.patch
new file mode 100644
index 000000000000..ceeb28f38e0d
--- /dev/null
+++ b/app-crypt/mcrypt/files/mcrypt-2.6.8-format-string.patch
@@ -0,0 +1,31 @@
+--- a/src/errors.c
++++ b/src/errors.c
+@@ -25,24 +25,24 @@
+
+ void err_quit(char *errmsg)
+ {
+- fprintf(stderr, errmsg);
++ fprintf(stderr, "%s", errmsg);
+ exit(-1);
+ }
+
+ void err_warn(char *errmsg)
+ {
+ if (quiet <= 1)
+- fprintf(stderr, errmsg);
++ fprintf(stderr, "%s", errmsg);
+ }
+
+ void err_info(char *errmsg)
+ {
+ if (quiet == 0)
+- fprintf(stderr, errmsg);
++ fprintf(stderr, "%s", errmsg);
+ }
+
+ void err_crit(char *errmsg)
+ {
+ if (quiet <= 2)
+- fprintf(stderr, errmsg);
++ fprintf(stderr, "%s", errmsg);
+ }
diff --git a/app-crypt/mcrypt/files/mcrypt-2.6.8-overflow.patch b/app-crypt/mcrypt/files/mcrypt-2.6.8-overflow.patch
new file mode 100644
index 000000000000..97c658bb2d3b
--- /dev/null
+++ b/app-crypt/mcrypt/files/mcrypt-2.6.8-overflow.patch
@@ -0,0 +1,25 @@
+From 3efb40e17ce4f76717ae17a1ce1e1f747ddf59fd Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 22 Dec 2012 22:37:06 +0200
+Subject: [PATCH] cleanup: buffer overflow
+
+---
+ src/extra.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/extra.c b/src/extra.c
+index 3082f82..c7a1ac0 100644
+--- a/src/extra.c
++++ b/src/extra.c
+@@ -241,6 +241,8 @@ int check_file_head(FILE * fstream, char *algorithm, char *mode,
+ if (m_getbit(6, flags) == 1) { /* if the salt bit is set */
+ if (m_getbit(0, sflag) != 0) { /* if the first bit is set */
+ *salt_size = m_setbit(0, sflag, 0);
++ if (*salt_size > sizeof(tmp_buf))
++ err_quit(_("Salt is too long\n"));
+ if (*salt_size > 0) {
+ fread(tmp_buf, 1, *salt_size,
+ fstream);
+--
+1.7.8.6
+
diff --git a/app-crypt/mcrypt/files/mcrypt-2.6.8-segv.patch b/app-crypt/mcrypt/files/mcrypt-2.6.8-segv.patch
new file mode 100644
index 000000000000..478b3cbc0f6e
--- /dev/null
+++ b/app-crypt/mcrypt/files/mcrypt-2.6.8-segv.patch
@@ -0,0 +1,40 @@
+From 5bee29fae8f0e936ad4c957aef6035d09532a57a Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 22 Dec 2012 22:04:27 +0200
+Subject: [PATCH] cleanup: fixup segv on buffer access
+
+use exact buffer size instead of guess.
+
+do not copy out of source buffer.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ src/rfc2440.c | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/rfc2440.c b/src/rfc2440.c
+index 5a1f296..929b9ab 100644
+--- a/src/rfc2440.c
++++ b/src/rfc2440.c
+@@ -497,7 +497,7 @@ plaintext_encode(const USTRING dat)
+ time_t t;
+
+ assert(dat->len > 0);
+- result = make_ustring( NULL, 2 * dat->len); /* xxx */
++ result = make_ustring( NULL, dat->len + 12); /* xxx */
+ newdat = (USTRING)dat;
+ result->d[pos++] = (0x80 | 0x40 | PKT_PLAINTEXT);
+
+@@ -810,7 +810,8 @@ encrypted_encode(const USTRING pt, const DEK *dek)
+ _mcrypt_encrypt(dek->hd, rndpref, dek->blocklen + 2, NULL, 0);
+ _mcrypt_sync(dek->hd, rndpref, dek->blocklen);
+
+- ct = make_ustring( rndpref, 2 * pt->len); /* xxx */
++ ct = make_ustring( NULL, dek->blocklen + 2 + pt->len + 12); /* xxx */
++ memcpy(ct->d, rndpref, dek->blocklen + 2);
+ pos = dek->blocklen + 2;
+
+ _mcrypt_encrypt(dek->hd, ct->d + pos, pt->len, pt->d, pt->len);
+--
+1.7.8.6
+
diff --git a/app-crypt/mcrypt/files/mcrypt-2.6.8-sprintf.patch b/app-crypt/mcrypt/files/mcrypt-2.6.8-sprintf.patch
new file mode 100644
index 000000000000..a287680958bb
--- /dev/null
+++ b/app-crypt/mcrypt/files/mcrypt-2.6.8-sprintf.patch
@@ -0,0 +1,108 @@
+Description: [CVE-2012-4527] Stack-based buffer overflow with long file names
+ .
+ A buffer overflow in mcrypt version 2.6.8 and earlier due to long filenames.
+ If a user were tricked into attempting to encrypt/decrypt specially crafted
+ long filename(s), this flaw would cause a stack-based buffer overflow that
+ could potentially lead to arbitrary code execution.
+ .
+ Note that this is caught by FORTIFY_SOURCE, which makes this a crash-only
+ bug on wheezy.
+Author: Attila Bogar, Jean-Michel Vourgère <jmv_deb@nirgal.com>
+Origin: https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2012-4527
+Bug: CVE-2012-4527
+Bug-Debian: http://bugs.debian.org/690924
+Forwarded: no
+Last-Update: 2012-11-01
+Index: mcrypt-2.6.8/src/mcrypt.c
+===================================================================
+--- mcrypt-2.6.8.orig/src/mcrypt.c
++++ mcrypt-2.6.8/src/mcrypt.c
+@@ -41,4 +41,6 @@
+
++/* Temporary error message can contain one file name and 1k of text */
++#define ERRWIDTH ((PATH_MAX)+1024)
+-char tmperr[128];
++char tmperr[ERRWIDTH];
+ unsigned int stream_flag = FALSE;
+ char *keymode = NULL;
+ char *mode = NULL;
+@@ -482,7 +485,7 @@
+ #ifdef HAVE_STAT
+ if (stream_flag == FALSE) {
+ if (is_normal_file(file[i]) == FALSE) {
+- sprintf(tmperr,
++ snprintf(tmperr, ERRWIDTH,
+ _
+ ("%s: %s is not a regular file. Skipping...\n"),
+ program_name, file[i]);
+@@ -501,7 +504,7 @@
+ dinfile = file[i];
+ if ((isatty(fileno((FILE *) (stdin))) == 1)
+ && (stream_flag == TRUE) && (force == 0)) { /* not a tty */
+- sprintf(tmperr,
++ snprintf(tmperr, ERRWIDTH,
+ _
+ ("%s: Encrypted data will not be read from a terminal.\n"),
+ program_name);
+@@ -520,7 +523,7 @@
+ einfile = file[i];
+ if ((isatty(fileno((FILE *) (stdout))) == 1)
+ && (stream_flag == TRUE) && (force == 0)) { /* not a tty */
+- sprintf(tmperr,
++ snprintf(tmperr, ERRWIDTH,
+ _
+ ("%s: Encrypted data will not be written to a terminal.\n"),
+ program_name);
+@@ -544,7 +547,7 @@
+ strcpy(outfile, einfile);
+ /* if file has already the .nc ignore it */
+ if (strstr(outfile, ".nc") != NULL) {
+- sprintf(tmperr,
++ snprintf(tmperr, ERRWIDTH,
+ _
+ ("%s: file %s has the .nc suffix... skipping...\n"),
+ program_name, outfile);
+@@ -590,10 +593,10 @@
+
+ if (x == 0) {
+ if (stream_flag == FALSE) {
+- sprintf(tmperr, _("File %s was decrypted.\n"), dinfile);
++ snprintf(tmperr, ERRWIDTH, _("File %s was decrypted.\n"), dinfile);
+ err_warn(tmperr);
+ } else {
+- sprintf(tmperr, _("Stdin was decrypted.\n"));
++ snprintf(tmperr, ERRWIDTH, _("Stdin was decrypted.\n"));
+ err_warn(tmperr);
+ }
+ #ifdef HAVE_STAT
+@@ -610,7 +613,7 @@
+
+ } else {
+ if (stream_flag == FALSE) {
+- sprintf(tmperr,
++ snprintf(tmperr, ERRWIDTH,
+ _
+ ("File %s was NOT decrypted successfully.\n"),
+ dinfile);
+@@ -636,10 +639,10 @@
+
+ if (x == 0) {
+ if (stream_flag == FALSE) {
+- sprintf(tmperr, _("File %s was encrypted.\n"), einfile);
++ snprintf(tmperr, ERRWIDTH, _("File %s was encrypted.\n"), einfile);
+ err_warn(tmperr);
+ } else {
+- sprintf(tmperr, _("Stdin was encrypted.\n"));
++ snprintf(tmperr, ERRWIDTH, _("Stdin was encrypted.\n"));
+ err_warn(tmperr);
+ }
+ #ifdef HAVE_STAT
+@@ -655,7 +658,7 @@
+
+ } else {
+ if (stream_flag == FALSE) {
+- sprintf(tmperr,
++ snprintf(tmperr, ERRWIDTH,
+ _
+ ("File %s was NOT encrypted successfully.\n"),
+ einfile);
diff --git a/app-crypt/mcrypt/files/mcrypt-2.6.8-stdlib.h.patch b/app-crypt/mcrypt/files/mcrypt-2.6.8-stdlib.h.patch
new file mode 100644
index 000000000000..c4bdb18a6dbc
--- /dev/null
+++ b/app-crypt/mcrypt/files/mcrypt-2.6.8-stdlib.h.patch
@@ -0,0 +1,11 @@
+--- a/src/rfc2440.c 2008-11-17 06:50:01.000000000 +1100
++++ b/src/rfc2440.c 2010-08-10 13:48:28.000000000 +1000
+@@ -23,7 +23,7 @@
+ #include <zlib.h>
+ #endif
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+
+ #include "xmalloc.h"
+ #include "keys.h"
diff --git a/app-crypt/mcrypt/mcrypt-2.6.8-r3.ebuild b/app-crypt/mcrypt/mcrypt-2.6.8-r3.ebuild
new file mode 100644
index 000000000000..03b77bb3afb3
--- /dev/null
+++ b/app-crypt/mcrypt/mcrypt-2.6.8-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="replacement of the old unix crypt(1)"
+HOMEPAGE="http://mcrypt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86 ~x86-macos"
+IUSE="nls"
+
+DEPEND=">=dev-libs/libmcrypt-2.5.8
+ >=app-crypt/mhash-0.9.9
+ sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.6.7-qa.patch"
+ "${FILESDIR}/${P}-stdlib.h.patch"
+ "${FILESDIR}/${P}-segv.patch"
+ "${FILESDIR}/${P}-sprintf.patch"
+ "${FILESDIR}/${P}-format-string.patch"
+ "${FILESDIR}/${P}-overflow.patch"
+)
+
+src_configure() {
+ econf $(use_enable nls)
+}
diff --git a/app-crypt/mcrypt/metadata.xml b/app-crypt/mcrypt/metadata.xml
new file mode 100644
index 000000000000..a07f7533cf4a
--- /dev/null
+++ b/app-crypt/mcrypt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">mcrypt</remote-id>
+ </upstream>
+</pkgmetadata>