summaryrefslogtreecommitdiff
path: root/sshconnect1.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2014-02-10 00:18:28 +0000
committerColin Watson <cjwatson@debian.org>2014-02-10 00:18:28 +0000
commit9a975a9faed7c4f334e8c8490db3e77e102f2b21 (patch)
tree764a885ec9a963f6a8b15de6e1765f16b9ac4738 /sshconnect1.c
parentee196dab7c5f97f0b80c8099343a375bead92010 (diff)
parentcdb6c90811caa5df2df856be9b0b16db020fe31d (diff)
Import openssh_6.5p1.orig.tar.gz
Diffstat (limited to 'sshconnect1.c')
-rw-r--r--sshconnect1.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sshconnect1.c b/sshconnect1.c
index d285e23c0..7bd6cb018 100644
--- a/sshconnect1.c
+++ b/sshconnect1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect1.c,v 1.71 2013/05/17 00:13:14 djm Exp $ */ 1/* $OpenBSD: sshconnect1.c,v 1.72 2013/09/02 22:00:34 deraadt Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -542,9 +542,6 @@ ssh_kex(char *host, struct sockaddr *hostaddr)
542 542
543 derive_ssh1_session_id(host_key->rsa->n, server_key->rsa->n, cookie, session_id); 543 derive_ssh1_session_id(host_key->rsa->n, server_key->rsa->n, cookie, session_id);
544 544
545 /* Generate a session key. */
546 arc4random_stir();
547
548 /* 545 /*
549 * Generate an encryption key for the session. The key is a 256 bit 546 * Generate an encryption key for the session. The key is a 256 bit
550 * random number, interpreted as a 32-byte key, with the least 547 * random number, interpreted as a 32-byte key, with the least