From ab05cb01a6c76fb280120246a5dd20ebc552aaa7 Mon Sep 17 00:00:00 2001 From: clemenso Date: Thu, 23 Dec 2010 19:24:55 +0000 Subject: refactor ObjectDirectory git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@855 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- smcc/src/test/java/at/gv/egiz/smcc/FINEIDTest.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'smcc/src/test/java/at/gv/egiz/smcc/FINEIDTest.java') diff --git a/smcc/src/test/java/at/gv/egiz/smcc/FINEIDTest.java b/smcc/src/test/java/at/gv/egiz/smcc/FINEIDTest.java index eef6f611..251728bd 100644 --- a/smcc/src/test/java/at/gv/egiz/smcc/FINEIDTest.java +++ b/smcc/src/test/java/at/gv/egiz/smcc/FINEIDTest.java @@ -1,5 +1,6 @@ package at.gv.egiz.smcc; +import at.gv.egiz.smcc.cio.CIOCertificate; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; @@ -95,10 +96,10 @@ public class FINEIDTest extends AbstractSignatureCard { // **** READ CERT **** - for (int i = 0; i < ef_od.getEf_cd_list().size(); i++) { + for (int i = 0; i < ef_od.getCDReferences().size(); i++) { FINEIDCIOCertificateDirectory ef_cd = new FINEIDCIOCertificateDirectory( - ef_od.getEf_cd_list().get(i)); + ef_od.getCDReferences().get(i)); try { ef_cd.selectAndRead(channel); @@ -158,11 +159,11 @@ public class FINEIDTest extends AbstractSignatureCard { // **** VERIFY PIN **** - byte[] prkdPath = ef_od.getEf_prkd(); + byte[] prkdPath = ef_od.getPrKDReferences().get(0); System.out.println("PRKD path: " + SMCCHelper.toString(prkdPath)); FINEIDCIOKeyDirectory ef_prkd = new FINEIDCIOKeyDirectory(ef_od - .getEf_prkd()); + .getPrKDReferences().get(0)); ef_prkd.selectAndRead(channel); byte[] efKey = null; @@ -181,10 +182,10 @@ public class FINEIDTest extends AbstractSignatureCard { System.out.println("Key path: " + SMCCHelper.toString(efKey)); - byte[] aod = ef_od.getEf_aod(); + byte[] aod = ef_od.getAODReferences().get(0); System.out.println("AOD path: " + SMCCHelper.toString(aod)); - FINEIDAODirectory ef_aod = new FINEIDAODirectory(ef_od.getEf_aod()); + FINEIDAODirectory ef_aod = new FINEIDAODirectory(ef_od.getAODReferences().get(0)); ef_aod.selectAndRead(channel); byte[] pinPath = null; -- cgit v1.2.3