Merge pull request #272 from robur-coop/e2e-testing

Add and use pkcs12 in tls-crypt-v2 e2e test
robur-coop · Jun 26, 2024 · 9a7c5c8 · 9a7c5c8
2 parents 1058a3b + a0b2fab
commit 9a7c5c8
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 8 deletions.
diff --git a/src/config.ml b/src/config.ml
@@ -1091,13 +1091,14 @@ let a_multi_fingerprint =
   >>| fun fps -> B (Peer_fingerprint, fps)
 
 let a_peer_fingerprint =
-  string "peer-fingerprint" *> a_whitespace
+  string "peer-fingerprint" *> a_whitespace *> commit
   *> choice
        [
          string "[inline]" *> return (`Need_inline `Peer_fingerprint);
-         ( choice [ a_fingerprint; fail "Bad fingerprint" ] >>| fun fp ->
+         ( a_fingerprint <?> "fingerprint" >>| fun fp ->
            `Entry (B (Peer_fingerprint, [ fp ])) );
        ]
+       ~failure_msg:"bad fingerprint"
 
 let a_key_direction_option =
   choice

diff --git a/test/e2e/miragevpn-client.sh b/test/e2e/miragevpn-client.sh
@@ -31,4 +31,4 @@ sleep 0.5
 
 # run miragevpn-client-notun
 # NOTE: timeout as in FreeBSD 14 & GNU coreutils
-timeout -k 30 10 ../../_build/default/app/miragevpn_client_notun.exe --test "$client_config" -v -v > /dev/null
+timeout -k 30 10 ../../_build/default/app/miragevpn_client_notun.exe --test "$client_config" -v -v --pkcs12-password= > /dev/null
diff --git a/test/e2e/sample-keys/client-nopass.p12 b/test/e2e/sample-keys/client-nopass.p12
diff --git a/test/e2e/tls-crypt-v2/client-nopass.p12 b/test/e2e/tls-crypt-v2/client-nopass.p12
@@ -0,0 +1 @@
+../sample-keys/client-nopass.p12
diff --git a/test/e2e/tls-crypt-v2/client.conf b/test/e2e/tls-crypt-v2/client.conf
@@ -7,9 +7,10 @@ remote-random
 resolv-retry infinite
 nobind
 #persist-key
-ca ca.crt
+peer-fingerprint 18:0A:6D:FA:3D:5C:B5:D4:8F:FF:2C:7F:45:53:14:FD:71:99:D8:0C:EE:07:68:0D:4A:00:EE:95:D9:59:C9:1B
 auth-user-pass user.txt
 remote-cert-tls server
+pkcs12 client-nopass.p12
 cipher AES-256-CBC
 verb 7
 tls-crypt-v2 tls-crypt-v2-client-timestamp.key
diff --git a/test/e2e/tls-crypt-v2/client.crt b/test/e2e/tls-crypt-v2/client.crt
diff --git a/test/e2e/tls-crypt-v2/client.key b/test/e2e/tls-crypt-v2/client.key
diff --git a/test/e2e/tls-crypt/client.crt b/test/e2e/tls-crypt/client.crt
diff --git a/test/e2e/tls-crypt/client.key b/test/e2e/tls-crypt/client.key