[svn] GnuPG - r4177 - in branches/GNUPG-1-9-BRANCH: . agent sm
svn author wk
cvs at cvs.gnupg.org
Tue Jun 27 16:32:55 CEST 2006
Author: wk
Date: 2006-06-27 16:32:34 +0200 (Tue, 27 Jun 2006)
New Revision: 4177
Modified:
branches/GNUPG-1-9-BRANCH/NEWS
branches/GNUPG-1-9-BRANCH/TODO
branches/GNUPG-1-9-BRANCH/agent/ChangeLog
branches/GNUPG-1-9-BRANCH/agent/command-ssh.c
branches/GNUPG-1-9-BRANCH/agent/gpg-agent.c
branches/GNUPG-1-9-BRANCH/configure.ac
branches/GNUPG-1-9-BRANCH/sm/ChangeLog
branches/GNUPG-1-9-BRANCH/sm/certchain.c
branches/GNUPG-1-9-BRANCH/sm/certdump.c
branches/GNUPG-1-9-BRANCH/sm/gpgsm.h
branches/GNUPG-1-9-BRANCH/sm/keylist.c
Log:
Various smaller changes
Modified: branches/GNUPG-1-9-BRANCH/NEWS
===================================================================
--- branches/GNUPG-1-9-BRANCH/NEWS 2006-06-27 14:30:59 UTC (rev 4176)
+++ branches/GNUPG-1-9-BRANCH/NEWS 2006-06-27 14:32:34 UTC (rev 4177)
@@ -1,3 +1,8 @@
+Noteworthy changes in version 1.9.22
+-------------------------------------------------
+
+
+
Noteworthy changes in version 1.9.21 (2006-06-20)
-------------------------------------------------
Modified: branches/GNUPG-1-9-BRANCH/TODO
===================================================================
--- branches/GNUPG-1-9-BRANCH/TODO 2006-06-27 14:30:59 UTC (rev 4176)
+++ branches/GNUPG-1-9-BRANCH/TODO 2006-06-27 14:32:34 UTC (rev 4177)
@@ -111,6 +111,10 @@
anyway.
** skclist.c:random_is_faked
Remove the whole stuff?
+** qbits
+ We pass a new qbit parameter to genkey - implement this in libgcrypt.
+** Makefile.am
+ Remove the no-pointer-sign kludge.
* common/
** ttyio
Modified: branches/GNUPG-1-9-BRANCH/agent/ChangeLog
===================================================================
--- branches/GNUPG-1-9-BRANCH/agent/ChangeLog 2006-06-27 14:30:59 UTC (rev 4176)
+++ branches/GNUPG-1-9-BRANCH/agent/ChangeLog 2006-06-27 14:32:34 UTC (rev 4177)
@@ -1,3 +1,14 @@
+2006-06-26 Werner Koch <wk at g10code.com>
+
+ * gpg-agent.c (handle_signal): Print infor for SIGUSR2 only in
+ verbose mode.
+
+2006-06-22 Werner Koch <wk at g10code.com>
+
+ * command-ssh.c (make_cstring): Use memcpy instead of strncpy.
+ (ssh_receive_mpint_list, sexp_key_extract, data_sign): Use
+ xtrycalloc instead of xtrymalloc followed by memset.
+
2006-06-20 Werner Koch <wk at g10code.com>
* minip12.c (create_final): New arg PW. Add code to calculate the
Modified: branches/GNUPG-1-9-BRANCH/agent/command-ssh.c
===================================================================
--- branches/GNUPG-1-9-BRANCH/agent/command-ssh.c 2006-06-27 14:30:59 UTC (rev 4176)
+++ branches/GNUPG-1-9-BRANCH/agent/command-ssh.c 2006-06-27 14:32:34 UTC (rev 4177)
@@ -268,7 +268,7 @@
s = xtrymalloc (data_n + 1);
if (s)
{
- strncpy (s, data, data_n);
+ memcpy (s, data, data_n);
s[data_n] = 0;
}
@@ -853,14 +853,12 @@
elems_public = key_spec.elems_key_public;
elems_public_n = strlen (elems_public);
- mpis = xtrymalloc (sizeof (*mpis) * (elems_n + 1));
- if (! mpis)
+ mpis = xtrycalloc (elems_n + 1, sizeof *mpis );
+ if (!mpis)
{
err = gpg_error_from_errno (errno);
goto out;
}
-
- memset (mpis, 0, sizeof (*mpis) * (elems_n + 1));
elem_is_secret = 0;
for (i = 0; i < elems_n; i++)
@@ -1143,13 +1141,12 @@
}
elems_n = strlen (elems);
- mpis_new = xtrymalloc (sizeof (*mpis_new) * (elems_n + 1));
- if (! mpis_new)
+ mpis_new = xtrycalloc (elems_n + 1, sizeof *mpis_new );
+ if (!mpis_new)
{
err = gpg_error_from_errno (errno);
goto out;
}
- memset (mpis_new, 0, sizeof (*mpis_new) * (elems_n + 1));
value_list = gcry_sexp_find_token (sexp, key_spec.identifier, 0);
if (! value_list)
@@ -2055,13 +2052,12 @@
elems = spec.elems_signature;
elems_n = strlen (elems);
- mpis = xtrymalloc (sizeof (*mpis) * (elems_n + 1));
- if (! mpis)
+ mpis = xtrycalloc (elems_n + 1, sizeof *mpis);
+ if (!mpis)
{
err = gpg_error_from_errno (errno);
goto out;
}
- memset (mpis, 0, sizeof (*mpis) * (elems_n + 1));
for (i = 0; i < elems_n; i++)
{
Modified: branches/GNUPG-1-9-BRANCH/agent/gpg-agent.c
===================================================================
--- branches/GNUPG-1-9-BRANCH/agent/gpg-agent.c 2006-06-27 14:30:59 UTC (rev 4176)
+++ branches/GNUPG-1-9-BRANCH/agent/gpg-agent.c 2006-06-27 14:32:34 UTC (rev 4177)
@@ -1360,7 +1360,8 @@
break;
case SIGUSR2:
- log_info ("SIGUSR2 received - checking smartcard status\n");
+ if (opt.verbose)
+ log_info ("SIGUSR2 received - checking smartcard status\n");
break;
case SIGTERM:
Modified: branches/GNUPG-1-9-BRANCH/configure.ac
===================================================================
--- branches/GNUPG-1-9-BRANCH/configure.ac 2006-06-27 14:30:59 UTC (rev 4176)
+++ branches/GNUPG-1-9-BRANCH/configure.ac 2006-06-27 14:32:34 UTC (rev 4177)
@@ -26,8 +26,8 @@
# Remember to change the version number immediately *after* a release.
# Set my_issvn to "yes" for non-released code. Remember to run an
# "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [1.9.21])
-m4_define([my_issvn], [no])
+m4_define([my_version], [1.9.22])
+m4_define([my_issvn], [yes])
m4_define([svn_revision], m4_esyscmd([echo -n $((svn info 2>/dev/null \
Modified: branches/GNUPG-1-9-BRANCH/sm/ChangeLog
===================================================================
--- branches/GNUPG-1-9-BRANCH/sm/ChangeLog 2006-06-27 14:30:59 UTC (rev 4176)
+++ branches/GNUPG-1-9-BRANCH/sm/ChangeLog 2006-06-27 14:32:34 UTC (rev 4177)
@@ -1,3 +1,8 @@
+2006-06-26 Werner Koch <wk at g10code.com>
+
+ * certdump.c (gpgsm_cert_log_name): New.
+ * certchain.c (is_cert_still_valid): Log the name of the certificate.
+
2006-06-20 Werner Koch <wk at g10code.com>
* gpgsm.c (gpgsm_init_default_ctrl): Take care of the command line
Modified: branches/GNUPG-1-9-BRANCH/sm/certchain.c
===================================================================
--- branches/GNUPG-1-9-BRANCH/sm/certchain.c 2006-06-27 14:30:59 UTC (rev 4176)
+++ branches/GNUPG-1-9-BRANCH/sm/certchain.c 2006-06-27 14:32:34 UTC (rev 4177)
@@ -597,6 +597,8 @@
{
/* Fixme: We should change the wording because we may
have used OCSP. */
+ if (!lm)
+ gpgsm_cert_log_name (NULL, subject_cert);
switch (gpg_err_code (err))
{
case GPG_ERR_CERT_REVOKED:
Modified: branches/GNUPG-1-9-BRANCH/sm/certdump.c
===================================================================
--- branches/GNUPG-1-9-BRANCH/sm/certdump.c 2006-06-27 14:30:59 UTC (rev 4176)
+++ branches/GNUPG-1-9-BRANCH/sm/certdump.c 2006-06-27 14:32:34 UTC (rev 4177)
@@ -238,6 +238,36 @@
}
+/* Log the certificate's name in "#SN/ISSUERDN" format along with
+ TEXT. */
+void
+gpgsm_cert_log_name (const char *text, ksba_cert_t cert)
+{
+ log_info ("%s", text? text:"certificate" );
+ if (cert)
+ {
+ ksba_sexp_t sn;
+ char *p;
+
+ p = ksba_cert_get_issuer (cert, 0);
+ sn = ksba_cert_get_serial (cert);
+ if (p && sn)
+ {
+ log_printf (" #");
+ gpgsm_dump_serial (sn);
+ log_printf ("/");
+ gpgsm_dump_string (p);
+ }
+ else
+ log_printf (" [invalid]");
+ ksba_free (sn);
+ xfree (p);
+ }
+ log_printf ("\n");
+}
+
+
+
/* helper for the rfc2253 string parser */
static const unsigned char *
Modified: branches/GNUPG-1-9-BRANCH/sm/gpgsm.h
===================================================================
--- branches/GNUPG-1-9-BRANCH/sm/gpgsm.h 2006-06-27 14:30:59 UTC (rev 4176)
+++ branches/GNUPG-1-9-BRANCH/sm/gpgsm.h 2006-06-27 14:32:34 UTC (rev 4177)
@@ -218,6 +218,8 @@
void gpgsm_print_name2 (FILE *fp, const char *string, int translate);
void gpgsm_print_name (FILE *fp, const char *string);
+void gpgsm_cert_log_name (const char *text, ksba_cert_t cert);
+
void gpgsm_dump_cert (const char *text, ksba_cert_t cert);
void gpgsm_dump_serial (ksba_const_sexp_t p);
void gpgsm_dump_time (ksba_isotime_t t);
Modified: branches/GNUPG-1-9-BRANCH/sm/keylist.c
===================================================================
--- branches/GNUPG-1-9-BRANCH/sm/keylist.c 2006-06-27 14:30:59 UTC (rev 4176)
+++ branches/GNUPG-1-9-BRANCH/sm/keylist.c 2006-06-27 14:32:34 UTC (rev 4177)
@@ -672,7 +672,7 @@
else
fputs ("[?]\n", fp);
- fputs (" keyUsage:", fp);
+ fputs (" keyUsage: ", fp);
err = ksba_cert_get_key_usage (cert, &kusage);
if (gpg_err_code (err) != GPG_ERR_NO_DATA)
{
More information about the Gnupg-commits
mailing list