diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-04 12:45:06 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-04 18:34:53 +0100 |
commit | 9443129b08b37a6f4267d257cd8d42dd92a2539c (patch) | |
tree | aec261361299cc2d85827dbcf5d03b594ae85e28 /pkgs/tools/networking/openssh/gcmrekey.patch | |
parent | f78534ca0f8ec63d79370eb2367605579efba088 (diff) | |
parent | f6d51f7717cffd8b220ce02498db8b8359b5964c (diff) | |
download | nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.gz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.bz2 nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.lz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.xz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.zst nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.zip |
Merge master into stdenv-updates
Conflicts: pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates) pkgs/misc/emulators/zsnes/default.nix (more complex, build tested) pkgs/top-level/all-packages.nix (auto-solved)
Diffstat (limited to 'pkgs/tools/networking/openssh/gcmrekey.patch')
-rw-r--r-- | pkgs/tools/networking/openssh/gcmrekey.patch | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/pkgs/tools/networking/openssh/gcmrekey.patch b/pkgs/tools/networking/openssh/gcmrekey.patch deleted file mode 100644 index ddb694af1ddb..000000000000 --- a/pkgs/tools/networking/openssh/gcmrekey.patch +++ /dev/null @@ -1,18 +0,0 @@ -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; |