mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
openssh: apply patch to fix https://bugzilla.redhat.com/show_bug.cgi?id=1380296
This commit is contained in:
parent
e3deccc0d7
commit
83a8cb1dc2
2 changed files with 38 additions and 0 deletions
|
@ -0,0 +1,37 @@
|
|||
diff --git a/kex.c b/kex.c
|
||||
index 50c7a0f..823668b 100644
|
||||
--- a/kex.c
|
||||
+++ b/kex.c
|
||||
@@ -419,6 +419,8 @@ kex_input_newkeys(int type, u_int32_t seq, void *ctxt)
|
||||
ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_protocol_error);
|
||||
if ((r = sshpkt_get_end(ssh)) != 0)
|
||||
return r;
|
||||
+ if ((r = ssh_set_newkeys(ssh, MODE_IN)) != 0)
|
||||
+ return r;
|
||||
kex->done = 1;
|
||||
sshbuf_reset(kex->peer);
|
||||
/* sshbuf_reset(kex->my); */
|
||||
diff --git a/packet.c b/packet.c
|
||||
index d6dad2d..f96566b 100644
|
||||
--- a/packet.c
|
||||
+++ b/packet.c
|
||||
@@ -38,7 +38,7 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
-
|
||||
+
|
||||
#include <sys/param.h> /* MIN roundup */
|
||||
#include <sys/types.h>
|
||||
#include "openbsd-compat/sys-queue.h"
|
||||
@@ -1907,9 +1907,7 @@ ssh_packet_read_poll2(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p)
|
||||
return r;
|
||||
return SSH_ERR_PROTOCOL_ERROR;
|
||||
}
|
||||
- if (*typep == SSH2_MSG_NEWKEYS)
|
||||
- r = ssh_set_newkeys(ssh, MODE_IN);
|
||||
- else if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side)
|
||||
+ if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side)
|
||||
r = ssh_packet_enable_delayed_compress(ssh);
|
||||
else
|
||||
r = 0;
|
|
@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches =
|
||||
[
|
||||
./RH-1380296-NEWKEYS-null-pointer-deref.patch
|
||||
./locale_archive.patch
|
||||
./fix-host-key-algorithms-plus.patch
|
||||
|
||||
|
|
Loading…
Reference in a new issue