GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spelling: fix misspellings

Browse Source 
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
This commit is contained in:
Daniel Kahn Gillmor 2018-11-08 12:34:27 +07:00
parent d0a5caf73c
commit 2557d0ae6f
48 changed files with 141 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -99,7 +99,7 @@ release:
$(MAKE) distcheck TESTFLAGS=--parallel; \ $(MAKE) distcheck TESTFLAGS=--parallel; \
echo "/* Build finished at $$(date -uIseconds) */" ;\ echo "/* Build finished at $$(date -uIseconds) */" ;\
echo "/*" ;\ echo "/*" ;\
echo " * Please run the final step interactivly:" ;\ echo " * Please run the final step interactively:" ;\
echo " * make sign-release" ;\ echo " * make sign-release" ;\
echo " */" ;\ echo " */" ;\
) 2>&1 | tee "$(RELEASE_NAME).buildlog" ) 2>&1 | tee "$(RELEASE_NAME).buildlog"

14
NEWS
View File

@ -459,7 +459,7 @@ Noteworthy changes in version 1.6.0 (2015-08-26) [C25/A14/R0]
* The passphrase handler for the loopback mode has been improved and may * The passphrase handler for the loopback mode has been improved and may
also be used with genkey. also be used with genkey.
* [w32] The standard GnuPG 2.1 install directory is now seached for * [w32] The standard GnuPG 2.1 install directory is now searched for
gpgconf.exe before a registry specified directory and the Gpg4win gpgconf.exe before a registry specified directory and the Gpg4win
install directory. install directory.
@ -762,7 +762,7 @@ Noteworthy changes in version 1.1.8 (2008-12-08)
------------------------------------------------ ------------------------------------------------
* SIGPIPE is now again ignored as described in the manual. Fixes * SIGPIPE is now again ignored as described in the manual. Fixes
regresion introduced with 1.1.6. regression introduced with 1.1.6.
Noteworthy changes in version 1.1.7 (2008-10-17) Noteworthy changes in version 1.1.7 (2008-10-17)
@ -958,8 +958,8 @@ Noteworthy changes in version 1.0.3 (2005-06-20)
* Previousy, GPGME would use a default "include certs" of 1. This * Previousy, GPGME would use a default "include certs" of 1. This
has been changed. Now GPGME will use the crypto backend engines has been changed. Now GPGME will use the crypto backend engines
default unless you set the value with gpgme_set_include_certs() default unless you set the value with gpgme_set_include_certs()
explicitely. A new macro GPGME_INCLUDE_CERTS_DEFAULT can be used explicitly. A new macro GPGME_INCLUDE_CERTS_DEFAULT can be used
as a value to explicitely request the new default behaviour. as a value to explicitly request the new default behaviour.
Because the default changes, this is a slight change of the API Because the default changes, this is a slight change of the API
semantics. We consider it to be a bug fix. semantics. We consider it to be a bug fix.
@ -1046,7 +1046,7 @@ Noteworthy changes in version 0.4.7 (2004-04-29)
disabled in the gpgme_key_t structures. disabled in the gpgme_key_t structures.
* A bug fix: The flag wrong_key_usage of gpgme_signature_t was * A bug fix: The flag wrong_key_usage of gpgme_signature_t was
accidently of type int instead unsigned int. accidentally of type int instead unsigned int.
* Interface changes relative to the 0.4.5 release: * Interface changes relative to the 0.4.5 release:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -1259,7 +1259,7 @@ Noteworthy changes in version 0.4.1 (2003-06-06)
The error values have been completely replaced by a more The error values have been completely replaced by a more
sophisticated model that allows GPGME to transparently and accurately sophisticated model that allows GPGME to transparently and accurately
report all errors from the other GnuPG components, irregardless of report all errors from the other GnuPG components, regardless of
process boundaries. This is achieved by using the library process boundaries. This is achieved by using the library
libgpg-errors, which is shared by all GnuPG components. This library libgpg-errors, which is shared by all GnuPG components. This library
is now required for GPGME. is now required for GPGME.
@ -1877,7 +1877,7 @@ Noteworthy changes in version 0.3.1 (2002-02-09)
selects between local keyring, remote keyserver, or both. selects between local keyring, remote keyserver, or both.
For this, two new macros are defined, GPGME_KEYLIST_MODE_LOCAL For this, two new macros are defined, GPGME_KEYLIST_MODE_LOCAL
and GPGME_KEYLIST_MODE_EXTERN. To make it possible to modify the and GPGME_KEYLIST_MODE_EXTERN. To make it possible to modify the
current setting, a fucntion gpgme_get_keylist_mode was added to current setting, a function gpgme_get_keylist_mode was added to
retrieve the current mode. retrieve the current mode.
* gpgme_wait accepts a new argument STATUS to return the error status * gpgme_wait accepts a new argument STATUS to return the error status

6
TODO
View File

@ -32,7 +32,7 @@ Hey Emacs, this is -*- org -*- mode!
Clean up the current TODO list. Include properties as relevant (so Clean up the current TODO list. Include properties as relevant (so
if someone does make a PDF or HTML version the TOC will work). if someone does make a PDF or HTML version the TOC will work).
Also check ans see if some of these ancient things can be removed Also check to see if some of these ancient things can be removed
(e.g. do we really need to fix things that were broken in GPG (e.g. do we really need to fix things that were broken in GPG
1.3.x? I'm thinking not so much). 1.3.x? I'm thinking not so much).
@ -78,7 +78,7 @@ Hey Emacs, this is -*- org -*- mode!
:PROPERTIES: :PROPERTIES:
:CUSTOM_ID: set-fd-blocking :CUSTOM_ID: set-fd-blocking
:END: :END:
issueing simple commands, because we are mixing synchronous issuing simple commands, because we are mixing synchronous
commands into potentially asynchronous operations. commands into potentially asynchronous operations.
** Might want to implement nonblock for w32 native backend! ** Might want to implement nonblock for w32 native backend!
:PROPERTIES: :PROPERTIES:
@ -272,7 +272,7 @@ Hey Emacs, this is -*- org -*- mode!
with a string and some optional arguments. This is for example with a string and some optional arguments. This is for example
required to notify an application of a changed smartcard, The required to notify an application of a changed smartcard, The
application can then do whatever is required. There are other application can then do whatever is required. There are other
usages too. This notfication system should be independent of any usages too. This notification system should be independent of any
contextes of course. contextes of course.
Not sure whether this is still required. GPGME_PROTOCOL_ASSUAN is Not sure whether this is still required. GPGME_PROTOCOL_ASSUAN is

2
configure.ac
View File

@ -347,7 +347,7 @@ if test "$found" = "1"; then
AC_CHECK_PROGS([DOXYGEN], [doxygen]) AC_CHECK_PROGS([DOXYGEN], [doxygen])
if test -z "$DOXYGEN"; if test -z "$DOXYGEN";
# This is not highlighted becase it's not really important. # This is not highlighted because it's not really important.
then AC_MSG_WARN([Doxygen not found - Qt binding doc will not be built.]) then AC_MSG_WARN([Doxygen not found - Qt binding doc will not be built.])
fi fi
AC_CHECK_PROGS([GRAPHVIZ], [dot]) AC_CHECK_PROGS([GRAPHVIZ], [dot])

8
doc/ChangeLog-2011
View File

@ -700,7 +700,7 @@
2002-05-26 Marcus Brinkmann <marcus@g10code.de> 2002-05-26 Marcus Brinkmann <marcus@g10code.de>
* gpgme.texi: Some typographical correctons throughout. * gpgme.texi: Some typographical corrections throughout.
2002-05-09 Marcus Brinkmann <marcus@g10code.de> 2002-05-09 Marcus Brinkmann <marcus@g10code.de>
@ -720,7 +720,7 @@
* gpgme.texi (Manipulating Data Buffers): Changed some data types * gpgme.texi (Manipulating Data Buffers): Changed some data types
to void*. to void*.
(Protocol Selection): Added gpgme_get_protocol. (Protocol Selection): Added gpgme_get_protocol.
(Verify): Updated to include the new attribute fucntions and (Verify): Updated to include the new attribute functions and
status codes. status codes.
2002-04-27 Werner Koch <wk@gnupg.org> 2002-04-27 Werner Koch <wk@gnupg.org>
@ -839,7 +839,7 @@
2002-01-29 Marcus Brinkmann <marcus@g10code.de> 2002-01-29 Marcus Brinkmann <marcus@g10code.de>
* gpgme.texi (Run Control): New section. * gpgme.texi (Run Control): New section.
(Verify): Docuent gpgme_get_notation. (Verify): Document gpgme_get_notation.
(More Information): New section describing gpgme_get_op_info. (More Information): New section describing gpgme_get_op_info.
2002-01-22 Marcus Brinkmann <marcus@g10code.de> 2002-01-22 Marcus Brinkmann <marcus@g10code.de>
@ -865,7 +865,7 @@
* gpgme.texi (Top): Complete detailmenu. * gpgme.texi (Top): Complete detailmenu.
* gpgme.texi: Convert embarassing cruft to the real thing. * gpgme.texi: Convert embarrassing cruft to the real thing.
2002-01-16 Marcus Brinkmann <marcus@g10code.de> 2002-01-16 Marcus Brinkmann <marcus@g10code.de>

2
doc/examples/show-group-options.c
View File

@ -1,4 +1,4 @@
/* show-group-options.c - Example code to retriev the group option. /* show-group-options.c - Example code to retrieve the group option.
Copyright (C) 2008 g10 Code GmbH Copyright (C) 2008 g10 Code GmbH
This file is part of GPGME. This file is part of GPGME.

16
doc/gpgme.texi
View File

@ -732,7 +732,7 @@ directory part is used as the default installation directory; the
Windows. Windows.
@item require-gnupg @item require-gnupg
Set the mimimum version of the required GnuPG engine. If that version Set the minimum version of the required GnuPG engine. If that version
is not met, GPGME fails early instead of trying to use the existent is not met, GPGME fails early instead of trying to use the existent
version. The given version must be a string with major, minor, and version. The given version must be a string with major, minor, and
micro number. Example: "2.1.0". micro number. Example: "2.1.0".
@ -4031,7 +4031,7 @@ does only work for OpenPGP and requires at least version 2.1.13 of
GnuPG. GnuPG.
@var{userid} is commonly the mail address associated with the key. @var{userid} is commonly the mail address associated with the key.
GPGME does not require a specificy syntax but if more than a mail GPGME does not require a specific syntax but if more than a mail
address is given, RFC-822 style format is suggested. The value is address is given, RFC-822 style format is suggested. The value is
expected to be in UTF-8 encoding (i.e. no IDN encoding for mail expected to be in UTF-8 encoding (i.e. no IDN encoding for mail
addresses). This is a required parameter. addresses). This is a required parameter.
@ -4240,7 +4240,7 @@ requires at least version 2.1.13 of GnuPG.
@var{userid} is the user ID to add to the key. A user ID is commonly @var{userid} is the user ID to add to the key. A user ID is commonly
the mail address to be associated with the key. GPGME does not the mail address to be associated with the key. GPGME does not
require a specificy syntax but if more than a mail address is given, require a specific syntax but if more than a mail address is given,
RFC-822 style format is suggested. The value is expected to be in RFC-822 style format is suggested. The value is expected to be in
UTF-8 encoding (i.e. no IDN encoding for mail addresses). This is a UTF-8 encoding (i.e. no IDN encoding for mail addresses). This is a
required parameter. required parameter.
@ -5432,7 +5432,7 @@ multiple of the following bit values:
@since{1.8.0} @since{1.8.0}
The @code{GPGME_DECRYPT_VERIFY} symbol specifies that this function The @code{GPGME_DECRYPT_VERIFY} symbol specifies that this function
shall exacty act as @code{gpgme_op_decrypt_verify}. shall exactly act as @code{gpgme_op_decrypt_verify}.
@item GPGME_DECRYPT_UNWRAP @item GPGME_DECRYPT_UNWRAP
@since{1.8.0} @since{1.8.0}
@ -5444,7 +5444,7 @@ counterpart to @code{GPGME_ENCRYPT_WRAP}.
@end table @end table
The function returns the error codes as descriped for The function returns the error codes as described for
@code{gpgme_op_decrypt} respective @code{gpgme_op_encrypt}. @code{gpgme_op_decrypt} respective @code{gpgme_op_encrypt}.
@end deftypefun @end deftypefun
@ -5739,7 +5739,7 @@ The defined bits are:
A policy requirement was not met. A policy requirement was not met.
@item GPGME_SIGSUM_SYS_ERROR @item GPGME_SIGSUM_SYS_ERROR
A system error occured. A system error occurred.
@item GPGME_SIGSUM_TOFU_CONFLICT @item GPGME_SIGSUM_TOFU_CONFLICT
A TOFU conflict was detected. A TOFU conflict was detected.
@ -6897,7 +6897,7 @@ returned. Synchronous operations running in parallel, as well as key
and trust item list operations, do not affect @code{gpgme_wait}. and trust item list operations, do not affect @code{gpgme_wait}.
In a multi-threaded environment, only one thread should ever call In a multi-threaded environment, only one thread should ever call
@code{gpgme_wait} at any time, irregardless if @var{ctx} is specified @code{gpgme_wait} at any time, regardless of whether @var{ctx} is specified
or not. This means that all calls to this function should be fully or not. This means that all calls to this function should be fully
synchronized by locking primitives. It is safe to start asynchronous synchronized by locking primitives. It is safe to start asynchronous
operations while a thread is running in @code{gpgme_wait}. operations while a thread is running in @code{gpgme_wait}.
@ -8229,7 +8229,7 @@ The function @code{gpgme_get_sig_string_attr} is equivalent to:
@end example @end example
@end deftypefun @end deftypefun
@deftypefun {const char *} gpgme_get_sig_ulong_attr (@w{gpgme_ctx_t @var{ctx}}, @w{int @var{idx}}, @w{gpgme_attr_t @var{waht}}, @w{int @var{whatidx}}) @deftypefun {const char *} gpgme_get_sig_ulong_attr (@w{gpgme_ctx_t @var{ctx}}, @w{int @var{idx}}, @w{gpgme_attr_t @var{what}}, @w{int @var{whatidx}})
The function @code{gpgme_get_sig_ulong_attr} is equivalent to: The function @code{gpgme_get_sig_ulong_attr} is equivalent to:
@example @example

4
doc/uiserver.texi
View File

@ -564,7 +564,7 @@ do this it uses the Assuan command:
@deffn Command START_KEYMANAGER @deffn Command START_KEYMANAGER
The server shall pop up the main window of the key manager (aka The server shall pop up the main window of the key manager (aka
certificate manager). The client expects that the key manager is brought certificate manager). The client expects that the key manager is brought
into the foregound and that this command immediatley returns (does not into the foregound and that this command immediately returns (does not
wait until the key manager has been fully brought up). wait until the key manager has been fully brought up).
@end deffn @end deffn
@ -575,7 +575,7 @@ do this it uses the Assuan command:
@deffn Command START_CONFDIALOG @deffn Command START_CONFDIALOG
The server shall pop up its configuration dialog. The client expects The server shall pop up its configuration dialog. The client expects
that this dialog is brought into the foregound and that this command that this dialog is brought into the foregound and that this command
immediatley returns (i.e. it does not wait until the dialog has been immediately returns (i.e. it does not wait until the dialog has been
fully brought up). fully brought up).
@end deffn @end deffn

22
lang/cl/gpgme.lisp
View File

@ -140,11 +140,11 @@
(gpg-err-source err)) (gpg-err-source err))
(defun gpgme-strerror (err) (defun gpgme-strerror (err)
"Return a string containig a description of the error code." "Return a string containing a description of the error code."
(gpg-strerror err)) (gpg-strerror err))
(defun gpgme-strsource (err) (defun gpgme-strsource (err)
"Return a string containig a description of the error source." "Return a string containing a description of the error source."
(gpg-strsource err)) (gpg-strsource err))
(defun gpgme-err-code-from-errno (err) (defun gpgme-err-code-from-errno (err)
@ -267,7 +267,7 @@
:from-c translate-gpgme-sig-notation-t-from-foreign) :from-c translate-gpgme-sig-notation-t-from-foreign)
"Signature notation pointer type.") "Signature notation pointer type.")
;; FIXME: Doesn't this depend on endianess? ;; FIXME: Doesn't this depend on endianness?
(defbitfield (gpgme-sig-notation-bitfield :unsigned-int) (defbitfield (gpgme-sig-notation-bitfield :unsigned-int)
(:human-readable 1) (:human-readable 1)
(:critical 2)) (:critical 2))
@ -411,7 +411,7 @@
:from-c translate-gpgme-subkey-t-from-foreign) :from-c translate-gpgme-subkey-t-from-foreign)
"A subkey from a key.") "A subkey from a key.")
;; FIXME: Doesn't this depend on endianess? ;; FIXME: Doesn't this depend on endianness?
(defbitfield (gpgme-subkey-bitfield :unsigned-int) (defbitfield (gpgme-subkey-bitfield :unsigned-int)
"The subkey bitfield." "The subkey bitfield."
(:revoked 1) (:revoked 1)
@ -445,7 +445,7 @@
:from-c translate-gpgme-key-sig-t-from-foreign) :from-c translate-gpgme-key-sig-t-from-foreign)
"A signature on a user ID.") "A signature on a user ID.")
;; FIXME: Doesn't this depend on endianess? ;; FIXME: Doesn't this depend on endianness?
(defbitfield (gpgme-key-sig-bitfield :unsigned-int) (defbitfield (gpgme-key-sig-bitfield :unsigned-int)
"The key signature bitfield." "The key signature bitfield."
(:revoked 1) (:revoked 1)
@ -476,7 +476,7 @@
:from-c translate-gpgme-user-id-t-from-foreign) :from-c translate-gpgme-user-id-t-from-foreign)
"A user ID from a key.") "A user ID from a key.")
;; FIXME: Doesn't this depend on endianess? ;; FIXME: Doesn't this depend on endianness?
(defbitfield (gpgme-user-id-bitfield :unsigned-int) (defbitfield (gpgme-user-id-bitfield :unsigned-int)
"The user ID bitfield." "The user ID bitfield."
(:revoked 1) (:revoked 1)
@ -501,7 +501,7 @@
:to-c translate-gpgme-key-t-to-foreign) :to-c translate-gpgme-key-t-to-foreign)
"A key from the keyring.") "A key from the keyring.")
;; FIXME: Doesn't this depend on endianess? ;; FIXME: Doesn't this depend on endianness?
(defbitfield (gpgme-key-bitfield :unsigned-int) (defbitfield (gpgme-key-bitfield :unsigned-int)
"The key bitfield." "The key bitfield."
(:revoked 1) (:revoked 1)
@ -1017,7 +1017,7 @@
:from-c translate-gpgme-signature-t-from-foreign) :from-c translate-gpgme-signature-t-from-foreign)
"A signature structure.") "A signature structure.")
;; FIXME: Doesn't this depend on endianess? ;; FIXME: Doesn't this depend on endianness?
(defbitfield (gpgme-signature-bitfield :unsigned-int) (defbitfield (gpgme-signature-bitfield :unsigned-int)
"The signature bitfield." "The signature bitfield."
(:wrong-key-usage 1) (:wrong-key-usage 1)
@ -1683,7 +1683,7 @@
;;; The release callback removes the stream from the *data-handles* ;;; The release callback removes the stream from the *data-handles*
;;; hash and releases the CBS structure that is used as the key in ;;; hash and releases the CBS structure that is used as the key in
;;; that hash. It is implicitely invoked (through GPGME) by ;;; that hash. It is implicitly invoked (through GPGME) by
;;; gpgme-data-release. ;;; gpgme-data-release.
(defcallback data-release-cb :void ((handle :pointer)) (defcallback data-release-cb :void ((handle :pointer))
(unwind-protect (remhash (pointer-address handle) *data-handles*) (unwind-protect (remhash (pointer-address handle) *data-handles*)
@ -1783,7 +1783,7 @@
(when *debug* (format t "DEBUG: gpgme-data-new: ~A~%" dh)) (when *debug* (format t "DEBUG: gpgme-data-new: ~A~%" dh))
dh)))) dh))))
;;; This function releases a GPGME data object. It implicitely ;;; This function releases a GPGME data object. It implicitly
;;; invokes the data-release-cb function to clean up associated junk. ;;; invokes the data-release-cb function to clean up associated junk.
(defun gpgme-data-release (dh) (defun gpgme-data-release (dh)
"Release a GPGME data object." "Release a GPGME data object."
@ -1907,7 +1907,7 @@
(:documentation "Set the protocol of CONTEXT to PROTOCOL.")) (:documentation "Set the protocol of CONTEXT to PROTOCOL."))
;;; FIXME: Adjust translator to reject invalid protocols. Currently, ;;; FIXME: Adjust translator to reject invalid protocols. Currently,
;;; specifing an invalid protocol throws a "NIL is not 32 signed int" ;;; specifying an invalid protocol throws a "NIL is not 32 signed int"
;;; error. This is suboptimal. ;;; error. This is suboptimal.
(defmethod (setf protocol) (protocol (ctx context)) (defmethod (setf protocol) (protocol (ctx context))
(gpgme-set-protocol ctx protocol)) (gpgme-set-protocol ctx protocol))

2
lang/cpp/README
View File

@ -43,7 +43,7 @@ pattern so the documentation for GPGME itself provides a good
way to start. way to start.
The context structure in GPGME is mapped to a Context object in The context structure in GPGME is mapped to a Context object in
GpgMEpp. Additional convienience code provides Data objects and GpgMEpp. Additional convenience code provides Data objects and
a Dataprovider interface that can be used to implement GPGME's a Dataprovider interface that can be used to implement GPGME's
data with any subclass by implementing the right callbacks. data with any subclass by implementing the right callbacks.

2
lang/cpp/src/key.h
View File

@ -163,7 +163,7 @@ public:
* Needs gnupg 2.1.13 and the key needs to be updated * Needs gnupg 2.1.13 and the key needs to be updated
* afterwards to see the new uid. * afterwards to see the new uid.
* *
* @param uid should be fully formated and UTF-8 encoded. * @param uid should be fully formatted and UTF-8 encoded.
* *
* @returns a possible error. * @returns a possible error.
**/ **/

2
lang/js/DemoExtension/maindemo.js
View File

@ -110,7 +110,7 @@ document.addEventListener('DOMContentLoaded', function () {
document.getElementById( document.getElementById(
'pubkey').value = keys[0].fingerprint; 'pubkey').value = keys[0].fingerprint;
} else if (keys.length > 1) { } else if (keys.length > 1) {
alert('The pattern was not unambigious enough for a Key. ' alert('The pattern was not unambiguous enough for a Key. '
+ keys.length + ' Keys were found'); + keys.length + ' Keys were found');
} else { } else {
alert('No keys found'); alert('No keys found');

2
lang/js/jsdoc_index.md
View File

@ -39,7 +39,7 @@ gnupg.
**Due to security constraints, the javascript-binding currently only offers **Due to security constraints, the javascript-binding currently only offers
limited support for secret-Key interaction.** limited support for secret-Key interaction.**
The existance of secret Keys is not secret, and those secret Keys can be used The existence of secret Keys is not secret, and those secret Keys can be used
for signing, but Operations that may expose, modify or delete secret Keys are for signing, but Operations that may expose, modify or delete secret Keys are
not supported. not supported.

2
lang/js/src/Helpers.js
View File

@ -171,7 +171,7 @@ export function atobArray (base64) {
* Taken and slightly adapted from * Taken and slightly adapted from
* https://www.onicos.com/staff/iz/amuse/javascript/expert/utf.txt * https://www.onicos.com/staff/iz/amuse/javascript/expert/utf.txt
* (original header: * (original header:
* utf.js - UTF-8 <=> UTF-16 convertion * utf.js - UTF-8 <=> UTF-16 conversion
* *
* Copyright (C) 1999 Masanao Izumo <iz@onicos.co.jp> * Copyright (C) 1999 Masanao Izumo <iz@onicos.co.jp>
* Version: 1.0 * Version: 1.0

2
lang/js/src/Key.js
View File

@ -94,7 +94,7 @@ class GPGME_Key {
/** /**
* Query any property of the Key listed in {@link validKeyProperties} * Query any property of the Key listed in {@link validKeyProperties}
* @param {String} property property to be retreived * @param {String} property property to be retrieved
* @returns {Boolean| String | Date | Array | Object} * @returns {Boolean| String | Date | Array | Object}
* @returns {Promise<Boolean| String | Date | Array | Object>} (if in async * @returns {Promise<Boolean| String | Date | Array | Object>} (if in async
* mode) * mode)

2
lang/js/src/Keyring.js
View File

@ -384,7 +384,7 @@ export class GPGME_Keyring {
* @param {String} option.userId The user Id, e.g. 'Foo Bar <foo@bar.baz>' * @param {String} option.userId The user Id, e.g. 'Foo Bar <foo@bar.baz>'
* @param {String} option.algo (optional) algorithm (and optionally key * @param {String} option.algo (optional) algorithm (and optionally key
* size) to be used. See {@link supportedKeyAlgos} below for supported * size) to be used. See {@link supportedKeyAlgos} below for supported
* values. If ommitted, 'default' is used. * values. If omitted, 'default' is used.
* @param {Number} option.expires (optional) Expiration time in seconds * @param {Number} option.expires (optional) Expiration time in seconds
* from now. If not set or set to 0, expiration will be 'never' * from now. If not set or set to 0, expiration will be 'never'
* *

16
lang/python/doc/meta/old-commits.log
View File

@ -420,7 +420,7 @@ Date: Sat May 2 10:28:42 2015 +1000
Updated Makefile Updated Makefile
* set make to use python3 instead. * set make to use python3 instead.
* This will mean a successful port may need to be maintained seperately * This will mean a successful port may need to be maintained separately
from the original python2 code instead of merged, but ought to be able from the original python2 code instead of merged, but ought to be able
to share most things. So maybe merge with separated make files or a to share most things. So maybe merge with separated make files or a
pre-make script to set python2 or python3 prior to building ... decide pre-make script to set python2 or python3 prior to building ... decide
@ -1934,7 +1934,7 @@ commit 45e8a5f4e13d3ca797ec3b0037242874a6be5562
Author: belyi <devnull@localhost> Author: belyi <devnull@localhost>
Date: Sat Mar 26 19:44:18 2005 +0000 Date: Sat Mar 26 19:44:18 2005 +0000
Updated verion number to 0.6.2 in version.py Updated version number to 0.6.2 in version.py
Added examples/*.glade files into documentation package. Added examples/*.glade files into documentation package.
pyme/debian/examples | 1 + pyme/debian/examples | 1 +
@ -1997,7 +1997,7 @@ Author: belyi <devnull@localhost>
Date: Fri Mar 25 04:30:17 2005 +0000 Date: Fri Mar 25 04:30:17 2005 +0000
Improved PyGtkGpgKeys example to manage owner_trust on keys. Improved PyGtkGpgKeys example to manage owner_trust on keys.
Added another example inter-edit.py which is just a hepler to write Added another example inter-edit.py which is just a helper to write
scripts for Context.op_edit() command. scripts for Context.op_edit() command.
pyme/examples/PyGtkGpgKeys.glade | 78 ++++++++++++++++++++++++++++++++++++++++ pyme/examples/PyGtkGpgKeys.glade | 78 ++++++++++++++++++++++++++++++++++++++++
@ -2011,7 +2011,7 @@ Author: belyi <devnull@localhost>
Date: Fri Mar 25 00:30:39 2005 +0000 Date: Fri Mar 25 00:30:39 2005 +0000
Updated PyGtkGpgKeys example to include import, export and reload Updated PyGtkGpgKeys example to include import, export and reload
functionality. Also added ability to remove number of keys simultanously. functionality. Also added ability to remove number of keys simultaneously.
Rearanged how KeyColumn is used to avoid unnecessary sorts and duplication Rearanged how KeyColumn is used to avoid unnecessary sorts and duplication
of information in different parts of the code. of information in different parts of the code.
@ -2035,7 +2035,7 @@ commit 59e23f32c3b46413c9ec09e23e1a385a110fb103
Author: belyi <devnull@localhost> Author: belyi <devnull@localhost>
Date: Thu Mar 24 05:44:58 2005 +0000 Date: Thu Mar 24 05:44:58 2005 +0000
Added wait method Context class which handles asynchornous calls a little Added wait method Context class which handles asynchronous calls a little
bit better than the one generated by SWIG. bit better than the one generated by SWIG.
pyme/debian/changelog | 7 +++++++ pyme/debian/changelog | 7 +++++++
@ -2101,7 +2101,7 @@ Date: Fri Mar 18 19:09:33 2005 +0000
Added package building for python2.4 Added package building for python2.4
Updated copyright notes to include myslef and avoid confusion who's the Updated copyright notes to include myself and avoid confusion who's the
maintainer. In John's own words: "I'd prefer to just step out of the picture". maintainer. In John's own words: "I'd prefer to just step out of the picture".
Jonh's copyright notice left intact. Jonh's copyright notice left intact.
@ -2182,7 +2182,7 @@ Date: Thu Apr 8 16:15:09 2004 +0000
Ensure that we support only python2.2 and up. :-) Ensure that we support only python2.2 and up. :-)
Use generators in core.Context class which makes pyme.aux obsolete Use generators in core.Context class which makes pyme.aux obsolete
Remove importing future nested_scopes since they are standart starting Remove importing future nested_scopes since they are standard starting
with python2.2 with python2.2
pyme/pyme/__init__.py | 5 ++--- pyme/pyme/__init__.py | 5 ++---
@ -2293,7 +2293,7 @@ commit af7129baa8260697d85c2ddb434562e8a80b62d8
Author: belyi <devnull@localhost> Author: belyi <devnull@localhost>
Date: Sat Mar 20 20:15:53 2004 +0000 Date: Sat Mar 20 20:15:53 2004 +0000
Added minimum of formating and SF icon. Added minimum of formatting and SF icon.
pyme-web/index.html | 18 +++++++++++------- pyme-web/index.html | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-) 1 file changed, 11 insertions(+), 7 deletions(-)

6
lang/python/doc/rst/gpgme-python-howto.rst
View File

@ -1063,7 +1063,7 @@ obtained.
#. Import from ProtonMail via HKP for Python Example no. 1 #. Import from ProtonMail via HKP for Python Example no. 1
The following script is avalable with the rest of the examples under The following script is available with the rest of the examples under
the somewhat less than original name, ``pmkey-import-hkp.py``. the somewhat less than original name, ``pmkey-import-hkp.py``.
.. code:: python .. code:: python
@ -1814,7 +1814,7 @@ to any preconfigured keys set in the ``gpg.conf`` file:
with open("secret_plans.txt.asc", "wb") as afile: with open("secret_plans.txt.asc", "wb") as afile:
afile.write(ciphertext) afile.write(ciphertext)
If the ``recipients`` paramater is empty then the plaintext is encrypted If the ``recipients`` parameter is empty then the plaintext is encrypted
symmetrically. If no ``passphrase`` is supplied as a parameter or via a symmetrically. If no ``passphrase`` is supplied as a parameter or via a
callback registered with the ``Context()`` then an out-of-band prompt callback registered with the ``Context()`` then an out-of-band prompt
for the passphrase via pinentry will be invoked. for the passphrase via pinentry will be invoked.
@ -2592,7 +2592,7 @@ demonstrable. One of the better and easier examples being the one of the
early examples in this HOWTO, the `key early examples in this HOWTO, the `key
counting <#howto-keys-counting>`__ code. Running that example as an counting <#howto-keys-counting>`__ code. Running that example as an
executable Python script, ``keycount.py`` (available in the executable Python script, ``keycount.py`` (available in the
``examples/howto/`` directory), will take a noticable amount of time to ``examples/howto/`` directory), will take a noticeable amount of time to
run on most systems where the public keybox or keyring contains a few run on most systems where the public keybox or keyring contains a few
thousand public keys. thousand public keys.

6
lang/python/doc/src/gpgme-python-howto
View File

@ -1108,7 +1108,7 @@ address can be obtained.
:CUSTOM_ID: import-hkp4py-pm1 :CUSTOM_ID: import-hkp4py-pm1
:END: :END:
The following script is avalable with the rest of the examples under The following script is available with the rest of the examples under
the somewhat less than original name, =pmkey-import-hkp.py=. the somewhat less than original name, =pmkey-import-hkp.py=.
#+BEGIN_SRC python -i #+BEGIN_SRC python -i
@ -1869,7 +1869,7 @@ with open("secret_plans.txt.asc", "wb") as afile:
afile.write(ciphertext) afile.write(ciphertext)
#+END_SRC #+END_SRC
If the =recipients= paramater is empty then the plaintext is encrypted If the =recipients= parameter is empty then the plaintext is encrypted
symmetrically. If no =passphrase= is supplied as a parameter or via a symmetrically. If no =passphrase= is supplied as a parameter or via a
callback registered with the =Context()= then an out-of-band prompt callback registered with the =Context()= then an out-of-band prompt
for the passphrase via pinentry will be invoked. for the passphrase via pinentry will be invoked.
@ -2662,7 +2662,7 @@ Nevertheless, there are some situations where the benefits are
demonstrable. One of the better and easier examples being the one of demonstrable. One of the better and easier examples being the one of
the early examples in this HOWTO, the [[#howto-keys-counting][key counting]] code. Running that the early examples in this HOWTO, the [[#howto-keys-counting][key counting]] code. Running that
example as an executable Python script, =keycount.py= (available in example as an executable Python script, =keycount.py= (available in
the =examples/howto/= directory), will take a noticable amount of time the =examples/howto/= directory), will take a noticeable amount of time
to run on most systems where the public keybox or keyring contains a to run on most systems where the public keybox or keyring contains a
few thousand public keys. few thousand public keys.

6
lang/python/doc/texinfo/gpgme-python-howto.texi
View File

@ -1249,7 +1249,7 @@ address can be obtained.
Import from ProtonMail via HKP for Python Example no. 1 Import from ProtonMail via HKP for Python Example no. 1
The following script is avalable with the rest of the examples under The following script is available with the rest of the examples under
the somewhat less than original name, @samp{pmkey-import-hkp.py}. the somewhat less than original name, @samp{pmkey-import-hkp.py}.
@example @example
@ -2006,7 +2006,7 @@ with open("secret_plans.txt.asc", "wb") as afile:
afile.write(ciphertext) afile.write(ciphertext)
@end example @end example
If the @samp{recipients} paramater is empty then the plaintext is encrypted If the @samp{recipients} parameter is empty then the plaintext is encrypted
symmetrically. If no @samp{passphrase} is supplied as a parameter or via a symmetrically. If no @samp{passphrase} is supplied as a parameter or via a
callback registered with the @samp{Context()} then an out-of-band prompt callback registered with the @samp{Context()} then an out-of-band prompt
for the passphrase via pinentry will be invoked. for the passphrase via pinentry will be invoked.
@ -2774,7 +2774,7 @@ Nevertheless, there are some situations where the benefits are
demonstrable. One of the better and easier examples being the one of demonstrable. One of the better and easier examples being the one of
the early examples in this HOWTO, the @ref{Counting keys, , key counting} code. Running that the early examples in this HOWTO, the @ref{Counting keys, , key counting} code. Running that
example as an executable Python script, @samp{keycount.py} (available in example as an executable Python script, @samp{keycount.py} (available in
the @samp{examples/howto/} directory), will take a noticable amount of time the @samp{examples/howto/} directory), will take a noticeable amount of time
to run on most systems where the public keybox or keyring contains a to run on most systems where the public keybox or keyring contains a
few thousand public keys. few thousand public keys.

2
lang/python/helpers.c
View File

@ -914,7 +914,7 @@ static ssize_t pyDataWriteCb(void *hook, const void *buffer, size_t size)
} }
/* Set the current position from where the next read or write starts /* Set the current position from where the next read or write starts
in the data object with the handle HOOK to OFFSET, relativ to in the data object with the handle HOOK to OFFSET, relative to
WHENCE. Returns the new offset in bytes from the beginning of the WHENCE. Returns the new offset in bytes from the beginning of the
data object. */ data object. */
static off_t pyDataSeekCb(void *hook, off_t offset, int whence) static off_t pyDataSeekCb(void *hook, off_t offset, int whence)

2
lang/python/tests/t-quick-key-manipulation.py
View File

@ -82,7 +82,7 @@ with support.EphemeralContext() as ctx:
# try to revoke a non-existent UID # try to revoke a non-existent UID
try: try:
ctx.key_revoke_uid(key, "i dont exist") ctx.key_revoke_uid(key, "i don't exist")
# IMHO this should fail. issue2963. # IMHO this should fail. issue2963.
# assert False, "Expected an error but got none" # assert False, "Expected an error but got none"
except gpg.errors.GpgError: except gpg.errors.GpgError:

6
lang/qt/README
View File

@ -3,7 +3,7 @@ Qt API bindings/wrapper for GPGME
Based on KF5gpgmepp QGpgME and libkleo/backends/qgpgme Based on KF5gpgmepp QGpgME and libkleo/backends/qgpgme
Please note that QGpgME has a different license (GPL only) Please note that QGpgME has a different license (GPL only)
then GPGME itself. See the License secion in this then GPGME itself. See the License section in this
document for more information. document for more information.
Overview Overview
@ -47,14 +47,14 @@ for API stability reasons.
Some jobs like the verification or decryption jobs have Some jobs like the verification or decryption jobs have
dedicated result classes. Each result class at least dedicated result classes. Each result class at least
has the member function error() that can be used has the member function error() that can be used
to check if a job failed. Additionally errors are emited to check if a job failed. Additionally errors are emitted
in the result signal. in the result signal.
Jobs also provide progress signal whenever GnuPG emits Jobs also provide progress signal whenever GnuPG emits
a progress status line. a progress status line.
Most jobs also provide a way synchronusly execute them. Most jobs also provide a way synchronusly execute them.
Please not that synchronus use does not cause the autodeletion Please not that synchronous use does not cause the autodeletion
to take place so you have to manually delete them. to take place so you have to manually delete them.
Async usage: Async usage:

6
lang/qt/doc/Doxyfile.in
View File

@ -1092,7 +1092,7 @@ HTML_STYLESHEET =
# cascading style sheets that are included after the standard style sheets # cascading style sheets that are included after the standard style sheets
# created by doxygen. Using this option one can overrule certain style aspects. # created by doxygen. Using this option one can overrule certain style aspects.
# This is preferred over using HTML_STYLESHEET since it does not replace the # This is preferred over using HTML_STYLESHEET since it does not replace the
# standard style sheet and is therefor more robust against future updates. # standard style sheet and is therefore more robust against future updates.
# Doxygen will copy the style sheet files to the output directory. # Doxygen will copy the style sheet files to the output directory.
# Note: The order of the extra stylesheet files is of importance (e.g. the last # Note: The order of the extra stylesheet files is of importance (e.g. the last
# stylesheet in the list overrules the setting of the previous ones in the # stylesheet in the list overrules the setting of the previous ones in the
@ -1635,8 +1635,8 @@ EXTRA_PACKAGES =
# Note: Only use a user-defined header if you know what you are doing! The # Note: Only use a user-defined header if you know what you are doing! The
# following commands have a special meaning inside the header: $title, # following commands have a special meaning inside the header: $title,
# $datetime, $date, $doxygenversion, $projectname, $projectnumber, # $datetime, $date, $doxygenversion, $projectname, $projectnumber,
# $projectbrief, $projectlogo. Doxygen will replace $title with the empy string, # $projectbrief, $projectlogo. Doxygen will replace $title with the empty string,
# for the replacement values of the other commands the user is refered to # for the replacement values of the other commands the user is referred to
# HTML_HEADER. # HTML_HEADER.
# This tag requires that the tag GENERATE_LATEX is set to YES. # This tag requires that the tag GENERATE_LATEX is set to YES.

2
lang/qt/src/dn.h
View File

@ -83,7 +83,7 @@ public:
const_iterator begin() const; const_iterator begin() const;
const_iterator end() const; const_iterator end() const;
/** Set the order in which prettyDN will reorder the Attirbutes. */ /** Set the order in which prettyDN will reorder the Attributes. */
void setAttributeOrder(const QStringList &order) const; void setAttributeOrder(const QStringList &order) const;
/** Get the used attribute order. */ /** Get the used attribute order. */

4
lang/qt/src/wkspublishjob.h
View File

@ -53,7 +53,7 @@ namespace QGpgME {
* send the RFC822 mail returned in returnedData. * send the RFC822 mail returned in returnedData.
* *
* When the response is received start a startRecieve with the * When the response is received start a startRecieve with the
* RFC822 mail received as paramater response. Check for errors * RFC822 mail received as parameter response. Check for errors
* and then send again send the result from returnedData back to * and then send again send the result from returnedData back to
* the server. * the server.
* *
@ -87,7 +87,7 @@ public:
*/ */
virtual void startCreate(const char *fpr, const QString &mailbox) = 0; virtual void startCreate(const char *fpr, const QString &mailbox) = 0;
/** Handle a submisson response. The returnedData in the result singnal /** Handle a submission response. The returnedData in the result singnal
* will contain the confirmation response as returned by gpg-wks-client --receive * will contain the confirmation response as returned by gpg-wks-client --receive
* *
* @param response The response of the server. * @param response The response of the server.

2
lang/qt/tests/t-encrypt.cpp
View File

@ -303,7 +303,7 @@ private:
killAgent(mDir.path()); killAgent(mDir.path());
/* Now create a new homedir which with we test symetric decrypt. */ /* Now create a new homedir which with we test symmetric decrypt. */
QTemporaryDir tmp; QTemporaryDir tmp;
qputenv("GNUPGHOME", tmp.path().toUtf8()); qputenv("GNUPGHOME", tmp.path().toUtf8());
QFile agentConf(tmp.path() + QStringLiteral("/gpg-agent.conf")); QFile agentConf(tmp.path() + QStringLiteral("/gpg-agent.conf"));

6
m4/glib-2.0.m4
View File

@ -116,7 +116,7 @@ main ()
glib_major_version, glib_minor_version, glib_micro_version); glib_major_version, glib_minor_version, glib_micro_version);
printf ("*** was found! If pkg-config was correct, then it is best\n"); printf ("*** was found! If pkg-config was correct, then it is best\n");
printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n");
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
printf("*** required on your system.\n"); printf("*** required on your system.\n");
printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
@ -152,7 +152,7 @@ main ()
printf("*** being found. The easiest way to fix this is to remove the old version\n"); printf("*** being found. The easiest way to fix this is to remove the old version\n");
printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
printf("*** correct copy of pkg-config. (In this case, you will have to\n"); printf("*** correct copy of pkg-config. (In this case, you will have to\n");
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
printf("*** so that the correct libraries are found at run-time))\n"); printf("*** so that the correct libraries are found at run-time))\n");
} }
} }
@ -194,7 +194,7 @@ main ()
echo "*** If you have an old version installed, it is best to remove it, although" echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
[ echo "*** The test program failed to compile or link. See the file config.log for the" [ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) echo "*** exact error that occurred. This usually means GLIB is incorrectly installed."])
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
fi fi

2
m4/gpg-error.m4
View File

@ -17,7 +17,7 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
dnl dnl
dnl Test for libgpg-error and define GPG_ERROR_CFLAGS, GPG_ERROR_LIBS, dnl Test for libgpg-error and define GPG_ERROR_CFLAGS, GPG_ERROR_LIBS,
dnl GPG_ERROR_MT_CFLAGS, and GPG_ERROR_MT_LIBS. The _MT_ variants are dnl GPG_ERROR_MT_CFLAGS, and GPG_ERROR_MT_LIBS. The _MT_ variants are
dnl used for programs requireing real multi thread support. dnl used for programs requiring real multi thread support.
dnl dnl
dnl If a prefix option is not used, the config script is first dnl If a prefix option is not used, the config script is first
dnl searched in $SYSROOT/bin and then along $PATH. If the used dnl searched in $SYSROOT/bin and then along $PATH. If the used

2
m4/python.m4
View File

@ -2,7 +2,7 @@
## Python file handling ## Python file handling
## From Andrew Dalke ## From Andrew Dalke
## Updated by James Henstridge ## Updated by James Henstridge
## Upated by Werner Koch 2018-10-17 ## Updated by Werner Koch 2018-10-17
## --------------------------------- ## ---------------------------------
# Copyright (C) 1999-2017 Free Software Foundation, Inc. # Copyright (C) 1999-2017 Free Software Foundation, Inc.
# #

2
m4/qt.m4
View File

@ -56,7 +56,7 @@ AC_DEFUN([FIND_QT],
fi fi
AC_MSG_RESULT([$mocversion]) AC_MSG_RESULT([$mocversion])
dnl Check that a binary can actually be build with this qt. dnl Check that a binary can actually be build with this qt.
dnl pkg-config may be set up in a way that it looks also for libaries dnl pkg-config may be set up in a way that it looks also for libraries
dnl of the build system and not only for the host system. In that case dnl of the build system and not only for the host system. In that case
dnl we check here that we can actually compile / link a qt application dnl we check here that we can actually compile / link a qt application
dnl for host. dnl for host.

58
src/ChangeLog-2011
View File

@ -514,7 +514,7 @@
* engine-backend.h (struct engine_ops): Add PASSWD. * engine-backend.h (struct engine_ops): Add PASSWD.
* engine-gpgsm.c (gpgsm_passwd): New. * engine-gpgsm.c (gpgsm_passwd): New.
(_gpgme_engine_ops_gpgsm): Register. (_gpgme_engine_ops_gpgsm): Register.
(gpgsm_reset): Reset only if we have a conenction. (gpgsm_reset): Reset only if we have a connection.
* gpgme.h.in (GPGME_PK_ECDSA, GPGME_PK_ECDH): New. * gpgme.h.in (GPGME_PK_ECDSA, GPGME_PK_ECDH): New.
* gpgme.c (gpgme_pubkey_algo_name): Add them. * gpgme.c (gpgme_pubkey_algo_name): Add them.
@ -934,7 +934,7 @@
* engine-backend.h: Define with [ENABLE_ASSUAN] instead * engine-backend.h: Define with [ENABLE_ASSUAN] instead
of [ENABLE_GPGSM]. of [ENABLE_GPGSM].
* posix-io.c (_gpgme_io_waitpid): Make non-static. * posix-io.c (_gpgme_io_waitpid): Make non-static.
* util.h (ENABLE_ASSUAN): Declar _gpgme_assuan_system_hooks, * util.h (ENABLE_ASSUAN): Declare _gpgme_assuan_system_hooks,
_gpgme_assuan_malloc_hooks, _gpgme_assuan_log_cb. _gpgme_assuan_malloc_hooks, _gpgme_assuan_log_cb.
* engine-gpgsm.c: Don't map assuan error codes. Use * engine-gpgsm.c: Don't map assuan error codes. Use
assuan_release instead of assuan_disconnect. assuan_release instead of assuan_disconnect.
@ -1401,7 +1401,7 @@
2008-06-19 Werner Koch <wk@g10code.com> 2008-06-19 Werner Koch <wk@g10code.com>
* gpgme.h (GPGME_CONF_PATHNAME): Replace by GPGME_CONF_FILENAME, * gpgme.h (GPGME_CONF_PATHNAME): Replace by GPGME_CONF_FILENAME,
change all callers and provide compatibilty macro. change all callers and provide compatibility macro.
(gpgme_conf_type_t): Add complex types 34..37. (gpgme_conf_type_t): Add complex types 34..37.
* engine-gpgconf.c (gpgconf_parse_option, arg_to_data) * engine-gpgconf.c (gpgconf_parse_option, arg_to_data)
(_gpgme_conf_arg_new, _gpgme_conf_arg_release): Add new types. (_gpgme_conf_arg_new, _gpgme_conf_arg_release): Add new types.
@ -1806,7 +1806,7 @@
2007-07-12 Marcus Brinkmann <marcus@g10code.de> 2007-07-12 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am: Replace implicite rule by suffix rule. Add * Makefile.am: Replace implicit rule by suffix rule. Add
SUFFIXES for that. SUFFIXES for that.
2007-07-12 Werner Koch <wk@g10code.com> 2007-07-12 Werner Koch <wk@g10code.com>
@ -2029,7 +2029,7 @@
2006-03-06 Marcus Brinkmann <marcus@g10code.de> 2006-03-06 Marcus Brinkmann <marcus@g10code.de>
* gpgme-config.in (cflags_pth): Revert accidential removal of * gpgme-config.in (cflags_pth): Revert accidental removal of
pthread support with last change. pthread support with last change.
2006-02-28 Marcus Brinkmann <marcus@g10code.de> 2006-02-28 Marcus Brinkmann <marcus@g10code.de>
@ -2052,7 +2052,7 @@
2006-02-15 Marcus Brinkmann <marcus@g10code.de> 2006-02-15 Marcus Brinkmann <marcus@g10code.de>
* w32-io.c (create_writer): Make C->have_data a manually resetted * w32-io.c (create_writer): Make C->have_data a manually reset
event. event.
(writer): Move code from end of if block to beginning, so it (writer): Move code from end of if block to beginning, so it
is also run the first time. is also run the first time.
@ -2368,7 +2368,7 @@
* gpgme.def: New. * gpgme.def: New.
* versioninfo.rc.in: New. * versioninfo.rc.in: New.
* Makefile.am: Addes support for building a W32 DLL. * Makefile.am: Adds support for building a W32 DLL.
* ttyname_r.c (ttyname_r) [W32]: Return error. * ttyname_r.c (ttyname_r) [W32]: Return error.
* ath-compat.c [W32]: select and co are not yet supported; return * ath-compat.c [W32]: select and co are not yet supported; return
@ -2779,7 +2779,7 @@
2004-03-03 Werner Koch <wk@gnupg.org> 2004-03-03 Werner Koch <wk@gnupg.org>
* engine-gpgsm.c (gpgsm_export_ext): Properly insert a space * engine-gpgsm.c (gpgsm_export_ext): Properly insert a space
beween patterns. between patterns.
2004-02-18 Werner Koch <wk@gnupg.org> 2004-02-18 Werner Koch <wk@gnupg.org>
@ -3132,23 +3132,23 @@
* engine.h: Likewise for _gpgme_engine_op_export and * engine.h: Likewise for _gpgme_engine_op_export and
_gpgme_engine_op_export_ext. _gpgme_engine_op_export_ext.
* engine-backend.h (struct engine_ops): Change second argument of * engine-backend.h (struct engine_ops): Change second argument of
prototype of export to const char *, and add reserverd int as prototype of export to const char *, and add reserved int as
third argument. Add prototype for export_ext. third argument. Add prototype for export_ext.
* engine.c (_gpgme_engine_op_export_ext): New function. * engine.c (_gpgme_engine_op_export_ext): New function.
(_gpgme_engine_op_export): Change second argument of prototype of (_gpgme_engine_op_export): Change second argument of prototype of
export to const char *, and add reserverd int as third argument. export to const char *, and add reserved int as third argument.
* rungpg.c (gpg_export): Change second argument of prototype of * rungpg.c (gpg_export): Change second argument of prototype of
export to const char *, and add reserverd int as third argument. export to const char *, and add reserved int as third argument.
(gpg_export_ext): New function. (gpg_export_ext): New function.
(gpg_keylist_ext): Break loop at error. (gpg_keylist_ext): Break loop at error.
(_gpgme_engine_ops_gpg): Add gpg_export_ext. (_gpgme_engine_ops_gpg): Add gpg_export_ext.
* engine-gpgsm.c (gpgsm_export): Change second argument of * engine-gpgsm.c (gpgsm_export): Change second argument of
prototype of export to const char *, and add reserverd int as prototype of export to const char *, and add reserved int as
third argument. third argument.
(gpgsm_export_ext): New function. (gpgsm_export_ext): New function.
(_gpgme_engine_ops_gpgsm): Add gpgsm_export_ext. (_gpgme_engine_ops_gpgsm): Add gpgsm_export_ext.
* export.c (export_start): Change second argument of prototype of * export.c (export_start): Change second argument of prototype of
export to const char *, and add reserverd int as third argument. export to const char *, and add reserved int as third argument.
(gpgme_op_export_start): Likewise. (gpgme_op_export_start): Likewise.
(export_ext_start): New function. (export_ext_start): New function.
(gpgme_op_export_ext_start): Likewise. (gpgme_op_export_ext_start): Likewise.
@ -5109,7 +5109,7 @@
* key.h (struct certsig_s): New. Use it in gpgme_key_s. * key.h (struct certsig_s): New. Use it in gpgme_key_s.
* key.c (gpgme_key_release): Release it. We need to add more code * key.c (gpgme_key_release): Release it. We need to add more code
of course. of course.
(_gpgme_key_append_name): Use memset to intialize the struct. (_gpgme_key_append_name): Use memset to initialize the struct.
* gpgme.h (GPGME_KEYLIST_MODE_SIGS): New. * gpgme.h (GPGME_KEYLIST_MODE_SIGS): New.
* rungpg.c (_gpgme_gpg_op_keylist): Include sigs in listing depending * rungpg.c (_gpgme_gpg_op_keylist): Include sigs in listing depending
non the list mode. non the list mode.
@ -5217,7 +5217,7 @@
2002-07-27 Marcus Brinkmann <marcus@g10code.de> 2002-07-27 Marcus Brinkmann <marcus@g10code.de>
* delete.c (delete_problem): New case ambigious specification. * delete.c (delete_problem): New case ambiguous specification.
(delete_status_handler): Handle new case (poorly). (delete_status_handler): Handle new case (poorly).
2002-07-25 Marcus Brinkmann <marcus@g10code.de> 2002-07-25 Marcus Brinkmann <marcus@g10code.de>
@ -5338,8 +5338,8 @@
* import.c (append_xml_impinfo): Kludge to print fingerprint * import.c (append_xml_impinfo): Kludge to print fingerprint
instead of keyid for use with gpgsm. instead of keyid for use with gpgsm.
(import_status_handler): Set a flag to know whether any import (import_status_handler): Set a flag to know whether any import
occured. occurred.
(gpgme_op_import): Reurn -1 if no certificate ewas imported. (gpgme_op_import): Return -1 if no certificate ewas imported.
2002-06-25 Werner Koch <wk@gnupg.org> 2002-06-25 Werner Koch <wk@gnupg.org>
@ -5364,7 +5364,7 @@
(gpgsm_status_handler): Use parse_status. (gpgsm_status_handler): Use parse_status.
(gpgsm_assuan_simple_command): Accept new arguments STATUS_FNC and (gpgsm_assuan_simple_command): Accept new arguments STATUS_FNC and
STATUS_FNC_VALUE and process status messages. STATUS_FNC_VALUE and process status messages.
(gpgsm_set_recipients): Pass new arugments to gpgsm_assuan_simple_command. (gpgsm_set_recipients): Pass new arguments to gpgsm_assuan_simple_command.
(gpgsm_set_fd): Likewise. (gpgsm_set_fd): Likewise.
(_gpgme_gpgsm_op_keylist): Likewise. (_gpgme_gpgsm_op_keylist): Likewise.
(_gpgme_gpgsm_op_keylist_ext): Likewise. (_gpgme_gpgsm_op_keylist_ext): Likewise.
@ -5397,7 +5397,7 @@
2002-06-13 Werner Koch <wk@gnupg.org> 2002-06-13 Werner Koch <wk@gnupg.org>
* verify.c (gpgme_op_verify): Make sure that we never access an * verify.c (gpgme_op_verify): Make sure that we never access an
unitialized result structure. uninitialized result structure.
2002-06-12 Werner Koch <wk@gnupg.org> 2002-06-12 Werner Koch <wk@gnupg.org>
@ -5701,7 +5701,7 @@
(_gpgme_key_cache_get): Likewise. (_gpgme_key_cache_get): Likewise.
(gpgme_key_ref, gpgme_key_release): Lock the key_ref_lock. (gpgme_key_ref, gpgme_key_release): Lock the key_ref_lock.
* import.c (append_xml_impinfo): Make IMPORTED_FIELDS and * import.c (append_xml_impinfo): Make IMPORTED_FIELDS and
IMPORT_RES_FIELDS very const. Make FIELD and FIELD_NAME a litle IMPORT_RES_FIELDS very const. Make FIELD and FIELD_NAME a little
const. const.
* engine.c (_gpgme_engine_get_info): New variable * engine.c (_gpgme_engine_get_info): New variable
ENGINE_INFO_LOCK. Take lock while determining engine info. ENGINE_INFO_LOCK. Take lock while determining engine info.
@ -6058,7 +6058,7 @@
flagged and EOF is not received. One problem is that the engine flagged and EOF is not received. One problem is that the engine
status handlers don't have access to the context, a horrible status handlers don't have access to the context, a horrible
kludge works around this for now. All errors that happen during a kludge works around this for now. All errors that happen during a
pending operation should be catched and reported in ctx->error, pending operation should be caught and reported in ctx->error,
including out-of-core and cancellation. This rounds up neatly a including out-of-core and cancellation. This rounds up neatly a
couple of loose ends, and makes it possible to pass up any errors couple of loose ends, and makes it possible to pass up any errors
in the communication with the backend as well. As a bonus, there in the communication with the backend as well. As a bonus, there
@ -6424,7 +6424,7 @@
(gpgsm_assuan_simple_command): Removed underscore from (gpgsm_assuan_simple_command): Removed underscore from
assuan_write_line. assuan_write_line.
(_gpgme_gpgsm_start): Ditto. (_gpgme_gpgsm_start): Ditto.
(gpgsm_assuan_simple_command): Replaced interal Assuan read (gpgsm_assuan_simple_command): Replaced internal Assuan read
function by the new assuan_read_line. Removed the use of the function by the new assuan_read_line. Removed the use of the
internal header. internal header.
(gpgsm_status_handler): Ditto. Use the new assuan_pending_line. (gpgsm_status_handler): Ditto. Use the new assuan_pending_line.
@ -6516,7 +6516,7 @@
2001-11-22 Marcus Brinkmann <marcus@g10code.de> 2001-11-22 Marcus Brinkmann <marcus@g10code.de>
* engine-gpgsm.c: Shuffle around header inclusion a bit, to still * engine-gpgsm.c: Shuffle around header inclusion a bit, to still
keep them seperate. keep them separate.
(_gpgme_set_status_handler) [!ENABLE_GPGSM]: New function. (_gpgme_set_status_handler) [!ENABLE_GPGSM]: New function.
2001-11-22 Werner Koch <wk@gnupg.org> 2001-11-22 Werner Koch <wk@gnupg.org>
@ -6726,7 +6726,7 @@
passphrase result. passphrase result.
(_gpgme_release_decrypt_result): Don't release removed members. (_gpgme_release_decrypt_result): Don't release removed members.
(decrypt_status_handler): Call _gpgme_passphrase_status_handler, (decrypt_status_handler): Call _gpgme_passphrase_status_handler,
and don't handle the cases catched there. and don't handle the cases caught there.
(command_handler): Removed. (command_handler): Removed.
(gpgme_op_decrypt_start): Don't set command handler, but invoke (gpgme_op_decrypt_start): Don't set command handler, but invoke
_gpgme_passphrase_start which does it. _gpgme_passphrase_start which does it.
@ -6739,7 +6739,7 @@
passphrase result. passphrase result.
(_gpgme_release_sign_result): Don't release removed members. (_gpgme_release_sign_result): Don't release removed members.
(sign_status_handler): Call _gpgme_passphrase_status_handler, (sign_status_handler): Call _gpgme_passphrase_status_handler,
and don't handle the cases catched there. and don't handle the cases caught there.
(command_handler): Removed. (command_handler): Removed.
(gpgme_op_sign_start): Don't set command handler, but invoke (gpgme_op_sign_start): Don't set command handler, but invoke
_gpgme_passphrase_start which does it. _gpgme_passphrase_start which does it.
@ -6976,7 +6976,7 @@
* key.h: New keyflags for capabilities. * key.h: New keyflags for capabilities.
* keylist.c (set_mainkey_capability, set_subkey_capability): New. * keylist.c (set_mainkey_capability, set_subkey_capability): New.
(keylist_colon_handler): Parse them. (keylist_colon_handler): Parse them.
* gpgme.h: New attribute values for capabilties. * gpgme.h: New attribute values for capabilities.
* key.c (gpgme_key_get_string_attr): Return them. * key.c (gpgme_key_get_string_attr): Return them.
(capabilities_to_string): New. (capabilities_to_string): New.
(gpgme_key_get_ulong_attr): Return the global caps. (gpgme_key_get_ulong_attr): Return the global caps.
@ -7006,9 +7006,9 @@
* w32-io.c (destroy_reader): Set stop_me flag. * w32-io.c (destroy_reader): Set stop_me flag.
(writer,create_writer,destroy_writer,find_writer,kill_writer): New. (writer,create_writer,destroy_writer,find_writer,kill_writer): New.
(_gpgme_io_write): Use a writer thread to avaoid blocking. (_gpgme_io_write): Use a writer thread to avoid blocking.
(_gpgme_io_close): Cleanup a writer thread (_gpgme_io_close): Cleanup a writer thread
(_gpgme_io_select): Repalce tthe faked wait on writing by a real (_gpgme_io_select): Repalce the faked wait on writing by a real
waiting which is now possible due to the use of a writer thread. waiting which is now possible due to the use of a writer thread.
2001-02-20 Werner Koch <wk@gnupg.org> 2001-02-20 Werner Koch <wk@gnupg.org>
@ -7109,7 +7109,7 @@
* w32-io.c: Does now use reader threads, so that we can use * w32-io.c: Does now use reader threads, so that we can use
WaitForMultipleObjects. WaitForMultipleObjects.
* sema.h, posix-sema.c, w32-sema.c: Support for Critcial sections. * sema.h, posix-sema.c, w32-sema.c: Support for Critical sections.
Does currently only work for W32. Does currently only work for W32.
* debug.c, util.h : New. Changed all fprintfs to use this new * debug.c, util.h : New. Changed all fprintfs to use this new

6
src/argparse.c
View File

@ -417,7 +417,7 @@ static void
store_alias( ARGPARSE_ARGS *arg, char *name, char *value ) store_alias( ARGPARSE_ARGS *arg, char *name, char *value )
{ {
/* TODO: replace this dummy function with a rea one /* TODO: replace this dummy function with a rea one
* and fix the probelms IRIX has with (ALIAS_DEV)arg.. * and fix the problems IRIX has with (ALIAS_DEV)arg..
* used as lvalue * used as lvalue
*/ */
(void)arg; (void)arg;
@ -448,7 +448,7 @@ ignore_invalid_option_p (ARGPARSE_ARGS *arg, const char *keyword)
/* Add the keywords up to the next LF to the list of to be ignored /* Add the keywords up to the next LF to the list of to be ignored
options. After returning FP will either be at EOF or the next options. After returning FP will either be at EOF or the next
character read wll be the first of a new line. The function character read will be the first of a new line. The function
returns 0 on success or true on malloc failure. */ returns 0 on success or true on malloc failure. */
static int static int
ignore_invalid_option_add (ARGPARSE_ARGS *arg, FILE *fp) ignore_invalid_option_add (ARGPARSE_ARGS *arg, FILE *fp)
@ -1230,7 +1230,7 @@ long_opt_strlen( ARGPARSE_OPTS *o )
* this option * this option
* - a description,ine which starts with a '@' and is followed by * - a description,ine which starts with a '@' and is followed by
* any other characters is printed as is; this may be used for examples * any other characters is printed as is; this may be used for examples
* ans such. * as such.
* - A description which starts with a '|' outputs the string between this * - A description which starts with a '|' outputs the string between this
* bar and the next one as arguments of the long option. * bar and the next one as arguments of the long option.
*/ */

2
src/cJSON.h
View File

@ -145,7 +145,7 @@ extern void cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
extern void cJSON_AddItemReferenceToObject(cJSON *object, extern void cJSON_AddItemReferenceToObject(cJSON *object,
const char *string,cJSON *item); const char *string,cJSON *item);
/* Remove/Detatch items from Arrays/Objects. */ /* Remove/Detach items from Arrays/Objects. */
extern cJSON *cJSON_DetachItemFromArray(cJSON *array,int which); extern cJSON *cJSON_DetachItemFromArray(cJSON *array,int which);
extern void cJSON_DeleteItemFromArray(cJSON *array,int which); extern void cJSON_DeleteItemFromArray(cJSON *array,int which);
extern cJSON *cJSON_DetachItemFromObject(cJSON *object,const char *string); extern cJSON *cJSON_DetachItemFromObject(cJSON *object,const char *string);

2
src/data-fd.c
View File

@ -1,4 +1,4 @@
/* data-fd.c - A file descripor based data object. /* data-fd.c - A file descriptor based data object.
Copyright (C) 2002, 2004 g10 Code GmbH Copyright (C) 2002, 2004 g10 Code GmbH
This file is part of GPGME. This file is part of GPGME.

4
src/data-identify.c
View File

@ -258,7 +258,7 @@ pgp_binary_detection (const void *image_arg, size_t imagelen)
case PKT_COMPRESSED: case PKT_COMPRESSED:
/* If this is the first packet we assume that that a signed /* If this is the first packet we assume that that a signed
* packet follows. We do not want to uncompress it here due * packet follows. We do not want to uncompress it here due
* to the need of a lot of code and the potentail DoS. */ * to the need of a lot of code and the potential DoS. */
if (!anypacket) if (!anypacket)
return GPGME_DATA_TYPE_PGP_SIGNED; return GPGME_DATA_TYPE_PGP_SIGNED;
return GPGME_DATA_TYPE_PGP_OTHER; return GPGME_DATA_TYPE_PGP_OTHER;
@ -479,7 +479,7 @@ basic_detection (char *data, size_t datalen)
file pointer but there is no guarantee that it will work. file pointer but there is no guarantee that it will work.
FIXME: We may want to add internal buffering so that this function FIXME: We may want to add internal buffering so that this function
can be implemented for allmost all kind of data objects. can be implemented for almost all kind of data objects.
*/ */
gpgme_data_type_t gpgme_data_type_t
gpgme_data_identify (gpgme_data_t dh, int reserved) gpgme_data_identify (gpgme_data_t dh, int reserved)

2
src/data.c
View File

@ -409,7 +409,7 @@ gpgme_data_write (gpgme_data_t dh, const void *buffer, size_t size)
/* Set the current position from where the next read or write starts /* Set the current position from where the next read or write starts
in the data object with the handle DH to OFFSET, relativ to in the data object with the handle DH to OFFSET, relative to
WHENCE. */ WHENCE. */
gpgme_off_t gpgme_off_t
gpgme_data_seek (gpgme_data_t dh, gpgme_off_t offset, int whence) gpgme_data_seek (gpgme_data_t dh, gpgme_off_t offset, int whence)

2
src/data.h
View File

@ -49,7 +49,7 @@ typedef gpgme_ssize_t (*gpgme_data_write_cb) (gpgme_data_t dh,
size_t size); size_t size);
/* Set the current position from where the next read or write starts /* Set the current position from where the next read or write starts
in the data object with the handle DH to OFFSET, relativ to in the data object with the handle DH to OFFSET, relative to
WHENCE. */ WHENCE. */
typedef gpgme_off_t (*gpgme_data_seek_cb) (gpgme_data_t dh, typedef gpgme_off_t (*gpgme_data_seek_cb) (gpgme_data_t dh,
gpgme_off_t offset, gpgme_off_t offset,

2
src/engine-gpg.c
View File

@ -745,7 +745,7 @@ gpg_set_status_cb (void *engine, gpgme_status_cb_t cb, void *cb_value)
} }
/* Note, that the status_handler is allowed to modifiy the args /* Note, that the status_handler is allowed to modify the args
value. */ value. */
static void static void
gpg_set_status_handler (void *engine, engine_status_handler_t fnc, gpg_set_status_handler (void *engine, engine_status_handler_t fnc,

2
src/engine-gpgconf.c
View File

@ -1041,7 +1041,7 @@ gpgconf_conf_dir (void *engine, const char *what, char **result)
/* Parse a line received from gpgconf --query-swdb. This function may /* Parse a line received from gpgconf --query-swdb. This function may
* modify LINE. The result is stored at RESUL. */ * modify LINE. The result is stored at RESULT. */
static gpg_error_t static gpg_error_t
parse_swdb_line (char *line, gpgme_query_swdb_result_t result) parse_swdb_line (char *line, gpgme_query_swdb_result_t result)
{ {

2
src/engine-gpgsm.c
View File

@ -1661,7 +1661,7 @@ gpgsm_import (void *engine, gpgme_data_t keydata, gpgme_key_t *keyarray)
&& *keyarray[idx]->subkeys->fpr) && *keyarray[idx]->subkeys->fpr)
buflen += strlen (keyarray[idx]->subkeys->fpr) + 1; buflen += strlen (keyarray[idx]->subkeys->fpr) + 1;
} }
/* Allocate a bufer with extra space for the trailing Nul /* Allocate a buffer with extra space for the trailing Nul
introduced by the use of stpcpy. */ introduced by the use of stpcpy. */
buffer = malloc (buflen+1); buffer = malloc (buflen+1);
if (!buffer) if (!buffer)

12
src/gpgme-json.c
View File

@ -52,7 +52,7 @@ int main (void){fputs ("Build with Libgpg-error >= 1.28!\n", stderr);return 1;}
#define MIN_REPLY_CHUNK_SIZE 30 #define MIN_REPLY_CHUNK_SIZE 30
/* If no chunksize is provided we print everything. Changing /* If no chunksize is provided we print everything. Changing
* this to a positive value will result in all messages beeing * this to a positive value will result in all messages being
* chunked. */ * chunked. */
#define DEF_REPLY_CHUNK_SIZE 0 #define DEF_REPLY_CHUNK_SIZE 0
#define MAX_REPLY_CHUNK_SIZE (10 * 1024 * 1024) #define MAX_REPLY_CHUNK_SIZE (10 * 1024 * 1024)
@ -720,7 +720,7 @@ create_keylist_patterns (cjson_t request, const char *name)
ret[i++] = xstrdup (tmp); ret[i++] = xstrdup (tmp);
tmp = p + 1; tmp = p + 1;
} }
/* The last key is not newline delimted. */ /* The last key is not newline delimited. */
ret[i] = *tmp ? xstrdup (tmp) : NULL; ret[i] = *tmp ? xstrdup (tmp) : NULL;
xfree (keystring); xfree (keystring);
@ -1499,11 +1499,11 @@ make_data_object (cjson_t result, gpgme_data_t data,
/* Encode and chunk response. /* Encode and chunk response.
* *
* If neccessary this base64 encodes and chunks the repsonse * If necessary this base64 encodes and chunks the response
* for getmore so that we always return valid json independent * for getmore so that we always return valid json independent
* of the chunksize. * of the chunksize.
* *
* A chunked repsonse contains the base64 encoded chunk * A chunked response contains the base64 encoded chunk
* as a string and a boolean if there is still more data * as a string and a boolean if there is still more data
* available for getmore like: * available for getmore like:
* { * {
@ -3681,7 +3681,7 @@ native_messaging_repl (void)
for (;;) for (;;)
{ {
/* Read length. Note that the protocol uses native endianess. /* Read length. Note that the protocol uses native endianness.
* Is it allowed to call such a thing a well thought out * Is it allowed to call such a thing a well thought out
* protocol? */ * protocol? */
if (es_read (es_stdin, &nrequest, sizeof nrequest, &n)) if (es_read (es_stdin, &nrequest, sizeof nrequest, &n))
@ -3702,7 +3702,7 @@ native_messaging_repl (void)
log_error ("error reading request: request too long (%zu MiB)\n", log_error ("error reading request: request too long (%zu MiB)\n",
(size_t)nrequest / (1024*1024)); (size_t)nrequest / (1024*1024));
/* Fixme: Shall we read the request to the bit bucket and /* Fixme: Shall we read the request to the bit bucket and
* return an error reponse or just return an error reponse * return an error response or just return an error response
* and terminate? Needs some testing. */ * and terminate? Needs some testing. */
break; break;
} }

2
src/sign.c
View File

@ -337,7 +337,7 @@ _gpgme_sign_status_handler (void *priv, gpgme_status_code_t code, char *args)
case GPGME_STATUS_INV_RECP: case GPGME_STATUS_INV_RECP:
if (opd->inv_sgnr_seen && opd->ignore_inv_recp) if (opd->inv_sgnr_seen && opd->ignore_inv_recp)
break; break;
/* FALLTROUGH */ /* FALLTHROUGH */
case GPGME_STATUS_INV_SGNR: case GPGME_STATUS_INV_SGNR:
if (code == GPGME_STATUS_INV_SGNR) if (code == GPGME_STATUS_INV_SGNR)
opd->inv_sgnr_seen = 1; opd->inv_sgnr_seen = 1;

2
src/trustlist.c
View File

@ -65,7 +65,7 @@ trustlist_status_handler (void *priv, gpgme_status_code_t code, char *args)
With TYPE = U for a user ID With TYPE = U for a user ID
K for a key K for a key
The RECNO is either the one of the dir record or the one of the uid The RECNO is either the one of the dir record or the one of the uid
record. OT is the the usual trust letter and only availabel on K record. OT is the the usual trust letter and only available on K
lines. VAL is the calculated validity MC is the marginal trust lines. VAL is the calculated validity MC is the marginal trust
counter and only available on U lines CC is the same for the counter and only available on U lines CC is the same for the
complete count NAME ist the username and only printed on U complete count NAME ist the username and only printed on U

2
src/verify.c
View File

@ -1024,7 +1024,7 @@ _gpgme_verify_status_handler (void *priv, gpgme_status_code_t code, char *args)
* a GPGME user can do a keylisting with the address * a GPGME user can do a keylisting with the address
* normalisation. * normalisation.
* So when a duplicated TOFU_USER line is encountered * So when a duplicated TOFU_USER line is encountered
* we ignore the conflicting tofu stats emited afterwards. * we ignore the conflicting tofu stats emitted afterwards.
*/ */
if (gpg_err_code (err) == GPG_ERR_DUP_VALUE) if (gpg_err_code (err) == GPG_ERR_DUP_VALUE)
{ {

14
src/w32-io.c
View File

@ -143,7 +143,7 @@ static struct
/* The context of an associated writer object or NULL. */ /* The context of an associated writer object or NULL. */
struct writer_context_s *writer; struct writer_context_s *writer;
/* A notification hanlder. Noet that we current support only one /* A notification handler. Noet that we current support only one
* callback per fd. */ * callback per fd. */
struct { struct {
_gpgme_close_notify_handler_t handler; _gpgme_close_notify_handler_t handler;
@ -230,7 +230,7 @@ release_hddesc (hddesc_t hdd)
hdd->refcount--; hdd->refcount--;
if (hdd->refcount < 1) if (hdd->refcount < 1)
{ {
/* Holds a valid handle or was never intialized (in which case /* Holds a valid handle or was never initialized (in which case
* REFCOUNT would be -1 here). */ * REFCOUNT would be -1 here). */
TRACE_BEG3 (DEBUG_SYSIO, "gpgme:release_hddesc", hdd, TRACE_BEG3 (DEBUG_SYSIO, "gpgme:release_hddesc", hdd,
"hd=%p, sock=%d, refcount=%d", "hd=%p, sock=%d, refcount=%d",
@ -257,7 +257,7 @@ release_hddesc (hddesc_t hdd)
/* Returns our FD or -1 on resource limit. The returned integer /* Returns our FD or -1 on resource limit. The returned integer
* references a new object which has not been intialized but can be * references a new object which has not been initialized but can be
* release with release_fd. */ * release with release_fd. */
static int static int
new_fd (void) new_fd (void)
@ -1247,12 +1247,12 @@ _gpgme_io_close (int fd)
fd_table[fd].writer = NULL; fd_table[fd].writer = NULL;
} }
/* The handler may not use any fd fucntion because the table is /* The handler may not use any fd function because the table is
* locked. Can we avoid this? */ * locked. Can we avoid this? */
handler = fd_table[fd].notify.handler; handler = fd_table[fd].notify.handler;
value = fd_table[fd].notify.value; value = fd_table[fd].notify.value;
/* Release our reference to the handle descripor. Note that if no /* Release our reference to the handle descriptor. Note that if no
* reader or writer threads were used this release will also take * reader or writer threads were used this release will also take
* care that the handle descriptor is closed * care that the handle descriptor is closed
* (i.e. CloseHandle(hdd->hd) is called). */ * (i.e. CloseHandle(hdd->hd) is called). */
@ -1272,8 +1272,8 @@ _gpgme_io_close (int fd)
/* Set a close notification callback which is called right after FD /* Set a close notification callback which is called right after FD
* has been closed but before its slot (ie. the FD number) is beeing * has been closed but before its slot (ie. the FD number) is being
* released. Tha HANDLER may thus use the provided value of the FD * released. The HANDLER may thus use the provided value of the FD
* but it may not pass it to any I/O functions. Note: Only the last * but it may not pass it to any I/O functions. Note: Only the last
* handler set for an FD is used. */ * handler set for an FD is used. */
int int

2
tests/gpg/t-encrypt-mixed.c
View File

@ -31,7 +31,7 @@
#include "t-support.h" #include "t-support.h"
/* Tests mixed symmetric and asymetric decryption. Verifies /* Tests mixed symmetric and asymmetric decryption. Verifies
that an encrypted message can be decrypted without the that an encrypted message can be decrypted without the
secret key but that the recipient is also set correctly. */ secret key but that the recipient is also set correctly. */
int int

2
tests/gpgsm/t-genkey.c
View File

@ -105,7 +105,7 @@ main (void)
if (result->fpr) if (result->fpr)
{ {
fprintf (stderr, "%s:%d: generated key has (unexpectdly) a fingerprint\n", fprintf (stderr, "%s:%d: generated key has (unexpectedly) a fingerprint\n",
__FILE__, __LINE__); __FILE__, __LINE__);
exit (1); exit (1);
} }