ssl_init.c:

  fixing a test bug with #ifdef OPENSSL

bk: 55827c9ezFADiTCxINJ4bwJwNhZDpg

diff --git a/tests/libntp/run-ssl_init.c b/tests/libntp/run-ssl_init.c
index 8e87dc9c8732bd30a0c25e17d5158bcc2a196353..565470a300ba45484416cc08f4e382a97276d7c7 100644 (file)
--- a/tests/libntp/run-ssl_init.c
+++ b/tests/libntp/run-ssl_init.c
@@ -30,6 +30,7 @@ extern void test_MD5KeyTypeWithoutDigestLength();
 extern void test_MD5KeyTypeWithDigestLength();
 extern void test_SHA1KeyTypeWithDigestLength();
 extern void test_MD5KeyName();
+extern void test_SHA1KeyName();
 
 
 //=======Test Reset Option=====
@@ -52,6 +53,7 @@ int main(int argc, char *argv[])
   RUN_TEST(test_MD5KeyTypeWithDigestLength, 22);
   RUN_TEST(test_SHA1KeyTypeWithDigestLength, 31);
   RUN_TEST(test_MD5KeyName, 46);
+  RUN_TEST(test_SHA1KeyName, 50);
 
   return (UnityEnd());
 }

diff --git a/tests/libntp/ssl_init.c b/tests/libntp/ssl_init.c
index fb8a90959ea184dee41b3e3e86de9bf81d15d027..e8c37f58839fc2ba57686e57693238ba4c2803a5 100644 (file)
--- a/tests/libntp/ssl_init.c
+++ b/tests/libntp/ssl_init.c
@@ -47,8 +47,11 @@ void test_MD5KeyName() {
        TEST_ASSERT_EQUAL_STRING("MD5", keytype_name(KEY_TYPE_MD5));
 }
 
+void test_SHA1KeyName() {
 #ifdef OPENSSL
-TEvoid test_SHA1KeyName() {
        TEST_ASSERT_EQUAL_STRING("SHA", keytype_name(NID_sha));
-}
+#else
+       TEST_IGNORE_MESSAGE("Skipping because OPENSSL isn't defined");
 #endif /* OPENSSL */
+}
+