mirror of
https://github.com/openjdk/jdk.git
synced 2026-04-14 00:49:42 +00:00
6670889: Keystore created under Hindi Locale causing ArrayIndexOutOfBoundsException
Reviewed-by: chegar
This commit is contained in:
parent
bd18ff374c
commit
c20e1ffd6c
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -25,17 +25,16 @@
|
||||
|
||||
package sun.security.util;
|
||||
|
||||
import java.io.FilterOutputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.io.IOException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.TimeZone;
|
||||
import java.util.Vector;
|
||||
import java.util.Comparator;
|
||||
import java.util.Arrays;
|
||||
import java.math.BigInteger;
|
||||
import java.util.Locale;
|
||||
|
||||
|
||||
/**
|
||||
@ -501,7 +500,7 @@ extends ByteArrayOutputStream implements DerEncoder {
|
||||
pattern = "yyyyMMddHHmmss'Z'";
|
||||
}
|
||||
|
||||
SimpleDateFormat sdf = new SimpleDateFormat(pattern);
|
||||
SimpleDateFormat sdf = new SimpleDateFormat(pattern, Locale.US);
|
||||
sdf.setTimeZone(tz);
|
||||
byte[] time = (sdf.format(d)).getBytes("ISO-8859-1");
|
||||
|
||||
|
||||
42
jdk/test/sun/security/util/DerOutputStream/LocaleInTime.java
Normal file
42
jdk/test/sun/security/util/DerOutputStream/LocaleInTime.java
Normal file
@ -0,0 +1,42 @@
|
||||
/*
|
||||
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 6670889
|
||||
* @summary Keystore created under Hindi Locale causing ArrayIndexOutOfBoundsException
|
||||
* @run main/othervm -Duser.language=hi -Duser.region=IN LocaleInTime
|
||||
*/
|
||||
|
||||
import java.util.Date;
|
||||
import sun.security.util.DerOutputStream;
|
||||
import sun.security.util.DerValue;
|
||||
|
||||
public class LocaleInTime {
|
||||
public static void main(String args[]) throws Exception {
|
||||
DerOutputStream out = new DerOutputStream();
|
||||
out.putUTCTime(new Date());
|
||||
DerValue val = new DerValue(out.toByteArray());
|
||||
System.out.println(val.getUTCTime());
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user