Merge bk://www.ntp.org/ntp-dev

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1364

bk: 4af1ee30JW5IJ3ITDmVk2Q-u8OGahQ

diff --cc ChangeLog
index b1889c7f46354e41f6590c599b7da10d7f2f6950,63152bed6ff93422d03c95ca63defd8324785cc7..cb66f669e1d9c9f0de87ff97037c492e11a94269
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
+ * Provide all of OpenSSL's signature methods for ntp.keys (FIPS xxx).
 +* [Bug 1364] clock_gettime() not detected, need -lrt on Debian 5.0.3.
  (4.2.5p239-RC) 2009/10/30 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1357] bogus assert from refclock_shm.
  * [Bug 1359] Debug message cleanup.

diff --cc sntp/crypto.h
Simple merge