Modify cert clients to check server for wrapping params

CRMFPopClient and the pki cert client both can send a CRMF request
to a CA directly.  Logic is added to check the CA for the required
KRA wrapping params and use those in place of any that have been
provided by the environment or command line.

Also, additional data for the supported KRA keyset has been added to
the CAInfoService.  This will need to be managed by the admin.  The
default is "1" which corresponds to AES.

Change-Id: I186f9c610005ec300bccf1b07470493ce7cdfeb4

1 files changed, 16 insertions, 0 deletions

diff --git a/base/common/src/org/dogtagpki/common/CAInfo.java b/base/common/src/org/dogtagpki/common/CAInfo.java
index 89255ed1a..f21dcd0d7 100644
--- a/base/common/src/org/dogtagpki/common/CAInfo.java
+++ b/base/common/src/org/dogtagpki/common/CAInfo.java
@@ -54,6 +54,7 @@ public class CAInfo extends ResourceMessage {
     }
 
     String archivalMechanism;
+    String wrappingKeySet;
 
     @XmlElement(name="ArchivalMechanism")
     public String getArchivalMechanism() {
@@ -64,11 +65,21 @@ public class CAInfo extends ResourceMessage {
         this.archivalMechanism = archivalMechanism;
     }
 
+    @XmlElement(name="WrappingKeySet")
+    public String getWrappingKeySet() {
+        return wrappingKeySet;
+    }
+
+    public void setWrappingKeySet(String wrappingKeySet) {
+        this.wrappingKeySet = wrappingKeySet;
+    }
+
     @Override
     public int hashCode() {
         final int prime = 31;
         int result = super.hashCode();
         result = prime * result + ((archivalMechanism == null) ? 0 : archivalMechanism.hashCode());
+        result = prime * result + ((wrappingKeySet == null) ? 0 : wrappingKeySet.hashCode());
         return result;
     }
 
@@ -86,6 +97,11 @@ public class CAInfo extends ResourceMessage {
                 return false;
         } else if (!archivalMechanism.equals(other.archivalMechanism))
             return false;
+        if (wrappingKeySet == null) {
+            if (other.wrappingKeySet != null)
+                return false;
+        } else if (!wrappingKeySet.equals(other.wrappingKeySet))
+            return false;
         return true;
     }