Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 87222 invoked from network); 29 Jun 2006 07:50:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 29 Jun 2006 07:50:48 -0000 Received: (qmail 16639 invoked by uid 500); 29 Jun 2006 07:50:48 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 16553 invoked by uid 500); 29 Jun 2006 07:50:47 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 16542 invoked by uid 99); 29 Jun 2006 07:50:47 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Jun 2006 00:50:47 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Jun 2006 00:50:46 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id D72271A9842; Thu, 29 Jun 2006 00:50:26 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r417954 - in /incubator/harmony/enhanced/classlib/trunk/modules/security/src: main/java/common/org/apache/harmony/security/asn1/BerInputStream.java test/impl/java/org/apache/harmony/security/tests/asn1/der/UTCTimeTest.java Date: Thu, 29 Jun 2006 07:50:26 -0000 To: harmony-commits@incubator.apache.org From: smishura@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060629075026.D72271A9842@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: smishura Date: Thu Jun 29 00:50:25 2006 New Revision: 417954 URL: http://svn.apache.org/viewvc?rev=417954&view=rev Log: Fixing bug: wrong interpretation of encoded year by UTCTime Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/BerInputStream.java incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/asn1/der/UTCTimeTest.java Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/BerInputStream.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/BerInputStream.java?rev=417954&r1=417953&r2=417954&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/BerInputStream.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/BerInputStream.java Thu Jun 29 00:50:25 2006 @@ -473,9 +473,11 @@ times = new int[7]; } - times[0] = strToInt(contentOffset, 2) + 1900; // year - if (Calendar.getInstance().get(Calendar.YEAR) - times[0] > 80) { - times[0] += 100; + times[0] = strToInt(contentOffset, 2); // year + if (times[0] > 49) { + times[0] += 1900; + } else { + times[0] += 2000; } times[1] = strToInt(contentOffset + 2, 2); // month Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/asn1/der/UTCTimeTest.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/asn1/der/UTCTimeTest.java?rev=417954&r1=417953&r2=417954&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/asn1/der/UTCTimeTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/impl/java/org/apache/harmony/security/tests/asn1/der/UTCTimeTest.java Thu Jun 29 00:50:25 2006 @@ -67,12 +67,11 @@ 0x31, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5A }, null }, // YYMMDD-HHMMSS = "490203040506Z" -// FIXME test case fails -// { -// "3 Feb 2049 04:05:06", -// new byte[] { 0x17, 0x0D, 0x34, 0x39, 0x30, 0x32, 0x30, -// 0x33, 0x30, 0x34, 0x30, 0x35, 0x30, 0x36, 0x5A }, -// null }, + { + "3 Feb 2049 04:05:06", + new byte[] { 0x17, 0x0D, 0x34, 0x39, 0x30, 0x32, 0x30, + 0x33, 0x30, 0x34, 0x30, 0x35, 0x30, 0x36, 0x5A }, + null }, }; try {