[java-opensaml COMMIT] in /trunk: opensaml-security-api/src/main/java/org/opensaml/security/crypto/JCAConstants.java ...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri May 23 16:52:37 2014
New Revision: 3891

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3891&view=rev
Log:
Add constants and algorithm support for missing Signature algorithms defined in XML Signature 1.1: SHA-224 variants and DSA SHA-256.
Add contsnts for XML Encryption 1.1 MGFs.

Added:
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/descriptors/DigestSHA224.java   (with props)
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/descriptors/HMACSHA224.java   (with props)
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/descriptors/SignatureDSASHA256.java   (with props)
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/descriptors/SignatureECDSASHA224.java   (with props)
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/descriptors/SignatureRSASHA224.java   (with props)
Modified:
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/crypto/JCAConstants.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/EncryptionConstants.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignatureConstants.java
    trunk/opensaml-xmlsec-api/src/main/resources/META-INF/services/org.opensaml.xmlsec.algorithm.AlgorithmDescriptor
    trunk/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/algorithm/AlgorithmDescriptorsTest.java
    trunk/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/algorithm/AlgorithmRegistryTest.java
    trunk/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/algorithm/AlgorithmSupportTest.java

Modified: trunk/opensaml-security-api/src/main/java/org/opensaml/security/crypto/JCAConstants.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-api/src/main/java/org/opensaml/security/crypto/JCAConstants.java?rev=3891&r1=3890&r2=3891&view=diff
==============================================================================
--- trunk/opensaml-security-api/src/main/java/org/opensaml/security/crypto/JCAConstants.java (original)
+++ trunk/opensaml-security-api/src/main/java/org/opensaml/security/crypto/JCAConstants.java Fri May 23 16:52:37 2014
@@ -101,6 +101,9 @@
     /** Digest algorithm: "SHA-1". */
     public static final String DIGEST_SHA1 = "SHA-1";
     
+    /** Digest algorithm: "SHA-224". */
+    public static final String DIGEST_SHA224 = "SHA-224";
+    
     /** Digest algorithm: "SHA-256". */
     public static final String DIGEST_SHA256 = "SHA-256";
     
@@ -117,6 +120,12 @@
     /** Signature algorithm: "SHA1withDSA". */
     public static final String SIGNATURE_DSA_SHA1 = "SHA1withDSA";
     
+    /** Signature algorithm: "SHA224withDSA". */
+    public static final String SIGNATURE_DSA_SHA224 = "SHA224withDSA";
+    
+    /** Signature algorithm: "SHA256withDSA". */
+    public static final String SIGNATURE_DSA_SHA256 = "SHA256withDSA";
+    
     /** Signature algorithm: "MD5withRSA". */
     public static final String SIGNATURE_RSA_MD5 = "MD5withRSA";
     
@@ -125,6 +134,9 @@
     
     /** Signature algorithm: "SHA1withRSA". */
     public static final String SIGNATURE_RSA_SHA1 = "SHA1withRSA";
+    
+    /** Signature algorithm: "SHA224withRSA". */
+    public static final String SIGNATURE_RSA_SHA224 = "SHA224withRSA";
     
     /** Signature algorithm: "SHA256withRSA". */
     public static final String SIGNATURE_RSA_SHA256 = "SHA256withRSA";
@@ -137,6 +149,9 @@
     
     /** Signature algorithm: "SHA1withECDSA". */
     public static final String SIGNATURE_ECDSA_SHA1 = "SHA1withECDSA";
+    
+    /** Signature algorithm: "SHA224withECDSA". */
+    public static final String SIGNATURE_ECDSA_SHA224 = "SHA224withECDSA";
     
     /** Signature algorithm: "SHA256withECDSA". */
     public static final String SIGNATURE_ECDSA_SHA256 = "SHA256withECDSA";
@@ -160,6 +175,9 @@
     /** MAC algorithm: "HmacSHA1". */
     public static final String HMAC_SHA1 = "HmacSHA1";
     
+    /** MAC algorithm: "HmacSHA224". */
+    public static final String HMAC_SHA224 = "HmacSHA224";
+    
     /** MAC algorithm: "HmacSHA256". */
     public static final String HMAC_SHA256 = "HmacSHA256";
     

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/EncryptionConstants.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/EncryptionConstants.java?rev=3891&r1=3890&r2=3891&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/EncryptionConstants.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/EncryptionConstants.java Fri May 23 16:52:37 2014
@@ -123,6 +123,21 @@
 
     /** Block Encryption - OPTIONAL AES256-GCM. */
     public static final String ALGO_ID_BLOCKCIPHER_AES256_GCM = XMLENC11_NS + "aes256-gcm";
+    
+    /** Mask Generation Function - MGF1 with SHA-1. */

[... 420 lines stripped ...]