Imported Upstream version 1.4.0upstream/1.4.0

10 files changed, 351 insertions, 174 deletions

diff --git a/doc/DCO b/doc/DCO
new file mode 100644
index 0000000..fa62342
--- /dev/null
+++ b/doc/DCO
@@ -0,0 +1,29 @@
+GPGME Developer's Certificate of Origin.  Version 1.0
+=====================================================
+
+By making a contribution to the GPGME project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the free software license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the
+    best of my knowledge, is covered under an appropriate free
+    software license and I have the right under that license to
+    submit that work with modifications, whether created in whole
+    or in part by me, under the same free software license
+    (unless I am permitted to submit under a different license),
+    as indicated in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including
+    all personal information I submit with it, including my
+    sign-off) is maintained indefinitely and may be redistributed
+    consistent with this project or the free software license(s)
+    involved.
+
+Signed-off-by: [Your name and mail address]
diff --git a/doc/HACKING b/doc/HACKING
index 6149d25..aedcf09 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -2,7 +2,8 @@
 #+TITLE: Hacking notes for GPGME
 #+STARTUP: showall
 
-* No more ChangeLog files
+* How to contribute
+** No more ChangeLog files
 
   Do not modify any of the ChangeLog files in GPGME.  Starting
   on December 1st, 2011 we put change information only in the GIT
@@ -12,7 +13,7 @@
   be renamed to ChangeLog-2011
 
 
-* Commit log requirements
+** Commit log requirements
 
   Your commit log should always start with a one-line summary, the
   second line should be blank, and the remaining lines are usually
@@ -26,3 +27,54 @@
 
   Note that ./autogen.sh installs a git hook to do some basic syntax
   checking on the commit log message.
+
+** License policy
+
+  GPGME is currently licensed under the LGPLv2.1+ with tools and the
+  manual being under the GPLv3+.  We may eventually update to a newer
+  version of the licenses or a combination of them.  It is thus
+  important, that all contributed code allows for an update of the
+  license; for example we can't accept code under the LGPLv2(only).
+
+  If you want to contribute code or documentation to GPGME you are
+  asked to assert that the contribution is in accordance to the "GPGME
+  Developer's Certificate of Origin" as found in the file "DCO".
+  Except for a slight wording change, this DCO is identical to the one
+  used by the Linux kernel.  Please take these simple steps:
+
+  - Decide which mail address you want to use.  Please have your real
+    name in the address and not a pseudonym.  Anonymous contributions
+    can only be done if you find a proxy who certifies for you.
+
+  - If your employer or school might claim ownership of code written
+    by you; you need to talk to them to make sure that you have the
+    right to contribute under the DCO.
+
+  - Send an OpenPGP signed mail to the gnupg-devel@gnupg.org public
+    mailing list from your mail address.  Include a copy of the DCO as
+    found in the official master branch.  Insert your name and email
+    address into the DCO in the same way you want to use it later.
+    Example:
+
+      Signed-off-by: Joe R. Hacker <joe@example.org>
+
+    If you need it, you may perform simple transformations on the mail
+    address: Replacing "@" by " at " or "." by " dot ".)
+
+  - That's it.  From now on you only need to add a "Signed-off-by:"
+    line with your name and mail address to the GIT commit message.
+    It is recommended to send the patches using a PGP/MIME signed
+    mail.
+
+** Coding standards
+
+  Please follow the GNU coding standards.  If you are in doubt consult
+  the existing code as an example.  Do no re-indent code without a
+  need.  If you really need to do it, use a separate commit for such a
+  change.
+
+* Debug hints
+
+  - Use gpgme-tool for manual tests.
+  - The envvar GPGME_DEBUG enables debugging; see debug.[ch] for
+    details.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 93afc06..19b8c82 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -21,7 +21,7 @@
 
 DISTCLEANFILES = gpgme.tmp
 
-EXTRA_DIST = module-overview.sk HACKING ChangeLog-2011
+EXTRA_DIST = module-overview.sk HACKING DCO ChangeLog-2011
 
 info_TEXINFOS = gpgme.texi
 gpgme_TEXINFOS = uiserver.texi lesser.texi gpl.texi
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 31455d6..58181f6 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,6 +34,23 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -66,14 +83,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/glib-2.0.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 INFO_DEPS = $(srcdir)/gpgme.info
-am__TEXINFO_TEX_DIR = $(srcdir)
+TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex
+am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux
 DVIS = gpgme.dvi
 PDFS = gpgme.pdf
 PSS = gpgme.ps
@@ -84,6 +102,11 @@ TEXI2PDF = $(TEXI2DVI) --pdf --batch
 MAKEINFOHTML = $(MAKEINFO) --html
 AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
 DVIPS = dvips
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__installdirs = "$(DESTDIR)$(infodir)"
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -106,6 +129,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -116,7 +145,7 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_FILEVERSION = @BUILD_FILEVERSION@
-BUILD_NUMBER = @BUILD_NUMBER@
+BUILD_REVISION = @BUILD_REVISION@
 BUILD_TIMESTAMP = @BUILD_TIMESTAMP@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -207,6 +236,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+VERSION_NUMBER = @VERSION_NUMBER@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -264,7 +294,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 DISTCLEANFILES = gpgme.tmp
-EXTRA_DIST = module-overview.sk HACKING ChangeLog-2011
+EXTRA_DIST = module-overview.sk HACKING DCO ChangeLog-2011
 info_TEXINFOS = gpgme.texi
 gpgme_TEXINFOS = uiserver.texi lesser.texi gpl.texi
 all: all-am
@@ -360,7 +390,7 @@ gpgme.html: gpgme.texi $(srcdir)/version.texi $(gpgme_TEXINFOS)
 $(srcdir)/version.texi: @MAINTAINER_MODE_TRUE@ $(srcdir)/stamp-vti
 $(srcdir)/stamp-vti: gpgme.texi $(top_srcdir)/configure
 	@(dir=.; test -f ./gpgme.texi || dir=$(srcdir); \
-	set `$(SHELL) $(srcdir)/mdate-sh $$dir/gpgme.texi`; \
+	set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/gpgme.texi`; \
 	echo "@set UPDATED $$1 $$2 $$3"; \
 	echo "@set UPDATED-MONTH $$2 $$3"; \
 	echo "@set EDITION $(VERSION)"; \
@@ -400,9 +430,7 @@ uninstall-html-am:
 
 uninstall-info-am:
 	@$(PRE_UNINSTALL)
-	@if test -d '$(DESTDIR)$(infodir)' && \
-	    (install-info --version && \
-	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
+	@if test -d '$(DESTDIR)$(infodir)' && $(am__can_run_installinfo); then \
 	  list='$(INFO_DEPS)'; \
 	  for file in $$list; do \
 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
@@ -530,10 +558,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -572,8 +605,11 @@ install-dvi: install-dvi-am
 
 install-dvi-am: $(DVIS)
 	@$(NORMAL_INSTALL)
-	test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)"
 	@list='$(DVIS)'; test -n "$(dvidir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(dvidir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(dvidir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -588,18 +624,22 @@ install-html: install-html-am
 
 install-html-am: $(HTMLS)
 	@$(NORMAL_INSTALL)
-	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
 	@list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  $(am__strip_dir) \
-	  if test -d "$$d$$p"; then \
+	  d2=$$d$$p; \
+	  if test -d "$$d2"; then \
 	    echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
 	    $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
-	    echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
-	    $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
+	    echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \
+	    $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
 	  else \
-	    list2="$$list2 $$d$$p"; \
+	    list2="$$list2 $$d2"; \
 	  fi; \
 	done; \
 	test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \
@@ -611,9 +651,12 @@ install-info: install-info-am
 
 install-info-am: $(INFO_DEPS)
 	@$(NORMAL_INSTALL)
-	test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(infodir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(infodir)" || exit 1; \
+	fi; \
 	for file in $$list; do \
 	  case $$file in \
 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
@@ -631,8 +674,7 @@ install-info-am: $(INFO_DEPS)
 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
 	@$(POST_INSTALL)
-	@if (install-info --version && \
-	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
+	@if $(am__can_run_installinfo); then \
 	  list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
 	  for file in $$list; do \
 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
@@ -646,8 +688,11 @@ install-pdf: install-pdf-am
 
 install-pdf-am: $(PDFS)
 	@$(NORMAL_INSTALL)
-	test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
 	@list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pdfdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pdfdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -659,8 +704,11 @@ install-ps: install-ps-am
 
 install-ps-am: $(PSS)
 	@$(NORMAL_INSTALL)
-	test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)"
 	@list='$(PSS)'; test -n "$(psdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(psdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(psdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff --git a/doc/gpgme.info b/doc/gpgme.info
index a035624..77cb4d5 100644
--- a/doc/gpgme.info
+++ b/doc/gpgme.info
@@ -6,8 +6,8 @@ START-INFO-DIR-ENTRY
 * GPGME: (gpgme).          Adding support for cryptography to your program.
 END-INFO-DIR-ENTRY
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 g10
-Code GmbH.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2012,
+2013 g10 Code GmbH.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU General Public License as
@@ -22,11 +22,11 @@ General Public License for more details.
 
    This file documents the GPGME library.
 
-   This is Edition 1.3.2, last updated 2 May 2012, of `The `GnuPG Made
-Easy' Reference Manual', for Version 1.3.2.
+   This is Edition 1.4.0, last updated 26 February 2013, of `The `GnuPG
+Made Easy' Reference Manual', for Version 1.4.0.
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 g10
-Code GmbH.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2012,
+2013 g10 Code GmbH.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU General Public License as
@@ -41,116 +41,116 @@ General Public License for more details.
 
 
 Indirect:
-gpgme.info-1: 1731
-gpgme.info-2: 276396
+gpgme.info-1: 1761
+gpgme.info-2: 277587
 
 Tag Table:
 (Indirect)
-Node: Top1731
-Node: Introduction8512
-Node: Getting Started9299
-Node: Features10424
-Node: Overview11574
-Node: Preparation12683
-Node: Header13680
-Node: Building the Source14379
-Node: Largefile Support (LFS)16488
-Node: Using Automake20492
-Node: Using Libtool22128
-Node: Library Version Check22478
-Node: Signal Handling25366
-Node: Multi Threading26582
-Ref: Multi Threading-Footnote-128764
-Node: Protocols and Engines29178
-Node: Engine Version Check31527
-Node: Engine Information32104
-Node: Engine Configuration35804
-Node: OpenPGP37066
-Node: Cryptographic Message Syntax37402
-Node: Algorithms37696
-Ref: Algorithms-Footnote-138175
-Node: Public Key Algorithms38303
-Node: Hash Algorithms40234
-Node: Error Handling41332
-Node: Error Values43194
-Node: Error Sources48272
-Node: Error Codes50599
-Node: Error Strings55238
-Node: Exchanging Data57017
-Node: Creating Data Buffers58331
-Node: Memory Based Data Buffers58847
-Node: File Based Data Buffers62201
-Node: Callback Based Data Buffers64372
-Node: Destroying Data Buffers69928
-Node: Manipulating Data Buffers71287
-Node: Data Buffer I/O Operations71706
-Node: Data Buffer Meta-Data74409
-Node: Contexts77759
-Node: Creating Contexts78882
-Node: Destroying Contexts79693
-Node: Result Management80028
-Node: Context Attributes81434
-Node: Protocol Selection82212
-Node: Crypto Engine83224
-Node: ASCII Armor85045
-Node: Text Mode85657
-Node: Included Certificates86588
-Node: Key Listing Mode87963
-Node: Passphrase Callback91320
-Node: Progress Meter Callback94370
-Node: Locale96294
-Node: Key Management97833
-Node: Listing Keys107761
-Node: Information About Keys115023
-Node: Key Signatures123021
-Node: Manipulating Keys127033
-Node: Generating Keys127875
-Node: Exporting Keys132482
-Node: Importing Keys138381
-Ref: Importing Keys-Footnote-1145544
-Node: Deleting Keys145672
-Node: Changing Passphrases147069
-Node: Advanced Key Editing148330
-Node: Trust Item Management151434
-Node: Listing Trust Items152504
-Node: Information About Trust Items154802
-Node: Manipulating Trust Items156684
-Node: Crypto Operations157645
-Node: Decrypt158889
-Node: Verify162747
-Node: Decrypt and Verify180603
-Node: Sign182607
-Node: Selecting Signers183171
-Node: Creating a Signature184152
-Node: Signature Notation Data188741
-Node: Encrypt190925
-Node: Encrypting a Plaintext191281
-Node: Run Control197126
-Node: Waiting For Completion197873
-Node: Using External Event Loops199919
-Node: I/O Callback Interface201886
-Node: Registering I/O Callbacks206980
-Node: I/O Callback Example208971
-Node: I/O Callback Example GTK+215190
-Node: I/O Callback Example GDK216979
-Node: I/O Callback Example Qt218621
-Node: Cancellation220909
-Node: UI Server Protocol223162
-Ref: UI Server Protocol-Footnote-1224599
-Node: UI Server Encrypt224718
-Node: UI Server Sign229899
-Node: UI Server Decrypt232128
-Node: UI Server Verify233566
-Node: UI Server Set Input Files237068
-Node: UI Server Sign/Encrypt Files237868
-Node: UI Server Verify/Decrypt Files239637
-Node: UI Server Import/Export Keys241483
-Node: UI Server Checksum Files242516
-Node: Miscellaneous UI Server Commands244682
-Ref: command SENDER246594
-Node: Library Copying248270
-Node: Copying276396
-Node: Function and Data Index314027
-Node: Concept Index339006
+Node: Top1761
+Node: Introduction8548
+Node: Getting Started9335
+Node: Features10460
+Node: Overview11610
+Node: Preparation12719
+Node: Header13716
+Node: Building the Source14415
+Node: Largefile Support (LFS)16524
+Node: Using Automake20528
+Node: Using Libtool22164
+Node: Library Version Check22514
+Node: Signal Handling26469
+Node: Multi Threading27685
+Ref: Multi Threading-Footnote-129867
+Node: Protocols and Engines30281
+Node: Engine Version Check32630
+Node: Engine Information33207
+Node: Engine Configuration36907
+Node: OpenPGP38169
+Node: Cryptographic Message Syntax38505
+Node: Algorithms38799
+Ref: Algorithms-Footnote-139278
+Node: Public Key Algorithms39406
+Node: Hash Algorithms41337
+Node: Error Handling42435
+Node: Error Values44297
+Node: Error Sources49375
+Node: Error Codes51702
+Node: Error Strings56341
+Node: Exchanging Data58120
+Node: Creating Data Buffers59434
+Node: Memory Based Data Buffers59950
+Node: File Based Data Buffers63304
+Node: Callback Based Data Buffers65475
+Node: Destroying Data Buffers71031
+Node: Manipulating Data Buffers72390
+Node: Data Buffer I/O Operations72809
+Node: Data Buffer Meta-Data75512
+Node: Contexts78862
+Node: Creating Contexts79985
+Node: Destroying Contexts80796
+Node: Result Management81131
+Node: Context Attributes82537
+Node: Protocol Selection83315
+Node: Crypto Engine84327
+Node: ASCII Armor86148
+Node: Text Mode86760
+Node: Included Certificates87691
+Node: Key Listing Mode89066
+Node: Passphrase Callback92423
+Node: Progress Meter Callback95561
+Node: Locale97485
+Node: Key Management99024
+Node: Listing Keys108952
+Node: Information About Keys116214
+Node: Key Signatures124212
+Node: Manipulating Keys128224
+Node: Generating Keys129066
+Node: Exporting Keys133673
+Node: Importing Keys139572
+Ref: Importing Keys-Footnote-1146735
+Node: Deleting Keys146863
+Node: Changing Passphrases148260
+Node: Advanced Key Editing149521
+Node: Trust Item Management152625
+Node: Listing Trust Items153695
+Node: Information About Trust Items155993
+Node: Manipulating Trust Items157875
+Node: Crypto Operations158836
+Node: Decrypt160080
+Node: Verify163938
+Node: Decrypt and Verify181794
+Node: Sign183798
+Node: Selecting Signers184362
+Node: Creating a Signature185343
+Node: Signature Notation Data189932
+Node: Encrypt192116
+Node: Encrypting a Plaintext192472
+Node: Run Control198317
+Node: Waiting For Completion199064
+Node: Using External Event Loops201110
+Node: I/O Callback Interface203077
+Node: Registering I/O Callbacks208171
+Node: I/O Callback Example210162
+Node: I/O Callback Example GTK+216381
+Node: I/O Callback Example GDK218170
+Node: I/O Callback Example Qt219812
+Node: Cancellation222100
+Node: UI Server Protocol224353
+Ref: UI Server Protocol-Footnote-1225790
+Node: UI Server Encrypt225909
+Node: UI Server Sign231090
+Node: UI Server Decrypt233319
+Node: UI Server Verify234757
+Node: UI Server Set Input Files238259
+Node: UI Server Sign/Encrypt Files239059
+Node: UI Server Verify/Decrypt Files240828
+Node: UI Server Import/Export Keys242674
+Node: UI Server Checksum Files243707
+Node: Miscellaneous UI Server Commands245873
+Ref: command SENDER247785
+Node: Library Copying249461
+Node: Copying277587
+Node: Function and Data Index315218
+Node: Concept Index340334
 
 End Tag Table
diff --git a/doc/gpgme.info-1 b/doc/gpgme.info-1
index 35b948a..1275165 100644
--- a/doc/gpgme.info-1
+++ b/doc/gpgme.info-1
@@ -6,8 +6,8 @@ START-INFO-DIR-ENTRY
 * GPGME: (gpgme).          Adding support for cryptography to your program.
 END-INFO-DIR-ENTRY
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 g10
-Code GmbH.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2012,
+2013 g10 Code GmbH.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU General Public License as
@@ -22,11 +22,11 @@ General Public License for more details.
 
    This file documents the GPGME library.
 
-   This is Edition 1.3.2, last updated 2 May 2012, of `The `GnuPG Made
-Easy' Reference Manual', for Version 1.3.2.
+   This is Edition 1.4.0, last updated 26 February 2013, of `The `GnuPG
+Made Easy' Reference Manual', for Version 1.4.0.
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 g10
-Code GmbH.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2012,
+2013 g10 Code GmbH.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU General Public License as
@@ -45,8 +45,8 @@ File: gpgme.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Main Menu
 *********
 
-This is Edition 1.3.2, last updated 2 May 2012, of `The `GnuPG Made
-Easy' Reference Manual', for Version 1.3.2 of the GPGME library.
+This is Edition 1.4.0, last updated 26 February 2013, of `The `GnuPG
+Made Easy' Reference Manual', for Version 1.4.0 of the GPGME library.
 
 * Menu:
 
@@ -561,6 +561,26 @@ File: gpgme.info,  Node: Library Version Check,  Next: Signal Handling,  Prev: U
      detailed error code can be returned (historically,
      `gpgme_check_version' does not return a detailed error code).
 
+ -- Function: int gpgme_set_global_flag (const char *NAME,
+          const char *VALUE)
+     On some systems it is not easy to set environment variables and
+     thus hard to use GPGME's internal trace facility for debugging.
+     This function has been introduced as an alternative way to enable
+     debugging.  It is important to assure that only one thread accesses
+     GPGME functions between a call to this function and after the
+     return from the call to `gpgme_check_version'.
+
+     To enable debugging, you need to call this function as early as
+     possible -- even before `gpgme_check_version' -- with the string
+     "debug" for NAME and VALUE identical to the value used with the
+     environment variable `GPGME_DEBUG'.
+
+     This function returns `0' on success.  In contrast to other
+     functions the non-zero return value on failure does not convey any
+     error code.  For setting "debug" the only possible error cause is
+     an out of memory condition; which would exhibit itself later
+     anyway.  Thus the return value may be ignored.
+
    After initializing GPGME, you should set the locale information to
 the locale required for your output terminal.  This locale information
 is needed for example for the curses and Gtk pinentry.  Here is an
@@ -2233,9 +2253,10 @@ char *UID_HINT, const char *PASSPHRASE_INFO, int PREV_WAS_BAD, int FD)
      will be 0.
 
      The user must write the passphrase, followed by a newline
-     character, to the file descriptor FD.  If the user returns 0
-     indicating success, the user must at least write a newline
-     character before returning from the callback.
+     character, to the file descriptor FD.  The function
+     `gpgme_io_writen' should be used for the write operation.  Note
+     that if the user returns 0 to indicate success, the user must at
+     least write a newline character before returning from the callback.
 
      If an error occurs, return the corresponding `gpgme_error_t'
      value.  You can use the error code `GPG_ERR_CANCELED' to abort the
diff --git a/doc/gpgme.info-2 b/doc/gpgme.info-2
index cb7c5d1..35239ba 100644
--- a/doc/gpgme.info-2
+++ b/doc/gpgme.info-2
@@ -6,8 +6,8 @@ START-INFO-DIR-ENTRY
 * GPGME: (gpgme).          Adding support for cryptography to your program.
 END-INFO-DIR-ENTRY
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 g10
-Code GmbH.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2012,
+2013 g10 Code GmbH.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU General Public License as
@@ -22,11 +22,11 @@ General Public License for more details.
 
    This file documents the GPGME library.
 
-   This is Edition 1.3.2, last updated 2 May 2012, of `The `GnuPG Made
-Easy' Reference Manual', for Version 1.3.2.
+   This is Edition 1.4.0, last updated 26 February 2013, of `The `GnuPG
+Made Easy' Reference Manual', for Version 1.4.0.
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 g10
-Code GmbH.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2012,
+2013 g10 Code GmbH.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU General Public License as
@@ -898,7 +898,7 @@ Function and Data Index
                                                               (line  46)
 * gpgme_get_key:                         Listing Keys.        (line 149)
 * gpgme_get_keylist_mode:                Key Listing Mode.    (line  64)
-* gpgme_get_passphrase_cb:               Passphrase Callback. (line  54)
+* gpgme_get_passphrase_cb:               Passphrase Callback. (line  55)
 * gpgme_get_progress_cb:                 Progress Meter Callback.
                                                               (line  33)
 * gpgme_get_protocol:                    Protocol Selection.  (line  22)
@@ -1010,13 +1010,15 @@ Function and Data Index
 * gpgme_set_armor:                       ASCII Armor.         (line   7)
 * gpgme_set_engine_info:                 Engine Configuration.
                                                               (line  14)
+* gpgme_set_global_flag:                 Library Version Check.
+                                                              (line  44)
 * gpgme_set_include_certs:               Included Certificates.
                                                               (line   8)
 * gpgme_set_io_cbs:                      Registering I/O Callbacks.
                                                               (line  37)
 * gpgme_set_keylist_mode:                Key Listing Mode.    (line   8)
 * gpgme_set_locale:                      Locale.              (line  16)
-* gpgme_set_passphrase_cb:               Passphrase Callback. (line  35)
+* gpgme_set_passphrase_cb:               Passphrase Callback. (line  36)
 * gpgme_set_progress_cb:                 Progress Meter Callback.
                                                               (line  18)
 * gpgme_set_protocol:                    Protocol Selection.  (line   8)
diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index 61cdb37..af2e163 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -14,7 +14,7 @@
 
 @copying
 Copyright @copyright{} 2002, 2003, 2004, 2005, 2006, 2007,
-2008, 2010 g10 Code GmbH.
+2008, 2010, 2012, 2013 g10 Code GmbH.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -616,6 +616,30 @@ does not return a detailed error code).
 @end deftypefun
 
 
+@deftypefun {int} gpgme_set_global_flag  @
+            (@w{const char *@var{name}}, @
+            @w{const char *@var{value}})
+
+On some systems it is not easy to set environment variables and thus
+hard to use @acronym{GPGME}'s internal trace facility for debugging.
+This function has been introduced as an alternative way to enable
+debugging.  It is important to assure that only one thread accesses
+@acronym{GPGME} functions between a call to this function and after
+the return from the call to @code{gpgme_check_version}.
+
+To enable debugging, you need to call this function as early as
+possible --- even before @code{gpgme_check_version} --- with the
+string ``debug'' for @var{name} and @var{value} identical to the value
+used with the environment variable @code{GPGME_DEBUG}.
+
+This function returns @code{0} on success.  In contrast to other
+functions the non-zero return value on failure does not convey any
+error code.  For setting ``debug'' the only possible error cause is an
+out of memory condition; which would exhibit itself later anyway.
+Thus the return value may be ignored.
+@end deftypefun
+
+
 After initializing @acronym{GPGME}, you should set the locale
 information to the locale required for your output terminal.  This
 locale information is needed for example for the curses and Gtk
@@ -2350,9 +2374,10 @@ previous attempts failed, then @var{prev_was_bad} is 1, otherwise it
 will be 0.
 
 The user must write the passphrase, followed by a newline character,
-to the file descriptor @var{fd}.  If the user returns 0 indicating
-success, the user must at least write a newline character before
-returning from the callback.
+to the file descriptor @var{fd}.  The function @code{gpgme_io_writen}
+should be used for the write operation.  Note that if the user returns
+0 to indicate success, the user must at least write a newline
+character before returning from the callback.
 
 If an error occurs, return the corresponding @code{gpgme_error_t}
 value.  You can use the error code @code{GPG_ERR_CANCELED} to abort
diff --git a/doc/stamp-vti b/doc/stamp-vti
index 3e9775f..1040955 100644
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 2 May 2012
-@set UPDATED-MONTH May 2012
-@set EDITION 1.3.2
-@set VERSION 1.3.2
+@set UPDATED 26 February 2013
+@set UPDATED-MONTH February 2013
+@set EDITION 1.4.0
+@set VERSION 1.4.0
diff --git a/doc/version.texi b/doc/version.texi
index 3e9775f..1040955 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 2 May 2012
-@set UPDATED-MONTH May 2012
-@set EDITION 1.3.2
-@set VERSION 1.3.2
+@set UPDATED 26 February 2013
+@set UPDATED-MONTH February 2013
+@set EDITION 1.4.0
+@set VERSION 1.4.0