Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
7eb831c3
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
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看板
提交
7eb831c3
编写于
8月 07, 2014
作者:
I
igerasim
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8046343: (smartcardio) CardTerminal.connect('direct') does not work on MacOSX
Reviewed-by: mullan, valeriep
上级
f643c097
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
67 addition
and
4 deletion
+67
-4
src/share/classes/sun/security/smartcardio/CardImpl.java
src/share/classes/sun/security/smartcardio/CardImpl.java
+18
-4
test/sun/security/smartcardio/TestAll.java
test/sun/security/smartcardio/TestAll.java
+1
-0
test/sun/security/smartcardio/TestDirect.java
test/sun/security/smartcardio/TestDirect.java
+48
-0
未找到文件。
src/share/classes/sun/security/smartcardio/CardImpl.java
浏览文件 @
7eb831c3
/*
* Copyright (c) 2005, 201
0
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 201
4
, 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,9 +26,9 @@
package
sun.security.smartcardio
;
import
java.nio.ByteBuffer
;
import
java.security.AccessController
;
import
java.security.PrivilegedAction
;
import
javax.smartcardio.*
;
import
static
sun
.
security
.
smartcardio
.
PCSC
.*;
/**
...
...
@@ -62,6 +62,15 @@ final class CardImpl extends Card {
// thread holding exclusive access to the card, or null
private
volatile
Thread
exclusiveThread
;
// used for platform specific logic
private
static
final
boolean
isWindows
;
static
{
final
String
osName
=
AccessController
.
doPrivileged
(
(
PrivilegedAction
<
String
>)
()
->
System
.
getProperty
(
"os.name"
));
isWindows
=
osName
.
startsWith
(
"Windows"
);
}
CardImpl
(
TerminalImpl
terminal
,
String
protocol
)
throws
PCSCException
{
this
.
terminal
=
terminal
;
int
sharingMode
=
SCARD_SHARE_SHARED
;
...
...
@@ -74,7 +83,12 @@ final class CardImpl extends Card {
connectProtocol
=
SCARD_PROTOCOL_T1
;
}
else
if
(
protocol
.
equalsIgnoreCase
(
"direct"
))
{
// testing
connectProtocol
=
0
;
// MSDN states that the preferred protocol can be zero, but doesn't
// specify whether other values are allowed.
// pcsc-lite implementation expects the preferred protocol to be non zero.
connectProtocol
=
isWindows
?
0
:
SCARD_PROTOCOL_RAW
;
sharingMode
=
SCARD_SHARE_DIRECT
;
}
else
{
throw
new
IllegalArgumentException
(
"Unsupported protocol "
+
protocol
);
...
...
test/sun/security/smartcardio/TestAll.java
浏览文件 @
7eb831c3
...
...
@@ -40,6 +40,7 @@ public class TestAll {
TestMultiplePresent
.
class
,
TestPresent
.
class
,
TestTransmit
.
class
,
TestDirect
.
class
,
};
public
static
void
main
(
String
[]
args
)
throws
Exception
{
...
...
test/sun/security/smartcardio/TestDirect.java
0 → 100644
浏览文件 @
7eb831c3
/*
* Copyright (c) 2014, 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 8046343
* @summary Make sure that direct protocol is available
* @run main/manual TestDirect
*/
// This test requires special hardware.
import
javax.smartcardio.Card
;
import
javax.smartcardio.CardTerminal
;
import
javax.smartcardio.CardTerminals
;
import
javax.smartcardio.TerminalFactory
;
public
class
TestDirect
{
public
static
void
main
(
String
[]
args
)
throws
Exception
{
TerminalFactory
terminalFactory
=
TerminalFactory
.
getDefault
();
CardTerminals
cardTerminals
=
terminalFactory
.
terminals
();
CardTerminal
cardTerminal
=
cardTerminals
.
list
().
get
(
0
);
Card
card
=
cardTerminal
.
connect
(
"DIRECT"
);
card
.
disconnect
(
true
);
System
.
out
.
println
(
"OK."
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录