Commit4c77223

Wolfgang Glas

committed

Brush up the new script API by undertaking more tests.

1 parent89f9488 commit4c77223Copy full SHA for 4c77223

File tree

+21

-4

lines changed

pkcs15/src
- main/java/org/opensc/pkcs15/script/impl
  - CSFScriptParser.java
- test/java/test/org/opensc/pkcs15
  - TestCSFScripts.java

+21

-4

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ else if ("resp".equals(kv[0]))`
`307`	`307`	`else`
`308`	`308`	`cmd =newCommandAPDU(cla,ins,p1,p2);`
`309`	`309`
`310`		`-SimpleCommandr =newSimpleCommand(cmd,resp,false);`
	`310`	`+SimpleCommandr =newSimpleCommand(cmd,resp,true);`
`311`	`311`
`312`	`312`	`if (log.isDebugEnabled()) {`
`313`	`313`	`log.debug("apdu = " +Util.asHex(r.getRequest().getBytes()));`
`@@ -358,10 +358,13 @@ else if ("[include]".equals(section))`
`358`	`358`
`359`	`359`	`if (ret ==null)`
`360`	`360`	`ret =r;`
`361`		`-`
	`361`	`+`
`362`	`362`	`if (simpleCommand !=null)`
`363`	`363`	`simpleCommand.setNext(r);`
`364`	`364`
	`365`	`+while (r.getNext() !=null)`
	`366`	`+r = (SimpleCommand)r.getNext();`
	`367`	`+`
`365`	`368`	`simpleCommand =r;`
`366`	`369`
`367`	`370`	`section =this.readLine(reader);`

Lines changed: 16 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,20 +44,34 @@ public class TestCSFScripts extends HardwareCardSupport {`
`44`	`44`
`45`	`45`	`privateStringgetResourceBase() {`
`46`	`46`
	`47`	`+Strings =System.getProperty("org.opensc.pkcs15.test.resourceBase");`
	`48`	`+`
	`49`	`+if (s !=null)returns;`
	`50`	`+`
`47`	`51`	`return"file:/home/ev-i/Siemens/SmartCard/Unterlagen/CardOS_V4.3B/Packages_and_Release_Notes/V43B_CSF_Files_2005_05/Run_CSF";`
`48`	`52`	`}`
`49`	`53`
	`54`	`+privateStringgetScript() {`
	`55`	`+`
	`56`	`+Strings =System.getProperty("org.opensc.pkcs15.test.script");`
	`57`	`+`
	`58`	`+if (s !=null)returns;`
	`59`	`+`
	`60`	`+return"Run_V43B_Erase_Profile_Default.csf";`
	`61`	`+ }`
	`62`	`+`
`50`	`63`	`publicvoidtestInitScripts()throwsIOException,CardException {`
`51`	`64`
`52`		`-StringresPath=this.getResourceBase() +"/Run_V43B_Erase_Profile_Default.csf";`
	`65`	`+StringresPath=this.getResourceBase() +"/" +this.getScript();`
`53`	`66`
`54`	`67`	`ScriptResourceres =scriptResourceFactory.getScriptResource(resPath);`
`55`	`68`
`56`	`69`	`ScriptParsercsfParser =scriptParserFactory.getScriptParser("csf");`
`57`	`70`
`58`	`71`	`Commandcmd =csfParser.parseScript(res);`
`59`	`72`
`60`		`-cmd.execute(this.card.getBasicChannel());`
	`73`	`+while (cmd !=null)`
	`74`	`+cmd =cmd.execute(this.card.getBasicChannel());`
`61`	`75`	`}`
`62`	`76`
`63`	`77`

Comments

(0)