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 2015/02/05 11:30:21 UTC
svn commit: r1657517 - in
/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security:
algorithms/JCEMapper.java resource/config.xml
Author: coheigea
Date: Thu Feb 5 10:30:21 2015
New Revision: 1657517
URL: http://svn.apache.org/r1657517
Log:
[SANTUARIO-414] - Revised fix
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
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=1657517&r1=1657516&r2=1657517&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 Thu Feb 5 10:30:21 2015
@@ -60,51 +60,51 @@ public class JCEMapper {
// Digest algorithms
algorithmsMap.put(
MessageDigestAlgorithm.ALGO_ID_DIGEST_NOT_RECOMMENDED_MD5,
- new Algorithm("MD5", "MD5", "MessageDigest")
+ new Algorithm("", "MD5", "MessageDigest")
);
algorithmsMap.put(
MessageDigestAlgorithm.ALGO_ID_DIGEST_RIPEMD160,
- new Algorithm("RIPEMD160", "RIPEMD160", "MessageDigest")
+ new Algorithm("", "RIPEMD160", "MessageDigest")
);
algorithmsMap.put(
MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
- new Algorithm("SHA-1", "SHA-1", "MessageDigest")
+ new Algorithm("", "SHA-1", "MessageDigest")
);
algorithmsMap.put(
MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA224,
- new Algorithm("SHA-224", "SHA-224", "MessageDigest")
+ new Algorithm("", "SHA-224", "MessageDigest")
);
algorithmsMap.put(
MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA256,
- new Algorithm("SHA-256", "SHA-256", "MessageDigest")
+ new Algorithm("", "SHA-256", "MessageDigest")
);
algorithmsMap.put(
MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA384,
- new Algorithm("SHA-384", "SHA-384", "MessageDigest")
+ new Algorithm("", "SHA-384", "MessageDigest")
);
algorithmsMap.put(
MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA512,
- new Algorithm("SHA-512", "SHA-512", "MessageDigest")
+ new Algorithm("", "SHA-512", "MessageDigest")
);
algorithmsMap.put(
MessageDigestAlgorithm.ALGO_ID_DIGEST_WHIRLPOOL,
- new Algorithm("WHIRLPOOL", "WHIRLPOOL", "MessageDigest")
+ new Algorithm("", "WHIRLPOOL", "MessageDigest")
);
algorithmsMap.put(
MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA3_224,
- new Algorithm("SHA3-224", "SHA3-224", "MessageDigest")
+ new Algorithm("", "SHA3-224", "MessageDigest")
);
algorithmsMap.put(
MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA3_256,
- new Algorithm("SHA3-256", "SHA3-256", "MessageDigest")
+ new Algorithm("", "SHA3-256", "MessageDigest")
);
algorithmsMap.put(
MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA3_384,
- new Algorithm("SHA3-384", "SHA3-384", "MessageDigest")
+ new Algorithm("", "SHA3-384", "MessageDigest")
);
algorithmsMap.put(
MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA3_512,
- new Algorithm("SHA3-512", "SHA3-512", "MessageDigest")
+ new Algorithm("", "SHA3-512", "MessageDigest")
);
// Signature algorithms
algorithmsMap.put(
@@ -189,31 +189,31 @@ public class JCEMapper {
);
algorithmsMap.put(
XMLSignature.ALGO_ID_MAC_HMAC_NOT_RECOMMENDED_MD5,
- new Algorithm("HmacMD5", "HmacMD5", "Mac", 128, 0)
+ new Algorithm("", "HmacMD5", "Mac", 128, 0)
);
algorithmsMap.put(
XMLSignature.ALGO_ID_MAC_HMAC_RIPEMD160,
- new Algorithm("HMACRIPEMD160", "HMACRIPEMD160", "Mac", 160, 0)
+ new Algorithm("", "HMACRIPEMD160", "Mac", 160, 0)
);
algorithmsMap.put(
XMLSignature.ALGO_ID_MAC_HMAC_SHA1,
- new Algorithm("HmacSHA1", "HmacSHA1", "Mac", 160, 0)
+ new Algorithm("", "HmacSHA1", "Mac", 160, 0)
);
algorithmsMap.put(
XMLSignature.ALGO_ID_MAC_HMAC_SHA224,
- new Algorithm("HmacSHA224", "HmacSHA224", "Mac", 224, 0)
+ new Algorithm("", "HmacSHA224", "Mac", 224, 0)
);
algorithmsMap.put(
XMLSignature.ALGO_ID_MAC_HMAC_SHA256,
- new Algorithm("HmacSHA256", "HmacSHA256", "Mac", 256, 0)
+ new Algorithm("", "HmacSHA256", "Mac", 256, 0)
);
algorithmsMap.put(
XMLSignature.ALGO_ID_MAC_HMAC_SHA384,
- new Algorithm("HmacSHA384", "HmacSHA384", "Mac", 384, 0)
+ new Algorithm("", "HmacSHA384", "Mac", 384, 0)
);
algorithmsMap.put(
XMLSignature.ALGO_ID_MAC_HMAC_SHA512,
- new Algorithm("HmacSHA512", "HmacSHA512", "Mac", 512, 0)
+ new Algorithm("", "HmacSHA512", "Mac", 512, 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=1657517&r1=1657516&r2=1657517&view=diff
==============================================================================
Binary files - no diff available.