Mercurial > dovecot > core-2.2
changeset 20895:c9f69cf9e021
doveadm: trim doveadm dump dcrypt-key input
dcrypt does not like extra newlines at the end of a key.
| author | Martti Rannanjärvi <martti.rannanjarvi@dovecot.fi> |
|---|---|
| date | Tue, 18 Oct 2016 14:57:31 +0300 |
| parents | ade61ee3588a |
| children | fbdf07d53d13 |
| files | src/doveadm/doveadm-dump-dcrypt-key.c |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/doveadm/doveadm-dump-dcrypt-key.c Mon Oct 17 09:34:04 2016 +0200 +++ b/src/doveadm/doveadm-dump-dcrypt-key.c Tue Oct 18 14:57:31 2016 +0300 @@ -178,13 +178,14 @@ if (key_hash != NULL) printf("key_hash: %s\n", key_hash); + const char *data = t_str_rtrim(buf, "\r\n\t "); switch (kind) { case DCRYPT_KEY_KIND_PUBLIC: - dcrypt_dump_public_key_metadata(buf); + dcrypt_dump_public_key_metadata(data); break; case DCRYPT_KEY_KIND_PRIVATE: if (encryption_type == DCRYPT_KEY_ENCRYPTION_TYPE_NONE) - dcrypt_dump_private_key_metadata(buf); + dcrypt_dump_private_key_metadata(data); break; } return TRUE;