From owner-svn-src-stable-8@FreeBSD.ORG Mon Dec 16 02:30:57 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E0FDA6DC; Mon, 16 Dec 2013 02:30:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CCFBE1749; Mon, 16 Dec 2013 02:30:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBG2UvDg008667; Mon, 16 Dec 2013 02:30:57 GMT (envelope-from bjk@svn.freebsd.org) Received: (from bjk@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBG2UvH5008664; Mon, 16 Dec 2013 02:30:57 GMT (envelope-from bjk@svn.freebsd.org) Message-Id: <201312160230.rBG2UvH5008664@svn.freebsd.org> From: Benjamin Kaduk Date: Mon, 16 Dec 2013 02:30:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r259449 - in stable/8: . crypto/heimdal/lib/gssapi/krb5 sys/sys X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 02:30:58 -0000 Author: bjk (doc committer) Date: Mon Dec 16 02:30:56 2013 New Revision: 259449 URL: http://svnweb.freebsd.org/changeset/base/259449 Log: MFC r259286,259424,259425: Apply patch from upstream Heimdal for encoding fix RFC 4402 specifies the implementation of the gss_pseudo_random() function for the krb5 mechanism (and the C bindings therein). The implementation uses a PRF+ function that concatenates the output of individual krb5 pseudo-random operations produced with a counter and seed. The original implementation of this function in Heimdal incorrectly encoded the counter as a little-endian integer, but the RFC specifies the counter encoding as big-endian. The implementation initializes the counter to zero, so the first block of output (16 octets, for the modern AES enctypes 17 and 18) is unchanged. (RFC 4402 specifies that the counter should begin at 1, but both existing implementations begin with zero and it looks like the standard will be re-issued, with test vectors, to begin at zero.) This is upstream's commit f85652af868e64811f2b32b815d4198e7f9017f6, from 13 October, 2013: % Fix krb5's gss_pseudo_random() (n is big-endian) % % The first enctype RFC3961 prf output length's bytes are correct because % the little- and big-endian representations of unsigned zero are the % same. The second block of output was wrong because the counter was not % being encoded as big-endian. % % This change could break applications. But those applications would not % have been interoperating with other implementations anyways (in % particular: MIT's). Bump __FreeBSD_version accordingly and add a note in UPDATING. Approved by: hrs (mentor, src committer) Modified: stable/8/UPDATING (contents, props changed) stable/8/crypto/heimdal/lib/gssapi/krb5/prf.c stable/8/sys/sys/param.h Directory Properties: stable/8/crypto/heimdal/ (props changed) stable/8/sys/ (props changed) stable/8/sys/sys/ (props changed) Modified: stable/8/UPDATING ============================================================================== --- stable/8/UPDATING Mon Dec 16 02:25:28 2013 (r259448) +++ stable/8/UPDATING Mon Dec 16 02:30:56 2013 (r259449) @@ -15,6 +15,17 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. debugging tools present in HEAD were left in place because sun4v support still needs work to become production ready. +20131216: + The behavior of gss_pseudo_random() for the krb5 mechanism + has changed, for applications requesting a longer random string + than produced by the underlying enctype's pseudo-random() function. + In particular, the random string produced from a session key of + enctype aes256-cts-hmac-sha1-96 or aes256-cts-hmac-sha1-96 will + be different at the 17th octet and later, after this change. + The counter used in the PRF+ construction is now encoded as a + big-endian integer in accordance with RFC 4402. + __FreeBSD_version is bumped to 804501. + 20130823: Behavior of devfs rules path matching has been changed. Pattern is now always matched against fully qualified devfs Modified: stable/8/crypto/heimdal/lib/gssapi/krb5/prf.c ============================================================================== --- stable/8/crypto/heimdal/lib/gssapi/krb5/prf.c Mon Dec 16 02:25:28 2013 (r259448) +++ stable/8/crypto/heimdal/lib/gssapi/krb5/prf.c Mon Dec 16 02:30:56 2013 (r259449) @@ -117,7 +117,7 @@ _gsskrb5_pseudo_random(OM_uint32 *minor_ num = 0; p = prf_out->value; while(desired_output_len > 0) { - _gsskrb5_encode_om_uint32(num, input.data); + _gsskrb5_encode_be_om_uint32(num, input.data); ret = krb5_crypto_prf(context, crypto, &input, &output); if (ret) { OM_uint32 junk; @@ -129,7 +129,7 @@ _gsskrb5_pseudo_random(OM_uint32 *minor_ return GSS_S_FAILURE; } memcpy(p, output.data, min(desired_output_len, output.length)); - p += output.length; + p += tsize; desired_output_len -= output.length; krb5_data_free(&output); num++; Modified: stable/8/sys/sys/param.h ============================================================================== --- stable/8/sys/sys/param.h Mon Dec 16 02:25:28 2013 (r259448) +++ stable/8/sys/sys/param.h Mon Dec 16 02:30:56 2013 (r259449) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 804500 /* Master, propagated to newvers */ +#define __FreeBSD_version 804501 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From owner-svn-src-stable-8@FreeBSD.ORG Mon Dec 16 03:40:46 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A46B9D0F; Mon, 16 Dec 2013 03:40:46 +0000 (UTC) Received: from mail0.glenbarber.us (mail0.glenbarber.us [208.86.227.67]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 742FC1D4E; Mon, 16 Dec 2013 03:40:46 +0000 (UTC) Received: from glenbarber.us (unknown [IPv6:2001:470:8:1205:5604:a6ff:fe3a:96ea]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: gjb) by mail0.glenbarber.us (Postfix) with ESMTPSA id B624222A4F; Mon, 16 Dec 2013 03:40:44 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.8.3 mail0.glenbarber.us B624222A4F Authentication-Results: mail0.glenbarber.us; dkim=none reason="no signature"; dkim-adsp=none Date: Sun, 15 Dec 2013 22:40:43 -0500 From: Glen Barber To: Benjamin Kaduk Subject: Re: svn commit: r259449 - in stable/8: . crypto/heimdal/lib/gssapi/krb5 sys/sys Message-ID: <20131216034043.GK1446@glenbarber.us> References: <201312160230.rBG2UvH5008664@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="M9kwpIYUMbI/2cCx" Content-Disposition: inline In-Reply-To: <201312160230.rBG2UvH5008664@svn.freebsd.org> X-Operating-System: FreeBSD 11.0-CURRENT amd64 User-Agent: Mutt/1.5.22 (2013-10-16) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 03:40:46 -0000 --M9kwpIYUMbI/2cCx Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Dec 16, 2013 at 02:30:57AM +0000, Benjamin Kaduk wrote: > Author: bjk (doc committer) > Date: Mon Dec 16 02:30:56 2013 > New Revision: 259449 > URL: http://svnweb.freebsd.org/changeset/base/259449 >=20 > Log: > MFC r259286,259424,259425: > Apply patch from upstream Heimdal for encoding fix > =20 > RFC 4402 specifies the implementation of the gss_pseudo_random() > function for the krb5 mechanism (and the C bindings therein). > The implementation uses a PRF+ function that concatenates the output > of individual krb5 pseudo-random operations produced with a counter > and seed. The original implementation of this function in Heimdal > incorrectly encoded the counter as a little-endian integer, but the > RFC specifies the counter encoding as big-endian. The implementation > initializes the counter to zero, so the first block of output (16 oct= ets, > for the modern AES enctypes 17 and 18) is unchanged. (RFC 4402 speci= fies > that the counter should begin at 1, but both existing implementations > begin with zero and it looks like the standard will be re-issued, with > test vectors, to begin at zero.) > =20 This breaks stable/8 build. Glen --M9kwpIYUMbI/2cCx Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQIcBAEBCAAGBQJSrnY7AAoJELls3eqvi17QHvwP/jR7CKp7Jdj6L+nzmCk6u6nR lKFdkwNjnG/b2W+Rr4KVREZGReNe1+t++OnFrSgo3HuWc5Ou8ulXKHeg4NSRinf2 3RO2gLNZhSi6EH3GHdgRronJcRi4N9Fo91n0CV3uUQswA6CeMD9150sgaKEH91r4 CH9cXGO5XBiws1wlAkUpYq74Yg8urREyMqxgbPC/iQV6KUCKCEczfpc/aGD8B5Tn 32Ytk0U3XhHQHrVvZxwx3w15HEztQSD7aPclgaq599wOLt9wqQELkaQd8DmxJdVm UzqMcHc6c6JMTNGmr9eEftGPoMAfcI6ws7sa+JQVZPW9GJRik5YeQC5dfmth92Gr e62YwJ8+99WCnOYcRsH8charCaNfaIc3TsCklwU8QfusFNZS+GojhU0WnRSbW5v2 KuJ7sl9nH02DoN2UspFhTNX0OXroOJgZUeV9y98veBnEpnI+BJAY/Naul8Ya17wE WnoVUaib8GOmoPevIx1CjxrZJtJC3uyJKhXF9HwUwa2LqAjolilNatbzFYBDnjRP TvdPD8NnuMMPT2+QJU+tZaKY7QXQbj872a8zjgyw7yCW37U5diTnJ1gOdb/EXO8k aO9nE8j2wdqJpr9u8Yrhg5kLgykfDHzxr4Zg5ecRHVlcOxUYiD+2SHV4pbzq+RUu iUV2m96IaeSO/xlN88zI =kaj+ -----END PGP SIGNATURE----- --M9kwpIYUMbI/2cCx-- From owner-svn-src-stable-8@FreeBSD.ORG Mon Dec 16 03:48:53 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 097CCE96; Mon, 16 Dec 2013 03:48:53 +0000 (UTC) Received: from dmz-mailsec-scanner-1.mit.edu (dmz-mailsec-scanner-1.mit.edu [18.9.25.12]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 08D4D1DBC; Mon, 16 Dec 2013 03:48:51 +0000 (UTC) X-AuditID: 1209190c-b7f7f6d000000bbd-80-52ae782210c6 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36]) (using TLS with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP id C3.C5.03005.2287EA25; Sun, 15 Dec 2013 22:48:50 -0500 (EST) Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id rBG3mnrc001867; Sun, 15 Dec 2013 22:48:49 -0500 Received: from multics.mit.edu (system-low-sipb.mit.edu [18.187.2.37]) (authenticated bits=56) (User authenticated as kaduk@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id rBG3mkTW029404 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sun, 15 Dec 2013 22:48:48 -0500 Received: (from kaduk@localhost) by multics.mit.edu (8.12.9.20060308) id rBG3mkiX017764; Sun, 15 Dec 2013 22:48:46 -0500 (EST) Date: Sun, 15 Dec 2013 22:48:46 -0500 (EST) From: Benjamin Kaduk X-X-Sender: kaduk@multics.mit.edu To: Glen Barber Subject: Re: svn commit: r259449 - in stable/8: . crypto/heimdal/lib/gssapi/krb5 sys/sys In-Reply-To: <20131216034043.GK1446@glenbarber.us> Message-ID: References: <201312160230.rBG2UvH5008664@svn.freebsd.org> <20131216034043.GK1446@glenbarber.us> User-Agent: Alpine 1.10 (GSO 962 2008-03-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkleLIzCtJLcpLzFFi42IRYrdT0VWqWBdksOKAhMWkOa9ZLfY3H2Cz +NM+hcXiz6aFrBY9i88wWWzbvJfdgc1jxqf5LAGMUVw2Kak5mWWpRfp2CVwZ9+euYS5YzFWx 4/U/pgbGJo4uRk4OCQETiUnLNzFC2GISF+6tZ+ti5OIQEpjNJPHpXDM7hLORUWLRwV2MEM4h Jokdv0+yQDgNjBLvZ89jAelnEdCWODRlHyuIzSagJvF4bzMrxFxFic2nJjGD2CJA9rK1z8DG MgssZZTYuXcfkMPBISwQJXH9bgVIDaeAkcSUpY/A6nkFHCU2H7kPNkdIIF6iYe9fsFtFBXQk Vu+fwgJRIyhxcuYTMJtZwFLi3J/rbBMYhWYhSc1CklrAyLSKUTYlt0o3NzEzpzg1Wbc4OTEv L7VI11AvN7NELzWldBMjKMQ5JXl2ML45qHSIUYCDUYmHV8FyXZAQa2JZcWXuIUZJDiYlUV62 cqAQX1J+SmVGYnFGfFFpTmrxIUYJDmYlEd6Yq2uDhHhTEiurUovyYVLSHCxK4rw3OeyDhATS E0tSs1NTC1KLYLIyHBxKErw8IEMFi1LTUyvSMnNKENJMHJwgw3mAhr8sA6rhLS5IzC3OTIfI n2JUlBLn/QCSEABJZJTmwfXCUtArRnGgV4R534JU8QDTF1z3K6DBTECDvfesAhlckoiQkmpg XLvy94fVsYopb4UmP3wStOnUwWUFYeqMy6V79sw5mn31wGxbvYObo5fxvW4WzM6uakzaq3Vq Y0/UVI28u8ut5rxrCp54zeLy/HUTde5nqwQ9uHy1a2bo4j9JTbGSbz965+7s2dV0Ns9G43W1 zOqPUu+ZOjlqr8efVlBgOSXpvHHnGuNflZv+VSqxFGckGmoxFxUnAgDFFRfEHAMAAA== Cc: Benjamin Kaduk , svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org, svn-src-stable@freebsd.org X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 03:48:53 -0000 On Sun, 15 Dec 2013, Glen Barber wrote: > On Mon, Dec 16, 2013 at 02:30:57AM +0000, Benjamin Kaduk wrote: >> Author: bjk (doc committer) >> Date: Mon Dec 16 02:30:56 2013 >> New Revision: 259449 >> URL: http://svnweb.freebsd.org/changeset/base/259449 >> >> Log: >> MFC r259286,259424,259425: >> Apply patch from upstream Heimdal for encoding fix >> >> RFC 4402 specifies the implementation of the gss_pseudo_random() >> function for the krb5 mechanism (and the C bindings therein). >> The implementation uses a PRF+ function that concatenates the output >> of individual krb5 pseudo-random operations produced with a counter >> and seed. The original implementation of this function in Heimdal >> incorrectly encoded the counter as a little-endian integer, but the >> RFC specifies the counter encoding as big-endian. The implementation >> initializes the counter to zero, so the first block of output (16 octets, >> for the modern AES enctypes 17 and 18) is unchanged. (RFC 4402 specifies >> that the counter should begin at 1, but both existing implementations >> begin with zero and it looks like the standard will be re-issued, with >> test vectors, to begin at zero.) >> > > This breaks stable/8 build. Looking... -Ben From owner-svn-src-stable-8@FreeBSD.ORG Mon Dec 16 04:01:28 2013 Return-Path: Delivered-To: svn-src-stable-8@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DFDB9312; Mon, 16 Dec 2013 04:01:27 +0000 (UTC) Received: from mail.allbsd.org (gatekeeper.allbsd.org [IPv6:2001:2f0:104:e001::32]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 682AF1EA0; Mon, 16 Dec 2013 04:01:20 +0000 (UTC) Received: from alph.d.allbsd.org (p2106-ipbf2009funabasi.chiba.ocn.ne.jp [114.146.169.106]) (authenticated bits=128) by mail.allbsd.org (8.14.5/8.14.5) with ESMTP id rBG410UO087427 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 16 Dec 2013 13:01:11 +0900 (JST) (envelope-from hrs@FreeBSD.org) Received: from localhost (localhost [IPv6:::1]) (authenticated bits=0) by alph.d.allbsd.org (8.14.7/8.14.5) with ESMTP id rBG40wvA059710; Mon, 16 Dec 2013 13:00:59 +0900 (JST) (envelope-from hrs@FreeBSD.org) Date: Mon, 16 Dec 2013 13:00:52 +0900 (JST) Message-Id: <20131216.130052.128049839311409145.hrs@allbsd.org> To: bjk@FreeBSD.org Subject: Re: svn commit: r259449 - in stable/8: . crypto/heimdal/lib/gssapi/krb5 sys/sys From: Hiroki Sato In-Reply-To: References: <201312160230.rBG2UvH5008664@svn.freebsd.org> <20131216034043.GK1446@glenbarber.us> X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530 FFD7 4F2C D3D8 2793 CF2D X-Mailer: Mew version 6.5 on Emacs 24.3 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="--Security_Multipart(Mon_Dec_16_13_00_52_2013_160)--" Content-Transfer-Encoding: 7bit X-Virus-Scanned: clamav-milter 0.97.4 at gatekeeper.allbsd.org X-Virus-Status: Clean X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (mail.allbsd.org [133.31.130.32]); Mon, 16 Dec 2013 13:01:11 +0900 (JST) X-Spam-Status: No, score=-95.6 required=13.0 tests=CONTENT_TYPE_PRESENT, RCVD_IN_PBL,SPF_SOFTFAIL,USER_IN_WHITELIST autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on gatekeeper.allbsd.org Cc: gjb@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, svn-src-stable-8@FreeBSD.org, svn-src-stable@FreeBSD.org X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 04:01:28 -0000 ----Security_Multipart(Mon_Dec_16_13_00_52_2013_160)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Benjamin Kaduk wrote in : bj> On Sun, 15 Dec 2013, Glen Barber wrote: bj> bj> > On Mon, Dec 16, 2013 at 02:30:57AM +0000, Benjamin Kaduk wrote: bj> >> Author: bjk (doc committer) bj> >> Date: Mon Dec 16 02:30:56 2013 bj> >> New Revision: 259449 bj> >> URL: http://svnweb.freebsd.org/changeset/base/259449 bj> >> bj> >> Log: bj> >> MFC r259286,259424,259425: bj> >> Apply patch from upstream Heimdal for encoding fix bj> >> bj> >> RFC 4402 specifies the implementation of the gss_pseudo_random() bj> >> function for the krb5 mechanism (and the C bindings therein). bj> >> The implementation uses a PRF+ function that concatenates the output bj> >> of individual krb5 pseudo-random operations produced with a counter bj> >> and seed. The original implementation of this function in Heimdal bj> >> incorrectly encoded the counter as a little-endian integer, but the bj> >> RFC specifies the counter encoding as big-endian. The implementation bj> >> initializes the counter to zero, so the first block of output (16 bj> >> octets, bj> >> for the modern AES enctypes 17 and 18) is unchanged. (RFC 4402 bj> >> specifies bj> >> that the counter should begin at 1, but both existing implementations bj> >> begin with zero and it looks like the standard will be re-issued, with bj> >> test vectors, to begin at zero.) bj> >> bj> > bj> > This breaks stable/8 build. bj> bj> Looking... It seems tsize = min(desired_output_len, output.length) and /output.length/tsize/ just after the p+= line are missing for stable/9 and /8. -- Hiroki ----Security_Multipart(Mon_Dec_16_13_00_52_2013_160)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (FreeBSD) iEYEABECAAYFAlKuevQACgkQTyzT2CeTzy3rUwCcD/fYpZHzXBhncLeRiV9a3D11 yjQAn1zP4JtqBMdibYjtE51yYzAkzfuh =YZOy -----END PGP SIGNATURE----- ----Security_Multipart(Mon_Dec_16_13_00_52_2013_160)---- From owner-svn-src-stable-8@FreeBSD.ORG Mon Dec 16 04:15:52 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5D394E77; Mon, 16 Dec 2013 04:15:52 +0000 (UTC) Received: from dmz-mailsec-scanner-3.mit.edu (dmz-mailsec-scanner-3.mit.edu [18.9.25.14]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 42BD81FD7; Mon, 16 Dec 2013 04:15:50 +0000 (UTC) X-AuditID: 1209190e-b7efb6d000000bb9-81-52ae7e751ff6 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36]) (using TLS with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP id C0.F7.03001.57E7EA25; Sun, 15 Dec 2013 23:15:49 -0500 (EST) Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id rBG4FmSS003819; Sun, 15 Dec 2013 23:15:48 -0500 Received: from multics.mit.edu (system-low-sipb.mit.edu [18.187.2.37]) (authenticated bits=56) (User authenticated as kaduk@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id rBG4FjU5004832 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sun, 15 Dec 2013 23:15:47 -0500 Received: (from kaduk@localhost) by multics.mit.edu (8.12.9.20060308) id rBG4FjhL021229; Sun, 15 Dec 2013 23:15:45 -0500 (EST) Date: Sun, 15 Dec 2013 23:15:45 -0500 (EST) From: Benjamin Kaduk X-X-Sender: kaduk@multics.mit.edu To: Hiroki Sato Subject: Re: svn commit: r259449 - in stable/8: . crypto/heimdal/lib/gssapi/krb5 sys/sys In-Reply-To: <20131216.130052.128049839311409145.hrs@allbsd.org> Message-ID: References: <201312160230.rBG2UvH5008664@svn.freebsd.org> <20131216034043.GK1446@glenbarber.us> <20131216.130052.128049839311409145.hrs@allbsd.org> User-Agent: Alpine 1.10 (GSO 962 2008-03-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphleLIzCtJLcpLzFFi42IRYrdT0S2tWxdkcPeIosWkOa9ZLfY3H2Cz uNW+itniT/sUFos/mxayWvQsPsNksW3zXnYHdo8Zn+azBDBGcdmkpOZklqUW6dslcGXc+TiH peCwQMXGrbcYGxif8HQxcnJICJhIvHwzhw3CFpO4cG89mC0kMJtJ4umJnC5GLiB7I6PEx9tb GCGcQ0wSj14tYoNwGhgl5i++yQjSwiKgLTHx6yRWEJtNQE3i8d5mVoixihKbT01i7mLk4BAB svuPeIP0MgssZZQ4Nf8kWFxYIEri+t0KkHJOAQeJ508WsIGEeQUcJRY9t4FYdZJR4kjnJrCR ogI6Eqv3T2EBsXkFBCVOznwCZjMLWEqc+3OdbQKj0CwkqVlIUgsYmVYxyqbkVunmJmbmFKcm 6xYnJ+blpRbpGuvlZpbopaaUbmIEBTqnJN8Oxq8HlQ4xCnAwKvHwKliuCxJiTSwrrsw9xCjJ waQkyruqBijEl5SfUpmRWJwRX1Sak1p8iFGCg1lJhDfm6togId6UxMqq1KJ8mJQ0B4uSOO9N DvsgIYH0xJLU7NTUgtQimKwMB4eSBO+dWqChgkWp6akVaZk5JQhpJg5OkOE8QMN3gNTwFhck 5hZnpkPkTzEqSonzrgFJCIAkMkrz4HphiegVozjQK8K830GqeIBJDK77FdBgJqDB3ntWgQwu SURISTUwTiqzMFrdtlHNRuijz/cVmu/lBUJW+c360HbUtvXmBXaN5wfmT/HJWvPbL8k5dOHP 83eEzvUHTXHg9nm2Sez1q1U7KsNPGrkvTRKqft5Z/1h+elRKvANzgdXklBeLu6Z1b2Gbfmfd ln9XpLdqCr+Xs1/Rq/1Aubj6ltyC7zzfghtfbfu1pVVirxJLcUaioRZzUXEiAIYLUfAfAwAA Cc: bjk@freebsd.org, src-committers@freebsd.org, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, gjb@freebsd.org, svn-src-stable-8@freebsd.org X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 04:15:52 -0000 On Mon, 16 Dec 2013, Hiroki Sato wrote: > Benjamin Kaduk wrote > in : > > bj> On Sun, 15 Dec 2013, Glen Barber wrote: > bj> > bj> > On Mon, Dec 16, 2013 at 02:30:57AM +0000, Benjamin Kaduk wrote: > bj> >> Author: bjk (doc committer) > bj> >> Date: Mon Dec 16 02:30:56 2013 > bj> >> New Revision: 259449 > bj> >> URL: http://svnweb.freebsd.org/changeset/base/259449 > bj> >> > bj> >> Log: > bj> >> MFC r259286,259424,259425: > bj> >> Apply patch from upstream Heimdal for encoding fix > bj> >> > bj> >> RFC 4402 specifies the implementation of the gss_pseudo_random() > bj> >> function for the krb5 mechanism (and the C bindings therein). > bj> >> The implementation uses a PRF+ function that concatenates the output > bj> >> of individual krb5 pseudo-random operations produced with a counter > bj> >> and seed. The original implementation of this function in Heimdal > bj> >> incorrectly encoded the counter as a little-endian integer, but the > bj> >> RFC specifies the counter encoding as big-endian. The implementation > bj> >> initializes the counter to zero, so the first block of output (16 > bj> >> octets, > bj> >> for the modern AES enctypes 17 and 18) is unchanged. (RFC 4402 > bj> >> specifies > bj> >> that the counter should begin at 1, but both existing implementations > bj> >> begin with zero and it looks like the standard will be re-issued, with > bj> >> test vectors, to begin at zero.) > bj> >> > bj> > > bj> > This breaks stable/8 build. > bj> > bj> Looking... > > It seems tsize = min(desired_output_len, output.length) and > /output.length/tsize/ just after the p+= line are missing for > stable/9 and /8. Yes, a difference between heimdal 1.1 and 1.5.1. I was not happy that Nico put an unrelated change in the bug fix, but for head it is best to take upstream's patch as-is, to avoid causing conflicts for future imports. The fix is just to revert the unrelated hunk of the patch to prf.c. -Ben From owner-svn-src-stable-8@FreeBSD.ORG Mon Dec 16 06:56:39 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4ABD677C; Mon, 16 Dec 2013 06:56:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 351081DBF; Mon, 16 Dec 2013 06:56:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBG6udFQ002693; Mon, 16 Dec 2013 06:56:39 GMT (envelope-from bjk@svn.freebsd.org) Received: (from bjk@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBG6udt2002692; Mon, 16 Dec 2013 06:56:39 GMT (envelope-from bjk@svn.freebsd.org) Message-Id: <201312160656.rBG6udt2002692@svn.freebsd.org> From: Benjamin Kaduk Date: Mon, 16 Dec 2013 06:56:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r259452 - stable/8/crypto/heimdal/lib/gssapi/krb5 X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 06:56:39 -0000 Author: bjk (doc committer) Date: Mon Dec 16 06:56:38 2013 New Revision: 259452 URL: http://svnweb.freebsd.org/changeset/base/259452 Log: Fix build breakage after r259449 Approved by: hrs (mentor, src committer) Modified: stable/8/crypto/heimdal/lib/gssapi/krb5/prf.c Modified: stable/8/crypto/heimdal/lib/gssapi/krb5/prf.c ============================================================================== --- stable/8/crypto/heimdal/lib/gssapi/krb5/prf.c Mon Dec 16 06:52:30 2013 (r259451) +++ stable/8/crypto/heimdal/lib/gssapi/krb5/prf.c Mon Dec 16 06:56:38 2013 (r259452) @@ -129,7 +129,7 @@ _gsskrb5_pseudo_random(OM_uint32 *minor_ return GSS_S_FAILURE; } memcpy(p, output.data, min(desired_output_len, output.length)); - p += tsize; + p += output.length; desired_output_len -= output.length; krb5_data_free(&output); num++; From owner-svn-src-stable-8@FreeBSD.ORG Mon Dec 16 07:01:13 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CB11D8F9; Mon, 16 Dec 2013 07:01:13 +0000 (UTC) Received: from dmz-mailsec-scanner-8.mit.edu (dmz-mailsec-scanner-8.mit.edu [18.7.68.37]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B62401E28; Mon, 16 Dec 2013 07:01:12 +0000 (UTC) X-AuditID: 12074425-b7fd96d000000c39-0a-52aea536c448 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36]) (using TLS with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP id 12.4D.03129.735AEA25; Mon, 16 Dec 2013 02:01:11 -0500 (EST) Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id rBG719J7014145; Mon, 16 Dec 2013 02:01:10 -0500 Received: from multics.mit.edu (system-low-sipb.mit.edu [18.187.2.37]) (authenticated bits=56) (User authenticated as kaduk@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id rBG716eT011981 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 16 Dec 2013 02:01:08 -0500 Received: (from kaduk@localhost) by multics.mit.edu (8.12.9.20060308) id rBG71586012698; Mon, 16 Dec 2013 02:01:05 -0500 (EST) Date: Mon, 16 Dec 2013 02:01:05 -0500 (EST) From: Benjamin Kaduk To: gjb@freebsd.org Subject: Re: svn commit: r259449 - in stable/8: . crypto/heimdal/lib/gssapi/krb5 sys/sys In-Reply-To: Message-ID: References: <201312160230.rBG2UvH5008664@svn.freebsd.org> <20131216034043.GK1446@glenbarber.us> <20131216.130052.128049839311409145.hrs@allbsd.org> User-Agent: Alpine 1.10 (GSO 962 2008-03-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpmleLIzCtJLcpLzFFi42IRYrdT0TVfui7IYMsFFotJc16zWuxvPsBm cat9FbPFn/YpLBZ/Ni1ktehZfIbJYtvmvewO7B4zPs1nCWCM4rJJSc3JLEst0rdL4Mq4svAU U8Fx4Yol12YxNTBO4O9i5OSQEDCRWPOzkxnCFpO4cG89WxcjF4eQwGwmid0bfjJBOBsZJf7N 3AblHGKSOLb4GwuE08Ao8XXhZRaQfhYBbYkVizaxgthsAioSM99sZAOxRQSEJdY9OAc2l1ng CKPExbZZQEUcHMICURLX71aA1HAKOEm87LoHVs8r4CjRvbGPHWLBf0aJ/beWgSVEBXQkVu+f wgJRJChxcuYTMJtZwFLi3J/rbBMYBWchSc1CklrAyLSKUTYlt0o3NzEzpzg1Wbc4OTEvL7VI 10IvN7NELzWldBMjOKxdVHcwTjikdIhRgINRiYdX0XJdkBBrYllxZe4hRkkOJiVR3olzgUJ8 SfkplRmJxRnxRaU5qcWHGCU4mJVEeGOurg0S4k1JrKxKLcqHSUlzsCiJ897isA8SEkhPLEnN Tk0tSC2CycpwcChJ8OotARoqWJSanlqRlplTgpBm4uAEGc4DNNwEpIa3uCAxtzgzHSJ/ilFR Spz33WKghABIIqM0D64XlnZeMYoDvSLM6w7SzgNMWXDdr4AGMwEN9t6zCmRwSSJCSqqB0Ue/ 54TWgo8dJwJqjly6p7dQpap610R5x3Xu3FfdT1dNLzlz+cSEiX0mj373vd6+lePd7W/dsRqu NlfzG/jFij7VmzQf3rzs4twapwc7tmbu2S2l+uzGIrXC3kLn7OyfDetFjm52qzaeXfz67SY7 1rtHVeW/eZbtate5V2HWkReunpt8jiVPQYmlOCPRUIu5qDgRAMKJ89MWAwAA Cc: Benjamin Kaduk , src-committers@freebsd.org, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, Hiroki Sato , svn-src-stable-8@freebsd.org X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 07:01:13 -0000 On Sun, 15 Dec 2013, Benjamin Kaduk wrote: > On Mon, 16 Dec 2013, Hiroki Sato wrote: > >> Benjamin Kaduk wrote >> in : >> >> bj> On Sun, 15 Dec 2013, Glen Barber wrote: >> bj> >> bj> > On Mon, Dec 16, 2013 at 02:30:57AM +0000, Benjamin Kaduk wrote: >> bj> >> Author: bjk (doc committer) >> bj> >> Date: Mon Dec 16 02:30:56 2013 >> bj> >> New Revision: 259449 >> bj> >> URL: http://svnweb.freebsd.org/changeset/base/259449 >> bj> >> >> bj> >> Log: >> bj> >> MFC r259286,259424,259425: >> bj> >> Apply patch from upstream Heimdal for encoding fix >> bj> >> >> bj> >> RFC 4402 specifies the implementation of the gss_pseudo_random() >> bj> >> function for the krb5 mechanism (and the C bindings therein). >> bj> >> The implementation uses a PRF+ function that concatenates the >> output >> bj> >> of individual krb5 pseudo-random operations produced with a >> counter >> bj> >> and seed. The original implementation of this function in >> Heimdal >> bj> >> incorrectly encoded the counter as a little-endian integer, but >> the >> bj> >> RFC specifies the counter encoding as big-endian. The >> implementation >> bj> >> initializes the counter to zero, so the first block of output >> (16 >> bj> >> octets, >> bj> >> for the modern AES enctypes 17 and 18) is unchanged. (RFC 4402 >> bj> >> specifies >> bj> >> that the counter should begin at 1, but both existing >> implementations >> bj> >> begin with zero and it looks like the standard will be >> re-issued, with >> bj> >> test vectors, to begin at zero.) >> bj> >> >> bj> > >> bj> > This breaks stable/8 build. >> bj> >> bj> Looking... >> >> It seems tsize = min(desired_output_len, output.length) and >> /output.length/tsize/ just after the p+= line are missing for >> stable/9 and /8. > > Yes, a difference between heimdal 1.1 and 1.5.1. I was not happy that Nico > put an unrelated change in the bug fix, but for head it is best to take > upstream's patch as-is, to avoid causing conflicts for future imports. > > The fix is just to revert the unrelated hunk of the patch to prf.c. Committed in r259451 and r259452. Sorry for the breakage, and thanks for the prompt report. I guess my eyes failed to differentiate between "Heimdal 1.1" and "Heimdal 1.5.1" while looking at the logs deciding whether the merge was necessary. -Ben From owner-svn-src-stable-8@FreeBSD.ORG Mon Dec 16 15:08:30 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C95CA6D6; Mon, 16 Dec 2013 15:08:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B4383175A; Mon, 16 Dec 2013 15:08:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGF8UUQ084600; Mon, 16 Dec 2013 15:08:30 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGF8U6L084599; Mon, 16 Dec 2013 15:08:30 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201312161508.rBGF8U6L084599@svn.freebsd.org> From: Nathan Whitehorn Date: Mon, 16 Dec 2013 15:08:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r259467 - stable/8/sys/kern X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 15:08:30 -0000 Author: nwhitehorn Date: Mon Dec 16 15:08:30 2013 New Revision: 259467 URL: http://svnweb.freebsd.org/changeset/base/259467 Log: MFC r258819,258928: Add new sysctl, kern.supported_archs, containing the list of FreeBSD MACHINE_ARCH values whose binaries this kernel can run. This patch provides a feature requested for implementing pkgng ABI identifiers in a robust way. The list is designed to indicate whether, say, an i386 package can be run on the current system. If kern.supported_abis contains "i386", then the answer is yes. Otherwise, the answer is no. At the moment, this only supports MACHINE_ARCH and MACHINE_ARCH32. As we gain support for more interesting combinations, this needs to become more flexible, possibily through the sysent framework, along with the hw.machine_arch emulation immediately preceding this code in kern_mib.c. Reviewed by: imp Modified: stable/8/sys/kern/kern_mib.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/kern/ (props changed) Modified: stable/8/sys/kern/kern_mib.c ============================================================================== --- stable/8/sys/kern/kern_mib.c Mon Dec 16 15:02:10 2013 (r259466) +++ stable/8/sys/kern/kern_mib.c Mon Dec 16 15:08:30 2013 (r259467) @@ -261,6 +261,13 @@ sysctl_hw_machine_arch(SYSCTL_HANDLER_AR SYSCTL_PROC(_hw, HW_MACHINE_ARCH, machine_arch, CTLTYPE_STRING | CTLFLAG_RD, NULL, 0, sysctl_hw_machine_arch, "A", "System architecture"); +SYSCTL_STRING(_kern, OID_AUTO, supported_archs, CTLFLAG_RD | CTLFLAG_MPSAFE, +#ifdef COMPAT_FREEBSD32 + MACHINE_ARCH " " MACHINE_ARCH32, 0, "Supported architectures for binaries"); +#else + MACHINE_ARCH, 0, "Supported architectures for binaries"); +#endif + static int sysctl_hostname(SYSCTL_HANDLER_ARGS) { From owner-svn-src-stable-8@FreeBSD.ORG Thu Dec 19 07:09:29 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E86F32A4; Thu, 19 Dec 2013 07:09:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D2D3111A5; Thu, 19 Dec 2013 07:09:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJ79T6q092656; Thu, 19 Dec 2013 07:09:29 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJ79Tu3092652; Thu, 19 Dec 2013 07:09:29 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201312190709.rBJ79Tu3092652@svn.freebsd.org> From: Hans Petter Selasky Date: Thu, 19 Dec 2013 07:09:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r259600 - in stable/8/sys/dev/usb: . controller X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2013 07:09:30 -0000 Author: hselasky Date: Thu Dec 19 07:09:28 2013 New Revision: 259600 URL: http://svnweb.freebsd.org/changeset/base/259600 Log: MFC r259023 and r259095: Improve the XHCI command timeout recovery handling code. Fix some typos while at it. Modified: stable/8/sys/dev/usb/controller/usb_controller.c stable/8/sys/dev/usb/controller/xhci.c stable/8/sys/dev/usb/usb_bus.h stable/8/sys/dev/usb/usb_controller.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/usb/ (props changed) Modified: stable/8/sys/dev/usb/controller/usb_controller.c ============================================================================== --- stable/8/sys/dev/usb/controller/usb_controller.c Thu Dec 19 07:02:11 2013 (r259599) +++ stable/8/sys/dev/usb/controller/usb_controller.c Thu Dec 19 07:09:28 2013 (r259600) @@ -278,6 +278,28 @@ usb_resume(device_t dev) } /*------------------------------------------------------------------------* + * usb_bus_reset_async_locked + *------------------------------------------------------------------------*/ +void +usb_bus_reset_async_locked(struct usb_bus *bus) +{ + USB_BUS_LOCK_ASSERT(bus, MA_OWNED); + + DPRINTF("\n"); + + if (bus->reset_msg[0].hdr.pm_qentry.tqe_prev != NULL || + bus->reset_msg[1].hdr.pm_qentry.tqe_prev != NULL) { + DPRINTF("Reset already pending\n"); + return; + } + + device_printf(bus->parent, "Resetting controller\n"); + + usb_proc_msignal(&bus->explore_proc, + &bus->reset_msg[0], &bus->reset_msg[1]); +} + +/*------------------------------------------------------------------------* * usb_shutdown *------------------------------------------------------------------------*/ static int @@ -399,7 +421,7 @@ usb_bus_detach(struct usb_proc_msg *pm) /*------------------------------------------------------------------------* * usb_bus_suspend * - * This function is used to suspend the USB contoller. + * This function is used to suspend the USB controller. *------------------------------------------------------------------------*/ static void usb_bus_suspend(struct usb_proc_msg *pm) @@ -409,6 +431,8 @@ usb_bus_suspend(struct usb_proc_msg *pm) usb_error_t err; uint8_t do_unlock; + DPRINTF("\n"); + bus = ((struct usb_bus_msg *)pm)->bus; udev = bus->devices[USB_ROOT_HUB_ADDR]; @@ -454,7 +478,7 @@ usb_bus_suspend(struct usb_proc_msg *pm) /*------------------------------------------------------------------------* * usb_bus_resume * - * This function is used to resume the USB contoller. + * This function is used to resume the USB controller. *------------------------------------------------------------------------*/ static void usb_bus_resume(struct usb_proc_msg *pm) @@ -464,6 +488,8 @@ usb_bus_resume(struct usb_proc_msg *pm) usb_error_t err; uint8_t do_unlock; + DPRINTF("\n"); + bus = ((struct usb_bus_msg *)pm)->bus; udev = bus->devices[USB_ROOT_HUB_ADDR]; @@ -513,9 +539,31 @@ usb_bus_resume(struct usb_proc_msg *pm) } /*------------------------------------------------------------------------* + * usb_bus_reset + * + * This function is used to reset the USB controller. + *------------------------------------------------------------------------*/ +static void +usb_bus_reset(struct usb_proc_msg *pm) +{ + struct usb_bus *bus; + + DPRINTF("\n"); + + bus = ((struct usb_bus_msg *)pm)->bus; + + if (bus->bdev == NULL || bus->no_explore != 0) + return; + + /* a suspend and resume will reset the USB controller */ + usb_bus_suspend(pm); + usb_bus_resume(pm); +} + +/*------------------------------------------------------------------------* * usb_bus_shutdown * - * This function is used to shutdown the USB contoller. + * This function is used to shutdown the USB controller. *------------------------------------------------------------------------*/ static void usb_bus_shutdown(struct usb_proc_msg *pm) @@ -728,6 +776,11 @@ usb_attach_sub(device_t dev, struct usb_ bus->resume_msg[1].hdr.pm_callback = &usb_bus_resume; bus->resume_msg[1].bus = bus; + bus->reset_msg[0].hdr.pm_callback = &usb_bus_reset; + bus->reset_msg[0].bus = bus; + bus->reset_msg[1].hdr.pm_callback = &usb_bus_reset; + bus->reset_msg[1].bus = bus; + bus->shutdown_msg[0].hdr.pm_callback = &usb_bus_shutdown; bus->shutdown_msg[0].bus = bus; bus->shutdown_msg[1].hdr.pm_callback = &usb_bus_shutdown; Modified: stable/8/sys/dev/usb/controller/xhci.c ============================================================================== --- stable/8/sys/dev/usb/controller/xhci.c Thu Dec 19 07:02:11 2013 (r259599) +++ stable/8/sys/dev/usb/controller/xhci.c Thu Dec 19 07:09:28 2013 (r259600) @@ -253,6 +253,69 @@ xhci_ctx_get_le64(struct xhci_softc *sc, } #endif +static int +xhci_reset_command_queue_locked(struct xhci_softc *sc) +{ + struct usb_page_search buf_res; + struct xhci_hw_root *phwr; + uint64_t addr; + uint32_t temp; + + DPRINTF("\n"); + + temp = XREAD4(sc, oper, XHCI_CRCR_LO); + if (temp & XHCI_CRCR_LO_CRR) { + DPRINTF("Command ring running\n"); + temp &= ~(XHCI_CRCR_LO_CS | XHCI_CRCR_LO_CA); + + /* + * Try to abort the last command as per section + * 4.6.1.2 "Aborting a Command" of the XHCI + * specification: + */ + + /* stop and cancel */ + XWRITE4(sc, oper, XHCI_CRCR_LO, temp | XHCI_CRCR_LO_CS); + XWRITE4(sc, oper, XHCI_CRCR_HI, 0); + + XWRITE4(sc, oper, XHCI_CRCR_LO, temp | XHCI_CRCR_LO_CA); + XWRITE4(sc, oper, XHCI_CRCR_HI, 0); + + /* wait 250ms */ + usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 4); + + /* check if command ring is still running */ + temp = XREAD4(sc, oper, XHCI_CRCR_LO); + if (temp & XHCI_CRCR_LO_CRR) { + DPRINTF("Comand ring still running\n"); + return (USB_ERR_IOERROR); + } + } + + /* reset command ring */ + sc->sc_command_ccs = 1; + sc->sc_command_idx = 0; + + usbd_get_page(&sc->sc_hw.root_pc, 0, &buf_res); + + /* setup command ring control base address */ + addr = buf_res.physaddr; + phwr = buf_res.buffer; + addr += (uintptr_t)&((struct xhci_hw_root *)0)->hwr_commands[0]; + + DPRINTF("CRCR=0x%016llx\n", (unsigned long long)addr); + + memset(phwr->hwr_commands, 0, sizeof(phwr->hwr_commands)); + phwr->hwr_commands[XHCI_MAX_COMMANDS - 1].qwTrb0 = htole64(addr); + + usb_pc_cpu_flush(&sc->sc_hw.root_pc); + + XWRITE4(sc, oper, XHCI_CRCR_LO, ((uint32_t)addr) | XHCI_CRCR_LO_RCS); + XWRITE4(sc, oper, XHCI_CRCR_HI, (uint32_t)(addr >> 32)); + + return (0); +} + usb_error_t xhci_start_controller(struct xhci_softc *sc) { @@ -1025,6 +1088,7 @@ xhci_do_command(struct xhci_softc *sc, s uint32_t temp; uint8_t i; uint8_t j; + uint8_t timeout = 0; int err; XHCI_CMD_ASSERT_LOCKED(sc); @@ -1038,7 +1102,7 @@ xhci_do_command(struct xhci_softc *sc, s /* Queue command */ USB_BUS_LOCK(&sc->sc_bus); - +retry: i = sc->sc_command_idx; j = sc->sc_command_ccs; @@ -1109,25 +1173,22 @@ xhci_do_command(struct xhci_softc *sc, s err = 0; } if (err != 0) { - DPRINTFN(0, "Command timeout!\n"); - + DPRINTF("Command timeout!\n"); /* - * Try to abort the last command as per section - * 4.6.1.2 "Aborting a Command" of the XHCI - * specification: + * After some weeks of continuous operation, it has + * been observed that the ASMedia Technology, ASM1042 + * SuperSpeed USB Host Controller can suddenly stop + * accepting commands via the command queue. Try to + * first reset the command queue. If that fails do a + * host controller reset. */ - temp = XREAD4(sc, oper, XHCI_CRCR_LO); - XWRITE4(sc, oper, XHCI_CRCR_LO, temp | XHCI_CRCR_LO_CA); - - /* wait for abort event, if any */ - err = cv_timedwait(&sc->sc_cmd_cv, &sc->sc_bus.bus_mtx, hz / 16); - - if (err != 0 && xhci_interrupt_poll(sc) != 0) { - DPRINTF("Command was completed when polling\n"); - err = 0; - } - if (err != 0) { - DPRINTF("Command abort timeout!\n"); + if (timeout == 0 && + xhci_reset_command_queue_locked(sc) == 0) { + timeout = 1; + goto retry; + } else { + DPRINTF("Controller reset!\n"); + usb_bus_reset_async_locked(&sc->sc_bus); } err = USB_ERR_TIMEOUT; trb->dwTrb2 = 0; Modified: stable/8/sys/dev/usb/usb_bus.h ============================================================================== --- stable/8/sys/dev/usb/usb_bus.h Thu Dec 19 07:02:11 2013 (r259599) +++ stable/8/sys/dev/usb/usb_bus.h Thu Dec 19 07:09:28 2013 (r259600) @@ -71,6 +71,7 @@ struct usb_bus { struct usb_bus_msg attach_msg[2]; struct usb_bus_msg suspend_msg[2]; struct usb_bus_msg resume_msg[2]; + struct usb_bus_msg reset_msg[2]; struct usb_bus_msg shutdown_msg[2]; /* * This mutex protects the USB hardware: Modified: stable/8/sys/dev/usb/usb_controller.h ============================================================================== --- stable/8/sys/dev/usb/usb_controller.h Thu Dec 19 07:02:11 2013 (r259599) +++ stable/8/sys/dev/usb/usb_controller.h Thu Dec 19 07:09:28 2013 (r259600) @@ -186,6 +186,7 @@ void usb_bus_mem_flush_all(struct usb_bu uint8_t usb_bus_mem_alloc_all(struct usb_bus *bus, bus_dma_tag_t dmat, usb_bus_mem_cb_t *cb); void usb_bus_mem_free_all(struct usb_bus *bus, usb_bus_mem_cb_t *cb); uint16_t usb_isoc_time_expand(struct usb_bus *bus, uint16_t isoc_time_curr); +void usb_bus_reset_async_locked(struct usb_bus *bus); #if USB_HAVE_TT_SUPPORT uint8_t usbd_fs_isoc_schedule_alloc_slot(struct usb_xfer *isoc_xfer, uint16_t isoc_time); #endif From owner-svn-src-stable-8@FreeBSD.ORG Thu Dec 19 07:17:19 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4DA49943; Thu, 19 Dec 2013 07:17:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 39CD1123C; Thu, 19 Dec 2013 07:17:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJ7HJNE096302; Thu, 19 Dec 2013 07:17:19 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJ7HJMf096301; Thu, 19 Dec 2013 07:17:19 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201312190717.rBJ7HJMf096301@svn.freebsd.org> From: Hans Petter Selasky Date: Thu, 19 Dec 2013 07:17:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r259605 - stable/8/sys/dev/usb/controller X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2013 07:17:19 -0000 Author: hselasky Date: Thu Dec 19 07:17:18 2013 New Revision: 259605 URL: http://svnweb.freebsd.org/changeset/base/259605 Log: MFC r259248 and r259462: Set chain bit correctly. This will fix some problems sending and receiving Zero Length Packets, ZLPs. See comment in code for more information. Modified: stable/8/sys/dev/usb/controller/xhci.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/usb/ (props changed) Modified: stable/8/sys/dev/usb/controller/xhci.c ============================================================================== --- stable/8/sys/dev/usb/controller/xhci.c Thu Dec 19 07:17:07 2013 (r259604) +++ stable/8/sys/dev/usb/controller/xhci.c Thu Dec 19 07:17:18 2013 (r259605) @@ -1858,7 +1858,16 @@ restart: td->td_trb[x].dwTrb2 = htole32(dword); dword = XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_LINK) | - XHCI_TRB_3_CYCLE_BIT | XHCI_TRB_3_IOC_BIT; + XHCI_TRB_3_CYCLE_BIT | XHCI_TRB_3_IOC_BIT | + /* + * CHAIN-BIT: Ensure that a multi-TRB IN-endpoint + * frame only receives a single short packet event + * by setting the CHAIN bit in the LINK field. In + * addition some XHCI controllers have problems + * sending a ZLP unless the CHAIN-BIT is set in + * the LINK TRB. + */ + XHCI_TRB_3_CHAIN_BIT; td->td_trb[x].dwTrb3 = htole32(dword); @@ -1896,9 +1905,11 @@ restart: } /* clear TD SIZE to zero, hence this is the last TRB */ - /* remove chain bit because this is the last TRB in the chain */ + /* remove chain bit because this is the last data TRB in the chain */ td->td_trb[td->ntrb - 1].dwTrb2 &= ~htole32(XHCI_TRB_2_TDSZ_SET(15)); td->td_trb[td->ntrb - 1].dwTrb3 &= ~htole32(XHCI_TRB_3_CHAIN_BIT); + /* remove CHAIN-BIT from last LINK TRB */ + td->td_trb[td->ntrb].dwTrb3 &= ~htole32(XHCI_TRB_3_CHAIN_BIT); usb_pc_cpu_flush(td->page_cache); From owner-svn-src-stable-8@FreeBSD.ORG Thu Dec 19 09:46:14 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E81E93B9; Thu, 19 Dec 2013 09:46:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D3C881F34; Thu, 19 Dec 2013 09:46:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJ9kEIl051176; Thu, 19 Dec 2013 09:46:14 GMT (envelope-from truckman@svn.freebsd.org) Received: (from truckman@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJ9kE67051174; Thu, 19 Dec 2013 09:46:14 GMT (envelope-from truckman@svn.freebsd.org) Message-Id: <201312190946.rBJ9kE67051174@svn.freebsd.org> From: Don Lewis Date: Thu, 19 Dec 2013 09:46:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r259610 - in stable/8/sys/dev/usb: . serial X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2013 09:46:15 -0000 Author: truckman Date: Thu Dec 19 09:46:14 2013 New Revision: 259610 URL: http://svnweb.freebsd.org/changeset/base/259610 Log: MFC r258363: Add alternate ID for Novatel MiFi 2200 CDMA, which is used by my Virgin Mobile branded device. It needs the U3GINIT_SCSIEJECT quirk. Modified: stable/8/sys/dev/usb/serial/u3g.c stable/8/sys/dev/usb/usbdevs Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/usb/ (props changed) Modified: stable/8/sys/dev/usb/serial/u3g.c ============================================================================== --- stable/8/sys/dev/usb/serial/u3g.c Thu Dec 19 09:01:46 2013 (r259609) +++ stable/8/sys/dev/usb/serial/u3g.c Thu Dec 19 09:46:14 2013 (r259610) @@ -340,6 +340,7 @@ static const STRUCT_USB_HOST_ID u3g_devs U3G_DEV(NOVATEL, MC760, 0), U3G_DEV(NOVATEL, MC547, 0), U3G_DEV(NOVATEL, MC950D, 0), + U3G_DEV(NOVATEL, MIFI2200V, U3GINIT_SCSIEJECT), U3G_DEV(NOVATEL, U720, 0), U3G_DEV(NOVATEL, U727, 0), U3G_DEV(NOVATEL, U727_2, 0), Modified: stable/8/sys/dev/usb/usbdevs ============================================================================== --- stable/8/sys/dev/usb/usbdevs Thu Dec 19 09:01:46 2013 (r259609) +++ stable/8/sys/dev/usb/usbdevs Thu Dec 19 09:46:14 2013 (r259610) @@ -3068,6 +3068,7 @@ product NOVATEL EU870D 0x2420 Expedite product NOVATEL U727 0x4100 Merlin U727 CDMA product NOVATEL MC950D 0x4400 Novatel MC950D HSUPA product NOVATEL ZEROCD 0x5010 Novatel ZeroCD +product NOVATEL MIFI2200V 0x5020 Novatel MiFi 2200 CDMA Virgin Mobile product NOVATEL ZEROCD2 0x5030 Novatel ZeroCD product NOVATEL U727_2 0x5100 Merlin U727 CDMA product NOVATEL U760 0x6000 Novatel U760 From owner-svn-src-stable-8@FreeBSD.ORG Thu Dec 19 20:26:01 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 38A6DF34; Thu, 19 Dec 2013 20:26:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2473D15E4; Thu, 19 Dec 2013 20:26:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJKQ1mS092104; Thu, 19 Dec 2013 20:26:01 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJKQ0h0092099; Thu, 19 Dec 2013 20:26:00 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201312192026.rBJKQ0h0092099@svn.freebsd.org> From: Edwin Groothuis Date: Thu, 19 Dec 2013 20:26:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r259629 - stable/8/share/zoneinfo X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2013 20:26:01 -0000 Author: edwin Date: Thu Dec 19 20:26:00 2013 New Revision: 259629 URL: http://svnweb.freebsd.org/changeset/base/259629 Log: MFC of 259626, tzdata2013i: Removed support for solar-time-based time zones Jordan stays at summer time this year. Fix historical data for Cuba Modified: stable/8/share/zoneinfo/asia stable/8/share/zoneinfo/northamerica Directory Properties: stable/8/share/zoneinfo/ (props changed) Modified: stable/8/share/zoneinfo/asia ============================================================================== --- stable/8/share/zoneinfo/asia Thu Dec 19 20:25:55 2013 (r259628) +++ stable/8/share/zoneinfo/asia Thu Dec 19 20:26:00 2013 (r259629) @@ -1380,12 +1380,22 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 3 # switch back to standard time this winter, so the will stay on DST # until about the same time next year (at least). # http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?NewsID=88950 -# -# From Paul Eggert (2013-09-21): -# It's looking like this change will be permanent; see -# Petra News Agency, Cancelling winter saved Jordan $7 million (2013-02-20) -# . -# So move Jordan to UTC+3 as of the abovementioned date. + +# From Steffen Thorsen (2013-12-11): +# Jordan Times and other sources say that Jordan is going back to +# UTC+2 on 2013-12-19 at midnight: +# http://jordantimes.com/govt-decides-to-switch-back-to-wintertime +# Official, in Arabic: +# http://www.petra.gov.jo/public_news/Nws_NewsDetails.aspx?Menu_ID=&Site_Id=2&lang=1&NewsID=133230&CatID=14 +# ... Our background/permalink about it +# http://www.timeanddate.com/news/time/jordan-reverses-dst-decision.html +# ... +# http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?lang=2&site_id=1&NewsID=133313&Type=P +# ... says midnight for the coming one and 1:00 for the ones in the future +# (and they will use DST again next year, using the normal schedule). + +# From Paul Eggert (2013-12-11): +# As Steffen suggested, consider the past 21-month experiment to be DST. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Jordan 1973 only - Jun 6 0:00 1:00 S @@ -1415,11 +1425,13 @@ Rule Jordan 2002 2012 - Mar lastThu 24:0 Rule Jordan 2003 only - Oct 24 0:00s 0 - Rule Jordan 2004 only - Oct 15 0:00s 0 - Rule Jordan 2005 only - Sep lastFri 0:00s 0 - -Rule Jordan 2006 2012 - Oct lastFri 0:00s 0 - +Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 - +Rule Jordan 2013 only - Dec 20 0:00 0 - +Rule Jordan 2014 max - Mar lastThu 24:00 1:00 S +Rule Jordan 2014 max - Oct lastFri 0:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Amman 2:23:44 - LMT 1931 - 2:00 Jordan EE%sT 2012 Oct 26 0:00s - 3:00 - AST + 2:00 Jordan EE%sT # Kazakhstan Modified: stable/8/share/zoneinfo/northamerica ============================================================================== --- stable/8/share/zoneinfo/northamerica Thu Dec 19 20:25:55 2013 (r259628) +++ stable/8/share/zoneinfo/northamerica Thu Dec 19 20:26:00 2013 (r259629) @@ -2665,6 +2665,11 @@ Zone America/Costa_Rica -5:36:13 - LMT 1 # to DST--and one more hour on 1999-04-04--when the announcers will have # returned to Baltimore, which switches on that date.) +# From Steffen Thorsen (2013-11-11): +# DST start in Cuba in 2004 ... does not follow the same rules as the +# years before. The correct date should be Sunday 2004-03-28 00:00 ... +# https://web.archive.org/web/20040402060750/http://www.granma.cu/espanol/2004/marzo/sab27/reloj.html + # From Evert van der Veer via Steffen Thorsen (2004-10-28): # Cuba is not going back to standard time this year. # From Paul Eggert (2006-03-22): @@ -2854,7 +2859,8 @@ Rule Cuba 1996 only - Oct 6 0:00s 0 S Rule Cuba 1997 only - Oct 12 0:00s 0 S Rule Cuba 1998 1999 - Mar lastSun 0:00s 1:00 D Rule Cuba 1998 2003 - Oct lastSun 0:00s 0 S -Rule Cuba 2000 2004 - Apr Sun>=1 0:00s 1:00 D +Rule Cuba 2000 2003 - Apr Sun>=1 0:00s 1:00 D +Rule Cuba 2004 only - Mar lastSun 0:00s 1:00 D Rule Cuba 2006 2010 - Oct lastSun 0:00s 0 S Rule Cuba 2007 only - Mar Sun>=8 0:00s 1:00 D Rule Cuba 2008 only - Mar Sun>=15 0:00s 1:00 D