From: Juergen Perlinger Date: Fri, 19 Feb 2016 18:47:31 +0000 (+0100) Subject: [Bug 3013] Fix for ssl_init.c SHA1 test X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16e1da55fb78da615278dfd28f9d81a91e759bed;p=thirdparty%2Fntp.git [Bug 3013] Fix for ssl_init.c SHA1 test bk: 56c76343sZxoMaKGT5v5yrn4QYJ-4g --- diff --git a/ChangeLog b/ChangeLog index c70fe8fc5..a1d26dd7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ * [Bug 2994] Systems with HAVE_SIGNALED_IO fail to compile. perlinger@ntp.org * [Bug 2995] Fixes to compile on Windows +* [Bug 3013] Fix for ssl_init.c SHA1 test. perlinger@ntp.org + - Patch provided by Ch. Weisgerber --- (4.2.8p6) 2016/01/20 Released by Harlan Stenn diff --git a/tests/libntp/ssl_init.c b/tests/libntp/ssl_init.c index 42fe920b6..435e5c912 100644 --- a/tests/libntp/ssl_init.c +++ b/tests/libntp/ssl_init.c @@ -43,7 +43,7 @@ test_SHA1KeyTypeWithDigestLength(void) { size_t digestLength; size_t expected = TEST_SHA1_DIGEST_LENGTH; - TEST_ASSERT_EQUAL(NID_sha, keytype_from_text("SHA", &digestLength)); + TEST_ASSERT_EQUAL(NID_sha1, keytype_from_text("SHA1", &digestLength)); TEST_ASSERT_EQUAL(expected, digestLength); /* OPENSSL */ #else @@ -62,7 +62,7 @@ test_MD5KeyName(void) { void test_SHA1KeyName(void) { #ifdef OPENSSL - TEST_ASSERT_EQUAL_STRING("SHA", keytype_name(NID_sha)); + TEST_ASSERT_EQUAL_STRING("SHA1", keytype_name(NID_sha1)); #else TEST_IGNORE_MESSAGE("Skipping because OPENSSL isn't defined"); #endif /* OPENSSL */