diff --git a/README b/README index c8e503d..f8283ea 100644 --- a/README +++ b/README @@ -13,3 +13,22 @@ -Quantum-Computing safe crypto -super-fast NTRU algorithm + +[[ Java Crypto Library ]] + +[Crypto Providers] + -bouncy castle (various version ship) + -spongy castle + GCM not available + +*** DON'T TRUST THE PROVIDERS!!! *** + + +[Key Features] +1) bluesalt - use bluetooth devices as unlock key, user, salt + -what you have (who you are, what you know) + +2) random data - use camera for randomness + -fix android random problem + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 3d05003..ccc8345 100644 --- a/build.gradle +++ b/build.gradle @@ -6,8 +6,6 @@ buildscript { jcenter() } dependencies { - // gradle tools 2.2.2+ supports stable ndk - // classpath 'com.android.tools.build:gradle:2.3.0' classpath 'com.android.tools.build:gradle:3.2.1' } } diff --git a/ccc-jni/build.gradle b/ccc-jni/build.gradle index 572a917..4cdb4bc 100644 --- a/ccc-jni/build.gradle +++ b/ccc-jni/build.gradle @@ -16,16 +16,6 @@ android { cmake { arguments '-DANDROID_PLATFORM=android-23', '-DANDROID_TOOLCHAIN=clang' - // Sets optional flags for the C compiler. - // cFlags \ - // '-D_POSIX_THREADS', '-DNDEBUG', - // '-DPERSIST_SESSION_CACHE', '-DPERSIST_CERT_CACHE', '-DATOMIC_USER', - // '-DHAVE_PK_CALLBACKS', '-DNO_DSA', - // '-DNO_MD4', '-DNO_HC128', '-DNO_RABBIT', - // '-DHAVE_OCSP', '-DHAVE_CRL', '-DWOLFSSL_JNI', '-DHAVE_DH', - // '-Wall' - // explicitly build libs - //targets 'wolfssl' } } @@ -54,7 +44,6 @@ task copyLibs(type: Copy) { into "dist/wolfssl-jni_${thisDate}/" } - dependencies { testImplementation 'junit:junit:4.12' } diff --git a/settings.gradle b/settings.gradle index b65df5a..f191af2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,3 @@ -//include ':wolfssl-lib' -//include ':wolfssl-jni' -//include ':ccc-jni' +include ':wolfssl-lib' +include ':wolfssl-jni' +include ':ccc-jni' diff --git a/wolfssl-jni/build.gradle b/wolfssl-jni/build.gradle index 572a917..b90ecf7 100644 --- a/wolfssl-jni/build.gradle +++ b/wolfssl-jni/build.gradle @@ -16,18 +16,7 @@ android { cmake { arguments '-DANDROID_PLATFORM=android-23', '-DANDROID_TOOLCHAIN=clang' - // Sets optional flags for the C compiler. - // cFlags \ - // '-D_POSIX_THREADS', '-DNDEBUG', - // '-DPERSIST_SESSION_CACHE', '-DPERSIST_CERT_CACHE', '-DATOMIC_USER', - // '-DHAVE_PK_CALLBACKS', '-DNO_DSA', - // '-DNO_MD4', '-DNO_HC128', '-DNO_RABBIT', - // '-DHAVE_OCSP', '-DHAVE_CRL', '-DWOLFSSL_JNI', '-DHAVE_DH', - // '-Wall' - // explicitly build libs - //targets 'wolfssl' } - } } diff --git a/wolfssl-jni/libs/wolfssl-lib/arm64-v8a/libwolfssl.a b/wolfssl-jni/libs/wolfssl-lib/arm64-v8a/libwolfssl.a index 9cc7adc..3ecfa47 100644 Binary files a/wolfssl-jni/libs/wolfssl-lib/arm64-v8a/libwolfssl.a and b/wolfssl-jni/libs/wolfssl-lib/arm64-v8a/libwolfssl.a differ diff --git a/wolfssl-jni/libs/wolfssl-lib/armeabi-v7a/libwolfssl.a b/wolfssl-jni/libs/wolfssl-lib/armeabi-v7a/libwolfssl.a index 0870785..3269acb 100644 Binary files a/wolfssl-jni/libs/wolfssl-lib/armeabi-v7a/libwolfssl.a and b/wolfssl-jni/libs/wolfssl-lib/armeabi-v7a/libwolfssl.a differ diff --git a/wolfssl-jni/libs/wolfssl-lib/lib_history b/wolfssl-jni/libs/wolfssl-lib/lib_history new file mode 100644 index 0000000..668d050 --- /dev/null +++ b/wolfssl-jni/libs/wolfssl-lib/lib_history @@ -0,0 +1,10 @@ +=================== +LIBRARY BUILD DATES +=================== + +The following is the build history for this library. +Dates: + +2019-02-09 + + diff --git a/wolfssl-jni/libs/wolfssl-lib/x86/libwolfssl.a b/wolfssl-jni/libs/wolfssl-lib/x86/libwolfssl.a index 9f86e15..24d3bca 100644 Binary files a/wolfssl-jni/libs/wolfssl-lib/x86/libwolfssl.a and b/wolfssl-jni/libs/wolfssl-lib/x86/libwolfssl.a differ diff --git a/wolfssl-jni/libs/wolfssl-lib/x86_64/libwolfssl.a b/wolfssl-jni/libs/wolfssl-lib/x86_64/libwolfssl.a index ed4e331..234bfc8 100644 Binary files a/wolfssl-jni/libs/wolfssl-lib/x86_64/libwolfssl.a and b/wolfssl-jni/libs/wolfssl-lib/x86_64/libwolfssl.a differ diff --git a/wolfssl-lib/build.gradle b/wolfssl-lib/build.gradle index 0c79a41..f2319b2 100644 --- a/wolfssl-lib/build.gradle +++ b/wolfssl-lib/build.gradle @@ -1,17 +1,5 @@ apply plugin: 'com.android.library' -buildscript { - repositories { - google() - jcenter() - } - dependencies { - // gradle tools 2.2.2+ supports stable ndk - // classpath 'com.android.tools.build:gradle:2.3.0' - classpath 'com.android.tools.build:gradle:3.2.1' - } -} - android { compileSdkVersion 28 // a default can be used, but it is good practice to explicitly select build tools @@ -43,21 +31,9 @@ android { } } - - // buildTypes { - // release { - // minifyEnabled false - // proguardFiles getDefaultProguardFile('proguard-android.txt'), - // 'proguard-rules.pro' - // } - // } externalNativeBuild { cmake { path 'CMakeLists.txt' } } } - -dependencies { - //compile fileTree(dir: 'libs', include: ['*.jar']) -}