apt-key: remove carriage returns from armored keyrings before dearmoring

Without this, the awk script returns nothing if the armored keyring
uses Windows/DOS-style CRLF line endings (since awk is designed for
processing Unix text files). This would result in a NO_PUBKEY error
during the signature verification part of an apt-get update.

1 files changed, 2 insertions, 1 deletions

diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in
index 80b0c2ade..4f3e9c8e1 100644
--- a/cmdline/apt-key.in
+++ b/cmdline/apt-key.in
@@ -446,7 +446,8 @@ dearmor_keyring() {
     # The awk script is more complex through to skip surrounding garbage and
     # to support multiple keys in one file (old gpgs generate version headers
     # which get printed with the original and hence result in garbage input for base64
-    awk '/^-----BEGIN/{ x = 1; }
+    awk '{ gsub(/\r/,"") }
+/^-----BEGIN/{ x = 1; }
 /^$/{ if (x == 1) { x = 2; }; }
 /^[^=-]/{ if (x == 2) { print $0; }; }
 /^-----END/{ x = 0; }' | base64 -d