diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4b929b38a..d51be22ea 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -6,7 +6,7 @@ android:versionName="1.4.3"> diff --git a/chiffrement/chiffrement.java b/chiffrement/chiffrement.java index 0afa6ad8f..ad479387d 100644 --- a/chiffrement/chiffrement.java +++ b/chiffrement/chiffrement.java @@ -62,7 +62,7 @@ public class chiffrement { byte[] saltByte = removeUselessByte(saltHex.toByteArray(), 8); byte[] ivByte = removeUselessByte(ivHex.toByteArray(), 16); - SecretKeyFactory factory = SecretKeyFactory.getInstance("PBEwithSHA256AND256BITAES-CBC-BC"); + SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2withHmacSHA256"); KeySpec keySpec = new PBEKeySpec(password.toCharArray(), saltByte, 10000, 128); SecretKey tmpSecretKey = factory.generateSecret(keySpec); SecretKeySpec secretKeySpec = new SecretKeySpec(tmpSecretKey.getEncoded(), "AES"); @@ -87,7 +87,7 @@ public class chiffrement { byte[] salt = removeUselessByte(saltHex.toByteArray(), 8); byte[] iv = removeUselessByte(ivHex.toByteArray(), 16); - SecretKeyFactory factory = SecretKeyFactory.getInstance("PBEwithSHA256AND256BITAES-CBC-BC"); + SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2withHmacSHA256"); KeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 10000, 128); SecretKey tmp = factory.generateSecret(spec); SecretKeySpec secretKey = new SecretKeySpec(tmp.getEncoded(), "AES"); diff --git a/src/android/org/linphone/assistant/RemoteProvisioningLoginActivity.java b/src/android/org/linphone/assistant/RemoteProvisioningLoginActivity.java index 536c2027c..3881a8a86 100644 --- a/src/android/org/linphone/assistant/RemoteProvisioningLoginActivity.java +++ b/src/android/org/linphone/assistant/RemoteProvisioningLoginActivity.java @@ -378,7 +378,7 @@ public class RemoteProvisioningLoginActivity extends Activity implements OnClick byte[] saltByte = removeUselessByte(saltHex.toByteArray(), 8); byte[] ivByte = removeUselessByte(ivHex.toByteArray(), 16); - SecretKeyFactory factory = SecretKeyFactory.getInstance("PBEwithSHA256AND256BITAES-CBC-BC"); + SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2withHmacSHA256"); KeySpec keySpec = new PBEKeySpec(code_sms.getText().toString().toCharArray(), saltByte, 10000, 128); SecretKey tmpSecretKey = factory.generateSecret(keySpec); SecretKeySpec secretKeySpec = new SecretKeySpec(tmpSecretKey.getEncoded(), "AES");