Align behaviour of CTR and SIC modes in the JCE API.

Author: timw

prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java

@@ -249,7 +249,7 @@ else if (modeName.equalsIgnoreCase("OpenPGPCFB"))
             cipher = new BufferedGenericBlockCipher(
                 new OpenPGPCFBBlockCipher(baseEngine));
         }
-        else if (modeName.startsWith("SIC"))
+        else if (modeName.startsWith("SIC") || modeName.startsWith("CTR"))
         {
             ivLength = baseEngine.getBlockSize();
             if (ivLength < 16)
@@ -259,12 +259,6 @@ else if (modeName.startsWith("SIC"))
             cipher = new BufferedGenericBlockCipher(new BufferedBlockCipher(
                         new SICBlockCipher(baseEngine)));
         }
-        else if (modeName.startsWith("CTR"))
-        {
-            ivLength = baseEngine.getBlockSize();
-            cipher = new BufferedGenericBlockCipher(new BufferedBlockCipher(
-                        new SICBlockCipher(baseEngine)));
-        }
         else if (modeName.startsWith("GOFB"))
         {
             ivLength = baseEngine.getBlockSize();