blautenb 2004/03/06 03:38:45
Modified: src/org/apache/xml/security/resource config.xml
Log:
Updated algorithm configuration to support JDK 1.5
Revision Changes Path
1.36 +23 -12
xml-security/src/org/apache/xml/security/resource/config.xml
Index: config.xml
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/resource/config.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- config.xml 3 Mar 2004 11:45:56 -0000 1.35
+++ config.xml 6 Mar 2004 11:38:45 -0000 1.36
@@ -98,6 +98,11 @@
Class="com.sun.rsajca.Provider"
Info="SUN's provider for RSA signatures"
ProviderURL="http://java.sun.com/"; />
+ <!-- Duplicate SunRsaSign is required to support JDK 1.5 -->
+ <Provider Id="SunRsaSign"
+ Class="sun.security.rsa.SunRsaSign"
+ Info="SUN's provider for RSA signatures (JDK 1.5)"
+ ProviderURL="http://java.sun.com/"; />
<Provider Id="SunJCE"
Class="com.sun.crypto.provider.SunJCE"
Info="SunJCE Provider (implements DES, Triple DES,
Blowfish, PBE, Diffie-Hellman, HMAC-MD5, HMAC-SHA1)"
@@ -120,6 +125,8 @@
SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt";>
<ProviderAlgo ProviderId="BC"
JCEName="MD5" />
+ <ProviderAlgo ProviderId="SUN"
+ JCEName="MD5" />
</Algorithm>
<Algorithm URI="http://www.w3.org/2001/04/xmlenc#ripemd160";
Description="RIPEMD-160 message digest"
@@ -149,6 +156,8 @@
RequirementLevel="RECOMMENDED">
<ProviderAlgo ProviderId="BC"
JCEName="SHA-256" />
+ <ProviderAlgo ProviderId="SUN"
+ JCEName="SHA-256" />
</Algorithm>
<Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#sha384";
Description="SHA message digest with 384 bit"
@@ -157,6 +166,8 @@
SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt";>
<ProviderAlgo ProviderId="BC"
JCEName="SHA-384" />
+ <ProviderAlgo ProviderId="SUN"
+ JCEName="SHA-384" />
</Algorithm>
<Algorithm URI="http://www.w3.org/2001/04/xmlenc#sha512";
Description="SHA-1 message digest with 512 bit"
@@ -164,6 +175,8 @@
RequirementLevel="OPTIONAL">
<ProviderAlgo ProviderId="BC"
JCEName="SHA-512" />
+ <ProviderAlgo ProviderId="SUN"
+ JCEName="SHA-512" />
</Algorithm>
<!-- Signature Algorithms -->
@@ -186,6 +199,8 @@
SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt";>
<ProviderAlgo ProviderId="BC"
JCEName="MD5WithRSAEncryption" />
+ <ProviderAlgo ProviderId="SunRsaSign"
+ JCEName="MD5WithRSA" />
</Algorithm>
<Algorithm
URI="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160";
Description="RSA Signature with RIPEMD-160 message
digest"
@@ -241,6 +256,8 @@
SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt";>
<ProviderAlgo ProviderId="BC"
JCEName="HMACMD5" />
+ <ProviderAlgo ProviderId="SunJCE"
+ JCEName="HmacMD5" />
</Algorithm>
<Algorithm
URI="http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160";
Description="Message Authentication code using
RIPEMD-160"
@@ -270,6 +287,8 @@
SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt";>
<ProviderAlgo ProviderId="BC"
JCEName="HMACSHA256" />
+ <ProviderAlgo ProviderId="SunJCE"
+ JCEName="HmacSHA256" />
</Algorithm>
<Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha384";
Description="Message Authentication code using SHA-384"
@@ -278,6 +297,8 @@
SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt";>
<ProviderAlgo ProviderId="BC"
JCEName="HMACSHA384" />
+ <ProviderAlgo ProviderId="SunJCE"
+ JCEName="HmacSHA384" />
</Algorithm>
<Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha512";
Description="Message Authentication code using SHA-512"
@@ -286,6 +307,8 @@
SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt";>
<ProviderAlgo ProviderId="BC"
JCEName="HMACSHA512" />
+ <ProviderAlgo ProviderId="SunJCE"
+ JCEName="HmacSHA512" />
</Algorithm>
<!-- Block encryption Algorithms -->
@@ -405,9 +428,6 @@
<ProviderAlgo ProviderId="BC"
RequiredKey="DESEDE"
JCEName="DESEDEWrap" />
- <ProviderAlgo ProviderId="SunJCE"
- RequiredKey="DESEDE"
- JCEName="DESEDE" />
<!-- <ProviderAlgo ProviderId="BC" JCEName="DESEDEWrap"
RequiredKey="DESEDE" /> -->
</Algorithm>
<Algorithm URI="http://www.w3.org/2001/04/xmlenc#kw-aes128";
@@ -419,9 +439,6 @@
<ProviderAlgo ProviderId="BC"
JCEName="AESWrap"
RequiredKey="AES" />
- <ProviderAlgo ProviderId="SunJCE"
- JCEName="AES"
- RequiredKey="AES" />
<!-- <ProviderAlgo ProviderId="BC" JCEName="AESWrap"
RequiredKey="AES" /> -->
</Algorithm>
<Algorithm URI="http://www.w3.org/2001/04/xmlenc#kw-aes192";
@@ -433,9 +450,6 @@
<ProviderAlgo ProviderId="BC"
JCEName="AESWrap"
RequiredKey="AES" />
- <ProviderAlgo ProviderId="SunJCE"
- JCEName="AES"
- RequiredKey="AES" />
<!-- <ProviderAlgo ProviderId="BC" JCEName="AESWrap"
RequiredKey="AES" /> -->
</Algorithm>
<Algorithm URI="http://www.w3.org/2001/04/xmlenc#kw-aes256";
@@ -446,9 +460,6 @@
<!-- We need an AES in ElectronicCodeBook (ECB) mode here
without padding -->
<ProviderAlgo ProviderId="BC"
JCEName="AESWrap"
- RequiredKey="AES" />
- <ProviderAlgo ProviderId="SunJCE"
- JCEName="AES"
RequiredKey="AES" />
<!-- <ProviderAlgo ProviderId="BC" JCEName="AESWrap"
RequiredKey="AES" /> -->
</Algorithm>
