From 5e1e4a4b57e298806dba97175fa1fbd5c771c7cd Mon Sep 17 00:00:00 2001
From: ccy <3140717620@qq.com>
Date: 星期五, 09 十月 2026 16:17:18 +0800
Subject: [PATCH] 新的加密方式

---
 shortcrypto.cpp |  129 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 129 insertions(+), 0 deletions(-)

diff --git a/shortcrypto.cpp b/shortcrypto.cpp
index 796fcb8..e6d80fd 100644
--- a/shortcrypto.cpp
+++ b/shortcrypto.cpp
@@ -1,10 +1,16 @@
 锘�#include "shortcrypto.h"
 #include "tinyaes.h"
 #include <QtDebug>
+#include <QtMath>
+#include <algorithm>
 
 // Base85 瀛楃闆嗭細85涓彲鎵撳嵃瀛楃锛岄伩寮�瀹规槗鍦║RL/JSON閲屽嚭闂鐨勫瓧绗�
 const char *ShortCrypto::BASE85_CHARS =
     "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!#$%&()*+-;<=>?@^_`{|}~";
+
+// V3 瀛楃闆嗭細绾ぇ鍐欏瓧姣嶏紙26瀛楃锛夛紝璁稿彲瀵嗛挜鍙惈 A-Z锛�28浣�
+const char *ShortCrypto::V3_CHARS =
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 
 namespace {
     QByteArray pkcs7Pad(const QByteArray &data, int blockSize) {
@@ -105,6 +111,129 @@
     return pkcs7Unpad(decrypted);
 }
 
+QString ShortCrypto::encryptRaw(const QByteArray &plaintext, const QByteArray &key)
+{
+    if (key.size() != 16) {
+        qWarning() << "ShortCrypto::encryptRaw: key must be 16 bytes for AES-128";
+        return QString();
+    }
+    if (plaintext.isEmpty() || plaintext.size() % 16 != 0) {
+        qWarning() << "ShortCrypto::encryptRaw: plaintext size must be a non-zero multiple of 16, got"
+                   << plaintext.size();
+        return QString();
+    }
+
+    // 鍗曞潡鏃跺叏闆禝V鐨凜BC绛変环浜嶦CB锛涘鍧楁椂涓篊BC閾炬帴
+    QByteArray adjustedIv(16, '\0');
+
+    QByteArray encrypted = plaintext;
+    struct AES_ctx ctx;
+    AES_init_ctx_iv(&ctx, reinterpret_cast<const uint8_t*>(key.constData()),
+                    reinterpret_cast<const uint8_t*>(adjustedIv.constData()));
+    AES_CBC_encrypt_buffer(&ctx, reinterpret_cast<uint8_t*>(encrypted.data()), encrypted.size());
+
+    // 绾ぇ鍐欏瓧姣嶇紪鐮侊細16瀛楄妭瀵嗘枃 鈫� 28瀛楃锛堣嫢鍏佽鏁板瓧鎹�36瀛楃闆嗭紝闀垮害闄嶅埌25锛�
+    QByteArray encoded = baseNEncode(encrypted, V3_CHARS, 26);
+    return QString::fromLatin1(encoded);
+}
+
+QByteArray ShortCrypto::decryptRaw(const QString &ciphertext, const QByteArray &key)
+{
+    if (key.size() != 16) {
+        qWarning() << "ShortCrypto::decryptRaw: key must be 16 bytes for AES-128";
+        return QByteArray();
+    }
+
+    // 浼樺厛鎸夌函瀛楁瘝琛ㄨВ鐮侊紱鑻ュ惈琛ㄥ瀛楃锛堟棭鏈烞ase85鐗圴3瀵嗛挜锛夊垯鍥為��Base85
+    QByteArray encrypted = baseNDecode(ciphertext, V3_CHARS, 26);
+    if (encrypted.isEmpty()) {
+        encrypted = base85Decode(ciphertext);
+    }
+    if (encrypted.isEmpty()) {
+        qWarning() << "ShortCrypto::decryptRaw: decode failed";
+        return QByteArray();
+    }
+    if (encrypted.size() % 16 != 0) {
+        qWarning() << "ShortCrypto::decryptRaw: decoded data size not aligned to block size:"
+                   << encrypted.size();
+        return QByteArray();
+    }
+
+    QByteArray adjustedIv(16, '\0');
+    QByteArray decrypted = encrypted;
+    struct AES_ctx ctx;
+    AES_init_ctx_iv(&ctx, reinterpret_cast<const uint8_t*>(key.constData()),
+                    reinterpret_cast<const uint8_t*>(adjustedIv.constData()));
+    AES_CBC_decrypt_buffer(&ctx, reinterpret_cast<uint8_t*>(decrypted.data()), decrypted.size());
+    return decrypted;
+}
+
+QByteArray ShortCrypto::baseNEncode(const QByteArray &data, const char *alphabet, int base)
+{
+    // 鎶婃暣娈靛ぇ绔瓧鑺傚簭褰撲綔涓�涓ぇ鏁存暟锛岄�愭闄や互base鍙栦綑鏁�
+    QByteArray num = data;
+    QByteArray remainders;
+
+    bool isZero = false;
+    while (!isZero) {
+        isZero = true;
+        unsigned int carry = 0;
+        for (int i = 0; i < num.size(); ++i) {
+            unsigned int cur = (carry << 8) | static_cast<unsigned char>(num.at(i));
+            num[i] = static_cast<char>(cur / static_cast<unsigned int>(base));
+            carry = cur % static_cast<unsigned int>(base);
+            if (num.at(i) != 0) isZero = false;
+        }
+        if (isZero && remainders.isEmpty()) break; // 鍏ㄩ浂杈撳叆
+        remainders.append(alphabet[static_cast<int>(carry)]);
+        if (isZero) break;
+    }
+    if (remainders.isEmpty()) remainders.append(alphabet[0]);
+
+    // 杩樺師涓洪珮浣嶅湪鍓嶏紝骞剁敤alphabet[0]琛ラ綈鍥哄畾浣嶆暟锛堝墠瀵奸浂锛�
+    QByteArray result = remainders;
+    std::reverse(result.begin(), result.end());
+    int minimalLen = static_cast<int>(qCeil(data.size() * 8.0 * qLn(2.0) / qLn(static_cast<double>(base))));
+    if (result.size() < minimalLen) {
+        result.prepend(QByteArray(minimalLen - result.size(), alphabet[0]));
+    }
+    return result;
+}
+
+QByteArray ShortCrypto::baseNDecode(const QString &text, const char *alphabet, int base)
+{
+    // 寤虹珛瀛楃绱㈠紩琛�
+    int charToVal[256];
+    memset(charToVal, -1, sizeof(charToVal));
+    for (int i = 0; i < base; ++i) {
+        charToVal[static_cast<unsigned char>(alphabet[i])] = i;
+    }
+
+    // Horner娉曞垯锛歯um = num * base + v锛堝ぇ绔瓧鑺傚簭锛�
+    QByteArray num(16, '\0');
+    QByteArray input = text.toLatin1();
+    for (int i = 0; i < input.size(); ++i) {
+        int v = charToVal[static_cast<unsigned char>(input.at(i))];
+        if (v < 0) {
+            qWarning() << "ShortCrypto::baseNDecode: invalid character:" << QChar(input.at(i));
+            return QByteArray();
+        }
+        unsigned int carry = static_cast<unsigned int>(v);
+        for (int b = num.size() - 1; b >= 0; --b) {
+            unsigned int cur = (static_cast<unsigned int>(static_cast<unsigned char>(num.at(b))) * static_cast<unsigned int>(base)) + carry;
+            num[b] = static_cast<char>(cur & 0xFF);
+            carry = cur >> 8;
+        }
+        if (carry != 0) {
+            qWarning() << "ShortCrypto::baseNDecode: value overflows 128 bits";
+            return QByteArray();
+        }
+    }
+
+    // 淇濇寔16瀛楄妭瀹氬锛堝墠瀵奸浂鏈夋剰涔夛級锛岃皟鐢ㄦ柟鎸夊浐瀹氬潡闀垮鐞�
+    return num;
+}
+
 QByteArray ShortCrypto::base85Encode(const QByteArray &data)
 {
     QByteArray result;

--
Gitblit v1.9.1