v1.0.0开发：native层aes和rsa加密解密开发

build.gradle

@@ -12,7 +12,7 @@ buildscript {
     // buildToolsVersion
     ext.BUILD_TOOLS_VERSION = '30.0.3'
     // minSdkVersion
-    ext.MIN_SDK_VERSION = 16
+    ext.MIN_SDK_VERSION = 21
     // targetSdkVersion
     ext.TARGET_SDK_VERSION = 30
 

demo/src/main/java/com/yyxx/columbus/demo/DemoActivity.kt

@@ -96,6 +96,23 @@ class DemoActivity : Activity(), View.OnClickListener {
                     val src2 = SdkDrive.aesDecrypt(src, key)
                     Logger.d(src2)
                 }
+                3 -> {
+                    val src = "qtfc2jsgqrz81inn"
+                    val raw = SdkDrive.rsaEncrypt(src)
+                    Logger.d("raw : $raw")
+                }
+                4 -> {
+                    val raw =
+                        "ItBGaPY+GvPqtWg/BVVt6GQuhRI7NF8LC9qxl+0R2+5plJ2V5HBXOol8OSEMWttzRV/pbPaOYMoVjma67Js5LEe2RrL/vc84w2updiMHqAIjtMu6rXmIs1zHlCeXf1uaW8SGuKsM9Xn1OQ6GundkbinIOSVefn+Z/MkHeu446xU="
+                    val src = SdkDrive.rsaDecrypt(raw)
+                    Logger.d("src : $src")
+                }
+//                5 -> {
+//                    val raw =
+//                        "eyJiYWxhbmNlIjoiNjAwIiwiY29tbW9uIjp7ImJpeiI6eyJnYW1lX2NvZGUiOiJ0ZXN0Y29kZTEyMzQ1NiIsInBhY2thZ2VfbmFtZSI6ImNvbS5mbHlmdW4uZGVtbyJ9LCJkZXZpY2UiOnsiYWRpZCI6IjkwMmM5NWJjZDMzZjdhODMiLCJhbmRyb2lkX2lkIjoiOTAyYzk1YmNkMzNmN2E4MyIsImRldmljZV9pZCI6IjkwMmM5NWJjZDMzZjdhODMiLCJpZGZhIjoiIiwiaWRmdiI6IiIsImltZWkiOiIwIiwibG9jYWxfbGFuZ3VhZ2UiOiJDTiIsIm1hYyI6IjAyOjAwOjAwOjAwOjAwOjAwIiwibWZycyI6IkhVQVdFSSIsIm1vYmlsZV9icmFuZCI6IkhVQVdFSSIsIm1vZGVsIjoiQU5HLUFOMDAiLCJuZXR3b3JrIjoiMCIsIm9zIjoiYW5kcm9pZCIsIm9zX3ZlcnNpb24iOiIxMCIsInNjcmVlbiI6IjEwODB4MjM0MCIsInNpbXVsYXRvciI6IjAifSwiZXh0IjoiIiwidmVycyI6eyJjbGllbnRfdmVyc2lvbiI6IjEuMS43IiwiZ2FtZV92ZXJzaW9uX2NvZGUiOiIxMDQiLCJnYW1lX3ZlcnNpb25fbmFtZSI6IjEuMC40Iiwic2VydmVyX3ZlcnNpb24iOiIxLjAuMCJ9fSwicm9sZV9pZCI6ImFhYTE2MjMzMTgyODM4NzIiLCJyb2xlX2xldmVsIjoiMTEwIiwicm9sZV9uYW1lIjoi6KeS6Imy5ZCNMTIzIiwic2VydmVyX2NvZGUiOiIzMzMiLCJzZXJ2ZXJfbmFtZSI6IuacjeWKoeWZqOWQjTMzMyIsInVzZXJfaWQiOiI5MjA0MDQyODQ5NDcxMzI0MTYiLCJ2aXBfbGV2ZWwiOiIxIn0K"
+//                    val src = SdkDrive.base64Decode(raw)
+//                    Logger.d("src : $src")
+//                }
             }
         }
     }

demo/src/main/java/com/yyxx/columbus/demo/DemoApplication.kt

@@ -1,15 +1,15 @@
 package com.yyxx.columbus.demo
 
-import android.app.Application
 import android.content.Context
+import cn.yyxx.columbus.base.ColumbusApplication
 
 /**
  * @author #Suyghur.
  * Created on 2021/06/09
  */
-class DemoApplication : Application() {
+class DemoApplication : ColumbusApplication() {
 
-    override fun attachBaseContext(base: Context?) {
+    override fun attachBaseContext(base: Context) {
         super.attachBaseContext(base)
     }
 

library_base/src/main/java/cn/yyxx/columbus/base/Columbus.kt

@@ -1,6 +1,10 @@
 package cn.yyxx.columbus.base
 
+import android.app.Activity
+import android.app.Application
+import android.content.Context
 import androidx.annotation.Keep
+import cn.yyxx.columbus.base.internal.ICallback
 
 /**
  * @author #Suyghur.
@@ -9,8 +13,30 @@ import androidx.annotation.Keep
 class Columbus private constructor() {
 
 
+    fun attachBaseContext(application: Application, context: Context) {
 
+    }
+
+
+    fun initApplication(application: Application) {
+
+    }
+
+    fun initialize(activity: Activity, isLandscape: Boolean, callback: ICallback) {
+
+    }
 
+    fun login(activity: Activity, callback: ICallback) {
+
+    }
+
+    fun logout(activity: Activity, callback: ICallback) {
+
+    }
+
+    fun charge(activity: Activity, callback: ICallback) {
+
+    }
 
     companion object {
         @JvmStatic

library_base/src/main/java/cn/yyxx/columbus/base/ColumbusApplication.kt

@@ -7,13 +7,15 @@ import android.content.Context
  * @author #Suyghur.
  * Created on 2021/06/09
  */
-class ColumbusApplication : Application() {
+open class ColumbusApplication : Application() {
 
-    override fun attachBaseContext(base: Context?) {
+    override fun attachBaseContext(base: Context) {
         super.attachBaseContext(base)
+        Columbus.getInstance().attachBaseContext(this, base)
     }
 
     override fun onCreate() {
         super.onCreate()
+        Columbus.getInstance().initApplication(this)
     }
 }

library_base/src/main/java/cn/yyxx/columbus/base/SdkBridgeManager.kt

@@ -0,0 +1,8 @@
+package cn.yyxx.columbus.base
+
+/**
+ * @author #Suyghur.
+ * Created on 2021/06/12
+ */
+class SdkBridgeManager {
+}

library_base/src/main/java/cn/yyxx/columbus/base/internal/ICallback.kt

@@ -0,0 +1,10 @@
+package cn.yyxx.columbus.base.internal
+
+/**
+ * @author #Suyghur.
+ * Created on 2021/06/12
+ */
+interface ICallback {
+
+    fun onResult(code: Int, result: String)
+}

library_core/CMakeLists.txt

@@ -13,6 +13,10 @@ cmake_minimum_required(VERSION 3.4.1)
 
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/main/cpp/include)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/main/cpp/include/third_part)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/main/cpp/include/aes)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/main/cpp/include/rsa)
+
 #include_directories(src/main/cpp/json)
 #include_directories(src/main/cpp/encrypt)
 aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/src/main/cpp/ DIR_SOURCE)
@@ -51,8 +55,8 @@ find_library( # Sets the name of the path variable.
 
 target_link_libraries( # Specifies the target library.
         columbus
-        local_openssl
         local_crypto
+        local_openssl
         # Links the target library to the log library
         # included in the NDK.
         ${log-lib})

library_core/build.gradle

@@ -9,7 +9,7 @@ android {
     buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        minSdkVersion MIN_SDK_VERSION
+        minSdkVersion 21
         targetSdkVersion TARGET_SDK_VERSION
 
         externalNativeBuild {

library_core/src/main/cpp/aes.cpp

@@ -39,7 +39,7 @@ NOTE:   String length must be evenly divisible by 16byte (str_len % 16 == 0)
 /*****************************************************************************/
 
 #include <string.h>
-#include "include/aes.h"
+#include "include/aes/aes.h"
 
 /*****************************************************************************/
 /* Defines:                                                                  */

library_core/src/main/cpp/aes_utils.cpp

@@ -4,7 +4,7 @@
 
 #include <hex_utils.h>
 #include <logger.h>
-#include "include/aes_utils.h"
+#include "include/aes/aes_utils.h"
 
 static const unsigned char HEX[16] = {0x10, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f};
 

library_core/src/main/cpp/columbus.cpp

@@ -6,8 +6,9 @@
 
 #include <jni.h>
 #include <jtool.h>
+#include <rsa/rsa_utils.h>
 #include "include/logger.h"
-#include "include/aes_utils.h"
+#include "aes/aes_utils.h"
 
 static void GetAesKey(JNIEnv *env, jobject thiz) {
     uint8_t *aes_key = AesUtils::GetKey();
@@ -31,10 +32,10 @@ static jstring AesEncrypt(JNIEnv *env, jobject thiz, jstring src) {
     LOGD("%s", raw);
     env->ReleaseStringUTFChars(src, src_);
 
-    jstring jResult = JTool::GetJString(env, raw);
+    jstring result = JTool::GetJString(env, raw);
     free(raw);
 
-    return jResult;
+    return result;
 }
 
 static jstring AesDecrypt(JNIEnv *env, jobject thiz, jstring raw, jstring key) {
@@ -43,15 +44,38 @@ static jstring AesDecrypt(JNIEnv *env, jobject thiz, jstring raw, jstring key) {
     char *src = AesUtils::Decrypt(raw_, key_);
     env->ReleaseStringUTFChars(raw, raw_);
 
-    jstring jResult = JTool::GetJString(env, src);
+    jstring result = JTool::GetJString(env, src);
     free(src);
-    return jResult;
+    return result;
 }
 
+
+static jstring RsaEncrypt(JNIEnv *env, jobject thiz, jstring src) {
+    const char *src_ = env->GetStringUTFChars(src, JNI_FALSE);
+    std::string key = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCAVatPhPaZtxBkLBZDnOLf7no6VfnjBRMXhpOnWmkkDX4zurB/OKisYDFnR0UUVnKn717+absfLlDk9HZWBcTMznsUju9fuXlu3Elr8HeI3en7E0KIQzxkY1GT1+qtZ+tCjWuyMmUw4vWpO8/MRU3f6nc4io3w+7N+dP24BIo0ZwIDAQAB";
+    std::string raw = RsaUtils::EncryptByPublicKey(key, src_);
+//    LOGD("base64 raw : %s", raw.c_str());
+    env->ReleaseStringUTFChars(src, src_);
+    jstring result = JTool::GetJString(env, raw.c_str());
+    return result;
+}
+
+static jstring RsaDecrypt(JNIEnv *env, jobject thiz, jstring raw) {
+    const char *raw_ = env->GetStringUTFChars(raw, JNI_FALSE);
+    std::string key = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCAVatPhPaZtxBkLBZDnOLf7no6VfnjBRMXhpOnWmkkDX4zurB/OKisYDFnR0UUVnKn717+absfLlDk9HZWBcTMznsUju9fuXlu3Elr8HeI3en7E0KIQzxkY1GT1+qtZ+tCjWuyMmUw4vWpO8/MRU3f6nc4io3w+7N+dP24BIo0ZwIDAQAB";
+    std::string src = RsaUtils::DecryptByPublicKey(key, raw_);
+    env->ReleaseStringUTFChars(raw, raw_);
+    jstring result = JTool::GetJString(env, src.c_str());
+    return result;
+}
+
+
 static JNINativeMethod gMethod[] = {
         {"getAesKey",  "()V",                                                      (void *) GetAesKey},
         {"aesEncrypt", "(Ljava/lang/String;)Ljava/lang/String;",                   (void *) AesEncrypt},
-        {"aesDecrypt", "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;", (void *) AesDecrypt}
+        {"aesDecrypt", "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;", (void *) AesDecrypt},
+        {"rsaEncrypt", "(Ljava/lang/String;)Ljava/lang/String;",                   (void *) RsaEncrypt},
+        {"rsaDecrypt", "(Ljava/lang/String;)Ljava/lang/String;",                   (void *) RsaDecrypt}
 };
 
 extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {

library_core/src/main/cpp/include/aes.h → library_core/src/main/cpp/include/aes/aes.h

@@ -13,7 +13,6 @@
 
 // The #ifndef-guard allows it to be configured before #include'ing or at compile time.
 
-#include <stdint.h>
 
 #ifndef CBC
 #define CBC 1

library_core/src/main/cpp/include/aes_utils.h → library_core/src/main/cpp/include/aes/aes_utils.h

@@ -5,9 +5,6 @@
 #ifndef COLUMBUS_AES_UTILS_H
 #define COLUMBUS_AES_UTILS_H
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
 #include "aes.h"
 
 #define BLOCKLEN 16

library_core/src/main/cpp/include/rsa/rsa_utils.h

@@ -0,0 +1,36 @@
+//
+// Created by #Suyghur, on 2021/06/15.
+//
+
+#ifndef COLUMBUS_RSA_UTILS_H
+#define COLUMBUS_RSA_UTILS_H
+
+
+#include <string>
+
+class RsaUtils {
+public:
+
+    static std::string EncryptByPublicKey(std::string public_key, std::string src);
+
+    static std::string DecryptByPublicKey(std::string public_key, std::string raw);
+
+
+private:
+
+    static std::string GeneratePublicKey(std::string encode_key);
+
+    static std::string Encrypt(const std::string &public_key, const std::string &src);
+
+    static std::string Decrypt(const std::string &public_key, const std::string &src);
+
+
+    static std::string Base64Encode(const std::string &src);
+
+    static char *Base64Decode(const char *raw);
+
+
+};
+
+
+#endif //COLUMBUS_RSA_UTILS_H

library_core/src/main/cpp/include/openssl/obj_mac.h → library_core/src/main/cpp/include/third_part/openssl/obj_mac.h

@@ -2391,7 +2391,7 @@
 #define OBJ_X500algorithms              OBJ_X500,8L
 
 #define SN_rsa          "RSA"
-#define LN_rsa          "rsa"
+#define LN_rsa          "rsa_utils"
 #define NID_rsa         19
 #define OBJ_rsa         OBJ_X500algorithms,1L,1L
 
@@ -5001,7 +5001,7 @@
 #define OBJ_ED448               1L,3L,101L,113L
 
 #define SN_kx_rsa               "KxRSA"
-#define LN_kx_rsa               "kx-rsa"
+#define LN_kx_rsa               "kx-rsa_utils"
 #define NID_kx_rsa              1037
 
 #define SN_kx_ecdhe             "KxECDHE"
@@ -5021,7 +5021,7 @@
 #define NID_kx_dhe_psk          1041
 
 #define SN_kx_rsa_psk           "KxRSA_PSK"
-#define LN_kx_rsa_psk           "kx-rsa-psk"
+#define LN_kx_rsa_psk           "kx-rsa_utils-psk"
 #define NID_kx_rsa_psk          1042
 
 #define SN_kx_psk               "KxPSK"
@@ -5041,7 +5041,7 @@
 #define NID_kx_any              1063
 
 #define SN_auth_rsa             "AuthRSA"
-#define LN_auth_rsa             "auth-rsa"
+#define LN_auth_rsa             "auth-rsa_utils"
 #define NID_auth_rsa            1046
 
 #define SN_auth_ecdsa           "AuthECDSA"