Consolidate error messages.

2 files changed, 6 insertions, 6 deletions

diff --git a/client b/client
index fdef865..6438f6a 100755
--- a/client
+++ b/client
@@ -87,13 +87,13 @@ do {
     if (defined (my $extra = $2)) {
         my $h = eval { JSON::->new->decode($extra) };
         if ($@ or !defined $h) {
-            print STDERR "WARN: Ignoring extra greeting data from accountd \"$extra\"\n";
+            print STDERR "Warning: Ignoring extra greeting data from accountd \"$extra\"\n";
         } else {
             print STDERR "Received extra greeting data from accountd: $extra\n" if $ENV{DEBUG};
             ($JWK_thumbprint, $ALG, $KID) = @$h{qw/jwk-thumbprint alg kid/};
         }
     }
-    my $jwk_str = $S->getline() // die "ERROR: No JWK from lacme-accountd\n";
+    my $jwk_str = $S->getline() // die "Error: No JWK from lacme-accountd\n";
     $JWK = JSON::->new->decode($jwk_str);
     $JWK_thumbprint //= encode_base64url(sha256(json()->encode($JWK))); # SHA-256 is hardcoded, see RFC 8555 sec. 8.1
     $ALG //= "RS256";
@@ -210,7 +210,7 @@ sub acme2($$;$) {
     $payload = defined $payload ? encode_base64url(json()->encode($payload)) : "";
 
     $S->printflush($protected, ".", $payload, "\r\n");
-    my $sig = $S->getline() // die "ERROR: No response from lacme-accountd\n";
+    my $sig = $S->getline() // die "Error: lost connection with lacme-accountd\n";
     $sig =~ s/\r\n\z// or die;
     undef $NONCE; # consume the nonce
 
@@ -249,7 +249,7 @@ sub acme_resource($%) {
 
     if ($r eq "newAccount" or ($r eq "revokeCert" and !defined $KID)) {
         # per RFC 8555 sec. 6.2 these requests MUST have a JWK
-        print STDERR "WARNING: lacme-accountd supplied an empty JWK; try removing 'keyid' ",
+        print STDERR "Warning: lacme-accountd supplied an empty JWK; try removing 'keyid' ",
                      "setting from lacme-accountd.conf if the ACME resource request fails.\n"
             unless %$JWK;
         return acme2($uri, {jwk => $JWK}, \%payload);
@@ -342,7 +342,7 @@ elsif ($COMMAND eq 'newOrder') {
             $fh->print($keyAuthorization);
             $fh->close() or die "close: $!";
         } elsif ($! == EEXIST) {
-            print STDERR "WARNING: File exists: $challenge->{token}\n";
+            print STDERR "Warning: File exists: $challenge->{token}\n";
         } else {
             die "open($challenge->{token}): $!";
         }
diff --git a/tests/accountd-kid b/tests/accountd-kid
index f55facf..1f282fd 100644
--- a/tests/accountd-kid
+++ b/tests/accountd-kid
@@ -26,7 +26,7 @@ runuser -u lacme-account -- lacme-accountd --socket="$SOCKET" --quiet & PID=$!
 
 # newAccount resource fails as per RFC 8555 sec. 6.2 it requires a JWK
 ! lacme --socket="$SOCKET" account 2>"$STDERR" || fail
-grepstderr -Fxq "WARNING: lacme-accountd supplied an empty JWK; try removing 'keyid' setting from lacme-accountd.conf if the ACME resource request fails."
+grepstderr -Fxq "Warning: lacme-accountd supplied an empty JWK; try removing 'keyid' setting from lacme-accountd.conf if the ACME resource request fails."
 grepstderr -Fxq "400 Bad Request (Parse error reading JWS)"
 grep -F "] SIGNED header=base64url({" ~lacme-account/.local/share/lacme/accountd.log >/tmp/signed
 ! grep -vF "] SIGNED header=base64url({\"alg\":\"RS256\",\"jwk\":{}," </tmp/signed