[svn] GnuPG - r5032 - in trunk: . agent doc g10 sm
svn author wk
cvs at cvs.gnupg.org
Tue Jun 2 17:47:00 CEST 2009
Author: wk
Date: 2009-06-02 17:46:59 +0200 (Tue, 02 Jun 2009)
New Revision: 5032
Modified:
trunk/THANKS
trunk/agent/ChangeLog
trunk/agent/gpg-agent.c
trunk/doc/ChangeLog
trunk/doc/gpg-agent.texi
trunk/doc/tools.texi
trunk/g10/ChangeLog
trunk/g10/card-util.c
trunk/sm/ChangeLog
trunk/sm/encrypt.c
Log:
Fix for bug#1066.
A couple of minor changes.
Modified: trunk/agent/ChangeLog
===================================================================
--- trunk/agent/ChangeLog 2009-06-02 15:26:06 UTC (rev 5031)
+++ trunk/agent/ChangeLog 2009-06-02 15:46:59 UTC (rev 5032)
@@ -1,3 +1,7 @@
+2009-06-02 Werner Koch <wk at g10code.com>
+
+ * gpg-agent.c (main): Run pth_kill after fork. Fixes bug#1066.
+
2009-05-19 Werner Koch <wk at g10code.com>
* gpg-agent.c (JNLIB_NEED_AFLOCAL): Define.
Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog 2009-06-02 15:26:06 UTC (rev 5031)
+++ trunk/doc/ChangeLog 2009-06-02 15:46:59 UTC (rev 5032)
@@ -1,3 +1,9 @@
+2009-06-02 Werner Koch <wk at g10code.com>
+
+ * tools.texi (watchgnupg): Typo fix. Fixes bug#1065.
+
+ * gpg-agent.texi (Agent Commands): Update description of --daemon.
+
2009-05-20 Werner Koch <wk at g10code.com>
* gpg.texi (GPG Configuration Options): Explain new meaning of
Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog 2009-06-02 15:26:06 UTC (rev 5031)
+++ trunk/g10/ChangeLog 2009-06-02 15:46:59 UTC (rev 5032)
@@ -1,3 +1,7 @@
+2009-06-02 Werner Koch <wk at g10code.com>
+
+ * card-util.c (get_manufacturer): Add new manufacturer.
+
2009-05-26 Werner Koch <wk at g10code.com>
* parse-packet.c (mpi_read): Workaround for zero-length MPI bug in
Modified: trunk/sm/ChangeLog
===================================================================
--- trunk/sm/ChangeLog 2009-06-02 15:26:06 UTC (rev 5031)
+++ trunk/sm/ChangeLog 2009-06-02 15:46:59 UTC (rev 5032)
@@ -1,3 +1,7 @@
+2009-05-27 Werner Koch <wk at g10code.com>
+
+ * encrypt.c (encrypt_dek): Make use of make_canon_sexp.
+
2009-05-18 Werner Koch <wk at g10code.com>
* server.c (option_handler): New option "no-encrypt-to".
Modified: trunk/THANKS
===================================================================
--- trunk/THANKS 2009-06-02 15:26:06 UTC (rev 5031)
+++ trunk/THANKS 2009-06-02 15:46:59 UTC (rev 5032)
@@ -115,6 +115,7 @@
Jeff Long long at kestrel.cc.ukans.edu
Jeffery Von Ronne jronne at ics.uci.edu
Jens Bachem bachem at rrz.uni-koeln.de
+Jens Seidel jensseidel at users.sf.net
Jeroen C. van Gelderen jeroen at vangelderen.org
J Horacio MG homega at ciberia.es
J. Michael Ashley jashley at acm.org
Modified: trunk/agent/gpg-agent.c
===================================================================
--- trunk/agent/gpg-agent.c 2009-06-02 15:26:06 UTC (rev 5031)
+++ trunk/agent/gpg-agent.c 2009-06-02 15:46:59 UTC (rev 5032)
@@ -996,6 +996,9 @@
right now and thus we restore it. That is not strictly
necessary but some programs falsely assume a cleared
signal mask. */
+ if ( !pth_kill () )
+ log_error ("pth_kill failed in foked process\n");
+
#ifdef HAVE_SIGPROCMASK
if (startup_signal_mask_valid)
{
Modified: trunk/doc/gpg-agent.texi
===================================================================
--- trunk/doc/gpg-agent.texi 2009-06-02 15:26:06 UTC (rev 5031)
+++ trunk/doc/gpg-agent.texi 2009-06-02 15:46:59 UTC (rev 5032)
@@ -157,15 +157,17 @@
@item --daemon [@var{command line}]
@opindex daemon
-Run the program in the background. This option is required to prevent
-it from being accidently running in the background. A common way to do
-this is:
- at example
- at end example
-$ eval $(gpg-agent --daemon)
+Start the gpg-agent as a daemon; that is, detach it from the console
+and run it in the background. Because @command{gpg-agent} prints out
+important information required for further use, a common way of
+invoking gpg-agent is: @code{eval $(gpg-agent --daemon)} to setup the
+environment variables. The option @option{--write-env-file} is
+another way commonly used to do this. Yet another way is creating
+a new process as a child of gpg-agent: @code{gpg-agent --daemon
+/bin/sh}. This way you get a new shell with the environment setup
+properly; if you exit from this shell, gpg-agent terminates as well.
@end table
-
@mansect options
@node Agent Options
@section Option Summary
Modified: trunk/doc/tools.texi
===================================================================
--- trunk/doc/tools.texi 2009-06-02 15:26:06 UTC (rev 5031)
+++ trunk/doc/tools.texi 2009-06-02 15:46:59 UTC (rev 5032)
@@ -41,7 +41,7 @@
@end ifset
@mansect description
-Most of the main utilities are able to write there log files to a
+Most of the main utilities are able to write their log files to a
Unix Domain socket if configured that way. @command{watchgnupg} is a simple
listener for such a socket. It ameliorates the output with a time
stamp and makes sure that long lines are not interspersed with log
Modified: trunk/g10/card-util.c
===================================================================
--- trunk/g10/card-util.c 2009-06-02 15:26:06 UTC (rev 5031)
+++ trunk/g10/card-util.c 2009-06-02 15:46:59 UTC (rev 5032)
@@ -193,6 +193,7 @@
case 0x0002: return "Prism";
case 0x0003: return "OpenFortress";
case 0x0004: return "Wewid AB";
+ case 0x0005: return "ZeitControl";
/* 0x00000 and 0xFFFF are defined as test cards per spec,
0xFFF00 to 0xFFFE are assigned for use with randomly created
Modified: trunk/sm/encrypt.c
===================================================================
--- trunk/sm/encrypt.c 2009-06-02 15:26:06 UTC (rev 5031)
+++ trunk/sm/encrypt.c 2009-06-02 15:46:59 UTC (rev 5032)
@@ -207,22 +207,10 @@
gcry_sexp_release (s_data);
gcry_sexp_release (s_pkey);
- /* reformat it */
- len = gcry_sexp_sprint (s_ciph, GCRYSEXP_FMT_CANON, NULL, 0);
- assert (len);
- buf = xtrymalloc (len);
- if (!buf)
- {
- gpg_error_t tmperr = out_of_core ();
- gcry_sexp_release (s_ciph);
- return tmperr;
- }
- len = gcry_sexp_sprint (s_ciph, GCRYSEXP_FMT_CANON, (char*)buf, len);
- assert (len);
+ /* Reformat it. */
+ rc = make_canon_sexp (s_ciph, encval, NULL);
gcry_sexp_release (s_ciph);
-
- *encval = buf;
- return 0;
+ return rc;
}
More information about the Gnupg-commits
mailing list