From 8741fe8067a6dc9de4feee50ac73ce5396324df4 Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Wed, 9 Nov 2022 15:09:52 +0300
Subject: [PATCH 01/28] softtoken tests

---
 .cirrus.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 8328b96..5931e84 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -262,8 +262,13 @@ task:
         - apt-get install -y curl libnss3-tools
       env:
         CI_DISTRO: debian
-        CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.so
-        CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.orig.so
+      matrix:
+          env:
+            CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.so
+            CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.orig.so
+          env:
+            CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libsoftokn3.so
+            CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libsoftokn3.orig.so
   install_script:
     - curl -o pkcs11mod.tar.gz https://api.cirrus-ci.com/v1/artifact/build/$CIRRUS_BUILD_ID/Compile%20Go%20latest%20linux%20amd64/binaries/dist/pkcs11mod.tar.gz
     - tar -xaf ./pkcs11mod.tar.gz

From 58d02d607b0ac142b3879c75fa25f4c2c4b097d2 Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Wed, 9 Nov 2022 15:21:16 +0300
Subject: [PATCH 02/28] softtoken tests

---
 testdata/ci-certutil-tests.bash | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/testdata/ci-certutil-tests.bash b/testdata/ci-certutil-tests.bash
index e9cbda4..389d496 100755
--- a/testdata/ci-certutil-tests.bash
+++ b/testdata/ci-certutil-tests.bash
@@ -8,7 +8,7 @@ export P11PROXY_CKBI_TARGET=$PKCS11PROXY_CKBI_TARGET
 
 echo "===== init DB ====="
 
-ln -s -T "$CI_MAIN_MODULE" ./libnssckbi.so
+ln -s -T "$CI_MAIN_MODULE" ./libsoftokn3.so
 certutil -N -d . --empty-password
 
 echo "===== list all (default) ====="
@@ -21,7 +21,7 @@ testdata/assert-proxy-log.bash missing
 echo "===== list all (via pkcs11proxy) ====="
 
 mv "$CI_MAIN_MODULE" "$CI_BAK_MODULE"
-cp libpkcs11proxy.so "$CI_MAIN_MODULE"
+cp libsoftokn3proxy.so "$CI_MAIN_MODULE"
 
 certutil -L -d . -h all | tee list-all-pkcs11proxy.txt || true
 grep -q ",C," list-all-pkcs11proxy.txt
@@ -33,7 +33,7 @@ testdata/assert-proxy-log.bash present
 
 echo "===== list all (via p11proxy) ====="
 
-cp libp11proxy.so "$CI_MAIN_MODULE"
+cp libsoftokn3proxy.so "$CI_MAIN_MODULE"
 
 certutil -L -d . -h all | tee list-all-p11proxy.txt || true
 grep -q ",C," list-all-p11proxy.txt

From fa67ab9822fe0599c809ba5b09b0d50940da0034 Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Wed, 9 Nov 2022 15:25:11 +0300
Subject: [PATCH 03/28] softtoken tests

---
 testdata/ci-certutil-tests.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testdata/ci-certutil-tests.bash b/testdata/ci-certutil-tests.bash
index 389d496..98c277e 100755
--- a/testdata/ci-certutil-tests.bash
+++ b/testdata/ci-certutil-tests.bash
@@ -21,7 +21,7 @@ testdata/assert-proxy-log.bash missing
 echo "===== list all (via pkcs11proxy) ====="
 
 mv "$CI_MAIN_MODULE" "$CI_BAK_MODULE"
-cp libsoftokn3proxy.so "$CI_MAIN_MODULE"
+cp libpkcs11proxy.so "$CI_MAIN_MODULE"
 
 certutil -L -d . -h all | tee list-all-pkcs11proxy.txt || true
 grep -q ",C," list-all-pkcs11proxy.txt
@@ -33,7 +33,7 @@ testdata/assert-proxy-log.bash present
 
 echo "===== list all (via p11proxy) ====="
 
-cp libsoftokn3proxy.so "$CI_MAIN_MODULE"
+cp libp11proxy.so "$CI_MAIN_MODULE"
 
 certutil -L -d . -h all | tee list-all-p11proxy.txt || true
 grep -q ",C," list-all-p11proxy.txt

From 6bc5bcd48acaf2e5ef86c9eb9f2cdd9285c5e597 Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Wed, 9 Nov 2022 15:29:15 +0300
Subject: [PATCH 04/28] softtoken tests

---
 testdata/ci-certutil-tests.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testdata/ci-certutil-tests.bash b/testdata/ci-certutil-tests.bash
index 98c277e..e9cbda4 100755
--- a/testdata/ci-certutil-tests.bash
+++ b/testdata/ci-certutil-tests.bash
@@ -8,7 +8,7 @@ export P11PROXY_CKBI_TARGET=$PKCS11PROXY_CKBI_TARGET
 
 echo "===== init DB ====="
 
-ln -s -T "$CI_MAIN_MODULE" ./libsoftokn3.so
+ln -s -T "$CI_MAIN_MODULE" ./libnssckbi.so
 certutil -N -d . --empty-password
 
 echo "===== list all (default) ====="

From 15e67b8c2c219cd7a509bf94ddc780cf62b718b3 Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Wed, 9 Nov 2022 16:35:37 +0300
Subject: [PATCH 05/28] softtoken tests

---
 testdata/ci-certutil-tests.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testdata/ci-certutil-tests.bash b/testdata/ci-certutil-tests.bash
index e9cbda4..98c277e 100755
--- a/testdata/ci-certutil-tests.bash
+++ b/testdata/ci-certutil-tests.bash
@@ -8,7 +8,7 @@ export P11PROXY_CKBI_TARGET=$PKCS11PROXY_CKBI_TARGET
 
 echo "===== init DB ====="
 
-ln -s -T "$CI_MAIN_MODULE" ./libnssckbi.so
+ln -s -T "$CI_MAIN_MODULE" ./libsoftokn3.so
 certutil -N -d . --empty-password
 
 echo "===== list all (default) ====="

From e3472219f50714f2c7b3d8e3e4572fcccda8c9f2 Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Wed, 9 Nov 2022 16:52:11 +0300
Subject: [PATCH 06/28] softtoken tests

---
 .cirrus.yml                     | 9 ++-------
 testdata/ci-certutil-tests.bash | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 5931e84..8328b96 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -262,13 +262,8 @@ task:
         - apt-get install -y curl libnss3-tools
       env:
         CI_DISTRO: debian
-      matrix:
-          env:
-            CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.so
-            CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.orig.so
-          env:
-            CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libsoftokn3.so
-            CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libsoftokn3.orig.so
+        CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.so
+        CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.orig.so
   install_script:
     - curl -o pkcs11mod.tar.gz https://api.cirrus-ci.com/v1/artifact/build/$CIRRUS_BUILD_ID/Compile%20Go%20latest%20linux%20amd64/binaries/dist/pkcs11mod.tar.gz
     - tar -xaf ./pkcs11mod.tar.gz
diff --git a/testdata/ci-certutil-tests.bash b/testdata/ci-certutil-tests.bash
index 98c277e..e9cbda4 100755
--- a/testdata/ci-certutil-tests.bash
+++ b/testdata/ci-certutil-tests.bash
@@ -8,7 +8,7 @@ export P11PROXY_CKBI_TARGET=$PKCS11PROXY_CKBI_TARGET
 
 echo "===== init DB ====="
 
-ln -s -T "$CI_MAIN_MODULE" ./libsoftokn3.so
+ln -s -T "$CI_MAIN_MODULE" ./libnssckbi.so
 certutil -N -d . --empty-password
 
 echo "===== list all (default) ====="

From d5f492ef9aa4fa9563564ff30fe9841c157b5cde Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Wed, 9 Nov 2022 16:56:39 +0300
Subject: [PATCH 07/28] softtoken tests

---
 .cirrus.yml                    | 4 ++--
 testdata/ci-tstclnt-tests.bash | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 8328b96..99e0950 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -561,8 +561,8 @@ task:
         - apt-get install -y curl libnss3-tools
       env:
         CI_DISTRO: debian
-        CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.so
-        CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.orig.so
+        CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libsoftokn3.so
+        CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libsoftokn3.orig.so
   install_script:
     - curl -o pkcs11mod.tar.gz https://api.cirrus-ci.com/v1/artifact/build/$CIRRUS_BUILD_ID/Compile%20Go%20latest%20linux%20amd64/binaries/dist/pkcs11mod.tar.gz
     - tar -xaf ./pkcs11mod.tar.gz
diff --git a/testdata/ci-tstclnt-tests.bash b/testdata/ci-tstclnt-tests.bash
index 6dbf2c8..57ae87d 100755
--- a/testdata/ci-tstclnt-tests.bash
+++ b/testdata/ci-tstclnt-tests.bash
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env bashkbi
 
 set -euo pipefail
 shopt -s nullglob globstar

From 924bc4b1a13212f6ba070096ca055ae5b529da4b Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Wed, 9 Nov 2022 17:10:11 +0300
Subject: [PATCH 08/28] softtoken tests

---
 testdata/ci-tstclnt-tests.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testdata/ci-tstclnt-tests.bash b/testdata/ci-tstclnt-tests.bash
index 57ae87d..6dbf2c8 100755
--- a/testdata/ci-tstclnt-tests.bash
+++ b/testdata/ci-tstclnt-tests.bash
@@ -1,4 +1,4 @@
-#!/usr/bin/env bashkbi
+#!/usr/bin/env bash
 
 set -euo pipefail
 shopt -s nullglob globstar

From fa44b7fe5fdc4d183fd8470f9b8aff1619e51d40 Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Wed, 9 Nov 2022 17:49:02 +0300
Subject: [PATCH 09/28] softtoken tests

---
 .cirrus.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 99e0950..8328b96 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -561,8 +561,8 @@ task:
         - apt-get install -y curl libnss3-tools
       env:
         CI_DISTRO: debian
-        CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libsoftokn3.so
-        CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libsoftokn3.orig.so
+        CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.so
+        CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.orig.so
   install_script:
     - curl -o pkcs11mod.tar.gz https://api.cirrus-ci.com/v1/artifact/build/$CIRRUS_BUILD_ID/Compile%20Go%20latest%20linux%20amd64/binaries/dist/pkcs11mod.tar.gz
     - tar -xaf ./pkcs11mod.tar.gz

From e52e4a6803a05b485cecd97514d74b9806ec481d Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Thu, 10 Nov 2022 14:10:04 +0300
Subject: [PATCH 10/28] softtoken tests

---
 .cirrus.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 8328b96..99e0950 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -561,8 +561,8 @@ task:
         - apt-get install -y curl libnss3-tools
       env:
         CI_DISTRO: debian
-        CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.so
-        CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.orig.so
+        CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libsoftokn3.so
+        CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libsoftokn3.orig.so
   install_script:
     - curl -o pkcs11mod.tar.gz https://api.cirrus-ci.com/v1/artifact/build/$CIRRUS_BUILD_ID/Compile%20Go%20latest%20linux%20amd64/binaries/dist/pkcs11mod.tar.gz
     - tar -xaf ./pkcs11mod.tar.gz

From dbfb41a960032f16effc1e6ed224a9d5e7be1f4f Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Thu, 10 Nov 2022 14:25:35 +0300
Subject: [PATCH 11/28] softtoken tests

---
 .cirrus.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 99e0950..833b4fa 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -379,8 +379,8 @@ task:
         - apt-get install -y curl firefox-esr
       env:
         CI_DISTRO: debian
-        CI_MAIN_MODULE: /usr/lib/firefox-esr/libnssckbi.so
-        CI_BAK_MODULE: /usr/lib/firefox-esr/libnssckbi.orig.so
+        CI_MAIN_MODULE: /usr/lib/firefox-esr/libsoftokn3.so
+        CI_BAK_MODULE: /usr/lib/firefox-esr/libsoftokn3.orig.so
   install_script:
     - curl -o pkcs11mod.tar.gz https://api.cirrus-ci.com/v1/artifact/build/$CIRRUS_BUILD_ID/Compile%20Go%20latest%20linux%20amd64/binaries/dist/pkcs11mod.tar.gz
     - tar -xaf ./pkcs11mod.tar.gz
@@ -561,8 +561,8 @@ task:
         - apt-get install -y curl libnss3-tools
       env:
         CI_DISTRO: debian
-        CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libsoftokn3.so
-        CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libsoftokn3.orig.so
+        CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.so
+        CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.orig.so
   install_script:
     - curl -o pkcs11mod.tar.gz https://api.cirrus-ci.com/v1/artifact/build/$CIRRUS_BUILD_ID/Compile%20Go%20latest%20linux%20amd64/binaries/dist/pkcs11mod.tar.gz
     - tar -xaf ./pkcs11mod.tar.gz

From 9ab8bb83da8b7c68d4fea60408bcd94b84fb5975 Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Thu, 10 Nov 2022 14:31:28 +0300
Subject: [PATCH 12/28] softtoken tests

---
 .cirrus.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 833b4fa..8328b96 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -379,8 +379,8 @@ task:
         - apt-get install -y curl firefox-esr
       env:
         CI_DISTRO: debian
-        CI_MAIN_MODULE: /usr/lib/firefox-esr/libsoftokn3.so
-        CI_BAK_MODULE: /usr/lib/firefox-esr/libsoftokn3.orig.so
+        CI_MAIN_MODULE: /usr/lib/firefox-esr/libnssckbi.so
+        CI_BAK_MODULE: /usr/lib/firefox-esr/libnssckbi.orig.so
   install_script:
     - curl -o pkcs11mod.tar.gz https://api.cirrus-ci.com/v1/artifact/build/$CIRRUS_BUILD_ID/Compile%20Go%20latest%20linux%20amd64/binaries/dist/pkcs11mod.tar.gz
     - tar -xaf ./pkcs11mod.tar.gz

From 14261d5851f2a7ca9afcfecda78b1ef4b41aade1 Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Thu, 10 Nov 2022 16:28:25 +0300
Subject: [PATCH 13/28] softtoken tests

---
 .cirrus.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 8328b96..95702c4 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -561,8 +561,13 @@ task:
         - apt-get install -y curl libnss3-tools
       env:
         CI_DISTRO: debian
-        CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.so
-        CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.orig.so
+      matrix:
+          env:
+            CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.so
+            CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.orig.so
+          env:
+            CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libsoftokn3.so
+            CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libsoftokn3.orig.so
   install_script:
     - curl -o pkcs11mod.tar.gz https://api.cirrus-ci.com/v1/artifact/build/$CIRRUS_BUILD_ID/Compile%20Go%20latest%20linux%20amd64/binaries/dist/pkcs11mod.tar.gz
     - tar -xaf ./pkcs11mod.tar.gz

From 5bbd5f1d8914c6eee848592f0c599c02d9faca2c Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Thu, 10 Nov 2022 16:33:04 +0300
Subject: [PATCH 14/28] softtoken tests

---
 .cirrus.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 95702c4..8328b96 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -561,13 +561,8 @@ task:
         - apt-get install -y curl libnss3-tools
       env:
         CI_DISTRO: debian
-      matrix:
-          env:
-            CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.so
-            CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.orig.so
-          env:
-            CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libsoftokn3.so
-            CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libsoftokn3.orig.so
+        CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.so
+        CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.orig.so
   install_script:
     - curl -o pkcs11mod.tar.gz https://api.cirrus-ci.com/v1/artifact/build/$CIRRUS_BUILD_ID/Compile%20Go%20latest%20linux%20amd64/binaries/dist/pkcs11mod.tar.gz
     - tar -xaf ./pkcs11mod.tar.gz

From 2f9fed9c02ca0ac8907d793200ac9223ad5b0c72 Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Thu, 10 Nov 2022 16:34:05 +0300
Subject: [PATCH 15/28] softtoken tests

---
 .cirrus.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.cirrus.yml b/.cirrus.yml
index 8328b96..73a0fe0 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -325,6 +325,18 @@ task:
         CI_DISTRO: debian
         CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.so
         CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.orig.so
+    - container:
+        image: debian:latest
+        cpu: 1
+        memory: 1G
+      package_install_script:
+        - apt-get update
+        - apt-get install -y curl chromium
+        - ln -s -T /usr/bin/chromium /usr/bin/chromium-browser
+      env:
+        CI_DISTRO: debian
+        CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libsoftokn3.so
+        CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libsoftokn3.orig.so
   install_script:
     - curl -o pkcs11mod.tar.gz https://api.cirrus-ci.com/v1/artifact/build/$CIRRUS_BUILD_ID/Compile%20Go%20latest%20linux%20amd64/binaries/dist/pkcs11mod.tar.gz
     - tar -xaf ./pkcs11mod.tar.gz

From 47f42a2f04fbd90cc0b6e4971ed88a1ef5315096 Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Thu, 10 Nov 2022 16:34:20 +0300
Subject: [PATCH 16/28] softtoken tests

---
 .cirrus.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 73a0fe0..cdbbd9d 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -334,7 +334,7 @@ task:
         - apt-get install -y curl chromium
         - ln -s -T /usr/bin/chromium /usr/bin/chromium-browser
       env:
-        CI_DISTRO: debian
+        CI_DISTRO: debian-s
         CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libsoftokn3.so
         CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libsoftokn3.orig.so
   install_script:

From 1a4c24c0ee1fe0145888d4e975cc1ecc97d68f94 Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Mon, 14 Nov 2022 09:27:56 +0300
Subject: [PATCH 17/28] softtoken tests

---
 .cirrus.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index cdbbd9d..8328b96 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -325,18 +325,6 @@ task:
         CI_DISTRO: debian
         CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.so
         CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.orig.so
-    - container:
-        image: debian:latest
-        cpu: 1
-        memory: 1G
-      package_install_script:
-        - apt-get update
-        - apt-get install -y curl chromium
-        - ln -s -T /usr/bin/chromium /usr/bin/chromium-browser
-      env:
-        CI_DISTRO: debian-s
-        CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libsoftokn3.so
-        CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libsoftokn3.orig.so
   install_script:
     - curl -o pkcs11mod.tar.gz https://api.cirrus-ci.com/v1/artifact/build/$CIRRUS_BUILD_ID/Compile%20Go%20latest%20linux%20amd64/binaries/dist/pkcs11mod.tar.gz
     - tar -xaf ./pkcs11mod.tar.gz

From 4dae2f08dc9cf2c640e0219f2d8c8f3fd51b82de Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Mon, 14 Nov 2022 09:39:27 +0300
Subject: [PATCH 18/28] softtoken tests

---
 .cirrus.yml                        | 7 ++++---
 testdata/try-chromium-connect.bash | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 8328b96..e05a435 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -318,9 +318,10 @@ task:
         cpu: 1
         memory: 1G
       package_install_script:
-        - apt-get update
-        - apt-get install -y curl chromium
-        - ln -s -T /usr/bin/chromium /usr/bin/chromium-browser
+        - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+        - sudo add-apt-repository "deb http://dl.google.com/linux/chrome/deb/ stable main"
+        - sudo apt update
+        - sudo apt install google-chrome-stable
       env:
         CI_DISTRO: debian
         CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.so
diff --git a/testdata/try-chromium-connect.bash b/testdata/try-chromium-connect.bash
index c32cb77..738c6ab 100755
--- a/testdata/try-chromium-connect.bash
+++ b/testdata/try-chromium-connect.bash
@@ -22,7 +22,7 @@ rm -f screenshot.png
 # Disable sandbox because Chromium doesn't support running the sandbox as root,
 # and the Cirrus container runs as root.  See
 # https://github.com/Zenika/alpine-chrome .
-chromium-browser --no-sandbox --headless --disable-gpu --disable-software-rasterizer --disable-dev-shm-usage --screenshot=./screenshot.png "https://$SERVER_HOST" 2>&1 | tee log.txt
+google-chrome --no-sandbox --headless --disable-gpu --disable-software-rasterizer --disable-dev-shm-usage --screenshot=./screenshot.png "https://$SERVER_HOST" 2>&1 | tee log.txt
 TEXTOUT=$(cat log.txt)
 
 if echo "$TEXTOUT" | grep -q "SSL error"

From 2f2b0b9c1f0a8ec4b486ecf658171a33574d7996 Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Mon, 14 Nov 2022 09:44:43 +0300
Subject: [PATCH 19/28] softtoken tests

---
 .cirrus.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index e05a435..1627fc7 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -318,10 +318,11 @@ task:
         cpu: 1
         memory: 1G
       package_install_script:
-        - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
-        - sudo add-apt-repository "deb http://dl.google.com/linux/chrome/deb/ stable main"
-        - sudo apt update
-        - sudo apt install google-chrome-stable
+        - apt-get install wget
+        - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
+        - add-apt-repository "deb http://dl.google.com/linux/chrome/deb/ stable main"
+        - apt update
+        - apt install google-chrome-stable
       env:
         CI_DISTRO: debian
         CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.so

From d8e5cd7f844e0372cfeb28b29118738c5940439e Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Mon, 14 Nov 2022 09:50:42 +0300
Subject: [PATCH 20/28] softtoken tests

---
 .cirrus.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 1627fc7..f9c485e 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -318,10 +318,10 @@ task:
         cpu: 1
         memory: 1G
       package_install_script:
+        - apt update
         - apt-get install wget
         - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
         - add-apt-repository "deb http://dl.google.com/linux/chrome/deb/ stable main"
-        - apt update
         - apt install google-chrome-stable
       env:
         CI_DISTRO: debian

From d2f49ccb05cc975ee74b2cfe3852048d7a8225ee Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Mon, 14 Nov 2022 09:52:38 +0300
Subject: [PATCH 21/28] softtoken tests

---
 .cirrus.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index f9c485e..a8d549c 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -319,7 +319,7 @@ task:
         memory: 1G
       package_install_script:
         - apt update
-        - apt-get install wget
+        - apt-get install -y wget
         - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
         - add-apt-repository "deb http://dl.google.com/linux/chrome/deb/ stable main"
         - apt install google-chrome-stable

From d30110e205903b0bc2e367688ab54c712888a000 Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Mon, 14 Nov 2022 09:59:12 +0300
Subject: [PATCH 22/28] softtoken tests

---
 .cirrus.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cirrus.yml b/.cirrus.yml
index a8d549c..77d683e 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -320,6 +320,7 @@ task:
       package_install_script:
         - apt update
         - apt-get install -y wget
+        - apt-get install -y gnupg2
         - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
         - add-apt-repository "deb http://dl.google.com/linux/chrome/deb/ stable main"
         - apt install google-chrome-stable

From 257c95377778d708ca4f56129ac7312b2186ad59 Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Mon, 14 Nov 2022 10:04:16 +0300
Subject: [PATCH 23/28] softtoken tests

---
 .cirrus.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 77d683e..2cd0429 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -322,7 +322,8 @@ task:
         - apt-get install -y wget
         - apt-get install -y gnupg2
         - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
-        - add-apt-repository "deb http://dl.google.com/linux/chrome/deb/ stable main"
+        - apt install -y sudo
+        - sudo add-apt-repository "deb http://dl.google.com/linux/chrome/deb/ stable main"
         - apt install google-chrome-stable
       env:
         CI_DISTRO: debian

From d68a20a40d3d28a8e48a6a054aef38afefb31ed4 Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Mon, 14 Nov 2022 10:12:18 +0300
Subject: [PATCH 24/28] softtoken tests

---
 .cirrus.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 2cd0429..ad5af20 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -321,10 +321,10 @@ task:
         - apt update
         - apt-get install -y wget
         - apt-get install -y gnupg2
-        - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
+        - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
         - apt install -y sudo
-        - sudo add-apt-repository "deb http://dl.google.com/linux/chrome/deb/ stable main"
-        - apt install google-chrome-stable
+        - sudo apt install ./google-chrome-stable_current_amd64.deb
+
       env:
         CI_DISTRO: debian
         CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.so

From b01763f6f8b487791689544a5a6d9bdb2bedb814 Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Mon, 14 Nov 2022 10:21:59 +0300
Subject: [PATCH 25/28] softtoken tests

---
 .cirrus.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index ad5af20..75d040e 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -323,7 +323,7 @@ task:
         - apt-get install -y gnupg2
         - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
         - apt install -y sudo
-        - sudo apt install ./google-chrome-stable_current_amd64.deb
+        - apt install -y ./google-chrome-stable_current_amd64.deb
 
       env:
         CI_DISTRO: debian

From 57a5928e12c5a4f0b774523d8c0e9e404226d32f Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Mon, 14 Nov 2022 10:34:40 +0300
Subject: [PATCH 26/28] softtoken tests

---
 .cirrus.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 75d040e..96e7e67 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -324,7 +324,6 @@ task:
         - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
         - apt install -y sudo
         - apt install -y ./google-chrome-stable_current_amd64.deb
-
       env:
         CI_DISTRO: debian
         CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.so

From 284f2d634a866a3ef43a9424fa839862de2f1401 Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Mon, 14 Nov 2022 10:49:33 +0300
Subject: [PATCH 27/28] softtoken tests

---
 .cirrus.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 96e7e67..640a26e 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -322,7 +322,6 @@ task:
         - apt-get install -y wget
         - apt-get install -y gnupg2
         - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-        - apt install -y sudo
         - apt install -y ./google-chrome-stable_current_amd64.deb
       env:
         CI_DISTRO: debian

From 875ca746168471585eeacbcfb3a33f49fe52368e Mon Sep 17 00:00:00 2001
From: robertmin1 <104002271+robertmin1@users.noreply.github.com>
Date: Mon, 14 Nov 2022 11:09:40 +0300
Subject: [PATCH 28/28] softtoken tests

---
 .cirrus.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cirrus.yml b/.cirrus.yml
index 640a26e..2d305a4 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -322,6 +322,7 @@ task:
         - apt-get install -y wget
         - apt-get install -y gnupg2
         - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+        - apt install curl -y
         - apt install -y ./google-chrome-stable_current_amd64.deb
       env:
         CI_DISTRO: debian