You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2018/01/05 16:16:33 UTC
svn commit: r1820316 - in /santuario/xml-security-java/trunk/src/main:
java/org/apache/xml/security/algorithms/JCEMapper.java
java/org/apache/xml/security/resource/config.xml
resources/security-config.xml
Author: coheigea
Date: Fri Jan 5 16:16:33 2018
New Revision: 1820316
URL: http://svn.apache.org/viewvc?rev=1820316&view=rev
Log:
SANTUARIO-481 - JCEMapper returning keysizes for HMAC Algorithms
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/JCEMapper.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/resource/config.xml
santuario/xml-security-java/trunk/src/main/resources/security-config.xml
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/JCEMapper.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/JCEMapper.java?rev=1820316&r1=1820315&r2=1820316&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/JCEMapper.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/JCEMapper.java Fri Jan 5 16:16:33 2018
@@ -205,31 +205,31 @@ public class JCEMapper {
);
algorithmsMap.put(
XMLSignature.ALGO_ID_MAC_HMAC_NOT_RECOMMENDED_MD5,
- new Algorithm("", "HmacMD5", "Mac", 128, 0)
+ new Algorithm("", "HmacMD5", "Mac", 0, 0)
);
algorithmsMap.put(
XMLSignature.ALGO_ID_MAC_HMAC_RIPEMD160,
- new Algorithm("", "HMACRIPEMD160", "Mac", 160, 0)
+ new Algorithm("", "HMACRIPEMD160", "Mac", 0, 0)
);
algorithmsMap.put(
XMLSignature.ALGO_ID_MAC_HMAC_SHA1,
- new Algorithm("", "HmacSHA1", "Mac", 160, 0)
+ new Algorithm("", "HmacSHA1", "Mac", 0, 0)
);
algorithmsMap.put(
XMLSignature.ALGO_ID_MAC_HMAC_SHA224,
- new Algorithm("", "HmacSHA224", "Mac", 224, 0)
+ new Algorithm("", "HmacSHA224", "Mac", 0, 0)
);
algorithmsMap.put(
XMLSignature.ALGO_ID_MAC_HMAC_SHA256,
- new Algorithm("", "HmacSHA256", "Mac", 256, 0)
+ new Algorithm("", "HmacSHA256", "Mac", 0, 0)
);
algorithmsMap.put(
XMLSignature.ALGO_ID_MAC_HMAC_SHA384,
- new Algorithm("", "HmacSHA384", "Mac", 384, 0)
+ new Algorithm("", "HmacSHA384", "Mac", 0, 0)
);
algorithmsMap.put(
XMLSignature.ALGO_ID_MAC_HMAC_SHA512,
- new Algorithm("", "HmacSHA512", "Mac", 512, 0)
+ new Algorithm("", "HmacSHA512", "Mac", 0, 0)
);
// Encryption algorithms
algorithmsMap.put(
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/resource/config.xml
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/resource/config.xml?rev=1820316&r1=1820315&r2=1820316&view=diff
==============================================================================
Binary files - no diff available.
Modified: santuario/xml-security-java/trunk/src/main/resources/security-config.xml
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/resources/security-config.xml?rev=1820316&r1=1820315&r2=1820316&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/resources/security-config.xml (original)
+++ santuario/xml-security-java/trunk/src/main/resources/security-config.xml Fri Jan 5 16:16:33 2018
@@ -349,7 +349,7 @@
AlgorithmClass="Mac"
RequirementLevel="NOT RECOMMENDED"
SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
- KeyLength="128"
+ KeyLength="0"
RequiredKey="HmacMD5"
JCEName="HmacMD5"/>
@@ -358,7 +358,7 @@
AlgorithmClass="Mac"
RequirementLevel="OPTIONAL"
SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
- KeyLength="160"
+ KeyLength="0"
RequiredKey="HMACRIPEMD160"
JCEName="HMACRIPEMD160"/>
@@ -366,7 +366,7 @@
Description="Message Authentication code using SHA1"
AlgorithmClass="Mac"
RequirementLevel="REQUIRED"
- KeyLength="160"
+ KeyLength="0"
RequiredKey="HmacSHA1"
JCEName="HmacSHA1"/>
@@ -374,7 +374,7 @@
Description="Message Authentication code using SHA-224"
AlgorithmClass="Mac"
RequirementLevel="OPTIONAL"
- KeyLength="224"
+ KeyLength="0"
RequiredKey="HmacSHA224"
JCEName="HmacSHA224"/>
@@ -383,7 +383,7 @@
AlgorithmClass="Mac"
RequirementLevel="OPTIONAL"
SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
- KeyLength="256"
+ KeyLength="0"
RequiredKey="HmacSHA256"
JCEName="HmacSHA256"/>
@@ -392,7 +392,7 @@
AlgorithmClass="Mac"
RequirementLevel="OPTIONAL"
SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
- KeyLength="384"
+ KeyLength="0"
RequiredKey="HmacSHA384"
JCEName="HmacSHA384"/>
@@ -401,7 +401,7 @@
AlgorithmClass="Mac"
RequirementLevel="OPTIONAL"
SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
- KeyLength="512"
+ KeyLength="0"
RequiredKey="HmacSHA512"
JCEName="HmacSHA512"/>