diff --git a/README.md b/README.md index b68839f9d640859df40c8f3f8e1f24de570abcaa..37820e5092227c9bbf96eaaad0f3ce3fb4a5887b 100644 --- a/README.md +++ b/README.md @@ -125,9 +125,9 @@ mode-cfb、mode-ctr、mode-ctr-gladman、mode-ofb、mode-ecb、pad-pkcs7、pad-a ## 约束与限制 在下述版本验证通过: -DevEco Studio : 4.1.3.501, SDK: API11 (4.1.6.5) +DevEco Studio : 5.0.3.122, SDK: API12 (5.0.0.17) -DevEco Studio: 3.1 Beta2(3.1.0.400), SDK: API9 Release(3.2.11.9) +DevEco Studio : 4.1.3.600, SDK: API11 (4.1.0.67) ## 目录结构 ```` diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index a8d1ca0481258efddda79c1858a3f1a85b27ed17..d5df60501c8665e5dd475453e34fd9a3b625bf16 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -345,14 +345,13 @@ struct Index { .margin(20) .fontWeight(FontWeight.Bold) .onClick(() => { - let ciphertext: string = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f]).toString(); - let salt: string = CryptoJS.lib.WordArray.create([0x01234567, 0x89abcdef]).toString(); + let ciphertext: CryptoJS.lib.WordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f]); + let salt: CryptoJS.lib.WordArray = CryptoJS.lib.WordArray.create([0x01234567, 0x89abcdef]); - let cipSalt: Record = { - 'ciphertext': ciphertext, - 'salt': salt - } - let openSSLStr: string = CryptoJS.format.OpenSSL.stringify(CryptoJS.lib.CipherParams.create(cipSalt)); + let openSSLStr: string = CryptoJS.format.OpenSSL.stringify(CryptoJS.lib.CipherParams.create({ + ciphertext: ciphertext, + salt: salt + })); console.log("OpenSSL-stringify = " + openSSLStr); prompt.showToast({ message: 'OpenSSL-stringify=' + openSSLStr }) }) @@ -361,13 +360,13 @@ struct Index { .margin(20) .fontWeight(FontWeight.Bold) .onClick(() => { - let ciphertext: string = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f]).toString(); - let salt: string = CryptoJS.lib.WordArray.create([0x01234567, 0x89abcdef]).toString(); - let cipSalt: Record = { - 'ciphertext': ciphertext, - 'salt': salt - } - let openSSLStr: string = CryptoJS.format.OpenSSL.stringify(CryptoJS.lib.CipherParams.create(cipSalt)); + let ciphertext: CryptoJS.lib.WordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f]); + let salt: CryptoJS.lib.WordArray = CryptoJS.lib.WordArray.create([0x01234567, 0x89abcdef]); + + let openSSLStr: string = CryptoJS.format.OpenSSL.stringify(CryptoJS.lib.CipherParams.create({ + ciphertext: ciphertext, + salt: salt + })); console.log("OpenSSL-parse = " + CryptoJS.format.OpenSSL.parse(openSSLStr) .ciphertext .toString());