2026-04-29 Android: Updating to org.bouncycastle:bcprov-jdk18on:1.84 amd latest local java classes

Author: heinrichelsigan

android/CipherPipe/app/src/main/java/eu/cqrxs/cipherpipe/MainActivity.java

@@ -73,6 +73,8 @@ public class MainActivity extends AppCompatActivity {
     EncodeEnum encodeType = EncodeEnum.Base64;
     ZipType zipType = ZipType.None;
 
+    CipherMode2 cmode = CipherMode2.CFB;
+
     static boolean firstTimeInit = true, firstTimeInitEncodings = true;
 
     CipherEnum cipher;
@@ -114,7 +116,7 @@ public void onClick(View v) {
                 String hashed = keyHash.hash(key);
                 editKeyHash.setText(hashed);
 
-                CipherPipe pipe = new CipherPipe(key, hashed, encodeType, zipType, keyHash);
+                CipherPipe pipe = new CipherPipe(key, hashed, encodeType, zipType, keyHash, cmode);
 
                 CipherEnum[] cipherEnums = pipe.getInPipe();
                 String pipeSting = "";
@@ -131,7 +133,7 @@ public void onClick(View v) {
                 String hashed = keyHash.hash(key);
                 editKeyHash.setText(hashed);
 
-                CipherPipe pipe = new CipherPipe(hashed, key, encodeType, zipType, keyHash);
+                CipherPipe pipe = new CipherPipe(hashed, key, encodeType, zipType, keyHash, cmode);
 
                 CipherEnum[] cipherEnums = pipe.getInPipe();
                 String pipeSting = "";
@@ -144,7 +146,7 @@ public void onClick(View v) {
         btnRandText.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                String fortune = eu.cqrxs.cipherpipe.util.Fortune.getFortune();
+                String fortune = eu.cqrxs.util.Fortune.getFortune();
                 editTextSource.setText(fortune);
             }
         });
@@ -174,7 +176,7 @@ public void onClick(View v) {
                 if (cipherPipeString.length() > 0) {
                     ciphers = CipherEnum.parsePipeText(cipherPipeString);
                 }
-                CipherPipe pipe = new CipherPipe(ciphers, 8, encodeType, zipType, keyHash);
+                CipherPipe pipe = new CipherPipe(ciphers, 8, encodeType, zipType, keyHash, cmode);
                 String plain = editTextSource.getText().toString();
 
                 String pipeSting = pipe.getPipeString();
@@ -199,7 +201,7 @@ public void onClick(View v) {
                 if (cipherPipeString.length() > 0) {
                     ciphers = CipherEnum.parsePipeText(cipherPipeString);
                 }
-                CipherPipe pipe = new CipherPipe(ciphers, 8, encodeType, zipType, keyHash);
+                CipherPipe pipe = new CipherPipe(ciphers, 8, encodeType, zipType, keyHash, cmode);
 
                 String encrypted = editTextSource.getText().toString();
                 CipherEnum[] cipherEnums = pipe.getOutPipe();
@@ -346,7 +348,7 @@ public String encryptString(String plain, String key, String hashed, CipherPipe
 
         String encrypted = "";
         try {
-            encrypted = pipe.encrpytTextGoRounds(plain, key, hashed, encodeType, zipType, keyHash);
+            encrypted = pipe.encrpytTextGoRounds(plain, key, hashed, encodeType, zipType, keyHash, cmode);
         } catch (Exception exi) {
             showTextDestination.setText(exi.toString());
         }
@@ -357,7 +359,7 @@ public String decryptedString(String encrypted, String key, String hashed, Ciphe
 
         String decrypted = "";
         try {
-            decrypted =  pipe.decryptTextRoundsGo(encrypted, key, hashed, encodeType, zipType, keyHash);
+            decrypted =  pipe.decryptTextRoundsGo(encrypted, key, hashed, encodeType, zipType, keyHash, cmode);
         } catch (Exception exi) {
             showTextDestination.setText(exi.toString());
         }

android/CipherPipe/app/src/main/java/eu/cqrxs/crypt/cipher/CipherPipe.java

@@ -9,8 +9,8 @@
 
 package eu.cqrxs.crypt.cipher;
 
-import java.awt.*;
-import java.awt.image.BufferedImage;
+// import java.awt.*;
+// import java.awt.image.*;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
@@ -30,7 +30,9 @@
 import org.bouncycastle.crypto.*;
 
 import javax.crypto.Cipher;
-import javax.imageio.ImageIO;
+import android.graphics.*;
+
+import androidx.annotation.NonNull;
 
 /**
  * CipherPipe is symmetric block cipher encryption and decryption pipe line
@@ -91,7 +93,7 @@ public CipherPipe() {
      * @param kh {@link KeyHash}
      * @param cmode2 {@link CipherMode2}
      */
-    public CipherPipe(CipherEnum[] cipherEnums,
+    public CipherPipe(@NonNull CipherEnum[] cipherEnums,
                       int maxpipe,
                       EncodeEnum encType,
                       ZipType zpType,
@@ -859,12 +861,12 @@ public byte[] decodeDecrpytBytes(
     }
 
 
-    /**
-     * drawCipherPipe draws a cipher pipe image for a specified pipe
-     * state of method: prototype (not fully working)
-     * @param pipe the specific chipher pipe
-     * @return {@link BufferedImage}
-     */
+    /*
+     // * drawCipherPipe draws a cipher pipe image for a specified pipe
+     // * state of method: prototype (not fully working)
+     // * @param pipe the specific chipher pipe
+     // * @return {@link BufferedImage}
+     //
     public static BufferedImage drawCipherPipe(CipherPipe pipe) {
         String path = "eu/cqrxs/gui/img/"; // base path of the images
 
@@ -958,12 +960,12 @@ public static BufferedImage drawCipherPipe(CipherPipe pipe) {
     }
 
 
-    /**
-     * drawDecryptCipherPipe draws a cipher pipe image for a specified pipe
-     * state of method: prototype (not fully working)
-     * @param pipe the specific chipher pipe
-     * @return {@link BufferedImage}
-     */
+     //
+     // * drawDecryptCipherPipe draws a cipher pipe image for a specified pipe
+     // * state of method: prototype (not fully working)
+     // * @param pipe the specific chipher pipe
+     // * @return {@link BufferedImage}
+     //
     public static BufferedImage drawDecryptCipherPipe(CipherPipe pipe) {
 
         String path = "eu/cqrxs/gui/img/"; // base path of the images
@@ -1043,6 +1045,6 @@ public static BufferedImage drawDecryptCipherPipe(CipherPipe pipe) {
         // ImageIO.write(combined, "PNG", new File(path, "combined.png"));
         return combined;
     }
-
+     */
 
 }

android/CipherPipe/app/src/main/java/eu/cqrxs/crypt/encoding/UuCoder.java

@@ -9,6 +9,8 @@
 
 package eu.cqrxs.crypt.encoding;
 
+import org.bouncycastle.util.encoders.Encoder;
+
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -20,7 +22,7 @@
  * UuCoder provides UUEncoder and UUDecode
  *
  */
-public class UuCoder extends java.beans.Encoder implements IEncodable  {
+public class UuCoder implements IEncodable  {
 
         final static byte[] UUEncMap = new byte[] {
           0x60, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,

android/CipherPipe/app/src/main/java/eu/cqrxs/crypt/encoding/XxEncoder.java

@@ -22,7 +22,7 @@
  * 2026-01-21 last functionality that works
  *
  */
-public class XxEncoder extends java.beans.Encoder implements IEncodable  {
+public class XxEncoder  implements IEncodable  {
 
 	final static byte[] XXEncMap = new byte[] {
 		0x2B, 0x2D, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35,

android/CipherPipe/app/src/main/java/eu/cqrxs/util/ContextLazy.java

@@ -10,13 +10,14 @@
 
 package eu.cqrxs.util;
 
-import javax.naming.InitialContext;
+// import javax.naming.InitialContext;
 
 /**
   * ContextLazy - provides a lazy singelton for application context
   *
   */
 public class ContextLazy {
+    /*
     private static ContextLazy instance;
     private InitialContext mContext;
 	
@@ -36,4 +37,5 @@ private ContextLazy(InitialContext context) {
         mContext = context;
     }
 
+    */
 }