From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 28 Sep 2016 10:20:15 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7de44ac4ea9583f857bbc0564d87b4f33b0feba2;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
into  psp-deb1.ntp.org:/home/stenn/ntp-stable-2998

bk: 57eb995fykF2UJv9w73TnIGALgQvgA
---

7de44ac4ea9583f857bbc0564d87b4f33b0feba2
diff --cc sntp/tests/packetProcessing.c
index 1079cb7df,660b5b6e2..408054616
--- a/sntp/tests/packetProcessing.c
+++ b/sntp/tests/packetProcessing.c
@@@ -152,7 -163,13 +163,17 @@@ test_LengthNotMultipleOfFour(void
  void
  test_TooShortExtensionFieldLength(void)
  {
++XXX BO FRAG 1
+ 	/* [Bug 2998] We have to get around the formal specification of
+ 	 * the extension field if AUTOKEY is undefined. (At least CLANG
+ 	 * issues a warning in this case. It's just a warning, but
+ 	 * still...
+ 	 */
+ 	uint32_t * pe = testpkt.p.exten + 7;
+ 	
++XXX ELSE
 +#ifdef AUTOKEY
++XXX EO FRAG 1
  	/* The lower 16-bits are the length of the extension field.
  	 * This lengths must be multiples of 4 bytes, which gives
  	 * a minimum of 4 byte extension field length.
@@@ -166,9 -183,8 +187,17 @@@
  	int pkt_len = LEN_PKT_NOMAC + 4 + 24;
  
  	TEST_ASSERT_EQUAL(PACKET_UNUSEABLE,
++XXX ORIG FRAG 2
++			  process_pkt(&testpkt, &testsock, pkt_len,
++				      MODE_SERVER, &testspkt, "UnitTest"));
++XXX BO FRAG 2
+ 			  process_pkt(&testpkt.p, &testsock, pkt_len,
+ 				      MODE_SERVER, &testspkt.p, "UnitTest"));
++XXX ELSE FRAG 2
 +			  process_pkt(&testpkt, &testsock, pkt_len,
 +				      MODE_SERVER, &testspkt, "UnitTest"));
 +#endif  /* AUTOKEY */
++XXX EO FRAG 2
  }