From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 8 Jan 2009 08:06:45 +0000 (-0500)
Subject: Merge bk://maccarony.ntp.org/ntp-stable
X-Git-Tag: NTP_4_2_4P5~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=382b675ee121f9bd14605c9ff7881e97e3262469;p=thirdparty%2Fntp.git

Merge bk://maccarony.ntp.org/ntp-stable
into  pogo.udel.edu:/pogo/users/burnicki/ntp-stable-bug-1113

bk: 4965b415iPkUVNxo3WD3M7t7UCIhqw
---

382b675ee121f9bd14605c9ff7881e97e3262469
diff --cc ChangeLog
index d1475c824,0de7a249e..8fa1fad41
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,9 +1,10 @@@
 +* [BUG 1113] Fixed build errors with recent versions of openSSL. 
+ ---
+ (4.2.4p6) 2009/01/07 Released by Harlan Stenn <stenn@ntp.org>
+ 
+ * [Sec 1111] Fix incorrect check of EVP_VerifyFinal()'s return value.
+ * Update the copyright year.
+ 
  ---
  (4.2.4p5) 2008/08/17 Released by Harlan Stenn <stenn@ntp.org>