infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-09 07:35:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

8158633: BASE64 encoded cert not correctly parsed with UTF-16

Browse Source 
Reviewed-by: mullan
This commit is contained in:
Weijun Wang 2016-06-17 21:07:31 +08:00
parent 868cd939e6
commit 644df29a24
3 changed files with 72 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/java.base/share/classes/sun/security/util/Pem.java
View File

@ -26,6 +26,7 @@
package sun.security.util;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
/**
@ -42,7 +43,8 @@ public class Pem {
* @throws java.io.IOException if input is invalid
*/
public static byte[] decode(String input) throws IOException {
byte[] src = input.replaceAll("\\s+", "").getBytes();
byte[] src = input.replaceAll("\\s+", "")
.getBytes(StandardCharsets.ISO_8859_1);
try {
return Base64.getDecoder().decode(src);
} catch (IllegalArgumentException e) {

34
jdk/test/sun/security/util/Pem/PemEncoding.java Normal file
View File

@ -0,0 +1,34 @@
/*
* Copyright (c) 2016, 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.io.FileInputStream;
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));
}
}
}

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

@ -0,0 +1,35 @@
#
# Copyright (c) 2016, 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 -cp $TESTCLASSES \
-Dfile.encoding=UTF-16 \
PemEncoding $TESTSRC/../HostnameMatcher/cert5.crt