[git] Scute - branch, master, updated. scute-1.3.0-41-g3e6c414
by Justus Winter
cvs at cvs.gnupg.org
Tue Dec 22 16:40:19 CET 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PKCS#11 token on top of gpg-agent".
The branch, master has been updated
via 3e6c414479f266388ca9dff3fe7263dd833be35e (commit)
via 6b0841e693de7b0b6ee44ed5d6392e2ec37379bf (commit)
via bc6f0df4a85f9f1ba691142eec2c79876a0f89d1 (commit)
via 1ecff306ed72f610a40695b3f49bde435dd33a22 (commit)
via cb2f607878911cf7b253065042f3d264d5ef0107 (commit)
via f06567bc3c242a9537b5353e996c0ea709ad5afe (commit)
from bff0ac01526802dff9ec0def6abbcdfbe2b473f8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3e6c414479f266388ca9dff3fe7263dd833be35e
Author: Justus Winter <justus at g10code.com>
Date: Tue Dec 22 16:20:14 2015 +0100
doc/manual: Fix CAcert instructions, hide FIXMEs.
* doc/manual/scute.texi: Fix CAcert instructions, turn remaining
FIXMEs into comments.
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/doc/manual/scute.texi b/doc/manual/scute.texi
index 6896608..5900b03 100644
--- a/doc/manual/scute.texi
+++ b/doc/manual/scute.texi
@@ -410,10 +410,10 @@ then create a certificate and send it back to you.
If, for example, you use the CA @uref{http://www.cacert.org, CAcert},
then you can log into your account at the CAcert website, choose
-``FIXME'', check ``FIXME'', paste the above request block into the text
-field and click on ``Submit''. If everything works correctly, a
-certificate will be shown, which you can cut and paste into a new file
- at file{floppy-head.crt}.
+``Client Certificates -> New'', check ``Show advanced options'', paste
+the above request block into the text field and click on ``Submit''.
+If everything works correctly, a certificate will be shown, which you
+can cut and paste into a new file @file{floppy-head.crt}.
Alternatively if, for example, you set up your own CA with OpenSSL, then
you can create your own certificate by issueing a command similar
@@ -550,7 +550,7 @@ the @code{Try Again} button does not work as expected:
@center @image{firefox-bad-pin,11cm}
-FIXME: Document possible error codes.
+ at comment FIXME: Document possible error codes.
@node Troubleshooting
@@ -583,7 +583,7 @@ displayed in the certificate manager of Firefox.
@strong{Solution:} Make sure that the corresponding certificate is
imported in GPGSM.
-FIXME: Can this really happen???
+ at comment FIXME: Can this really happen???
@node Internals
commit 6b0841e693de7b0b6ee44ed5d6392e2ec37379bf
Author: Justus Winter <justus at g10code.com>
Date: Tue Dec 22 15:31:09 2015 +0100
doc/manual: Include screenshot of generic error message.
* doc/manual/Makefile.am (images): Add new file.
* doc/manual/firefox-bad-pin.png: New file.
* doc/manual/scute.texi: Update the paragraph on generic error
messages printed by Firefox, and include screenshot.
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
index a5558e3..62431d7 100644
--- a/doc/manual/Makefile.am
+++ b/doc/manual/Makefile.am
@@ -34,7 +34,7 @@ DISTCLEANFILES = scute.tmp
images = firefox-cm.png firefox-cm-view-detail.png firefox-cm-view.png \
firefox-dm-load-after.png firefox-dm-load-before.png \
firefox-dm-load.png firefox-dm-token-present.png firefox-pref.png \
- firefox-pref-view.png
+ firefox-pref-view.png firefox-bad-pin.png
images_eps = $(images:.png=.eps)
diff --git a/doc/manual/firefox-bad-pin.png b/doc/manual/firefox-bad-pin.png
new file mode 100644
index 0000000..5d225fb
Binary files /dev/null and b/doc/manual/firefox-bad-pin.png differ
diff --git a/doc/manual/scute.texi b/doc/manual/scute.texi
index b70fdde..6896608 100644
--- a/doc/manual/scute.texi
+++ b/doc/manual/scute.texi
@@ -543,11 +543,12 @@ the server.
If the card is not present, or you enter the wrong PIN, or the server
does not admit your certificate, you will get an error message. This
error message is generated by the application and Scute can not
-influence it. Unfortunately, in Firefox 1, this error message is not
-very user friendly: ``@code{example.com has received an incorrect or
-unexpected message. Error code: -12227}''.
+influence it. Unfortunately, in Firefox (at least up to version
+38.5.0), this error message is not very user friendly. For example,
+entering a bad PIN results in the following generic error message, and
+the @code{Try Again} button does not work as expected:
-FIXME: Screenshot.
+ at center @image{firefox-bad-pin,11cm}
FIXME: Document possible error codes.
commit bc6f0df4a85f9f1ba691142eec2c79876a0f89d1
Author: Justus Winter <justus at g10code.com>
Date: Tue Dec 22 15:27:27 2015 +0100
doc/manual: Include screenshot of certificate manager.
* doc/manual/scute.texi: Include screenshot of certificate manager.
There are two more unused screenshots, but I do not see why they
should be included.
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/doc/manual/scute.texi b/doc/manual/scute.texi
index 588d860..b70fdde 100644
--- a/doc/manual/scute.texi
+++ b/doc/manual/scute.texi
@@ -514,8 +514,10 @@ list.
@center @image{firefox-dm-token-present,15cm}
-FIXME: Add some documentation and screenshots for the certificate
-manager.
+The client certificate will show up in the @code{Certificate Manager}
+under @code{Your Certificates}:
+
+ at center @image{firefox-cm,13cm}
@node Authentication With Service
@section Authentication With Service
commit 1ecff306ed72f610a40695b3f49bde435dd33a22
Author: Justus Winter <justus at g10code.com>
Date: Tue Dec 22 14:34:05 2015 +0100
doc/manual: Rework image handling.
* doc/manual/Makefile.am: Do not convert PNGs to PDFs first for the
PDF manual, do not scale the EPS pictures down.
* doc/manual/scute.texi: Scale and center images for the LaTeX-based
formats.
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/TODO b/TODO
index 9102a1b..75ef5fd 100644
--- a/TODO
+++ b/TODO
@@ -2,7 +2,6 @@
* Manual:
** Some FIXME's which need attention.
-** The pictures in PDF output are blurry.
** The pictures in info output do not exist.
* Bugs or misfeatures:
diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
index 40a5fc0..a5558e3 100644
--- a/doc/manual/Makefile.am
+++ b/doc/manual/Makefile.am
@@ -36,11 +36,10 @@ images = firefox-cm.png firefox-cm-view-detail.png firefox-cm-view.png \
firefox-dm-load.png firefox-dm-token-present.png firefox-pref.png \
firefox-pref-view.png
-images_pdf = $(images:.png=.pdf)
images_eps = $(images:.png=.eps)
EXTRA_DIST = $(images)
-CLEANFILES = $(images_pdf) $(images_eps)
+CLEANFILES = $(images_eps)
info_TEXINFOS = scute.texi
scute_TEXINFOS = gpl.texi
@@ -52,10 +51,7 @@ scute.html/%.png: %.png
cp -v "$<" "$@"
scute.dvi: $(images_eps)
-scute.pdf: $(images_pdf)
+scute.pdf: $(images)
%.eps : %.png
- $(CONVERT) -resize 50% `test -f '$<' || echo '$(srcdir)/'`$< $@
-
-%.pdf : %.eps
- $(EPSTOPDF) `test -f '$<' || echo '$(srcdir)/'`$< --outfile=$@
+ $(CONVERT) `test -f '$<' || echo '$(srcdir)/'`$< $@
diff --git a/doc/manual/scute.texi b/doc/manual/scute.texi
index e3f0a3b..588d860 100644
--- a/doc/manual/scute.texi
+++ b/doc/manual/scute.texi
@@ -481,12 +481,12 @@ the preferences configuration dialog, you should select the
@code{Advanced} configuration section, then the @code{Security} tab, and
then select @code{Security Devices} in the category @code{Certificates}.
- at image{firefox-pref}
+ at center @image{firefox-pref,13cm}
In the devices manager dialog, you can select @code{Load} to load a new
PKCS #11 device.
- at image{firefox-dm-load-before}
+ at center @image{firefox-dm-load-before,13cm}
In the pop-up dialog that follows, you can give a module name
(e.g. ``@code{Scute}'') and a module filename. The latter should
@@ -497,14 +497,14 @@ file name @file{/usr/local/lib/scute.so}. If you or your system
administrator installed Scute in a different location, you have to
adjust the file name correspondingly.
- at image{firefox-dm-load}
+ at center @image{firefox-dm-load,8cm}
After confirming installation of the security device, a pop-up window
should confirm that the module was successfully loaded, and an entry for
the security device should appear in the device manager list of
@code{Security Modules and Devices}.
- at image{firefox-dm-load-after}
+ at center @image{firefox-dm-load-after,15cm}
When you insert the OpenPGP card for which you generated and imported a
certificate earlier (see @ref{Certificate Preparation}), the device
@@ -512,7 +512,7 @@ manager should detect this security token and display some information
about it in the @code{Details} list when you select it from the module
list.
- at image{firefox-dm-token-present}
+ at center @image{firefox-dm-token-present,15cm}
FIXME: Add some documentation and screenshots for the certificate
manager.
commit cb2f607878911cf7b253065042f3d264d5ef0107
Author: Justus Winter <justus at g10code.com>
Date: Tue Dec 22 14:03:40 2015 +0100
doc/manual: Adapt to renamed shared object.
* doc/manual/firefox-dm-load.png: Adapt to renamed shared object.
* doc/manual/scute.texi: Likewise.
--
This is a follow-up to dc221117.
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/doc/manual/firefox-dm-load.png b/doc/manual/firefox-dm-load.png
index df8fc0d..0094c78 100644
Binary files a/doc/manual/firefox-dm-load.png and b/doc/manual/firefox-dm-load.png differ
diff --git a/doc/manual/scute.texi b/doc/manual/scute.texi
index 72c8404..e3f0a3b 100644
--- a/doc/manual/scute.texi
+++ b/doc/manual/scute.texi
@@ -286,7 +286,7 @@ and installed according to the generic installation instructions found
in the source package in the file @code{INSTALL}. There are no Scute
specific options to the configure script.
-After installation, the @code{libscute.so} module file can be found in
+After installation, the @code{scute.so} module file can be found in
the library directory of the installation path.
@@ -491,9 +491,9 @@ PKCS #11 device.
In the pop-up dialog that follows, you can give a module name
(e.g. ``@code{Scute}'') and a module filename. The latter should
correspond to the full file name of the installed Scute module file
- at file{libscute.so}. The default installation path is
+ at file{scute.so}. The default installation path is
@file{/usr/local/lib}, which would mean that you have to provide the
-file name @file{/usr/local/lib/libscute.so}. If you or your system
+file name @file{/usr/local/lib/scute.so}. If you or your system
administrator installed Scute in a different location, you have to
adjust the file name correspondingly.
commit f06567bc3c242a9537b5353e996c0ea709ad5afe
Author: Justus Winter <justus at g10code.com>
Date: Tue Dec 22 12:24:04 2015 +0100
Fix some minor compiler warnings.
* src/agent.c (agent_configure): Avoid dead stores.
(unhexify_fpr): Likewise.
(get_cert_data_cb): Drop unused variable.
* src/gpgsm.c (search_cb): Avoid dead store.
* tests/t-gettokeninfo.c (main): Fail on error.
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/src/agent.c b/src/agent.c
index a3dcfd8..938edef 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -538,15 +538,11 @@ agent_configure (assuan_context_t ctx)
if (dft_pinentry_user_data)
err = agent_simple_cmd (ctx, "OPTION pinentry_user_data=%s",
dft_pinentry_user_data);
- if (gpg_err_code (err) == GPG_ERR_UNKNOWN_OPTION)
- err = 0;
- else if (err)
+ if (err && gpg_err_code (err) != GPG_ERR_UNKNOWN_OPTION)
return err;
err = agent_simple_cmd (ctx, "OPTION allow-pinentry-notify");
- if (gpg_err_code (err) == GPG_ERR_UNKNOWN_OPTION)
- err = 0;
- else if (err)
+ if (err && gpg_err_code (err) != GPG_ERR_UNKNOWN_OPTION)
return err;
err = assuan_transact (ctx, "GETINFO version",
@@ -652,7 +648,6 @@ unhexify_fpr (const char *hexstr, unsigned char *fpr)
if ((*src && !spacep (src)) || (cnt != 40))
return 0;
- cnt /= 2;
for (src = hexstr, cnt = 0; *src && !spacep (src); src += 2, cnt++)
fpr[cnt] = xtoi_2 (src);
@@ -1104,7 +1099,6 @@ gpg_error_t
get_cert_data_cb (void *opaque, const void *data, size_t data_len)
{
struct get_cert_s *cert_s = opaque;
- gpg_error_t err;
int needed_size;
needed_size = cert_s->cert_der_len + data_len;
diff --git a/src/gpgsm.c b/src/gpgsm.c
index 99b6652..2a2906f 100644
--- a/src/gpgsm.c
+++ b/src/gpgsm.c
@@ -89,7 +89,7 @@ search_cb (void *hook, struct cert *cert)
might still be able to proceed, for example with client
authentication. */
if (ctx->with_chain && strcmp (cert->chain_id, cert->fpr))
- err = scute_gpgsm_search_certs_by_fpr (cert->chain_id, search_cb, ctx);
+ scute_gpgsm_search_certs_by_fpr (cert->chain_id, search_cb, ctx);
/* Turn this certificate into a certificate object. */
err = scute_attr_cert (cert, &attrp, &attr_countp);
diff --git a/tests/t-gettokeninfo.c b/tests/t-gettokeninfo.c
index 7b6eff7..91861ae 100644
--- a/tests/t-gettokeninfo.c
+++ b/tests/t-gettokeninfo.c
@@ -64,6 +64,7 @@ main (int argc, char *argv[])
CK_TOKEN_INFO info;
err = C_GetTokenInfo (slots[i], &info);
+ fail_if_err (err);
printf ("%2i. Slot ID %lu\n", i, slots[i]);
-----------------------------------------------------------------------
Summary of changes:
TODO | 1 -
doc/manual/Makefile.am | 12 ++++--------
doc/manual/firefox-bad-pin.png | Bin 0 -> 28730 bytes
doc/manual/firefox-dm-load.png | Bin 16126 -> 16136 bytes
doc/manual/scute.texi | 43 ++++++++++++++++++++++-------------------
src/agent.c | 10 ++--------
src/gpgsm.c | 2 +-
tests/t-gettokeninfo.c | 1 +
8 files changed, 31 insertions(+), 38 deletions(-)
create mode 100644 doc/manual/firefox-bad-pin.png
hooks/post-receive
--
PKCS#11 token on top of gpg-agent
http://git.gnupg.org
More information about the Gnupg-commits
mailing list