summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-11-07 23:14:41 +1100
committerDarren Tucker <dtucker@zip.com.au>2006-11-07 23:14:41 +1100
commit0bc85579a9b5a106826169303dd2ee61c63c161e (patch)
treed98e767f275d45b4c62984fb73a3484a5b8e134f /sshd.c
parentdf0e438a2e4efe0422f6e0deb732d819d5938437 (diff)
- markus@cvs.openbsd.org 2006/11/06 21:25:28
[auth-rsa.c kexgexc.c kexdhs.c key.c ssh-dss.c sshd.c kexgexs.c ssh-keygen.c bufbn.c moduli.c scard.c kexdhc.c sshconnect1.c dh.c rsa.c] add missing checks for openssl return codes; with & ok djm@
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sshd.c b/sshd.c
index a5fa9e4eb..4aa1c98ed 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.347 2006/08/18 09:15:20 markus Exp $ */ 1/* $OpenBSD: sshd.c,v 1.348 2006/11/06 21:25:28 markus 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
@@ -2013,10 +2013,10 @@ do_ssh1_kex(void)
2013 * key is in the highest bits. 2013 * key is in the highest bits.
2014 */ 2014 */
2015 if (!rsafail) { 2015 if (!rsafail) {
2016 BN_mask_bits(session_key_int, sizeof(session_key) * 8); 2016 (void) BN_mask_bits(session_key_int, sizeof(session_key) * 8);
2017 len = BN_num_bytes(session_key_int); 2017 len = BN_num_bytes(session_key_int);
2018 if (len < 0 || (u_int)len > sizeof(session_key)) { 2018 if (len < 0 || (u_int)len > sizeof(session_key)) {
2019 error("do_connection: bad session key len from %s: " 2019 error("do_ssh1_kex: bad session key len from %s: "
2020 "session_key_int %d > sizeof(session_key) %lu", 2020 "session_key_int %d > sizeof(session_key) %lu",
2021 get_remote_ipaddr(), len, (u_long)sizeof(session_key)); 2021 get_remote_ipaddr(), len, (u_long)sizeof(session_key));
2022 rsafail++; 2022 rsafail++;