1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 32ec354e8..041cfe831 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,11 @@
      [ssh-add.c]
      skip requesting smartcard PIN when removing keys from agent; bz#2187
      patch from jay AT slushpupie.com; ok dtucker
+   - dtucker@cvs.openbsd.org 2013/12/19 00:19:12
+     [serverloop.c]
+     Cast client_alive_interval to u_int64_t before assinging to
+     max_time_milliseconds to avoid potential integer overflow in the timeout.
+     bz#2170, patch from Loganaden Velvindron, ok djm@
 
 20131221
  - (dtucker) [regress/keytype.sh] Actually test ecdsa key types.