1 files changed, 48 insertions, 11 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 59994a257..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
    */
@@ -77,6 +79,10 @@ public class PKIProfileImpl extends ObservableImpl
 	 */
 	private boolean revocationChecking;
   
+	
+	private String[] revocationCheckMethode = new String[] {RevocationSourceTypes.CRL};
+	protected String ocspRequestHashAlgorithm_ = null;
+	
   /**
    * The trust profile identifier. 
    */
@@ -96,13 +102,6 @@ public class PKIProfileImpl extends ObservableImpl
   }
 
   /**
-   * @see iaik.pki.PKIProfile#autoAddCertificates()
-   */
-  public boolean autoAddCertificates() {
-    return true;
-  }
-
-  /**
    * @see iaik.pki.PKIProfile#getRevocationProfile()
    */
   public RevocationProfile getRevocationProfile() {
@@ -134,23 +133,43 @@ 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)
    */
   public String[] getPreferredServiceOrder(X509Certificate arg0) {
-    return new String[] {RevocationSourceTypes.CRL};
+    return revocationCheckMethode;
   }
 
+  public void setPreferredServiceOrder(String[] order) {
+	  this.revocationCheckMethode = order;
+  }
+  
   /**
    * @see iaik.pki.store.truststore.TrustStoreProfile#getType()
    */
@@ -227,4 +246,22 @@ public class PKIProfileImpl extends ObservableImpl
   public void setId(String id) {
     this.id = id;
   }
+
+/* (non-Javadoc)
+ * @see iaik.pki.PKIProfile#autoAddCertificates()
+ */
+@Override
+public int autoAddCertificates() {
+	return 1;
+	
+}
+
+/* (non-Javadoc)
+ * @see iaik.pki.PKIProfile#getIndirectRevocationTrustStoreProfile()
+ */
+@Override
+public TrustStoreProfile getIndirectRevocationTrustStoreProfile() {
+	return null;
+	
+}
 }