From ab05cb01a6c76fb280120246a5dd20ebc552aaa7 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
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/main/java/at/gv/egiz/smcc/FINEIDCard.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'smcc/src/main/java/at/gv/egiz/smcc/FINEIDCard.java')

diff --git a/smcc/src/main/java/at/gv/egiz/smcc/FINEIDCard.java b/smcc/src/main/java/at/gv/egiz/smcc/FINEIDCard.java
index 32272af8..92371d8e 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/FINEIDCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/FINEIDCard.java
@@ -17,6 +17,7 @@
 
 package at.gv.egiz.smcc;
 
+import at.gv.egiz.smcc.cio.CIOCertificate;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.MessageDigest;
@@ -63,7 +64,7 @@ public class FINEIDCard extends AbstractSignatureCard implements SignatureCard {
 
 			// read PRKD to find correct key
 			FINEIDCIOKeyDirectory ef_prkd = new FINEIDCIOKeyDirectory(ef_od
-					.getEf_prkd());
+					.getPrKDReferences().get(0));
 			ef_prkd.selectAndRead(channel);
 
 			byte[] efKey = null;
@@ -93,7 +94,7 @@ public class FINEIDCard extends AbstractSignatureCard implements SignatureCard {
 			}
 
 			// read AOD to find the associated PIN (authId must match)
-			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;
@@ -181,10 +182,10 @@ public class FINEIDCard extends AbstractSignatureCard implements SignatureCard {
 
 			byte[] certPath = null;
 
-			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);
-- 
cgit v1.2.3