Merge psp-deb1.ntp.org:/home/lokeshw24/ntp-stable-unity

into  ubuntu.(none):/home/viperus/Desktop/ntp-stable-unity

bk: 55855983nJMHLiHacoFvSnFh40mK6A

diff --cc sntp/tests/Makefile.am
index c0654ac368146c6fcd4138647f73ef912b94a387,9ec4b2693c1a92994c86725bfe09dd4c21606616..01f5d05f4483971d8fe30a7de0f5f8bd438db983
--- 1/sntp/tests/Makefile.am
--- 2/sntp/tests/Makefile.am
+++ b/sntp/tests/Makefile.am
@@@ -114,9 -114,24 +116,25 @@@ BUILT_SOURCES +=                 
        $(srcdir)/run-kodDatabase.c     \
        $(srcdir)/run-kodFile.c         \
        $(srcdir)/run-networking.c      \
 +      $(srcdir)/run-utilities.c       \
        $(NULL)
  
+ test_crypto_CFLAGS =                  \
+       -I$(top_srcdir)/unity           \
+       $(NULL)
+ 
+ test_crypto_LDADD =                   \
+       $(unity_tests_LDADD)            \
+       $(NULL)
+ 
+ test_crypto_SOURCES =                 \
+       crypto.c                        \
+       run-crypto.c                    \
+       $(top_builddir)/version.c       \
+       $(NULL)
+ 
+ $(srcdir)/run-crypto.c: $(srcdir)/crypto.c $(std_unity_list)
+       $(run_unity) crypto.c run-crypto.c
  
  test_keyFile_CFLAGS =                 \
        -I$(top_srcdir)/unity           \