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

ed='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=0497b1696f75b2b589e4ae841fe24c61d7477953'>refs</a><a class='active' href='/guix/log/gnu/services/vpn.scm'>log</a><a href='/guix/tree/gnu/services/vpn.scm?id=0497b1696f75b2b589e4ae841fe24c61d7477953'>tree</a><a href='/guix/commit/gnu/services/vpn.scm?id=0497b1696f75b2b589e4ae841fe24c61d7477953'>commit</a><a href='/guix/diff/gnu/services/vpn.scm?id=0497b1696f75b2b589e4ae841fe24c61d7477953'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services/vpn.scm'>
<input type='hidden' name='id' value='0497b1696f75b2b589e4ae841fe24c61d7477953'/><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=0497b1696f75b2b589e4ae841fe24c61d7477953'>root</a>/<a href='/guix/log/gnu?id=0497b1696f75b2b589e4ae841fe24c61d7477953'>gnu</a>/<a href='/guix/log/gnu/services?id=0497b1696f75b2b589e4ae841fe24c61d7477953'>services</a>/<a href='/guix/log/gnu/services/vpn.scm?id=0497b1696f75b2b589e4ae841fe24c61d7477953'>vpn.scm</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/gnu/services/vpn.scm?id=0497b1696f75b2b589e4ae841fe24c61d7477953&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-09-09 12:24:12 +0200'>2023-09-09</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=5e72bb5c67943fecf690190bdccbda2bf16d12b0'>services: vpn: Fix broken format string for wireguard dns.</a><span class='msg-avail'>...</span></td><td>Reily Siegel</td></tr>
<tr><td><span title='2023-07-21 11:58:45 -0400'>2023-07-21</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=bdcf23cf69d47a1b576e70da63da08518329c0f5'>services: wireguard: Add a 'configuration' action.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2023-07-21 11:58:44 -0400'>2023-07-21</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=d2385da87e9c5f93ffb8af246cd28a4c2e8fcc0f'>services: wireguard: Clean-up configuration file serializer.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2023-07-21 11:58:44 -0400'>2023-07-21</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=8d785c43bad05546cfe8e08a1bbe065a63215f9d'>services: wireguard: Implement a dynamic IP monitoring feature.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2023-03-03 17:55:34 +0100'>2023-03-03</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=eddd9b1240897caabf64c90549ffa940eef45ce7'>services: vpn: Deprecate 'openvpn-client-service' &amp; 'openvpn-server-service' ...</a><span class='msg-avail'>...</span></td><td>Bruno Victal</td></tr>
<tr><td><span title='2022-12-25 16:56:48 +0100'>2022-12-25</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=2967abf1a2ae6787842c04752949f3c214da9338'>services: wireguard: Allow specifying pre-shared keys.</a><span class='msg-avail'>...</span></td><td>Timo Wilken</td></tr>
<tr><td><span title='2022-12-09 10:53:50 +0800'>2022-12-09</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=8d6feb4b10752fa0261d54d2d906642a5fcc08fa'>services: wireguard: Use the parameterized wireguard package.</a><span class='msg-avail'>...</span></td><td>EuAndreh</td></tr>
<tr><td><span title='2022-11-13 14:03:54 +0100'>2022-11-13</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=5ef933efa4d8f1b656f978023509222173ee6e9c'>services: vpn: Fix the profile wireguard package.</a><span class='msg-avail'>...</span></td><td>EuAndreh</td></tr>
<tr><td><span title='2022-11-12 18:40:16 +0100'>2022-11-12</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=fb35b7cedd48a47820b0c250677b7ec6ac78fdc1'>services: vpn: Add wireguard-tools to profile-service-type.</a><span class='msg-avail'>...</span></td><td>EuAndreh</td></tr>
<tr><td><span title='2022-10-20 13:07:46 +0200'>2022-10-20</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=7ee77dc6df625b974b8fc3a00b7144087b60a410'>services: wireguard: Add more configuration fields.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2022-06-24 23:18:21 +0200'>2022-06-24</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=6505f727e1824391b888dd0c2c60cf64ec66955a'>services: configuration: Remove 'validate-configuration'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-06-22 22:29:48 +0200'>2022-06-22</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=3c0c6ee57315baf446e77730f5abdec62f516f1b'>services: wireguard: Shepherd 'stop' method really stops.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-06-15 00:25:21 +0200'>2022-06-15</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=8cb1a49a3998c39f315a4199b7d4a121a6d66449'>services: configuration: Use *unspecified* instead of 'disabled.</a><span class='msg-avail'>...</span></td><td>Attila Lendvai</td></tr>
<tr><td><span title='2022-04-29 18:07:16 +0200'>2022-04-29</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=9d7248cd87fbda8c717341a8092780782bef0820'>services: Add missing 'description' fields.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-03-03 23:57:01 +0100'>2022-03-03</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=48bd8b408e1de93e8dc8bf134942b7b6141fc6ad'>services: openvpn: Actually save log file.</a><span class='msg-avail'>...</span></td><td>Cameron Chaparro</td></tr>