diff --git a/ccc-jni/lib/wolfssl-jni/arm64-v8a/libwolfssl-jni.so b/ccc-jni/lib/wolfssl-jni/arm64-v8a/libwolfssl-jni.so deleted file mode 100755 index dce341e..0000000 Binary files a/ccc-jni/lib/wolfssl-jni/arm64-v8a/libwolfssl-jni.so and /dev/null differ diff --git a/ccc-jni/lib/wolfssl-jni/armeabi-v7a/libwolfssl-jni.so b/ccc-jni/lib/wolfssl-jni/armeabi-v7a/libwolfssl-jni.so deleted file mode 100755 index 245176f..0000000 Binary files a/ccc-jni/lib/wolfssl-jni/armeabi-v7a/libwolfssl-jni.so and /dev/null differ diff --git a/ccc-jni/lib/wolfssl-jni/lib_history b/ccc-jni/lib/wolfssl-jni/lib_history deleted file mode 100644 index 668d050..0000000 --- a/ccc-jni/lib/wolfssl-jni/lib_history +++ /dev/null @@ -1,10 +0,0 @@ -=================== -LIBRARY BUILD DATES -=================== - -The following is the build history for this library. -Dates: - -2019-02-09 - - diff --git a/ccc-jni/lib/wolfssl-jni/x86/libwolfssl-jni.so b/ccc-jni/lib/wolfssl-jni/x86/libwolfssl-jni.so deleted file mode 100755 index 75a6f85..0000000 Binary files a/ccc-jni/lib/wolfssl-jni/x86/libwolfssl-jni.so and /dev/null differ diff --git a/ccc-jni/lib/wolfssl-jni/x86_64/libwolfssl-jni.so b/ccc-jni/lib/wolfssl-jni/x86_64/libwolfssl-jni.so deleted file mode 100755 index 0b880af..0000000 Binary files a/ccc-jni/lib/wolfssl-jni/x86_64/libwolfssl-jni.so and /dev/null differ diff --git a/ccc-jni/lib/wolfssl-lib/arm64-v8a/libwolfssl.a b/ccc-jni/lib/wolfssl-lib/arm64-v8a/libwolfssl.a deleted file mode 100644 index 3ecfa47..0000000 Binary files a/ccc-jni/lib/wolfssl-lib/arm64-v8a/libwolfssl.a and /dev/null differ diff --git a/ccc-jni/lib/wolfssl-lib/armeabi-v7a/libwolfssl.a b/ccc-jni/lib/wolfssl-lib/armeabi-v7a/libwolfssl.a deleted file mode 100644 index 3269acb..0000000 Binary files a/ccc-jni/lib/wolfssl-lib/armeabi-v7a/libwolfssl.a and /dev/null differ diff --git a/ccc-jni/lib/wolfssl-lib/lib_history b/ccc-jni/lib/wolfssl-lib/lib_history deleted file mode 100644 index 668d050..0000000 --- a/ccc-jni/lib/wolfssl-lib/lib_history +++ /dev/null @@ -1,10 +0,0 @@ -=================== -LIBRARY BUILD DATES -=================== - -The following is the build history for this library. -Dates: - -2019-02-09 - - diff --git a/ccc-jni/lib/wolfssl-lib/x86/libwolfssl.a b/ccc-jni/lib/wolfssl-lib/x86/libwolfssl.a deleted file mode 100644 index 24d3bca..0000000 Binary files a/ccc-jni/lib/wolfssl-lib/x86/libwolfssl.a and /dev/null differ diff --git a/ccc-jni/lib/wolfssl-lib/x86_64/libwolfssl.a b/ccc-jni/lib/wolfssl-lib/x86_64/libwolfssl.a deleted file mode 100644 index 234bfc8..0000000 Binary files a/ccc-jni/lib/wolfssl-lib/x86_64/libwolfssl.a and /dev/null differ diff --git a/ccc-jni/libs/wolfssl-jni.aar b/ccc-jni/libs/wolfssl-jni.aar deleted file mode 100644 index 6e17d71..0000000 Binary files a/ccc-jni/libs/wolfssl-jni.aar and /dev/null differ diff --git a/ccc-jni/libs/wolfssl-lib.aar b/ccc-jni/libs/wolfssl-lib.aar deleted file mode 100644 index a635602..0000000 Binary files a/ccc-jni/libs/wolfssl-lib.aar and /dev/null differ diff --git a/docs/proj_agile.rst b/docs/proj_agile.rst index 911aa70..1fb39d4 100644 --- a/docs/proj_agile.rst +++ b/docs/proj_agile.rst @@ -3,29 +3,30 @@ CCC Agile ========= -Working -------- +FEATURES +-------- +* ndk cmake builds (C++, LLVM support, ABI) +* .aar library packaging, includes java .class files (and other resources) -* combine wolfssl-lib + wolfssl-jni == ccc-ndk-jni (not ccc-jni which would be for java) - - TEST: check that all builds OK (ok-dokey) - - move from bash script builds, to all gradle (cleaning and copying libs) + + + +WORKING +------- * l@@k at Android Weekly emails -* TEST: add test code for JNI calls Milestone ^^^^^^^^^ - * WolfSSL validate with JNI -Backlog +BACKLOG ------- Tasks ^^^^^ - * GET THE LATEST - get the lastest ndk - get the latest gradle (see if 5.x is compatible) @@ -36,12 +37,17 @@ Tasks * l@@k at https://en.wikipedia.org/wiki/NTRU * l@@k at http://facebook.github.io/conceal/ * l@@k at https://techcrunch.com/2018/10/03/googles-cyber-unit-jigsaw-introduces-intra-a-security-app-dedicated-to-busting-censorship/ +* Create Multi Projects + - nc-wc-ndk (remove android GUI code) + - ccc-gui-a (android) + - ccc-gui-i (iOS) + - ccc-gui-e (electron) + - ccc-cmd (command line) Milestones ^^^^^^^^^^ - * JNI wrapper tests - RSA Public Key Generation - AES crypt @@ -55,9 +61,14 @@ Milestones -Completed +COMPLETED --------- - +* TEST: add test code for JNI calls + - tested AES, everything else should work accordingly +* combine wolfssl-lib + wolfssl-jni == ccc-ndk-jni (not ccc-jni which would be for java) + - TEST: check that all builds OK (ok-dokey) + - move from bash script builds, to all gradle (cleaning and copying libs) + - no bash builds needed because gradle is generating an .aar package * WolfSSL compile - fixing CMake build - discover which gradle to target --> wolfssl was main gradle app target diff --git a/docs/weekly_2019-02-11.rst b/docs/weekly_2019-02-11.rst index a27b4fb..4e7efce 100644 --- a/docs/weekly_2019-02-11.rst +++ b/docs/weekly_2019-02-11.rst @@ -3,24 +3,47 @@ Weekly Progress =============== -WORKING -======= - -* test JNI libs !!! =) - - try some java code that will call a C-hook - - - -ISSUES -====== - - - - NOTES ===== * Debug Android binaries: - https://resources.infosecinstitute.com/guide-debugging-android-binaries/ +* Android Library: https://developer.android.com/studio/projects/android-library +* Android Dependencies: https://developer.android.com/studio/build/dependencies#duplicate_classes + + + +WORKING +======= + +* ANDROID: Activity: plaintext, encrypt +* Create Two Projects + - nc-wc-ndk (remove android GUI code) + - all crypto-core, java wrapper code, for copius+cipher+chain + - add mods to wolfssl-oem, mod AES "s-boxes", figure out 512bit key AES + - ccc-gui-a (android GUI) + - pretty user interface for the crypto-core + + + +COMPLETED +========= + +* test JNI lib !!! =) + - try some java code that will call a C-hook +* create distributed library package + - generage wolfssl-jni.aar + + + + +ISSUES +====== + +* how to include NDK ABI Libs and also java class files?? + - use a ".aar" file, it is generated from gradle + - ./build/outputs/aar/.aar + - apply plugin: 'com.android.library' +