infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-16 21:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

8349532: Refactor ./util/Pem/encoding.sh to run in java

Browse Source 
Reviewed-by: weijun
This commit is contained in:
Mikhail Yankelevich 2025-02-07 15:40:17 +00:00 committed by Weijun Wang
parent 86cec4ea2c
commit 7cd5cb2916
2 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
test/jdk/sun/security/util/Pem/PemEncoding.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2025, 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
@ -21,14 +21,49 @@
* questions.
*/
/*
* @test
* @bug 8158633
* @summary BASE64 encoded cert not correctly parsed with UTF-16
* @library /test/lib
*/
import jdk.test.lib.process.ProcessTools;
import java.io.FileInputStream;
import java.nio.charset.Charset;
import java.nio.file.Path;
import java.security.cert.CertificateFactory;
public class PemEncoding {
public static void main(String[] args) throws Exception {
try (FileInputStream fis = new FileInputStream(args[0])) {
CertificateFactory cf = CertificateFactory.getInstance("X.509");
System.out.println(cf.generateCertificate(fis));
final var certPath = Path.of(System.getProperty("test.src", "."))
.getParent()
.resolve("HostnameChecker")
.resolve("cert5.crt")
.toString();
final var testCommand = new String[]{"-Dfile.encoding=UTF-16",
PemEncoding.PemEncodingTest.class.getName(),
certPath};
final var result = ProcessTools.executeTestJava(testCommand);
result.shouldHaveExitValue(0);
}
static class PemEncodingTest {
public static void main(String[] args) throws Exception {
try (FileInputStream fis = new FileInputStream(args[0])) {
CertificateFactory cf = CertificateFactory.getInstance("X.509");
System.out.println(cf.generateCertificate(fis));
}
if (!"UTF-16".equals(Charset.defaultCharset().displayName())) {
throw new RuntimeException("File encoding is not UTF-16");
}
}
}
}

35
test/jdk/sun/security/util/Pem/encoding.sh
View File

@ -1,35 +0,0 @@
#
# Copyright (c) 2016, 2024, 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 8158633
# @summary BASE64 encoded cert not correctly parsed with UTF-16
# @build PemEncoding
# @run shell encoding.sh
# jtreg does not like -Dfile.encoding=UTF-16 inside a @run main line,
# therefore a shell test is written.
$TESTJAVA/bin/java $TESTVMOPTS $TESTJAVAOPTS -cp $TESTCLASSES \
-Dfile.encoding=UTF-16 \
PemEncoding $TESTSRC/../HostnameChecker/cert5.crt