[Cryptix-commits] projects/jce/src/cryptix.jce.test TestAlgorithmParameters.java

[<gel...@mx...>]

gelderen    03/02/15 08:43:11

  Modified:    jce/src/cryptix.jce.test TestAlgorithmParameters.java
  Log:
  - Bandaid for the AlgorithmParameters test: explicitly limit ourselves
    to the CryptixCrypto provider. This may or may not be the right
    solution.

Revision  Changes    Path
1.5       +9 -8      projects/jce/src/cryptix.jce.test/TestAlgorithmParameters.java

Index: TestAlgorithmParameters.java
===================================================================
RCS file: /home/cryptix-cvs/cvsroot/projects/jce/src/cryptix.jce.test/TestAlgorithmParameters.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestAlgorithmParameters.java	28 Jul 2000 20:06:11 -0000	1.4
+++ TestAlgorithmParameters.java	15 Feb 2003 13:43:11 -0000	1.5
@@ -1,4 +1,4 @@
-/* $Id: TestAlgorithmParameters.java,v 1.4 2000/07/28 20:06:11 gelderen Exp $
+/* $Id: TestAlgorithmParameters.java,v 1.5 2003/02/15 13:43:11 gelderen Exp $
  *
  * Copyright (C) 1995-1999 The Cryptix Foundation Limited.
  * All rights reserved.
@@ -15,7 +15,7 @@
  * using DES as algorithm as default</B>
  *
  * @author Paul Waserbrot (pw...@cr...)
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
  */
 
 import java.security.SecureRandom;
@@ -28,7 +28,7 @@
 final class TestAlgorithmParameters
     extends Test 
 {
-    
+    private static final String PROVIDER = "CryptixCrypto";   
     private static final String name = "AlgorithmParameters";
     private Cipher c;
     private SecretKey sk;
@@ -66,11 +66,11 @@
     private void init () 
     throws Exception {
         // Generate key
-        KeyGenerator kg = KeyGenerator.getInstance(algo);
+        KeyGenerator kg = KeyGenerator.getInstance(algo, PROVIDER);
         kg.init(KEY_SIZE);
         sk = kg.generateKey();
         
-        c = Cipher.getInstance(algo+"/CBC/NONE");
+        c = Cipher.getInstance(algo+"/CBC/NONE", PROVIDER);
         c.init(Cipher.ENCRYPT_MODE, sk);
         
         return;
@@ -82,7 +82,8 @@
         byte [] iv = new byte[8];
         new SecureRandom().nextBytes(iv);
         
-        AlgorithmParameters ap1 = AlgorithmParameters.getInstance("DES");
+        AlgorithmParameters ap1 =
+            AlgorithmParameters.getInstance("DES", PROVIDER);
         ap1.init(new IvParameterSpec(iv));
         String a = ap1.getAlgorithm();
         String ivs = ap1.toString();
@@ -106,7 +107,7 @@
         String p = ap1.getProvider().getName();
         byte [] enc = ap1.getEncoded();
         
-        AlgorithmParameters ap2 = AlgorithmParameters.getInstance(algo);
+        AlgorithmParameters ap2 = AlgorithmParameters.getInstance(algo, PROVIDER);
         ap2.init(enc);
         
         return (a.equals(ap2.getAlgorithm()) && 
@@ -123,7 +124,7 @@
         String ivs = ap1.toString();
         String p = ap1.getProvider().getName();
         
-        AlgorithmParameters ap2 = AlgorithmParameters.getInstance(algo);
+        AlgorithmParameters ap2 = AlgorithmParameters.getInstance(algo, PROVIDER);
         ap2.init(new IvParameterSpec(iv));
         
         return (a.equals(ap2.getAlgorithm()) &&