From 774609d8ec7756e7b61c983761c88ad1eb953a2a Mon Sep 17 00:00:00 2001
From: JohnE <git@malloc.io>
Date: Wed, 6 Mar 2019 13:51:33 -0800
Subject: [PATCH] MOD: rebased and cleaned up

---
 docs/weekly_2019-03-01.rst | 78 ++++++++++++++++++++++++++++----------
 docs/weekly_2019-03-06.rst | 21 ----------
 2 files changed, 57 insertions(+), 42 deletions(-)
 delete mode 100644 docs/weekly_2019-03-06.rst

diff --git a/docs/weekly_2019-03-01.rst b/docs/weekly_2019-03-01.rst
index 2c39eb8..54e2a5a 100644
--- a/docs/weekly_2019-03-01.rst
+++ b/docs/weekly_2019-03-01.rst
@@ -2,11 +2,36 @@
 Weekly Progress 2019-03-01
 ==========================
 
+
 WORKING
 =======
 
-* adding crypto functionality
-  - adding tests
+* NC: test more JNI crypto features: RSA, CHACHA, AES modes
+* UI: flutter
+  - add combo spinner
+  - adding basic encrypt screen
+* using local branch "ciphers" for updates to add more ciphers
+* local branches "merg" and "sha" are old, DELETE them soon
+
+
+
+Cipher Combo API DESIGN
+=======================
+The following describes how the CCC library will be used.
+
+* CipherCombo
+  - this allows the library to encrypt with a deterministic pattern such that
+    any desperate combo will work interchangably
+  - Ccc_enc( CipherCombo combo, Password pass, Message msg )
+
+* Cipher
+  - this allows the library to encrypt with a single cipher
+  - Ccc_enc( Cipher cipher, Password pass, Message msg )
+
+* CipherPattern
+  - this allows a specific pattern of ciphers to be set
+  - Ccc_enc( CipherPattern pattern, Password pass, Message msg )
+
 
 
 NOTES
@@ -17,6 +42,14 @@ NOTES
 
 
 
+COMPLETED
+=========
+
+* NC: ShaTest.java works with .aar library!!
+* NC: updated the compile process, new CFlags!! added all ciphers!! (file: build.gradle)
+  - library now supports ALL ciphers
+  - also added support to generate keys (pub/pvt)
+
 
 
 
@@ -26,27 +59,30 @@ ISSUES
 
 MakeRsaKey : Feature not compiled in
 ------------------------------------
+* fix this by adding compile CFlag '-DWOLFSSL_KEY_GEN'
 
-MakeRsaKey()
-https://www.wolfssl.com/doxygen/group__RSA.html#ga3f89eea8d56ae352730ffd49ec2fd68e
+::
 
-#ifdef WOLFSSL_KEY_GEN
+  MakeRsaKey()
+  https://www.wolfssl.com/doxygen/group__RSA.html#ga3f89eea8d56ae352730ffd49ec2fd68e
 
+  #ifdef WOLFSSL_KEY_GEN
+    ...
 
-    E/AndroidRuntime: FATAL EXCEPTION: main
-    Process: io.malloc.ccc.android.mytest, PID: 24791
-    com.wolfssl.wolfcrypt.WolfCryptException: Feature not compiled in
-        at com.wolfssl.wolfcrypt.Rsa.MakeRsaKey(Native Method)
-        at com.wolfssl.wolfcrypt.Rsa.makeKey(Rsa.java:135)
-        at io.malloc.ccc.android.nc.RsaTest.testEncDec(RsaTest.java:41)
-        at io.malloc.ccc.android.ui.MainActivity$1.onClick(MainActivity.java:40)
-        at android.view.View.performClick(View.java:5637)
-        at android.view.View$PerformClick.run(View.java:22429)
-        at android.os.Handler.handleCallback(Handler.java:751)
-        at android.os.Handler.dispatchMessage(Handler.java:95)
-        at android.os.Looper.loop(Looper.java:154)
-        at android.app.ActivityThread.main(ActivityThread.java:6119)
-        at java.lang.reflect.Method.invoke(Native Method)
-        at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:886)
-        at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:776)
+  E/AndroidRuntime: FATAL EXCEPTION: main
+  Process: io.malloc.ccc.android.mytest, PID: 24791
+  com.wolfssl.wolfcrypt.WolfCryptException: Feature not compiled in
+      at com.wolfssl.wolfcrypt.Rsa.MakeRsaKey(Native Method)
+      at com.wolfssl.wolfcrypt.Rsa.makeKey(Rsa.java:135)
+      at io.malloc.ccc.android.nc.RsaTest.testEncDec(RsaTest.java:41)
+      at io.malloc.ccc.android.ui.MainActivity$1.onClick(MainActivity.java:40)
+      at android.view.View.performClick(View.java:5637)
+      at android.view.View$PerformClick.run(View.java:22429)
+      at android.os.Handler.handleCallback(Handler.java:751)
+      at android.os.Handler.dispatchMessage(Handler.java:95)
+      at android.os.Looper.loop(Looper.java:154)
+      at android.app.ActivityThread.main(ActivityThread.java:6119)
+      at java.lang.reflect.Method.invoke(Native Method)
+      at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:886)
+      at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:776)
 
diff --git a/docs/weekly_2019-03-06.rst b/docs/weekly_2019-03-06.rst
deleted file mode 100644
index 8bfd931..0000000
--- a/docs/weekly_2019-03-06.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-===============
-Weekly Progress
-===============
-
-
-WORKING
-=======
-
-
-
-ISSUES
-======
-
-
-
-
-NOTES
-=====
-
-
-