tobrien 2003/10/14 19:10:28
Modified: codec/src/test/org/apache/commons/codec/digest
DigestUtilsTest.java
codec/src/java/org/apache/commons/codec/digest
DigestUtils.java
Log:
Removed the 1.4 method call on MessageDigest
from DigestUtils.
Revision Changes Path
1.5 +0 -23
jakarta-commons/codec/src/test/org/apache/commons/codec/digest/DigestUtilsTest.java
Index: DigestUtilsTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/codec/src/test/org/apache/commons/codec/digest/DigestUtilsTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DigestUtilsTest.java 12 Oct 2003 02:54:40 -0000 1.4
+++ DigestUtilsTest.java 15 Oct 2003 02:10:28 -0000 1.5
@@ -146,27 +146,4 @@
+ "hijkijkljklmklmnlmnomnopnopq"));
}
- public void testMd5NoAvailable() {
- DigestUtils.setProvider( Security.getProviders()[3]);
-
- try {
- DigestUtils.md5("test");
- fail( "The provider does not supply the MD5 algorithm, this operation
should have failed");
- } catch( RuntimeException re ) {
-
- }
-
- }
-
- public void testSHANoAvailable() {
- DigestUtils.setProvider( Security.getProviders()[3]);
-
- try {
- DigestUtils.sha("test");
- fail( "The provider does not supply the SHA algorithm, this operation
should have failed");
- } catch( RuntimeException re ) {
-
- }
-
- }
}
1.5 +7 -31
jakarta-commons/codec/src/java/org/apache/commons/codec/digest/DigestUtils.java
Index: DigestUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/codec/src/java/org/apache/commons/codec/digest/DigestUtils.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DigestUtils.java 12 Oct 2003 02:54:40 -0000 1.4
+++ DigestUtils.java 15 Oct 2003 02:10:28 -0000 1.5
@@ -59,8 +59,6 @@
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import java.security.Provider;
-import java.security.Security;
import org.apache.commons.codec.binary.Hex;
@@ -72,13 +70,6 @@
* @author David Graham
*/
public class DigestUtils {
-
- /**
- * This is the provider which DigestUtils uses to get instances of the MD5 and
SHA
- * algorithms. This variable is altered if a users wishes to customize the
implementation
- * of an algorithm.
- */
- private static Provider provider = null;
/**
* Returns an MD5 MessageDigest.
@@ -87,13 +78,10 @@
*/
private static MessageDigest getMd5Digest() {
try {
- if( provider != null ) {
- return MessageDigest.getInstance("MD5", provider);
- } else {
- return MessageDigest.getInstance("MD5");
- }
+ return MessageDigest.getInstance("MD5");
+
} catch (NoSuchAlgorithmException e) {
- throw new RuntimeException("Unable to get instance of MD5
message digest in DigestUtils" + e.getMessage());
+ throw new RuntimeException(e.getMessage());
}
}
@@ -104,13 +92,10 @@
*/
private static MessageDigest getShaDigest() {
try {
- if( provider != null) {
- return MessageDigest.getInstance("SHA", provider);
- } else {
- return MessageDigest.getInstance("SHA");
- }
+ return MessageDigest.getInstance("SHA");
+
} catch (NoSuchAlgorithmException e) {
- throw new RuntimeException("Unable to get instance of SHA message
digest in DigestUtils" + e.getMessage());
+ throw new RuntimeException(e.getMessage());
}
}
@@ -199,14 +184,5 @@
public static String shaHex(String data) {
return new String(Hex.encodeHex(sha(data)));
}
-
- /**
- * Allows for the replacement of the default Provider from which the DigestUtils
- * retrieves the implementations of MD5 and SHA.
- *
- * @param provider an instance of a Provider
- */
- public static void setProvider(Provider pProvider) {
- provider = pProvider;
- }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
