[git] GpgOL - branch, master, updated. gpgol-1.4.0-232-g3029cf6
by Andre Heinecke
cvs at cvs.gnupg.org
Fri Dec 16 19:08:50 CET 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".
The branch, master has been updated
via 3029cf63dcb05d57b8c77c759cbb7f4469bef567 (commit)
via 52ac388b38b2ce600680fc701a052044066b8fed (commit)
via 980791862ea2acaff19a1180d1faf6ac1a9b0843 (commit)
from 66ab61651831db028131a9b5dba3be3b0c0aec71 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3029cf63dcb05d57b8c77c759cbb7f4469bef567
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Dec 16 19:08:04 2016 +0100
Fix direct trust handling
* mail.cpp (level_4_check): Fix it.
(Mail::get_crypto_details): Use it correctly.
diff --git a/src/mail.cpp b/src/mail.cpp
index 4e51265..71eec62 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -1388,7 +1388,7 @@ Mail::set_uuid()
return 0;
}
-/* Returns 1 if the userid is ultimately trusted.
+/* Returns 2 if the userid is ultimately trusted.
Returns 1 if the userid is fully trusted but has
a signature by a key for which we have a secret
@@ -1431,8 +1431,8 @@ level_4_check (const UserID &uid)
}
/* Check that the userID of the signature is the ultimately
trusted one. */
- const char *signed_uid_str = uid.id ();
- if (!signed_uid_str)
+ const char *sig_uid_str = sig.signerUserID();
+ if (!sig_uid_str)
{
/* should not happen */
TRACEPOINT;
@@ -1442,21 +1442,22 @@ level_4_check (const UserID &uid)
{
if (signer_uid.validity() != UserID::Validity::Ultimate)
{
+ TRACEPOINT;
continue;
}
- const char *signer_uid_str = uid.id ();
- if (!signer_uid_str)
+ const char *signer_uid_str = signer_uid.id ();
+ if (!sig_uid_str)
{
/* should not happen */
TRACEPOINT;
continue;
}
- if (!strcmp(signer_uid_str, signed_uid_str))
+ if (!strcmp(sig_uid_str, signer_uid_str))
{
/* We have a match */
log_debug ("%s:%s: classified %s as ultimate because "
"it was signed by uid %s of key %s",
- SRCNAME, __func__, signed_uid_str, signer_uid_str,
+ SRCNAME, __func__, signer_uid_str, sig_uid_str,
secKeyID);
return 1;
}
@@ -1537,17 +1538,17 @@ Mail::get_crypto_details()
/* level 4 check for direct trust */
int four_check = level_4_check (m_uid);
- if (four_check == 1 && m_sig.key().hasSecret ())
+ if (four_check == 2 && m_sig.key().hasSecret ())
{
message = _("You signed this message.");
}
else if (four_check == 1)
{
- message = _("The sender is allowed to manage your mail trust.");
+ message = _("The senders identity was certified by yourself.");
}
else if (four_check == 2)
{
- message = _("The senders identity was certified by yourself.");
+ message = _("The sender is allowed to manage your mail trust.");
}
else
{
commit 52ac388b38b2ce600680fc701a052044066b8fed
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Dec 16 19:06:44 2016 +0100
Improve some strings
* src/gpgoladdin.cpp (GetCustomUI_MIME): Change some strings.
* src/mail.cpp(Mail::get_crypto_summary): Use trusted instead
of trustworthy.
(Mail::get_crypto_details): Update some strings.
diff --git a/src/gpgoladdin.cpp b/src/gpgoladdin.cpp
index 1903ec0..15ba34d 100644
--- a/src/gpgoladdin.cpp
+++ b/src/gpgoladdin.cpp
@@ -795,22 +795,22 @@ GetCustomUI_MIME (BSTR RibbonID, BSTR * RibbonXml)
"You can use this you to generate your "
"own certificates. ");*/
const char *encryptTTip =
- _("Encrypt the message.");
+ _("Encrypt the message");
const char *encryptSTip =
- _("Encrypts the message and all attachments before sending.");
+ _("Encrypts the message and all attachments before sending");
const char *signTTip =
- _("Sign the message.");
+ _("Sign the message");
const char *signSTip =
- _("Sign the message and all attachments before sending.");
+ _("Sign the message and all attachments before sending");
const char *secureTTip =
- _("Encrypt and sign the message.");
+ _("Sign and encrypt the message");
const char *secureSTip =
_("Encrypting and cryptographically signing a message means that the "
"recipient can be sure that no one modified the message and only the "
- "recipients can read it.\nNot even the NSA.");
+ "recipients can read it");
const char *optsSTip =
- _("Open the settings dialog for GpgOL.");
+ _("Open the settings dialog for GpgOL");
log_debug ("%s:%s: GetCustomUI_MIME for id: %ls", SRCNAME, __func__, RibbonID);
if (!RibbonXml || !RibbonID)
@@ -860,7 +860,7 @@ GetCustomUI_MIME (BSTR RibbonID, BSTR * RibbonXml)
" </tabs>"
" </ribbon>"
"</customUI>", _("GpgOL"),
- _("Sign Encrypt"), secureTTip, secureSTip,
+ _("Secure"), secureTTip, secureSTip,
_("Sign"), signTTip, signSTip,
_("Encrypt"), encryptTTip, encryptSTip,
optsSTip
@@ -978,7 +978,7 @@ GetCustomUI_MIME (BSTR RibbonID, BSTR * RibbonXml)
_("GpgOL"),
optsSTip,
_("GpgOL"),
- _("Sign Encrypt"), secureTTip, secureSTip,
+ _("Secure"), secureTTip, secureSTip,
_("Sign"), signTTip, signSTip,
_("Encrypt"), encryptTTip, encryptSTip,
optsSTip
diff --git a/src/mail.cpp b/src/mail.cpp
index feb0ca4..4e51265 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -1479,7 +1479,7 @@ Mail::get_crypto_summary ()
}
if (level > 3)
{
- return _("Highly Trustworthy");
+ return _("Highly Trusted");
}
if (level >= 2 && enc)
{
@@ -1487,7 +1487,7 @@ Mail::get_crypto_summary ()
}
if (level >= 2)
{
- return _("Trustworthy");
+ return _("Trusted");
}
if (enc)
{
@@ -1630,14 +1630,14 @@ Mail::get_crypto_details()
or just unkown. */
message = is_encrypted () ? _("But the sender address is not trustworthy because:") :
_("The sender address is not trustworthy because:");
- message += "\n\n";
+ message += "\n";
keyFound = !(m_sig.summary() & Signature::Summary::KeyMissing);
bool general_problem = true;
/* First the general stuff. */
if (m_sig.summary() & Signature::Summary::Red)
{
- message += _("The signature is invalid.\n");
+ message += _("The signature is invalid: \n");
}
else if (m_sig.summary() & Signature::Summary::SysError ||
m_verify_result.numSignatures() < 1)
@@ -1702,6 +1702,10 @@ Mail::get_crypto_details()
/* Bit of a catch all for weird results. */
message += _("is not certified by any trustworthy key.");
}
+ else if (m_uid.isRevoked())
+ {
+ message += _("The sender marked this address as revoked.");
+ }
else if ((m_sig.validity() & Signature::Validity::Never))
{
message += _("is marked as not trustworthy.");
commit 980791862ea2acaff19a1180d1faf6ac1a9b0843
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Dec 16 19:05:10 2016 +0100
Update icons for level 2
* src/icons: Update level2 icon
* src/icons/level-3-enc.png: Reexport
diff --git a/src/icons/level-2-enc.png b/src/icons/level-2-enc.png
index 88c8c5c..78cb90e 100644
Binary files a/src/icons/level-2-enc.png and b/src/icons/level-2-enc.png differ
diff --git a/src/icons/level-2-enc.svg b/src/icons/level-2-enc.svg
index 2669bd6..0f88c88 100644
--- a/src/icons/level-2-enc.svg
+++ b/src/icons/level-2-enc.svg
@@ -102,14 +102,19 @@
inkscape:connector-curvature="0"
style="fill:#27ae60;fill-opacity:1;stroke:#141414;stroke-width:0.47197506;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
class="ColorScheme-PositiveText"
- d="m 31.999994,16.235986 c -8.733266,0 -15.764006,7.030749 -15.764006,15.764013 0,8.733264 7.03074,15.764013 15.764006,15.764013 8.733265,0 15.764015,-7.030749 15.764015,-15.764013 0,-8.733264 -7.03075,-15.764013 -15.764015,-15.764013 z"
+ d="m 31.999997,16.235987 c -8.733263,0 -15.76401,7.03075 -15.76401,15.764013 0,8.733263 7.030747,15.764012 15.76401,15.764012 8.733265,0 15.764015,-7.030749 15.764015,-15.764012 0,-8.733263 -7.03075,-15.764013 -15.764015,-15.764013 z"
id="path4387"
inkscape:export-xdpi="75"
inkscape:export-ydpi="75" />
<path
- style="stroke:#ffffff;stroke-width:6.65334034;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0"
- d="M 22.704998,31.346016 H 42.71243 M 32.708712,21.3423 v 20.007434"
- id="path6" />
+ sodipodi:type="arc"
+ style="fill:#ffffff;fill-opacity:1;stroke:none"
+ id="path2990"
+ sodipodi:cx="15"
+ sodipodi:cy="13"
+ sodipodi:rx="11.4375"
+ sodipodi:ry="11.0625"
+ d="m 26.4375,13 a 11.4375,11.0625 0 1 1 -22.875,0 11.4375,11.0625 0 1 1 22.875,0 z"
+ transform="matrix(0.69945359,0,0,0.72316383,21.508194,22.598869)" />
</g>
</svg>
diff --git a/src/icons/level-2.png b/src/icons/level-2.png
index 505f9de..17fb28b 100644
Binary files a/src/icons/level-2.png and b/src/icons/level-2.png differ
diff --git a/src/icons/level-2.svg b/src/icons/level-2.svg
index bca880e..1a2c145 100644
--- a/src/icons/level-2.svg
+++ b/src/icons/level-2.svg
@@ -36,8 +36,8 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="16"
- inkscape:cx="21.252968"
- inkscape:cy="41.031963"
+ inkscape:cx="10.034218"
+ inkscape:cy="26.031963"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
@@ -76,7 +76,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -93,9 +93,14 @@
inkscape:export-xdpi="75"
inkscape:export-ydpi="75" />
<path
- style="stroke:#ffffff;stroke-width:9.98001003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0"
- d="M 10.0575,23.019027 H 40.06865 M 25.063075,8.0134522 V 38.024602"
- id="path6" />
+ sodipodi:type="arc"
+ style="fill:#ffffff;fill-opacity:1;stroke:none"
+ id="path2990"
+ sodipodi:cx="15"
+ sodipodi:cy="13"
+ sodipodi:rx="11.4375"
+ sodipodi:ry="11.0625"
+ d="m 26.4375,13 a 11.4375,11.0625 0 1 1 -22.875,0 11.4375,11.0625 0 1 1 22.875,0 z"
+ transform="matrix(1.0491803,0,0,1.0847458,8.2622952,9.8983042)" />
</g>
</svg>
diff --git a/src/icons/level-3-enc.png b/src/icons/level-3-enc.png
index fccbd9d..6a46cd0 100644
Binary files a/src/icons/level-3-enc.png and b/src/icons/level-3-enc.png differ
-----------------------------------------------------------------------
Summary of changes:
src/gpgoladdin.cpp | 18 +++++++++---------
src/icons/level-2-enc.png | Bin 1653 -> 1783 bytes
src/icons/level-2-enc.svg | 15 ++++++++++-----
src/icons/level-2.png | Bin 1182 -> 1314 bytes
src/icons/level-2.svg | 19 ++++++++++++-------
src/icons/level-3-enc.png | Bin 1928 -> 1861 bytes
src/mail.cpp | 33 +++++++++++++++++++--------------
7 files changed, 50 insertions(+), 35 deletions(-)
hooks/post-receive
--
GnuPG extension for MS Outlook
http://git.gnupg.org
More information about the Gnupg-commits
mailing list