Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
c5d67df6
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
3
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c5d67df6
编写于
9月 07, 2012
作者:
M
mullan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
4647343: IDENT variable in sun.security.x509 classes not used
Reviewed-by: mullan Contributed-by: jason.uh@oracle.com
上级
575fc89d
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
22 addition
and
405 deletion
+22
-405
src/share/classes/sun/security/x509/CertificateIssuerUniqueIdentity.java
...es/sun/security/x509/CertificateIssuerUniqueIdentity.java
+0
-177
src/share/classes/sun/security/x509/CertificateSubjectUniqueIdentity.java
...s/sun/security/x509/CertificateSubjectUniqueIdentity.java
+0
-176
src/share/classes/sun/security/x509/X509CertImpl.java
src/share/classes/sun/security/x509/X509CertImpl.java
+2
-4
src/share/classes/sun/security/x509/X509CertInfo.java
src/share/classes/sun/security/x509/X509CertInfo.java
+20
-48
未找到文件。
src/share/classes/sun/security/x509/CertificateIssuerUniqueIdentity.java
已删除
100644 → 0
浏览文件 @
575fc89d
/*
* Copyright (c) 1997, 2011, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
package
sun.security.x509
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.io.OutputStream
;
import
java.util.Enumeration
;
import
sun.security.util.*
;
/**
* This class defines the subject/issuer unique identity attribute
* for the Certificate.
*
* @author Amit Kapoor
* @author Hemma Prafullchandra
* @see CertAttrSet
*/
public
class
CertificateIssuerUniqueIdentity
implements
CertAttrSet
<
String
>
{
private
UniqueIdentity
id
;
/**
* Identifier for this attribute, to be used with the
* get, set, delete methods of Certificate, x509 type.
*/
public
static
final
String
IDENT
=
"x509.info.issuerID"
;
/**
* Sub attributes name for this CertAttrSet.
*/
public
static
final
String
NAME
=
"issuerID"
;
public
static
final
String
ID
=
"id"
;
/**
* Default constructor for the certificate attribute.
*
* @param key the UniqueIdentity
*/
public
CertificateIssuerUniqueIdentity
(
UniqueIdentity
id
)
{
this
.
id
=
id
;
}
/**
* Create the object, decoding the values from the passed DER stream.
*
* @param in the DerInputStream to read the UniqueIdentity from.
* @exception IOException on decoding errors.
*/
public
CertificateIssuerUniqueIdentity
(
DerInputStream
in
)
throws
IOException
{
id
=
new
UniqueIdentity
(
in
);
}
/**
* Create the object, decoding the values from the passed stream.
*
* @param in the InputStream to read the UniqueIdentity from.
* @exception IOException on decoding errors.
*/
public
CertificateIssuerUniqueIdentity
(
InputStream
in
)
throws
IOException
{
DerValue
val
=
new
DerValue
(
in
);
id
=
new
UniqueIdentity
(
val
);
}
/**
* Create the object, decoding the values from the passed DER value.
*
* @param in the DerValue to read the UniqueIdentity from.
* @exception IOException on decoding errors.
*/
public
CertificateIssuerUniqueIdentity
(
DerValue
val
)
throws
IOException
{
id
=
new
UniqueIdentity
(
val
);
}
/**
* Return the identity as user readable string.
*/
public
String
toString
()
{
if
(
id
==
null
)
return
""
;
return
(
id
.
toString
());
}
/**
* Encode the identity in DER form to the stream.
*
* @param out the DerOutputStream to marshal the contents to.
* @exception IOException on errors.
*/
public
void
encode
(
OutputStream
out
)
throws
IOException
{
DerOutputStream
tmp
=
new
DerOutputStream
();
id
.
encode
(
tmp
,
DerValue
.
createTag
(
DerValue
.
TAG_CONTEXT
,
false
,(
byte
)
1
));
out
.
write
(
tmp
.
toByteArray
());
}
/**
* Set the attribute value.
*/
public
void
set
(
String
name
,
Object
obj
)
throws
IOException
{
if
(!(
obj
instanceof
UniqueIdentity
))
{
throw
new
IOException
(
"Attribute must be of type UniqueIdentity."
);
}
if
(
name
.
equalsIgnoreCase
(
ID
))
{
id
=
(
UniqueIdentity
)
obj
;
}
else
{
throw
new
IOException
(
"Attribute name not recognized by "
+
"CertAttrSet: CertificateIssuerUniqueIdentity."
);
}
}
/**
* Get the attribute value.
*/
public
UniqueIdentity
get
(
String
name
)
throws
IOException
{
if
(
name
.
equalsIgnoreCase
(
ID
))
{
return
(
id
);
}
else
{
throw
new
IOException
(
"Attribute name not recognized by "
+
"CertAttrSet: CertificateIssuerUniqueIdentity."
);
}
}
/**
* Delete the attribute value.
*/
public
void
delete
(
String
name
)
throws
IOException
{
if
(
name
.
equalsIgnoreCase
(
ID
))
{
id
=
null
;
}
else
{
throw
new
IOException
(
"Attribute name not recognized by "
+
"CertAttrSet: CertificateIssuerUniqueIdentity."
);
}
}
/**
* Return an enumeration of names of attributes existing within this
* attribute.
*/
public
Enumeration
<
String
>
getElements
()
{
AttributeNameEnumeration
elements
=
new
AttributeNameEnumeration
();
elements
.
addElement
(
ID
);
return
(
elements
.
elements
());
}
/**
* Return the name of this attribute.
*/
public
String
getName
()
{
return
(
NAME
);
}
}
src/share/classes/sun/security/x509/CertificateSubjectUniqueIdentity.java
已删除
100644 → 0
浏览文件 @
575fc89d
/*
* Copyright (c) 1997, 2011, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
package
sun.security.x509
;
import
java.io.InputStream
;
import
java.io.IOException
;
import
java.io.OutputStream
;
import
java.util.Enumeration
;
import
sun.security.util.*
;
/**
* This class defines the subject/issuer unique identity attribute
* for the Certificate.
*
* @author Amit Kapoor
* @author Hemma Prafullchandra
* @see CertAttrSet
*/
public
class
CertificateSubjectUniqueIdentity
implements
CertAttrSet
<
String
>
{
/**
* Identifier for this attribute, to be used with the
* get, set, delete methods of Certificate, x509 type.
*/
public
static
final
String
IDENT
=
"x509.info.subjectID"
;
/**
* Sub attributes name for this CertAttrSet.
*/
public
static
final
String
NAME
=
"subjectID"
;
public
static
final
String
ID
=
"id"
;
private
UniqueIdentity
id
;
/**
* Default constructor for the certificate attribute.
*
* @param key the UniqueIdentity
*/
public
CertificateSubjectUniqueIdentity
(
UniqueIdentity
id
)
{
this
.
id
=
id
;
}
/**
* Create the object, decoding the values from the passed DER stream.
*
* @param in the DerInputStream to read the UniqueIdentity from.
* @exception IOException on decoding errors.
*/
public
CertificateSubjectUniqueIdentity
(
DerInputStream
in
)
throws
IOException
{
id
=
new
UniqueIdentity
(
in
);
}
/**
* Create the object, decoding the values from the passed stream.
*
* @param in the InputStream to read the UniqueIdentity from.
* @exception IOException on decoding errors.
*/
public
CertificateSubjectUniqueIdentity
(
InputStream
in
)
throws
IOException
{
DerValue
val
=
new
DerValue
(
in
);
id
=
new
UniqueIdentity
(
val
);
}
/**
* Create the object, decoding the values from the passed DER value.
*
* @param in the DerValue to read the UniqueIdentity from.
* @exception IOException on decoding errors.
*/
public
CertificateSubjectUniqueIdentity
(
DerValue
val
)
throws
IOException
{
id
=
new
UniqueIdentity
(
val
);
}
/**
* Return the identity as user readable string.
*/
public
String
toString
()
{
if
(
id
==
null
)
return
""
;
return
(
id
.
toString
());
}
/**
* Encode the identity in DER form to the stream.
*
* @param out the DerOutputStream to marshal the contents to.
* @exception IOException on errors.
*/
public
void
encode
(
OutputStream
out
)
throws
IOException
{
DerOutputStream
tmp
=
new
DerOutputStream
();
id
.
encode
(
tmp
,
DerValue
.
createTag
(
DerValue
.
TAG_CONTEXT
,
false
,(
byte
)
2
));
out
.
write
(
tmp
.
toByteArray
());
}
/**
* Set the attribute value.
*/
public
void
set
(
String
name
,
Object
obj
)
throws
IOException
{
if
(!(
obj
instanceof
UniqueIdentity
))
{
throw
new
IOException
(
"Attribute must be of type UniqueIdentity."
);
}
if
(
name
.
equalsIgnoreCase
(
ID
))
{
id
=
(
UniqueIdentity
)
obj
;
}
else
{
throw
new
IOException
(
"Attribute name not recognized by "
+
"CertAttrSet: CertificateSubjectUniqueIdentity."
);
}
}
/**
* Get the attribute value.
*/
public
UniqueIdentity
get
(
String
name
)
throws
IOException
{
if
(
name
.
equalsIgnoreCase
(
ID
))
{
return
(
id
);
}
else
{
throw
new
IOException
(
"Attribute name not recognized by "
+
"CertAttrSet: CertificateSubjectUniqueIdentity."
);
}
}
/**
* Delete the attribute value.
*/
public
void
delete
(
String
name
)
throws
IOException
{
if
(
name
.
equalsIgnoreCase
(
ID
))
{
id
=
null
;
}
else
{
throw
new
IOException
(
"Attribute name not recognized by "
+
"CertAttrSet: CertificateSubjectUniqueIdentity."
);
}
}
/**
* Return an enumeration of names of attributes existing within this
* attribute.
*/
public
Enumeration
<
String
>
getElements
()
{
AttributeNameEnumeration
elements
=
new
AttributeNameEnumeration
();
elements
.
addElement
(
ID
);
return
(
elements
.
elements
());
}
/**
* Return the name of this attribute.
*/
public
String
getName
()
{
return
(
NAME
);
}
}
src/share/classes/sun/security/x509/X509CertImpl.java
浏览文件 @
c5d67df6
...
...
@@ -1070,8 +1070,7 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
return
null
;
try
{
UniqueIdentity
id
=
(
UniqueIdentity
)
info
.
get
(
CertificateIssuerUniqueIdentity
.
NAME
+
DOT
+
CertificateIssuerUniqueIdentity
.
ID
);
X509CertInfo
.
ISSUER_ID
);
if
(
id
==
null
)
return
null
;
else
...
...
@@ -1091,8 +1090,7 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
return
null
;
try
{
UniqueIdentity
id
=
(
UniqueIdentity
)
info
.
get
(
CertificateSubjectUniqueIdentity
.
NAME
+
DOT
+
CertificateSubjectUniqueIdentity
.
ID
);
X509CertInfo
.
SUBJECT_ID
);
if
(
id
==
null
)
return
null
;
else
...
...
src/share/classes/sun/security/x509/X509CertInfo.java
浏览文件 @
c5d67df6
...
...
@@ -75,8 +75,8 @@ public class X509CertInfo implements CertAttrSet<String> {
public
static
final
String
VALIDITY
=
CertificateValidity
.
NAME
;
public
static
final
String
SUBJECT
=
CertificateSubjectName
.
NAME
;
public
static
final
String
KEY
=
CertificateX509Key
.
NAME
;
public
static
final
String
ISSUER_ID
=
CertificateIssuerUniqueIdentity
.
NAME
;
public
static
final
String
SUBJECT_ID
=
CertificateSubjectUniqueIdentity
.
NAME
;
public
static
final
String
ISSUER_ID
=
"issuerID"
;
public
static
final
String
SUBJECT_ID
=
"subjectID"
;
public
static
final
String
EXTENSIONS
=
CertificateExtensions
.
NAME
;
// X509.v1 data
...
...
@@ -89,8 +89,8 @@ public class X509CertInfo implements CertAttrSet<String> {
protected
CertificateX509Key
pubKey
=
null
;
// X509.v2 & v3 extensions
protected
CertificateIssuer
UniqueIdentity
issuerUniqueId
=
null
;
protected
CertificateSubject
UniqueIdentity
subjectUniqueId
=
null
;
protected
UniqueIdentity
issuerUniqueId
=
null
;
protected
UniqueIdentity
subjectUniqueId
=
null
;
// X509.v3 extensions
protected
CertificateExtensions
extensions
=
null
;
...
...
@@ -431,19 +431,11 @@ public class X509CertInfo implements CertAttrSet<String> {
break
;
case
ATTR_ISSUER_ID:
if
(
suffix
==
null
)
{
setIssuerUniqueId
(
val
);
}
else
{
issuerUniqueId
.
set
(
suffix
,
val
);
}
break
;
case
ATTR_SUBJECT_ID:
if
(
suffix
==
null
)
{
setSubjectUniqueId
(
val
);
}
else
{
subjectUniqueId
.
set
(
suffix
,
val
);
}
break
;
case
ATTR_EXTENSIONS:
...
...
@@ -529,18 +521,10 @@ public class X509CertInfo implements CertAttrSet<String> {
}
break
;
case
(
ATTR_ISSUER_ID
):
if
(
suffix
==
null
)
{
issuerUniqueId
=
null
;
}
else
{
issuerUniqueId
.
delete
(
suffix
);
}
break
;
case
(
ATTR_SUBJECT_ID
):
if
(
suffix
==
null
)
{
subjectUniqueId
=
null
;
}
else
{
subjectUniqueId
.
delete
(
suffix
);
}
break
;
case
(
ATTR_EXTENSIONS
):
if
(
suffix
==
null
)
{
...
...
@@ -626,23 +610,9 @@ public class X509CertInfo implements CertAttrSet<String> {
return
(
serialNum
.
get
(
suffix
));
}
case
(
ATTR_ISSUER_ID
):
if
(
suffix
==
null
)
{
return
(
issuerUniqueId
);
}
else
{
if
(
issuerUniqueId
==
null
)
return
null
;
else
return
(
issuerUniqueId
.
get
(
suffix
));
}
case
(
ATTR_SUBJECT_ID
):
if
(
suffix
==
null
)
{
return
(
subjectUniqueId
);
}
else
{
if
(
subjectUniqueId
==
null
)
return
null
;
else
return
(
subjectUniqueId
.
get
(
suffix
));
}
}
return
null
;
}
...
...
@@ -711,7 +681,7 @@ public class X509CertInfo implements CertAttrSet<String> {
// Get the issuerUniqueId if present
tmp
=
in
.
getDerValue
();
if
(
tmp
.
isContextSpecific
((
byte
)
1
))
{
issuerUniqueId
=
new
CertificateIssuer
UniqueIdentity
(
tmp
);
issuerUniqueId
=
new
UniqueIdentity
(
tmp
);
if
(
in
.
available
()
==
0
)
return
;
tmp
=
in
.
getDerValue
();
...
...
@@ -719,7 +689,7 @@ public class X509CertInfo implements CertAttrSet<String> {
// Get the subjectUniqueId if present.
if
(
tmp
.
isContextSpecific
((
byte
)
2
))
{
subjectUniqueId
=
new
CertificateSubject
UniqueIdentity
(
tmp
);
subjectUniqueId
=
new
UniqueIdentity
(
tmp
);
if
(
in
.
available
()
==
0
)
return
;
tmp
=
in
.
getDerValue
();
...
...
@@ -814,10 +784,12 @@ public class X509CertInfo implements CertAttrSet<String> {
// Encode issuerUniqueId & subjectUniqueId.
if
(
issuerUniqueId
!=
null
)
{
issuerUniqueId
.
encode
(
tmp
);
issuerUniqueId
.
encode
(
tmp
,
DerValue
.
createTag
(
DerValue
.
TAG_CONTEXT
,
false
,(
byte
)
1
));
}
if
(
subjectUniqueId
!=
null
)
{
subjectUniqueId
.
encode
(
tmp
);
subjectUniqueId
.
encode
(
tmp
,
DerValue
.
createTag
(
DerValue
.
TAG_CONTEXT
,
false
,(
byte
)
2
));
}
// Write all the extensions.
...
...
@@ -946,11 +918,11 @@ public class X509CertInfo implements CertAttrSet<String> {
if
(
version
.
compare
(
CertificateVersion
.
V2
)
<
0
)
{
throw
new
CertificateException
(
"Invalid version"
);
}
if
(!(
val
instanceof
CertificateIssuer
UniqueIdentity
))
{
if
(!(
val
instanceof
UniqueIdentity
))
{
throw
new
CertificateException
(
"IssuerUniqueId class type invalid."
);
}
issuerUniqueId
=
(
CertificateIssuer
UniqueIdentity
)
val
;
issuerUniqueId
=
(
UniqueIdentity
)
val
;
}
/**
...
...
@@ -963,11 +935,11 @@ public class X509CertInfo implements CertAttrSet<String> {
if
(
version
.
compare
(
CertificateVersion
.
V2
)
<
0
)
{
throw
new
CertificateException
(
"Invalid version"
);
}
if
(!(
val
instanceof
CertificateSubject
UniqueIdentity
))
{
if
(!(
val
instanceof
UniqueIdentity
))
{
throw
new
CertificateException
(
"SubjectUniqueId class type invalid."
);
}
subjectUniqueId
=
(
CertificateSubject
UniqueIdentity
)
val
;
subjectUniqueId
=
(
UniqueIdentity
)
val
;
}
/**
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录