diff options
| author | Julian Andres Klode <jak@debian.org> | 2024-02-20 08:30:27 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2024-02-20 08:30:27 +0000 |
| commit | 59cd4953f5330cd44facf893ba9f5fbdc618ce6c (patch) | |
| tree | 289fdf21716577b7b16f771fb12e978e162db17b | |
| parent | c1aac9f3879f8d4f0f0d5bccd33d362ca5b75615 (diff) | |
| parent | 18e4c6108e1957a886c1df5054cff73d35a62006 (diff) | |
Merge branch 'apt-key-handle-crlf-keyrings' into 'main'
apt-key: remove carriage returns from armored keyrings before dearmoring
See merge request apt-team/apt!309
| -rw-r--r-- | cmdline/apt-key.in | 3 |
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 |