k
/
legado
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(EncoderUtils): change default transformation of AES

Browse Source
pull/1902/head
Xwite 3 years ago
parent 80c56322f6
commit 83a9971d66
1 changed files with 8 additions and 8 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 16
      app/src/main/java/io/legado/app/utils/EncoderUtils.kt

16
app/src/main/java/io/legado/app/utils/EncoderUtils.kt
Unescape View File

@ -47,7 +47,7 @@ object EncoderUtils {
* @param data The data. * @param data The data.
* @param key The key. * @param key The key.
* @param transformation The name of the transformation, * @param transformation The name of the transformation,
* 加密算法/加密模式/填充类型, *DES/CBC/PKCS5Padding*. * 加密算法/加密模式/填充类型, *AES/CBC/PKCS5Padding*.
* @param iv The buffer with the IV. The contents of the * @param iv The buffer with the IV. The contents of the
* buffer are copied to protect against subsequent modification. * buffer are copied to protect against subsequent modification.
* @return the Base64-encode bytes of AES encryption * @return the Base64-encode bytes of AES encryption
@ -56,7 +56,7 @@ object EncoderUtils {
fun encryptAES2Base64( fun encryptAES2Base64(
data: ByteArray?, data: ByteArray?,
key: ByteArray?, key: ByteArray?,
transformation: String? = "DES/ECB/PKCS5Padding", transformation: String? = "AES/ECB/PKCS5Padding",
iv: ByteArray? = null iv: ByteArray? = null
): ByteArray? { ): ByteArray? {
return Base64.encode(encryptAES(data, key, transformation, iv), Base64.NO_WRAP) return Base64.encode(encryptAES(data, key, transformation, iv), Base64.NO_WRAP)
@ -68,7 +68,7 @@ object EncoderUtils {
* @param data The data. * @param data The data.
* @param key The key. * @param key The key.
* @param transformation The name of the transformation, * @param transformation The name of the transformation,
* 加密算法/加密模式/填充类型, *DES/CBC/PKCS5Padding*. * 加密算法/加密模式/填充类型, *AES/CBC/PKCS5Padding*.
* @param iv The buffer with the IV. The contents of the * @param iv The buffer with the IV. The contents of the
* buffer are copied to protect against subsequent modification. * buffer are copied to protect against subsequent modification.
* @return the bytes of AES encryption * @return the bytes of AES encryption
@ -77,7 +77,7 @@ object EncoderUtils {
fun encryptAES( fun encryptAES(
data: ByteArray?, data: ByteArray?,
key: ByteArray?, key: ByteArray?,
transformation: String? = "DES/ECB/PKCS5Padding", transformation: String? = "AES/ECB/PKCS5Padding",
iv: ByteArray? = null iv: ByteArray? = null
): ByteArray? { ): ByteArray? {
return symmetricTemplate(data, key, "AES", transformation!!, iv, true) return symmetricTemplate(data, key, "AES", transformation!!, iv, true)
@ -90,7 +90,7 @@ object EncoderUtils {
* @param data The data. * @param data The data.
* @param key The key. * @param key The key.
* @param transformation The name of the transformation, * @param transformation The name of the transformation,
* 加密算法/加密模式/填充类型, *DES/CBC/PKCS5Padding*. * 加密算法/加密模式/填充类型, *AES/CBC/PKCS5Padding*.
* @param iv The buffer with the IV. The contents of the * @param iv The buffer with the IV. The contents of the
* buffer are copied to protect against subsequent modification. * buffer are copied to protect against subsequent modification.
* @return the bytes of AES decryption for Base64-encode bytes * @return the bytes of AES decryption for Base64-encode bytes
@ -99,7 +99,7 @@ object EncoderUtils {
fun decryptBase64AES( fun decryptBase64AES(
data: ByteArray?, data: ByteArray?,
key: ByteArray?, key: ByteArray?,
transformation: String = "DES/ECB/PKCS5Padding", transformation: String = "AES/ECB/PKCS5Padding",
iv: ByteArray? = null iv: ByteArray? = null
): ByteArray? { ): ByteArray? {
return decryptAES(Base64.decode(data, Base64.NO_WRAP), key, transformation, iv) return decryptAES(Base64.decode(data, Base64.NO_WRAP), key, transformation, iv)
@ -111,7 +111,7 @@ object EncoderUtils {
* @param data The data. * @param data The data.
* @param key The key. * @param key The key.
* @param transformation The name of the transformation, * @param transformation The name of the transformation,
* 加密算法/加密模式/填充类型, *DES/CBC/PKCS5Padding*. * 加密算法/加密模式/填充类型, *AES/CBC/PKCS5Padding*.
* @param iv The buffer with the IV. The contents of the * @param iv The buffer with the IV. The contents of the
* buffer are copied to protect against subsequent modification. * buffer are copied to protect against subsequent modification.
* @return the bytes of AES decryption * @return the bytes of AES decryption
@ -120,7 +120,7 @@ object EncoderUtils {
fun decryptAES( fun decryptAES(
data: ByteArray?, data: ByteArray?,
key: ByteArray?, key: ByteArray?,
transformation: String = "DES/ECB/PKCS5Padding", transformation: String = "AES/ECB/PKCS5Padding",
iv: ByteArray? = null iv: ByteArray? = null
): ByteArray? { ): ByteArray? {
return symmetricTemplate(data, key, "AES", transformation, iv, false) return symmetricTemplate(data, key, "AES", transformation, iv, false)

Write Preview
Loading…
Cancel
Save