[git] GPGME - branch, master, updated. gpgme-1.7.0-13-g95f3865
by Daniel Kahn Gillmor
cvs at cvs.gnupg.org
Fri Sep 23 16:10:19 CEST 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 Made Easy".
The branch, master has been updated
via 95f38652f696476b38a040644eac40b4511d2b32 (commit)
via a11450eb048df79a3f2b00ebef6d7cab07ad5054 (commit)
via 9b38817968b90caf73f123255fe427691e82fec4 (commit)
from a142f187b7ddb2728ec3e1743da4a0c4538ab40a (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 95f38652f696476b38a040644eac40b4511d2b32
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Thu Sep 22 18:43:48 2016 -0400
Fix spelling
* lang/cpp/src/context.h, lang/qt/src/protocol.h,
lang/qt/src/wkspublishjob.h, src/data-identify.c, src/engine-gpg.c:
minor spelling cleanup.
--
Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
diff --git a/lang/cpp/src/context.h b/lang/cpp/src/context.h
index b1e4f5f..ab15a21 100644
--- a/lang/cpp/src/context.h
+++ b/lang/cpp/src/context.h
@@ -364,8 +364,8 @@ public:
* @param file The executable to start.
* @param argv list of arguments file should be argv[0].
* @param input The data to be sent through stdin.
- * @param output The data to be recieve the stdout.
- * @param err The data to recieve stderr.
+ * @param output The data to be receive the stdout.
+ * @param err The data to receive stderr.
* @param flags Additional flags.
*
* @returns An error or empty error.
diff --git a/lang/qt/src/protocol.h b/lang/qt/src/protocol.h
index 40ddcb5..15d83e0 100644
--- a/lang/qt/src/protocol.h
+++ b/lang/qt/src/protocol.h
@@ -76,7 +76,7 @@ class TofuPolicyJob;
* two are always a QString for the auditlog and an GpgME::Error for
* an eventual error.
*
- * In case async API is used and the result signal is emited a
+ * In case async API is used and the result signal is emitted a
* job schedules its own deletion.
*
* Most jobs also provide a synchronous call exec in which case
@@ -161,14 +161,14 @@ public:
/** Obtain a reference to the OpenPGP Protocol.
*
* The reference is to a static object.
- * @returns Refrence to the OpenPGP Protocol.
+ * @returns Reference to the OpenPGP Protocol.
*/
QGPGME_EXPORT Protocol *openpgp();
/** Obtain a reference to the smime Protocol.
*
* The reference is to a static object.
- * @returns Refrence to the smime Protocol.
+ * @returns Reference to the smime Protocol.
*/
QGPGME_EXPORT Protocol *smime();
diff --git a/lang/qt/src/wkspublishjob.h b/lang/qt/src/wkspublishjob.h
index 782112f..d7bcd5d 100644
--- a/lang/qt/src/wkspublishjob.h
+++ b/lang/qt/src/wkspublishjob.h
@@ -45,7 +45,7 @@ namespace QGpgME {
* Handles Web Key Service Publishing. Needs WKS tools installed and
* server support.
*
- * Remember that after a result is emited the job is auto deleted
+ * Remember that after a result is emitted the job is auto deleted
* so you can only use it for a single action.
*/
class QGPGME_EXPORT WKSPublishJob: public Job
diff --git a/src/data-identify.c b/src/data-identify.c
index a5da7f5..615a4f3 100644
--- a/src/data-identify.c
+++ b/src/data-identify.c
@@ -278,7 +278,7 @@ pgp_binary_detection (const void *image_arg, size_t imagelen)
/* This is probably an armored "PGP MESSAGE" which can encode
* different PGP data types. STRING is modified after a call to this
- * fucntion. */
+ * function. */
static gpgme_data_type_t
inspect_pgp_message (char *string)
{
diff --git a/src/engine-gpg.c b/src/engine-gpg.c
index 3f1d34d..4415c94 100644
--- a/src/engine-gpg.c
+++ b/src/engine-gpg.c
@@ -2543,7 +2543,7 @@ gpg_keylist_build_options (engine_gpg_t gpg, int secret_only,
err = add_arg (gpg, "--with-colons");
/* Since gpg 2.1.15 fingerprints are always printed, thus there is
- * no more need to explictly request them. */
+ * no more need to explicitly request them. */
if (!have_gpg_version (gpg, "2.1.15"))
{
if (!err)
commit a11450eb048df79a3f2b00ebef6d7cab07ad5054
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Thu Sep 22 18:23:04 2016 -0400
move some file encodings to UTF-8
* THANKS, doc/ChangeLog-2011, tests/ChangeLog-2011,
tests/gpg/geheim.txt: convert from iso 8859-1 to utf-8.
* lang/qt/src/dataprovider.cpp, lang/qt/src/qgpgmerefreshkeysjob.cpp,
lang/qt/src/qgpgmesecretkeyexportjob.cpp: replace U+FFFD REPLACEMENT
CHARACTER with proper U+00E4 LATIN SMALL LETTER A WITH DIAERESIS.
--
Note that src/versioninfo.rc.in is still ISO-8859-1. I don't know
whether Windows will properly handle UTF-8 in this file or not, so i
have not touched it.
Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
diff --git a/THANKS b/THANKS
index 9d79004..e312775 100644
--- a/THANKS
+++ b/THANKS
@@ -5,7 +5,7 @@ want to thank them for their help. If we forgot you, please let us
know.
Adriaan de Groot adridg at cs.kun.nl
-Albrecht Dreß albrecht.dress at arcor.de
+Albrecht Dreß albrecht.dress at arcor.de
Alfons Hoogervorst alfons at proteus.demon.nl
Daniel Mueller daniel at danm.de
Enno Cramer uebergeek at web.de
@@ -13,13 +13,13 @@ Frank Heckenbach frank at g-n-u.de
Igor Belyi gpgme at katehok.ac93.org
Jan-Oliver Wagner jan at intevation.de
Johannes Poehlmann jhp at caldera.de
-Jose C. García Sogo jose at jaimedelamo.eu.org
+Jose C. GarcÃa Sogo jose at jaimedelamo.eu.org
Leo Gaspard ekleog at gmail.com
Mark Mutz mutz at kde.org
Miguel Coca mcoca at gnu.org
Noel Torres envite at rolamasao.org
Patrick Spendrin patrick.spendrin at kdab.com
-Stéphane Corthésy stephane at sente.ch
+Stéphane Corthésy stephane at sente.ch
Timo Schulz twoaday at freakmail.de
Tommy Reynolds reynolds at redhat.com
W. Trevor King wking at tremily.us
diff --git a/doc/ChangeLog-2011 b/doc/ChangeLog-2011
index d6ecca7..e270fae 100644
--- a/doc/ChangeLog-2011
+++ b/doc/ChangeLog-2011
@@ -397,7 +397,7 @@
(Listing Keys): Update examples.
(Decrypt): Result might also be available when operation failed.
(Verify): Result might also be available when operation failed.
- All spotted by Stéphane Corthésy.
+ All spotted by Stéphane Corthésy.
2003-07-22 Marcus Brinkmann <marcus at g10code.de>
diff --git a/lang/qt/src/dataprovider.cpp b/lang/qt/src/dataprovider.cpp
index df56133..8385686 100644
--- a/lang/qt/src/dataprovider.cpp
+++ b/lang/qt/src/dataprovider.cpp
@@ -1,5 +1,5 @@
/* dataprovider.cpp
- Copyright (C) 2004 Klar�vdalens Datakonsult AB
+ Copyright (C) 2004 Klarävdalens Datakonsult AB
Copyright (c) 2016 Intevation GmbH
This file is part of QGPGME.
diff --git a/lang/qt/src/qgpgmerefreshkeysjob.cpp b/lang/qt/src/qgpgmerefreshkeysjob.cpp
index 93ac63a..493a010 100644
--- a/lang/qt/src/qgpgmerefreshkeysjob.cpp
+++ b/lang/qt/src/qgpgmerefreshkeysjob.cpp
@@ -2,7 +2,7 @@
qgpgmerefreshkeysjob.cpp
This file is part of qgpgme, the Qt API binding for gpgme
- Copyright (c) 2004 Klar�vdalens Datakonsult AB
+ Copyright (c) 2004 Klarävdalens Datakonsult AB
Copyright (c) 2016 Intevation GmbH
QGpgME is free software; you can redistribute it and/or
diff --git a/lang/qt/src/qgpgmesecretkeyexportjob.cpp b/lang/qt/src/qgpgmesecretkeyexportjob.cpp
index d740852..75cd83a 100644
--- a/lang/qt/src/qgpgmesecretkeyexportjob.cpp
+++ b/lang/qt/src/qgpgmesecretkeyexportjob.cpp
@@ -2,7 +2,7 @@
qgpgmesecretexportjob.cpp
This file is part of qgpgme, the Qt API binding for gpgme
- Copyright (c) 2004 Klar�vdalens Datakonsult AB
+ Copyright (c) 2004 Klarävdalens Datakonsult AB
Copyright (c) 2016 Intevation GmbH
QGpgME is free software; you can redistribute it and/or
diff --git a/tests/ChangeLog-2011 b/tests/ChangeLog-2011
index 596c2df..3ec0fb7 100644
--- a/tests/ChangeLog-2011
+++ b/tests/ChangeLog-2011
@@ -603,7 +603,7 @@
2002-09-28 Marcus Brinkmann <marcus at g10code.de>
- * t-version.c: Include <string.h>. Reported by Stéphane Corthésy.
+ * t-version.c: Include <string.h>. Reported by Stéphane Corthésy.
2002-09-02 Marcus Brinkmann <marcus at g10code.de>
@@ -624,8 +624,8 @@
* gpg/t-encrypt-sym.c (main): Change type of I to size_t and
rename to LEN.
- * gpg/t-verify.c (main): Likewise. Submitted by Stéphane
- Corthésy.
+ * gpg/t-verify.c (main): Likewise. Submitted by Stéphane
+ Corthésy.
2002-07-03 Marcus Brinkmann <marcus at g10code.de>
@@ -772,7 +772,7 @@
2001-12-19 Marcus Brinkmann <marcus at g10code.de>
* gpg/t-decrypt-verify.c: Don't include `mcheck.h'. Reported by
- Stéphane Corthésy.
+ Stéphane Corthésy.
2001-12-19 Marcus Brinkmann <marcus at g10code.de>
diff --git a/tests/gpg/geheim.txt b/tests/gpg/geheim.txt
index 99a5478..49d78a7 100644
--- a/tests/gpg/geheim.txt
+++ b/tests/gpg/geheim.txt
@@ -1,2 +1,2 @@
-Wenn Sie dies lesen können, ist es wohl nicht
+Wenn Sie dies lesen können, ist es wohl nicht
geheim genug.
commit 9b38817968b90caf73f123255fe427691e82fec4
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Sep 23 16:03:37 2016 +0200
tests: Check data after decryption
* tests/gpgsm/t-decrypt.c (main): Check data matches expected.
Only print result if it does not.
diff --git a/tests/gpgsm/t-decrypt.c b/tests/gpgsm/t-decrypt.c
index 658809c..81803af 100644
--- a/tests/gpgsm/t-decrypt.c
+++ b/tests/gpgsm/t-decrypt.c
@@ -54,6 +54,8 @@ main (void)
gpgme_ctx_t ctx;
gpgme_error_t err;
gpgme_data_t in, out;
+ size_t len;
+ char *test_text2;
gpgme_decrypt_result_t result;
init_gpgme (GPGME_PROTOCOL_CMS);
@@ -77,10 +79,18 @@ main (void)
__FILE__, __LINE__, result->unsupported_algorithm);
exit (1);
}
- print_data (out);
+ test_text2 = gpgme_data_release_and_get_mem (out, &len);
+ test_text2[len] = '\0';
+ if (strcmp (test_text1, test_text2))
+ {
+ fprintf (stderr, "%s:%i: data mismatch: expected: \n\"%s\"\n"
+ "got:\n\"%s\"",
+ __FILE__, __LINE__, test_text1, test_text2);
+ exit (1);
+ }
+ free (test_text2);
gpgme_data_release (in);
- gpgme_data_release (out);
gpgme_release (ctx);
return 0;
}
-----------------------------------------------------------------------
Summary of changes:
THANKS | 6 +++---
doc/ChangeLog-2011 | 2 +-
lang/cpp/src/context.h | 4 ++--
lang/qt/src/dataprovider.cpp | 2 +-
lang/qt/src/protocol.h | 6 +++---
lang/qt/src/qgpgmerefreshkeysjob.cpp | 2 +-
lang/qt/src/qgpgmesecretkeyexportjob.cpp | 2 +-
lang/qt/src/wkspublishjob.h | 2 +-
src/data-identify.c | 2 +-
src/engine-gpg.c | 2 +-
tests/ChangeLog-2011 | 8 ++++----
tests/gpg/geheim.txt | 2 +-
tests/gpgsm/t-decrypt.c | 14 ++++++++++++--
13 files changed, 32 insertions(+), 22 deletions(-)
hooks/post-receive
--
GnuPG Made Easy
http://git.gnupg.org
More information about the Gnupg-commits
mailing list