Merge pull request #5 from xianglin1998/master

add prng check.

Author: xianglin1998

app/build.gradle

@@ -25,9 +25,9 @@ android {
         //单元测试的支持
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         //版本号，整形
-        versionCode 3
+        versionCode 4
         //版本名称，字符串!
-        versionName "1.3"
+        versionName "1.3.1"
     }
     //构建的类型，发布版和测试版
     buildTypes {

app/src/main/java/cn/rrg/rdv/activities/px53x/MfcukConsoleActivity.java

@@ -2,16 +2,53 @@
 
 import android.content.DialogInterface;
 import android.content.Intent;
+
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
+
+import android.os.Bundle;
 import android.view.View;
+import android.widget.TextView;
 
+import cn.dxl.common.util.ViewUtil;
+import cn.dxl.common.widget.ToastUtil;
 import cn.rrg.console.define.ICommandTools;
 import cn.rrg.console.define.ICommandType;
 import cn.rrg.natives.MfcukTools;
+import cn.rrg.natives.PN53XTagLeaksAdapter;
+import cn.rrg.rdv.R;
 import cn.rrg.rdv.implement.EntryICommandType;
 
 public class MfcukConsoleActivity extends PN53XConsoleActivity {
 
+    private AlertDialog checkTipsDialog;
+    private TextView txtMsgView;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        checkTipsDialog = new AlertDialog.Builder(context).create();
+        checkTipsDialog.setTitle(R.string.tips);
+        View continer = ViewUtil.inflate(context, R.layout.dialog_working_msg);
+        txtMsgView = continer.findViewById(R.id.text1);
+        txtMsgView.setText(R.string.msg_working_darkside_check);
+        checkTipsDialog.setView(continer);
+        checkTipsDialog.setCancelable(false);
+    }
+
+    private void showWorkingDialog(boolean show) {
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                if (show)
+                    checkTipsDialog.show();
+                else
+                    checkTipsDialog.dismiss();
+            }
+        });
+    }
+
     @Override
     protected View getCommandGUI() {
         return null;
@@ -39,6 +76,24 @@ public String parseKey(String output) {
 
     @Override
     protected int startTest(ICommandTools cmd) {
+        showWorkingDialog(true);
+        // Judge if there is have a nack loophole
+        if (!new PN53XTagLeaksAdapter().isDarksideSupported()) {
+            showWorkingDialog(false);
+            // darkside no supported.
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    new AlertDialog.Builder(context)
+                            .setTitle(R.string.tips)
+                            .setMessage(getString(R.string.msg_darkside_no_supported)).show();
+                }
+            });
+            return -1;
+        } else {
+            showWorkingDialog(false);
+            ToastUtil.show(context, getString(R.string.msg_darkside_support), false);
+        }
         mDefaultCMD = "mfcuk -C -R 0:A -w -v 2";
         return super.startTest(cmd);
     }

app/src/main/res/values-en/strings.xml

@@ -323,5 +323,8 @@
     <string name="msg_special_tag">Found chinese magic tag.</string>
     <string name="msg_normal_tag_found">Found normal tag.</string>
     <string name="sector_line">Sector</string>
+    <string name="msg_darkside_no_supported">Cards do not support Darkside vulnerability (MFCUK, full encryption) testing. Replace the card or use the Nested vulnerability (MFOC, semi-encryption) testing tool, or the Hardnested vulnerability (high-intensity Nested vulnerability) testing tool, or sniff.</string>
+    <string name="msg_working_darkside_check">Checking whether the card supports Darkside</string>
+    <string name="msg_darkside_support">The card supports Darkside</string>
 
 </resources>

app/src/main/res/values-zh/strings.xml

@@ -319,5 +319,8 @@
     <string name="msg_special_tag">发现特殊的后门UID标签!</string>
     <string name="msg_normal_tag_found">发现普通的标签!</string>
     <string name="sector_line">扇 区</string>
+    <string name="msg_darkside_no_supported">卡片不支持Darkside漏洞（MFCUK、全加密）测试，请更换卡片或者使用Nested漏洞（MFOC、半加密）测试工具，或者Hardnested漏洞（高强度的Nested漏洞）测试工具，或者嗅探。</string>
+    <string name="msg_working_darkside_check">正在检查该卡片是否支持Darkside</string>
+    <string name="msg_darkside_support">该卡片支持Darkside漏洞</string>
 
 </resources>

app/src/main/res/values/strings.xml

@@ -322,5 +322,8 @@
     <string name="msg_special_tag">Found chinese magic tag.</string>
     <string name="msg_normal_tag_found">Found normal tag.</string>
     <string name="sector_line">Sector</string>
+    <string name="msg_darkside_no_supported">Cards do not support Darkside vulnerability (MFCUK, full encryption) testing. Replace the card or use the Nested vulnerability (MFOC, semi-encryption) testing tool, or the Hardnested vulnerability (high-intensity Nested vulnerability) testing tool, or sniff.</string>
+    <string name="msg_working_darkside_check">Checking whether the card supports Darkside</string>
+    <string name="msg_darkside_support">The card supports Darkside</string>
 
 </resources>

commapping/src/main/java/cn/rrg/com/SppHasBlock.java

@@ -32,6 +32,7 @@ public static SppHasBlock get() {
 
     @Override
     public int write(byte[] sendMsg, int offset, int length, int timeout) throws IOException {
+        setThreadPriority();
         if (outputStream == null) return -1;
         outputStream.write(sendMsg, offset, length - offset);
         outputStream.flush();
@@ -40,6 +41,7 @@ public int write(byte[] sendMsg, int offset, int length, int timeout) throws IOE
 
     @Override
     public int read(byte[] recvMsg, int offset, int length, int timeout) throws IOException {
+        setThreadPriority();
         if (inputStream == null) return -1;
         long start = System.currentTimeMillis();
         while (inputStream.available() < (length - offset)) {
@@ -59,4 +61,8 @@ public int read(byte[] recvMsg, int offset, int length, int timeout) throws IOEx
     public int getUniqueId() {
         return UNIQUE_ID;
     }
+
+    private void setThreadPriority() {
+        Thread.currentThread().setPriority(Thread.MAX_PRIORITY);
+    }
 }

crapto1/.cxx/cmake/debug/x86/.ninja_deps

@@ -0,0 +1,5 @@
+# ninja log v5
+1	341	591194423	CMakeFiles/crapto1.dir/crapto1.c.o	2ae20ff9d3de30c2
+4	356	591194423	CMakeFiles/crapto1.dir/crypto1.c.o	208a3418496fca92
+6	485	591194424	CMakeFiles/crapto1.dir/main.c.o	1902701a56f595ff
+485	811	591194424	D:/Developer/AndroidStudioProject/RFID-Tools/crapto1/build/intermediates/cmake/debug/obj/x86/libcrapto1.so	ac668822d378730a