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

Add salt and iv in qrcode

Browse source
This commit is contained in:
Erwan Croze 2018-08-01 10:21:34 +02:00
parent 1afb50292a
commit 51b42b14bc
6 changed files with 51 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
chiffrement/chiffrement.java
View file

@ -1,5 +1,6 @@
import java.io.BufferedWriter;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.math.BigInteger;
import java.nio.charset.Charset;
@ -25,6 +26,11 @@ public class chiffrement {
return newTab;
}
static void help() {
System.out.println("Usage chiffrement:\n\tcrypt(0: decrypt, 1: crypt)\n\tpassword\n\tcontent(to crypt or decrypt)\n\touputName\n\t(only when crypt):" +
"\n\t\tsalt(16 bytes in hexa)\n\t\tiv(32 byte in hexa)");
}
public static void main(String[] args) {
if (args.length >= 4) {
String encrypted;
@ -40,12 +46,21 @@ public class chiffrement {
byte[] unBased64Data = content.getBytes();
ByteArrayInputStream inputStream = new ByteArrayInputStream(unBased64Data);
byte[] contentToDecrypt = new byte[unBased64Data.length];
byte[] salt = new byte[16];
byte[] iv = new byte[32];
byte[] contentToDecrypt = new byte[unBased64Data.length - 48];
inputStream.read(salt);
inputStream.read(iv);
inputStream.read(contentToDecrypt);
BigInteger saltHex = new BigInteger("F000000000000000", 16);
BigInteger ivHex = new BigInteger("F58B8C9A49B321DBA000000000000000", 16);
String saltString = new String(salt);
String ivString = new String(iv);
BigInteger saltHex = new BigInteger(saltString, 16);
BigInteger ivHex = new BigInteger(ivString, 16);
System.out.println("salut: iv " + ivString + " " + ivHex);
System.out.println("salut: salt " + saltString + " " + saltHex);
byte[] saltByte = removeUselessByte(saltHex.toByteArray(), 8);
byte[] ivByte = removeUselessByte(ivHex.toByteArray(), 16);
@ -63,10 +78,14 @@ public class chiffrement {
System.out.println(ex);
return;
}
} else {
} else if (args.length >= 6){
try {
BigInteger saltHex = new BigInteger("F000000000000000", 16);
BigInteger ivHex = new BigInteger("F58B8C9A49B321DBA000000000000000", 16);
String saltArg = args[4];
String ivArg = args[5];
BigInteger saltHex = new BigInteger(saltArg, 16);
BigInteger ivHex = new BigInteger(ivArg, 16);
byte[] contentToCrypt = content.getBytes(Charset.forName("UTF-8"));
byte[] salt = removeUselessByte(saltHex.toByteArray(), 8);
byte[] iv = removeUselessByte(ivHex.toByteArray(), 16);
@ -79,14 +98,17 @@ public class chiffrement {
Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
cipher.init(Cipher.ENCRYPT_MODE, secretKey, ivspec);
byte[] encryptedBytes = cipher.doFinal(content.getBytes(Charset.forName("UTF-8")));
byte[] encryptedBytes = cipher.doFinal(contentToCrypt);
encrypted = new String(Base64.getEncoder().encode(encryptedBytes));
encrypted = new String(saltArg) + new String(ivArg) + new String(Base64.getEncoder().encode(encryptedBytes));
} catch (Exception ex) {
System.out.println(ex);
return;
}
} else {
help();
return;
}
try {
BufferedWriter writer = Files.newBufferedWriter(output.toPath(), Charset.forName("UTF-8"));
@ -95,6 +117,8 @@ public class chiffrement {
} catch (Exception ex) {
System.out.println(ex);
}
} else {
help();
}
}
}

4
res/layout-sw533dp-land/dialer.xml
View file

@ -2,10 +2,10 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorD"
>
android:background="@color/colorD">
<ImageView
android:id="@+id/logodialer"
android:layout_width="wrap_content"
android:layout_height="300dp"
android:layout_alignParentStart="true"

1
res/layout-sw533dp/dialer.xml
View file

@ -5,6 +5,7 @@
android:layout_height="match_parent">
<ImageView
android:id="@+id/logodialer"
android:layout_width="400dp"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"

8
src/android/org/linphone/LinphoneManager.java
View file

@ -1780,9 +1780,11 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
}
public int getUnreadCountForChatRoom(ChatRoom cr) {
String key = cr.getPeerAddress().asStringUriOnly();
if (mUnreadChatsPerRoom.containsKey(key)) {
return mUnreadChatsPerRoom.get(key);
if (cr != null && cr.getPeerAddress() != null) {
String key = cr.getPeerAddress().asStringUriOnly();
if (mUnreadChatsPerRoom.containsKey(key)) {
return mUnreadChatsPerRoom.get(key);
}
}
return 0;
}

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

@ -55,6 +55,7 @@ import android.widget.TextView;
import android.widget.Toast;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.math.BigInteger;
import java.security.spec.KeySpec;
@ -361,12 +362,18 @@ public class RemoteProvisioningLoginActivity extends Activity implements OnClick
byte[] unBased64Data = qrcodeString.getBytes();
ByteArrayInputStream inputStream = new ByteArrayInputStream(unBased64Data);
byte[] contentToDecrypt = new byte[unBased64Data.length];
byte[] salt = new byte[16];
byte[] iv = new byte[32];
byte[] contentToDecrypt = new byte[unBased64Data.length - 48];
inputStream.read(salt);
inputStream.read(iv);
inputStream.read(contentToDecrypt);
BigInteger saltHex = new BigInteger("F000000000000000", 16);
BigInteger ivHex = new BigInteger("F58B8C9A49B321DBA000000000000000", 16);
String saltString = new String(salt);
String ivString = new String(iv);
BigInteger saltHex = new BigInteger(saltString, 16);
BigInteger ivHex = new BigInteger(ivString, 16);
byte[] saltByte = removeUselessByte(saltHex.toByteArray(), 8);
byte[] ivByte = removeUselessByte(ivHex.toByteArray(), 16);

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit 11f4c9c61feece2d46909ae62e91ac1bace64c2c
Subproject commit 9d1379872a6fead9f43d745ae8364d27ce3cf750