refactor ObjectDirectory

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@855 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

1 files changed, 6 insertions, 4 deletions

diff --git a/smcc/src/main/java/at/gv/egiz/smcc/ESDNIeCard.java b/smcc/src/main/java/at/gv/egiz/smcc/ESDNIeCard.java
index a0d426c7..4f1c7610 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/ESDNIeCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/ESDNIeCard.java
@@ -1,5 +1,7 @@
 package at.gv.egiz.smcc;

 

+import at.gv.egiz.smcc.cio.CIOCertificate;

+import at.gv.egiz.smcc.cio.ObjectDirectory;

 import java.io.ByteArrayOutputStream;

 import java.io.IOException;

 import java.io.InputStream;

@@ -66,11 +68,11 @@ public class ESDNIeCard extends AbstractSignatureCard implements SignatureCard {
 			// Select DF.CIA

 			executeSelectDFCIA(channel);

 

-			EFObjectDirectory efOd = new EFObjectDirectory();

+			ObjectDirectory efOd = new ObjectDirectory();

 			efOd.selectAndRead(channel);

 

 			DNIeCIOCertificateDirectory efPrkd = new DNIeCIOCertificateDirectory(

-					efOd.getEf_prkd());

+					efOd.getPrKDReferences().get(0));

 			efPrkd.selectAndRead(channel);

 

 			byte[] efKey = null;

@@ -155,11 +157,11 @@ public class ESDNIeCard extends AbstractSignatureCard implements SignatureCard {
 

 			byte[] efQcert = null;

 

-			EFObjectDirectory efOd = new EFObjectDirectory();

+			ObjectDirectory efOd = new ObjectDirectory();

 			efOd.selectAndRead(channel);

 

 			DNIeCIOCertificateDirectory efCd = new DNIeCIOCertificateDirectory(

-					efOd.getEf_cd_list().get(0));

+					efOd.getCDReferences().get(0));

 

 			try {

 				efCd.selectAndRead(channel);