infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-01 05:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

6474858: CardChannel.transmit(CommandAPDU) throws unexpected ArrayIndexOutOfBoundsException

Browse Source 
Reviewed-by: valeriep
This commit is contained in:
Ivan Gerasimov 2018-08-24 18:56:41 -07:00
parent 8f87784420
commit 852e131c61
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/java.smartcardio/share/classes/sun/security/smartcardio/ChannelImpl.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 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
@ -188,7 +188,7 @@ final class ChannelImpl extends CardChannel {
byte[] response = SCardTransmit
(card.cardId, card.protocol, command, 0, n);
int rn = response.length;
if (getresponse && (rn >= 2)) {
if (getresponse && (rn >= 2) && (n >= 1)) {
// see ISO 7816/2005, 5.1.3
if ((rn == 2) && (response[0] == 0x6c)) {
// Resend command using SW2 as short Le field
@ -201,6 +201,11 @@ final class ChannelImpl extends CardChannel {
if (rn > 2) {
result = concat(result, response, rn - 2);
}
if (command.length < 5) {
byte cla = command[0];
command = new byte[5];
command[0] = cla;
}
command[1] = (byte)0xC0;
command[2] = 0;
command[3] = 0;
@ -208,7 +213,6 @@ final class ChannelImpl extends CardChannel {
n = 5;
continue;
}
}
result = concat(result, response, rn);
break;

11
test/jdk/sun/security/smartcardio/TestTransmit.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 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
@ -23,7 +23,7 @@
/*
* @test
* @bug 6293769 6294527
* @bug 6293769 6294527 6474858
* @summary test transmit() works
* @author Andreas Sterbenz
* @modules java.smartcardio/javax.smartcardio
@ -90,6 +90,13 @@ public class TestTransmit extends Utils {
} // else ignore
}
// JDK-6474858 : CardChannel.transmit(CommandAPDU) throws
// unexpected ArrayIndexOutOfBoundsException
{
CommandAPDU capdu2 = new CommandAPDU(0x00, 0xA4, 0x00, 0x00);
channel.transmit(capdu2);
}
// disconnect
card.disconnect(true);