remove MOA-ID specific certStore directory.

From now, MOA-ID always use the MOA-SPSS certStore directory for chain building

1 files changed, 24 insertions, 5 deletions

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/PKIProfileImpl.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/PKIProfileImpl.java
index 9b692c090..1c8b6e18d 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/PKIProfileImpl.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/PKIProfileImpl.java
@@ -46,10 +46,12 @@
 
 package at.gv.egovernment.moa.id.commons.utils.ssl;
 
+import java.security.NoSuchAlgorithmException;
 import java.security.cert.X509Certificate;
 import java.util.Collections;
 import java.util.Set;
 
+import iaik.asn1.structures.AlgorithmID;
 import iaik.pki.PKIProfile;
 import iaik.pki.pathvalidation.ValidationProfile;
 import iaik.pki.revocation.RevocationProfile;
@@ -66,7 +68,7 @@ import iaik.pki.store.truststore.TrustStoreTypes;
  */
 public class PKIProfileImpl extends ObservableImpl
   implements PKIProfile, RevocationProfile, TrustStoreProfile, ValidationProfile {
-
+	
   /**
    * URI to the truststore
    */
@@ -79,6 +81,7 @@ public class PKIProfileImpl extends ObservableImpl
   
 	
 	private String[] revocationCheckMethode = new String[] {RevocationSourceTypes.CRL};
+	protected String ocspRequestHashAlgorithm_ = null;
 	
   /**
    * The trust profile identifier. 
@@ -130,16 +133,32 @@ public class PKIProfileImpl extends ObservableImpl
    * @see iaik.pki.revocation.RevocationProfile#getMaxRevocationAge(java.lang.String)
    */
   public long getMaxRevocationAge(String arg0) {
-    return 0;
+    return 0L;
   }
 
   /**
    * @see iaik.pki.revocation.RevocationProfile#getOCSPRequestHashAlgorithm()
    */
   public String getOCSPRequestHashAlgorithm() {
-    return null;
+	  if (ocspRequestHashAlgorithm_ == null) {
+	      try
+	      {
+	        ocspRequestHashAlgorithm_ = AlgorithmID.sha1.getImplementationName();
+	      }
+	      catch (NoSuchAlgorithmException localNoSuchAlgorithmException) {}
+	    }
+	    return ocspRequestHashAlgorithm_;
   }
 
+  public void setOCSPRequestHashAlgorithm(AlgorithmID paramAlgorithmID)
+		    throws NoSuchAlgorithmException
+		  {
+		    if (paramAlgorithmID == null) {
+		      throw new NullPointerException("Algorithm must not be null.");
+		    }
+		    ocspRequestHashAlgorithm_ = paramAlgorithmID.getImplementationName();
+		  }
+  
   /**
    * @see iaik.pki.revocation.RevocationProfile#getPreferredServiceOrder(java.security.cert.X509Certificate)
    */
@@ -233,8 +252,8 @@ public class PKIProfileImpl extends ObservableImpl
  */
 @Override
 public int autoAddCertificates() {
-	//TODO: ask harald!!!!!
 	return 1;
+	
 }
 
 /* (non-Javadoc)
@@ -242,7 +261,7 @@ public int autoAddCertificates() {
  */
 @Override
 public TrustStoreProfile getIndirectRevocationTrustStoreProfile() {
-	//TODO: ask harald!!!!!
 	return null;
+	
 }
 }