From 4876e3a692739bb9ca00d0f500fd5f4b3eb16ce3 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Fri, 7 Sep 2012 11:39:29 -0400
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-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

cted='selected'>koszko</option>
<option value='koszko-scripts'>koszko-scripts</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=085a8a0cdfef7c414c92dcf2b0ea9aa970888a62'>refs</a><a class='active' href='/guix/log/build-aux/test-env.in'>log</a><a href='/guix/tree/build-aux/test-env.in?id=085a8a0cdfef7c414c92dcf2b0ea9aa970888a62'>tree</a><a href='/guix/commit/build-aux/test-env.in?id=085a8a0cdfef7c414c92dcf2b0ea9aa970888a62'>commit</a><a href='/guix/diff/build-aux/test-env.in?id=085a8a0cdfef7c414c92dcf2b0ea9aa970888a62'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/build-aux/test-env.in'>
<input type='hidden' name='id' value='085a8a0cdfef7c414c92dcf2b0ea9aa970888a62'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=085a8a0cdfef7c414c92dcf2b0ea9aa970888a62'>root</a>/<a href='/guix/log/build-aux?id=085a8a0cdfef7c414c92dcf2b0ea9aa970888a62'>build-aux</a>/<a href='/guix/log/build-aux/test-env.in?id=085a8a0cdfef7c414c92dcf2b0ea9aa970888a62'>test-env.in</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/build-aux/test-env.in?id=085a8a0cdfef7c414c92dcf2b0ea9aa970888a62&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-04-20 12:13:16 +0200'>2021-04-20</span></td><td><a href='/guix/commit/build-aux/test-env.in?id=d95168321f4a9bf6857b598da0a183b45a868d54'>import: Remove Nix importer.</a><span class='msg-avail'>...<span class='msg-tooltip'>This importer has suffered from bitrot and no longer works with current
Nix and Nixpkgs.  See &lt;https://bugs.gnu.org/32339&gt; and
&lt;https://bugs.gnu.org/36255&gt;.

* guix/import/snix.scm, guix/scripts/import/nix.scm,
tests/snix.scm: Remove.
* Makefile.am (MODULES, SCM_TESTS): Remove them.
* guix/scripts/import.scm (importers): Remove "nix".
* build-aux/test-env.in: Remove NIXPKGS variable.
* configure.ac: Remove '--with-nixpkgs' option.
* doc/guix.texi (Invoking guix import): Remove bit about "guix import
nix".
* etc/completion/fish/guix.fish: Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-10-16 22:53:40 +0200'>2019-10-16</span></td><td><a href='/guix/commit/build-aux/test-env.in?id=a1aaca314ca94700ebe3449d6bd73522f2d243bc'>build: Remove references to 'NIX_LOCALSTATE_DIR'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* build-aux/test-env.in: Remove references to 'NIX_LOCALSTATE_DIR'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-10-16 22:53:40 +0200'>2019-10-16</span></td><td><a href='/guix/commit/build-aux/test-env.in?id=47e99e626b46b2fc433506a822d251de68ad6241'>daemon: Remove traces of 'NIX_ROOT_FINDER'.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to 2e3e5d21988fc2cafb2a9eaf4b00976ea425629d.

* build-aux/test-env.in: Remove mentions of 'NIX_ROOT_FINDER'.
* nix/libstore/gc.cc (LocalStore::collectGarbage): Adjust comment
accordingly.
</span></span></td><td>Ludovic Courtès</td></tr>