Merge bk://maccarony.ntp.org/ntp-stable

into  pogo.udel.edu:/pogo/users/burnicki/ntp-stable-bug-1113

bk: 4965b415iPkUVNxo3WD3M7t7UCIhqw

diff --cc ChangeLog
index d1475c82447114dc58d219d7dfd568c9de187cbe,0de7a249eff3f7f3250a4be67dca68166b9b832b..8fa1fad412c1c494cf7705c747c3229930360f6c
--- 1/ChangeLog
--- 2/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>
  

diff --cc ntpd/ntp_crypto.c
Simple merge