mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-20 13:08:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change derivation key algorithm

Browse source
This commit is contained in:
Erwan Croze 2018-08-24 09:30:16 +02:00
parent 182bb91fe8
commit bf65595d96
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -6,7 +6,7 @@
android:versionName="1.4.3">
<uses-sdk
android:minSdkVersion="16"
android:minSdkVersion="26"
android:targetSdkVersion="28"/>
<uses-permission android:name="android.permission.INTERNET"/>

4
chiffrement/chiffrement.java
View file

@ -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");

2
src/android/org/linphone/assistant/RemoteProvisioningLoginActivity.java
View file

@ -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");