Skip to content

Commit 0bcba8e

Browse files
authored
Merge pull request #453 from MangoInstantMessenger/dh-tests
Dh tests
2 parents 3c06435 + f04273f commit 0bcba8e

3 files changed

Lines changed: 54 additions & 21 deletions

File tree

MangoAPI.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{C75F
6969
scripts\checkTerraformChanges.ps1 = scripts\checkTerraformChanges.ps1
7070
scripts\deploy_terraform_backend.ps1 = scripts\deploy_terraform_backend.ps1
7171
scripts\generate_strong_password.ps1 = scripts\generate_strong_password.ps1
72+
scripts\dhVariablesSetup.ps1 = scripts\dhVariablesSetup.ps1
7273
EndProjectSection
7374
EndProject
7475
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "terraform", "terraform", "{D5B04B5C-55E7-48C0-BA17-A084C24610BA}"
Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,47 @@
1+
param(
2+
[Parameter(Mandatory = $true, Position = 0)]
3+
[string] $senderId,
4+
[Parameter(Mandatory = $true, Position = 1)]
5+
[string] $senderUsername,
6+
[Parameter(Mandatory = $true, Position = 2)]
7+
[string] $senderPassword,
8+
[Parameter(Mandatory = $true, Position = 3)]
9+
[string] $receiverId,
10+
[Parameter(Mandatory = $true, Position = 4)]
11+
[string] $receiverUsername,
12+
[Parameter(Mandatory = $true, Position = 5)]
13+
[string] $receiverPassword
14+
)
15+
116
# generate dh parameters
2-
MangoAPI.DiffieHellmanConsole login $env:SENDER_EMAIL $env:SENDER_PASSWORD;
3-
MangoAPI.DiffieHellmanConsole openssl-generate-dh-parameters;
4-
MangoAPI.DiffieHellmanConsole openssl-upload-dh-parameters;
17+
dotnet MangoAPI.DiffieHellmanConsole.dll login $senderUsername $senderPassword;
18+
dotnet MangoAPI.DiffieHellmanConsole.dll openssl-generate-dh-parameters;
19+
dotnet MangoAPI.DiffieHellmanConsole.dll openssl-upload-dh-parameters;
520

621
# sender sends key exchange request
7-
MangoAPI.DiffieHellmanConsole login $env:SENDER_EMAIL $env:SENDER_PASSWORD;
8-
MangoAPI.DiffieHellmanConsole openssl-download-dh-parameters;
9-
MangoAPI.DiffieHellmanConsole openssl-generate-private-key $env:RECEIVER_ID;
10-
MangoAPI.DiffieHellmanConsole openssl-generate-public-key $env:RECEIVER_ID;
11-
MangoAPI.DiffieHellmanConsole openssl-create-key-exchange $env:RECEIVER_ID;
22+
dotnet MangoAPI.DiffieHellmanConsole.dll login $senderUsername $senderPassword;
23+
dotnet MangoAPI.DiffieHellmanConsole.dll openssl-download-dh-parameters;
24+
dotnet MangoAPI.DiffieHellmanConsole.dll openssl-generate-private-key $receiverId;
25+
dotnet MangoAPI.DiffieHellmanConsole.dll openssl-generate-public-key $receiverId;
26+
dotnet MangoAPI.DiffieHellmanConsole.dll openssl-create-key-exchange $receiverId;
1227

1328
# receiver confirms key exchange request
14-
MangoAPI.DiffieHellmanConsole login $env:RECEIVER_EMAIL $env:RECEIVER_PASSWORD;
15-
MangoAPI.DiffieHellmanConsole openssl-download-dh-parameters;
16-
MangoAPI.DiffieHellmanConsole openssl-generate-private-key $env:SENDER_ID;
17-
MangoAPI.DiffieHellmanConsole openssl-generate-public-key $env:SENDER_ID;
18-
MangoAPI.DiffieHellmanConsole openssl-print-key-exchanges;
19-
MangoAPI.DiffieHellmanConsole openssl-confirm-key-exchange $env:SENDER_ID;
29+
dotnet MangoAPI.DiffieHellmanConsole.dll login $receiverUsername $receiverPassword;
30+
dotnet MangoAPI.DiffieHellmanConsole.dll openssl-download-dh-parameters;
31+
dotnet MangoAPI.DiffieHellmanConsole.dll openssl-generate-private-key $senderId;
32+
dotnet MangoAPI.DiffieHellmanConsole.dll openssl-generate-public-key $senderId;
33+
dotnet MangoAPI.DiffieHellmanConsole.dll openssl-print-key-exchanges;
34+
dotnet MangoAPI.DiffieHellmanConsole.dll openssl-confirm-key-exchange $senderId;
2035

2136
# receiver generates common secret
22-
MangoAPI.DiffieHellmanConsole openssl-download-public-key --receiver $env:SENDER_ID;
23-
MangoAPI.DiffieHellmanConsole openssl-create-common-secret --receiver $env:SENDER_ID;
37+
dotnet MangoAPI.DiffieHellmanConsole.dll openssl-download-public-key --receiver $senderId;
38+
dotnet MangoAPI.DiffieHellmanConsole.dll openssl-create-common-secret --receiver $senderId;
2439

2540
# sender generates common secret
26-
MangoAPI.DiffieHellmanConsole login $env:SENDER_EMAIL $env:SENDER_PASSWORD;
27-
MangoAPI.DiffieHellmanConsole openssl-print-key-exchanges;
28-
MangoAPI.DiffieHellmanConsole openssl-download-public-key --sender $env:RECEIVER_ID;
29-
MangoAPI.DiffieHellmanConsole openssl-create-common-secret --sender $env:RECEIVER_ID;
41+
dotnet MangoAPI.DiffieHellmanConsole.dll login $senderUsername $senderPassword;
42+
dotnet MangoAPI.DiffieHellmanConsole.dll openssl-print-key-exchanges;
43+
dotnet MangoAPI.DiffieHellmanConsole.dll openssl-download-public-key --sender $receiverId;
44+
dotnet MangoAPI.DiffieHellmanConsole.dll openssl-create-common-secret --sender $receiverId;
3045

3146
# validate common secrets
32-
MangoAPI.DiffieHellmanConsole openssl-validate-common-secret $env:SENDER_ID $env:RECEIVER_ID;
47+
dotnet MangoAPI.DiffieHellmanConsole.dll openssl-validate-common-secret $senderId $receiverId;

scripts/dhVariablesSetup.ps1

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
$senderId="CB992AB1-7CA2-4916-B381-329C53D8C6A3"; `
2+
$senderUsername="test1"; `
3+
$senderPassword="test1"; `
4+
$receiverId="7407CF51-71D2-41EC-8B15-AF41794368D6"; `
5+
$receiverUsername="test2"; `
6+
$receiverPassword="test2";
7+
8+
9+
.\OPENSSL_DH_HANDSHAKE_TEST.ps1 -senderId $senderId -senderUsername $senderUsername -senderPassword $senderPassword -receiverId $receiverId -receiverUsername $receiverUsername -receiverPassword $receiverPassword
10+
11+
.\OPENSSL_DH_HANDSHAKE_TEST.ps1 `
12+
-senderId $senderId `
13+
-senderUsername $senderUsername `
14+
-senderPassword $senderPassword `
15+
-receiverId $receiverId `
16+
-receiverUsername $receiverUsername `
17+
-receiverPassword $receiverPassword

0 commit comments

Comments
 (0)