archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8200152: KerberosString should use UTF-8 by default

Browse source 
Reviewed-by: xuelei
This commit is contained in:
Weijun Wang 2018-04-10 11:02:09 +08:00
parent 824df1c125
commit 370977cf4f
2 changed files with 63 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KerberosString.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 2018, 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
@ -26,8 +26,7 @@
package sun.security.krb5.internal.util;
import java.io.IOException;
import java.security.AccessController;
import sun.security.action.GetBooleanAction;
import sun.security.action.GetPropertyAction;
import sun.security.util.DerValue;
/**
@ -45,15 +44,21 @@ import sun.security.util.DerValue;
public final class KerberosString {
/**
* RFC 4120 defines KerberosString as GeneralString (IA5String), which
* only includes ASCII characters. However, other implementations have been
* known to use GeneralString to contain UTF-8 encoding. To interop
* with these implementations, the following system property is defined.
* When set as true, KerberosString is encoded as UTF-8. Note that this
* only affects the byte encoding, the tag of the ASN.1 type is still
* GeneralString.
* only includes ASCII characters. However, most implementations have been
* known to use GeneralString to contain UTF-8 encoding. The following
* system property is defined. When set as true, KerberosString is encoded
* as UTF-8. Otherwise, it's ASCII. The default is true.
*
* Note that this only affects the byte encoding, the tag of the ASN.1
* type is still GeneralString.
*/
public static final boolean MSNAME = AccessController.doPrivileged(
new GetBooleanAction("sun.security.krb5.msinterop.kstring"));
public static final boolean MSNAME;
static {
String prop = GetPropertyAction.privilegedGetProperty(
"sun.security.krb5.msinterop.kstring", "true");
MSNAME = Boolean.parseBoolean(prop);
}
private final String s;