aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2024-06-13 03:33:20 +0200
committerGuilhem Moulin <guilhem@fripost.org>2024-06-13 15:41:12 +0200
commitbf4d2d13ffcd894c6e7765dbd366f1163c69c9e1 (patch)
treed234196cc004dec3482716d2b3a6b5425d8386ed /tests
parent568656b1fcb60d451b4a5313876ef0b96ae8bbfd (diff)
Pass `-in /dev/stdin` option to openssl(1) to avoid warning with recent versions.
OpenSSL 3.2 from Debian sid spews Warning: Reading certificate from stdin since no -in or -new option is given without an explicit `-in /dev/stdin`.
Diffstat (limited to 'tests')
-rw-r--r--tests/account-encrypted-openssl2
-rw-r--r--tests/cert-extensions2
-rw-r--r--tests/cert-install4
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/account-encrypted-openssl b/tests/account-encrypted-openssl
index a3ad707..1f97fd0 100644
--- a/tests/account-encrypted-openssl
+++ b/tests/account-encrypted-openssl
@@ -2,7 +2,7 @@
PASSPHRASE="test"
-openssl rsa -aes128 -passout pass:"$PASSPHRASE" </etc/lacme/account.key >/etc/lacme/account.enc.key
+openssl rsa -in /etc/lacme/account.key -out /etc/lacme/account.enc.key -aes128 -passout pass:"$PASSPHRASE"
sed -ri '0,\|^#?privkey\s*=.*| {s||privkey = file:/etc/lacme/account.enc.key|}' /etc/lacme/lacme-accountd.conf
export TERM="linux"
diff --git a/tests/cert-extensions b/tests/cert-extensions
index bc40298..d7e7855 100644
--- a/tests/cert-extensions
+++ b/tests/cert-extensions
@@ -4,7 +4,7 @@ x509_check() {
local cert="$1" ext out
out="$(mktemp --tmpdir)"
ext="basicConstraints,subjectAltName,keyUsage,extendedKeyUsage,tlsfeature"
- openssl x509 -noout -subject -ext "$ext" -nameopt compat <"$cert" >"$out"
+ openssl x509 -in "$cert" -noout -subject -ext "$ext" -nameopt compat >"$out"
diff --unified --color=auto -b --label="a/${cert#/}" --label="b/${cert#/}" -- - "$out"
}
diff --git a/tests/cert-install b/tests/cert-install
index 4182790..e24fe34 100644
--- a/tests/cert-install
+++ b/tests/cert-install
@@ -46,9 +46,9 @@ diff --unified /etc/lacme/test1.crt /etc/lacme/test1.pem
check_hash() {
local p1="$1" p2 s1 s2
- s1="$(openssl x509 -noout -hash <"$p1")"
+ s1="$(openssl x509 -in "$p1" -noout -hash)"
for p2 in /usr/share/lacme/ca-certificates.pem.*; do
- s2="$(openssl x509 -noout -hash <"$p2")"
+ s2="$(openssl x509 -in "$p2" -noout -hash)"
if [ "$s1" = "$s2" ]; then
return 0
fi