stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8187023: Cannot read pkcs11 config file in UTF-16 environment

Browse Source 
Reviewed-by: ascarpino
This commit is contained in:
Ivan Gerasimov 2017-08-31 22:21:20 -07:00
parent 363d9c80be
commit 9f4207e324
3 changed files with 82 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2017, 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
@ -28,6 +28,7 @@ package sun.security.pkcs11;
import java.io.*;
import static java.io.StreamTokenizer.*;
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.security.*;
@ -202,7 +203,8 @@ final class Config {
reader = new StringReader(config);
} else {
reader = new BufferedReader(new InputStreamReader
(new FileInputStream(expand(filename))));
(new FileInputStream(expand(filename)),
StandardCharsets.ISO_8859_1));
}
parsedKeywords = new HashSet<String>();
st = new StreamTokenizer(reader);

40
jdk/test/sun/security/pkcs11/Config/ReadConfInUTF16Env.java Normal file
View File

@ -0,0 +1,40 @@
/*
* Copyright (c) 2017, 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.
*/
import java.security.Provider;
import java.security.Security;
public class ReadConfInUTF16Env {
public static void main(String argv[]) {
Provider p = Security.getProvider("SunPKCS11");
if (p == null) {
p = Security.getProvider("SunPKCS11-Solaris");
if (p == null) {
System.out.println("Skipping test - no PKCS11 provider available");
return;
}
}
System.out.println(p.getName());
}
}

38
jdk/test/sun/security/pkcs11/Config/ReadConfInUTF16Env.sh Normal file
View File

@ -0,0 +1,38 @@
#
# Copyright (c) 2017, 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 8187023
# @summary Pkcs11 config file should be assumed in ISO-8859-1
# @build ReadConfInUTF16Env
# @run shell ReadConfInUTF16Env.sh
# jtreg does not like -Dfile.encoding=UTF-16 inside a @run main line,
# testlibrary.ProcessTools.createJavaProcessBuilder() also had troubles
# executing a subprocess with -Dfile.encoding=UTF-16 option added,
# therefore a shell test is written.
$TESTJAVA/bin/java $TESTVMOPTS -cp $TESTCLASSES \
-Dfile.encoding=UTF-16 \
ReadConfInUTF16Env