public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openssh: Security fix

Browse Source 
CVE-2013-4548
This commit is contained in:
Eelco Dolstra 2013-11-08 16:42:59 +01:00
parent 065493284f
commit 52ad0eaca5
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/networking/openssh/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
''; '';
patches = [ ./locale_archive.patch ]; patches = [ ./locale_archive.patch ./gcmrekey.patch ];
buildInputs = [ zlib openssl libedit pkgconfig pam ] ++ buildInputs = [ zlib openssl libedit pkgconfig pam ] ++
(if withKerberos then [ kerberos ] else []) (if withKerberos then [ kerberos ] else [])

18
pkgs/tools/networking/openssh/gcmrekey.patch Normal file
View File

@ -0,0 +1,18 @@
http://www.openssh.com/txt/gcmrekey.adv
Index: monitor_wrap.c
===================================================================
RCS file: /cvs/src/usr.bin/ssh/monitor_wrap.c,v
retrieving revision 1.76
diff -u -p -u -r1.76 monitor_wrap.c
--- a/monitor_wrap.c 17 May 2013 00:13:13 -0000 1.76
+++ b/monitor_wrap.c 6 Nov 2013 16:31:26 -0000
@@ -469,7 +469,7 @@ mm_newkeys_from_blob(u_char *blob, int b
buffer_init(&b);
buffer_append(&b, blob, blen);
- newkey = xmalloc(sizeof(*newkey));
+ newkey = xcalloc(1, sizeof(*newkey));
enc = &newkey->enc;
mac = &newkey->mac;
comp = &newkey->comp;