[java-opensaml COMMIT] in /trunk: opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/SimpleKeyI...

[noreply at shibboleth.net]

Author: scantor
Date: Wed May 22 18:18:46 2013
New Revision: 3341

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3341&view=rev
Log:
Move DSig 1.1 access to dedicated methods.

Modified:
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/SimpleKeyInfoReferenceEncryptedKeyResolver.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupport.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyInfoType.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyValue.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/X509Data.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/BasicProviderKeyInfoCredentialResolver.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorFactory.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/InlineX509DataProvider.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/KeyInfoReferenceProvider.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoTypeImpl.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyValueImpl.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyValueUnmarshaller.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DataImpl.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleKeyInfoReferenceEncryptedKeyResolverTest.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupportTest.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/BasicKeyInfoGeneratorTest.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorTest.java

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/SimpleKeyInfoReferenceEncryptedKeyResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/SimpleKeyInfoReferenceEncryptedKeyResolver.java?rev=3341&r1=3340&r2=3341&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/SimpleKeyInfoReferenceEncryptedKeyResolver.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/SimpleKeyInfoReferenceEncryptedKeyResolver.java Wed May 22 18:18:46 2013
@@ -108,8 +108,8 @@
         if (limit == 0) {
             log.info("Reached depth limit for KeyInfoReferences");
         } else {
-            for (XMLObject xo : keyInfo.getXMLObjects(KeyInfoReference.DEFAULT_ELEMENT_NAME)) {
-                for (EncryptedKey encKey : resolveKeyInfo(dereferenceURI((KeyInfoReference) xo), limit-1)) {
+            for (KeyInfoReference ref : keyInfo.getKeyInfoReferences()) {
+                for (EncryptedKey encKey : resolveKeyInfo(dereferenceURI(ref), limit-1)) {
                     resolvedEncKeys.add(encKey);
                 }
             }

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupport.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupport.java?rev=3341&r1=3340&r2=3341&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupport.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupport.java Wed May 22 18:18:46 2013
@@ -618,8 +618,8 @@
         X509EncodedKeySpec keySpec = keyFactory.getKeySpec(pk, X509EncodedKeySpec.class);
         keyValue.setValue(Base64Support.encode(keySpec.getEncoded(), Base64Support.CHUNKED));
         
-        keyInfo.getXMLObjects(DEREncodedKeyValue.DEFAULT_ELEMENT_NAME).add(keyValue);
-    }        
+        keyInfo.getDEREncodedKeyValues().add(keyValue);
+    }
     
     /**
      * Extracts all the public keys within the given {@link KeyInfo}'s {@link KeyValue}s and
@@ -648,8 +648,8 @@
             }
         }
 
-        for (XMLObject keyDescriptor : keyInfo.getXMLObjects(DEREncodedKeyValue.DEFAULT_ELEMENT_NAME)) {
-            PublicKey newKey = getKey((DEREncodedKeyValue) keyDescriptor);
+        for (DEREncodedKeyValue keyDescriptor : keyInfo.getDEREncodedKeyValues()) {
+            PublicKey newKey = getKey(keyDescriptor);
             if (newKey != null) {
                 keys.add(newKey);
             }

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyInfoType.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyInfoType.java?rev=3341&r1=3340&r2=3341&view=diff

[... 481 lines stripped ...]