tests/certs/generate: Redirect known error output to the standard output.

That way we can avoid using autopkgtest's 'allow-stderr' restriction.

2 files changed, 12 insertions, 5 deletions

diff --git a/Changelog b/Changelog
index cad321b..72f7331 100644
--- a/Changelog
+++ b/Changelog
@@ -35,6 +35,8 @@ interimap (0.5.7) upstream;
    files.
  - Don't hardcode path to interimap/pullimap in .service files, and
    instead use $(bindir) (expanded at compile time).
+ - tests/certs/generate: redirect known error output to the standard
+   output.
 
  -- Guilhem Moulin <guilhem@fripost.org>  Thu, 24 Feb 2022 01:28:25 +0100
 
diff --git a/tests/certs/generate b/tests/certs/generate
index de379a0..36fce8b 100755
--- a/tests/certs/generate
+++ b/tests/certs/generate
@@ -10,10 +10,15 @@ cd "$BASEDIR"
 
 cadir="$(mktemp --tmpdir --directory)"
 trap 'rm -rf -- "$cadir"' EXIT INT TERM
+genpkey() {
+    local key="$1"
+    shift
+    openssl genpkey -out "$key" "$@" 2>&1
+}
 
 # generate CA (we intentionally throw away the private key and serial
 # file to avoid reuse)
-openssl genpkey -algorithm RSA -out "$cadir/ca.key"
+genpkey "$cadir/ca.key" -algorithm RSA
 openssl req -new -x509 -rand /dev/urandom -subj "/OU=$OU/CN=Fake Root CA" -key "$cadir/ca.key" -out ./ca.crt
 
 SERIAL=1
@@ -31,14 +36,14 @@ new() {
         printf "subjectAltName = %s\\n" "$3" >>"$cadir/new-ext.cnf"
     fi
     openssl x509 -req -in "$cadir/new.csr" -CA ./ca.crt -CAkey "$cadir/ca.key" \
-        -CAserial "$cadir/ca.srl" -CAcreateserial -extfile "$cadir/new-ext.cnf"
+        -CAserial "$cadir/ca.srl" -CAcreateserial -extfile "$cadir/new-ext.cnf" 2>&1
 }
 
-openssl genpkey -algorithm RSA -out ./dovecot.rsa.key
+genpkey ./dovecot.rsa.key -algorithm RSA
 new ./dovecot.rsa.key "localhost" "DNS:localhost,DNS:ip6-localhost,IP:127.0.0.1,IP:::1" >./dovecot.rsa.crt
 
-openssl genpkey -algorithm EC -pkeyopt ec_paramgen_curve:P-256 -pkeyopt ec_param_enc:named_curve -out ./dovecot.ecdsa.key
+genpkey ./dovecot.ecdsa.key -algorithm EC -pkeyopt ec_paramgen_curve:P-256 -pkeyopt ec_param_enc:named_curve
 new ./dovecot.ecdsa.key "localhost" >./dovecot.ecdsa.crt
 
-openssl genpkey -algorithm RSA -out ./dovecot.rsa2.key
+genpkey ./dovecot.rsa2.key -algorithm RSA
 new ./dovecot.rsa2.key "imap.example.net" "DNS:imap.example.net,DNS:localhost" >./dovecot.rsa2.crt