Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
libkleo
Commits
e9bb7c41
Commit
e9bb7c41
authored
Mar 25, 2021
by
Ingo Klöcker
Browse files
Fix normalization of addresses of encryption key overrides
GnuPG-bug-id: 5283
parent
442c1236
Changes
2
Hide whitespace changes
Inline
Side-by-side
autotests/keyresolvercoretest.cpp
View file @
e9bb7c41
...
...
@@ -132,12 +132,12 @@ private Q_SLOTS:
testKey
(
"sender-mixed@example.net"
,
CMS
).
primaryFingerprint
());
}
void
test_override
_sender
_openpgp
()
void
test_override
s
_openpgp
()
{
const
QString
override
=
testKey
(
"prefer-openpgp@example.net"
,
OpenPGP
).
primaryFingerprint
();
KeyResolverCore
resolver
(
/*encrypt=*/
true
,
/*sign=*/
true
);
resolver
.
setSender
(
QStringLiteral
(
"sender-mixed@example.net"
));
resolver
.
setOverrideKeys
({{
OpenPGP
,
{{
QStringLiteral
(
"sender-mixed@example.net"
),
{
override
}}}}});
resolver
.
setOverrideKeys
({{
OpenPGP
,
{{
QStringLiteral
(
"
Needs to be normalized <
sender-mixed@example.net
>
"
),
{
override
}}}}});
const
bool
success
=
resolver
.
resolve
();
...
...
@@ -147,13 +147,13 @@ private Q_SLOTS:
QCOMPARE
(
resolver
.
encryptionKeys
().
value
(
OpenPGP
).
value
(
"sender-mixed@example.net"
)[
0
].
primaryFingerprint
(),
override
);
}
void
test_override
_sender
_smime
()
void
test_override
s
_smime
()
{
const
QString
override
=
testKey
(
"prefer-smime@example.net"
,
CMS
).
primaryFingerprint
();
KeyResolverCore
resolver
(
/*encrypt=*/
true
,
/*sign=*/
true
);
resolver
.
setPreferredProtocol
(
CMS
);
resolver
.
setSender
(
QStringLiteral
(
"sender-mixed@example.net"
));
resolver
.
setOverrideKeys
({{
CMS
,
{{
QStringLiteral
(
"sender-mixed@example.net"
),
{
override
}}}}});
resolver
.
setOverrideKeys
({{
CMS
,
{{
QStringLiteral
(
"
Needs to be normalized <
sender-mixed@example.net
>
"
),
{
override
}}}}});
const
bool
success
=
resolver
.
resolve
();
...
...
src/kleo/keyresolvercore.cpp
View file @
e9bb7c41
...
...
@@ -190,7 +190,7 @@ void KeyResolverCore::Private::setOverrideKeys(const QMap<Protocol, QMap<QString
const
auto
normalized
=
QString
::
fromUtf8
(
UserID
::
addrSpecFromString
(
addr
.
toUtf8
().
constData
()).
c_str
());
const
auto
fingerprints
=
overrides
[
fmt
][
addr
];
normalizedOverrides
.
insert
(
addr
,
fingerprints
);
normalizedOverrides
.
insert
(
normalized
,
fingerprints
);
}
mOverrides
.
insert
(
fmt
,
normalizedOverrides
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment