[git] GnuPG - branch, master, updated. gnupg-2.1.0-beta442-20-gb5f95c1
by Werner Koch
cvs at cvs.gnupg.org
Wed Jun 25 11:46:45 CEST 2014
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 "The GNU Privacy Guard".
The branch, master has been updated
via b5f95c1b566f9530127f3f34e10d120a951cf428 (commit)
via f149e05427a370f5985bc3fb142370b043f19924 (commit)
from f171fd226e84311f92545ca0494771db07ba777d (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 b5f95c1b566f9530127f3f34e10d120a951cf428
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jun 25 11:15:45 2014 +0200
doc: Improve the rendering of the manual
diff --git a/artwork/gnupg-logo-420x135tr.png b/artwork/gnupg-logo-420x135tr.png
new file mode 100644
index 0000000..a1556df
Binary files /dev/null and b/artwork/gnupg-logo-420x135tr.png differ
diff --git a/doc/debugging.texi b/doc/debugging.texi
index c83ab1e..f26d1aa 100644
--- a/doc/debugging.texi
+++ b/doc/debugging.texi
@@ -177,10 +177,13 @@ you created the signing request. By running the command
you get a listing of all private keys under control of @command{gpg-agent}.
Pick the key which best matches the creation time and run the command
-
+
+ at cartouche
@smallexample
- /usr/local/libexec/gpg-protect-tool --p12-export ~/.gnupg/private-keys-v1.d/@var{foo} >@var{foo}.p12
+ /usr/local/libexec/gpg-protect-tool --p12-export \
+ ~/.gnupg/private-keys-v1.d/@var{foo} >@var{foo}.p12
@end smallexample
+ at end cartouche
(Please adjust the path to @command{gpg-protect-tool} to the appropriate
location). @var{foo} is the name of the key file you picked (it should
@@ -188,11 +191,13 @@ have the suffix @file{.key}). A Pinentry box will pop up and ask you
for the current passphrase of the key and a new passphrase to protect it
in the pkcs#12 file.
-To import the created file on the machine you use this command:
+To import the created file on the machine you use this command:
+ at cartouche
@smallexample
/usr/local/libexec/gpg-protect-tool --p12-import --store @var{foo}.p12
@end smallexample
+ at end cartouche
You will be asked for the pkcs#12 passphrase and a new passphrase to
protect the imported private key at its new location.
@@ -230,7 +235,7 @@ gpg: fatal: WriteConsole failed: Access denied
@end smallexample
@noindent
-The solution is to use the command @command{wineconsole}.
+The solution is to use the command @command{wineconsole}.
Some operations like gen-key really want to talk to the console directly
for increased security (for example to prevent the passphrase from
diff --git a/doc/gnupg-logo.pdf b/doc/gnupg-logo.pdf
deleted file mode 100644
index 84a3470..0000000
Binary files a/doc/gnupg-logo.pdf and /dev/null differ
diff --git a/doc/gnupg-logo.png b/doc/gnupg-logo.png
index 73cf00a..a1556df 100644
Binary files a/doc/gnupg-logo.png and b/doc/gnupg-logo.png differ
diff --git a/doc/gnupg.texi b/doc/gnupg.texi
index 1f0682b..875b8e4 100644
--- a/doc/gnupg.texi
+++ b/doc/gnupg.texi
@@ -29,12 +29,13 @@ This is the @cite{The GNU Privacy Guard Manual} (version
@value{VERSION}, @value{UPDATED-MONTH}).
@iftex
-Published by the Free Software Foundation@*
-51 Franklin St, Fifth Floor@*
-Boston, MA 02110-1301 USA
+Published by The GnuPG Project@*
+ at url{https://gnupg.org}@*
+(or @url{http://ic6au7wa3f6naxjq.onion})
@end iftex
-Copyright @copyright{} 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
+ at copyright{} 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.@*
+ at copyright{} 2013, 2014 Werner Koch.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -92,11 +93,11 @@ section entitled ``Copying''.
@sp 3
- at image{gnupg-logo,16cm,,The GnuPG Logo}
+ at image{gnupg-logo,,,The GnuPG Logo}
@sp 3
- at author Werner Koch (@email{wk@@gnupg.org})
+ at author The GnuPG Project (@url{https://gnupg.org})
@page
@vskip 0pt plus 1filll
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index c3dfd82..b42d353 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -597,7 +597,8 @@ agent. By default they may all be found in the current home directory
Here is an example where two keys are marked as ultimately trusted
and one as not trusted:
- @example
+ @cartouche
+ @smallexample
# CN=Wurzel ZS 3,O=Intevation GmbH,C=DE
A6935DD34EF3087973C706FC311AA2CCF733765B S
@@ -606,7 +607,8 @@ agent. By default they may all be found in the current home directory
# CN=Root-CA/O=Schlapphuete/L=Pullach/C=DE
!14:56:98:D3:FE:9C:CA:5A:31:6E:BC:81:D3:11:4E:00:90:A3:44:C2 S
- @end example
+ @end smallexample
+ @end cartouche
Before entering a key into this file, you need to ensure its
authenticity. How to do this depends on your organisation; your
@@ -669,11 +671,13 @@ The following example lists exactly one key. Note that keys available
through a OpenPGP smartcard in the active smartcard reader are
implicitly added to this list; i.e. there is no need to list them.
- @example
+ @cartouche
+ @smallexample
# Key added on: 2011-07-20 20:38:46
# Fingerprint: 5e:8d:c4:ad:e7:af:6e:27:8a:d6:13:e4:79:ad:0b:81
34B62F25E277CF13D3C6BCEBFD3F85D08F0A864B 0 confirm
- @end example
+ @end smallexample
+ @end cartouche
@item private-keys-v1.d/
@@ -892,8 +896,8 @@ If the decryption was successful the decrypted data is returned by
means of "D" lines.
Here is an example session:
-
- at example
+ at cartouche
+ at smallexample
C: PKDECRYPT
S: INQUIRE CIPHERTEXT
C: D (enc-val elg (a 349324324)
@@ -903,7 +907,8 @@ Here is an example session:
S: S PADDING 0
S: D (value 1234567890ABCDEF0)
S: OK descryption successful
- at end example
+ at end smallexample
+ at end cartouche
The “PADDING” status line is only send if gpg-agent can tell what kind
of padding is used. As of now only the value 0 is used to indicate
@@ -937,10 +942,15 @@ must be given. Valid names for <name> are:
@table @code
@item sha1
+The SHA-1 hash algorithm
@item sha256
+The SHA-256 hash algorithm
@item rmd160
+The RIPE-MD160 hash algorithm
@item md5
+The old and broken MD5 hash algorithm
@item tls-md5sha1
+A combined hash algorithm as used by the TLS protocol.
@end table
@noindent
@@ -977,8 +987,8 @@ caching.
Here is an example session:
-
- at example
+ at cartouche
+ at smallexample
C: SIGKEY <keyGrip>
S: OK key available
C: SIGKEY <keyGrip>
@@ -992,8 +1002,8 @@ Here is an example session:
S: # signature follows
S: D (sig-val rsa (s 45435453654612121212))
S: OK
- at end example
-
+ at end smallexample
+ at end cartouche
@node Agent GENKEY
@subsection Generating a Key
@@ -1043,8 +1053,8 @@ like S-Expression like this:
@end example
Here is an example session:
-
- at example
+ at cartouche
+ at smallexample
C: GENKEY
S: INQUIRE KEYPARM
C: D (genkey (rsa (nbits 1024)))
@@ -1052,7 +1062,8 @@ Here is an example session:
S: D (public-key
S: D (rsa (n 326487324683264) (e 10001)))
S OK key created
- at end example
+ at end smallexample
+ at end cartouche
@ifset gpgtwoone
The @option{--no-protection} option may be used to prevent prompting for a
@@ -1170,7 +1181,9 @@ special handling of passphrases. This command uses a syntax which helps
clients to use the agent with minimum effort.
@example
- GET_PASSPHRASE [--data] [--check] [--no-ask] [--repeat[=N]] [--qualitybar] @var{cache_id} [@var{error_message} @var{prompt} @var{description}]
+ GET_PASSPHRASE [--data] [--check] [--no-ask] [--repeat[=N]] \
+ [--qualitybar] @var{cache_id} \
+ [@var{error_message} @var{prompt} @var{description}]
@end example
@var{cache_id} is expected to be a string used to identify a cached
diff --git a/doc/scdaemon.texi b/doc/scdaemon.texi
index 1a4b6d7..861c898 100644
--- a/doc/scdaemon.texi
+++ b/doc/scdaemon.texi
@@ -178,7 +178,8 @@ show memory statistics.
@item 9 (512)
write hashed data to files named @code{dbgmd-000*}
@item 10 (1024)
-trace Assuan protocol. See also option @option{--debug-assuan-log-cats}.
+trace Assuan protocol.
+See also option @option{--debug-assuan-log-cats}.
@item 11 (2048)
trace APDU I/O to the card. This may reveal sensitive data.
@item 12 (4096)
@@ -268,10 +269,12 @@ a list of available readers. The default is then the first reader
found.
To get a list of available CCID readers you may use this command:
+ at cartouche
@smallexample
-echo scd getinfo reader_list | gpg-connect-agent --decode | awk '/^D/ @{print $2@}'
+ echo scd getinfo reader_list \
+ | gpg-connect-agent --decode | awk '/^D/ @{print $2@}'
@end smallexample
-
+ at end cartouche
@item --card-timeout @var{n}
@opindex card-timeout
@@ -347,8 +350,9 @@ This application is currently only used by @command{gpg} but may in
future also be useful with @command{gpgsm}. Version 1 and version 2 of
the card is supported.
-The specifications for these cards are available at
- at uref{http://g10code.com/docs/openpgp-card-1.0.pdf} and
+ at noindent
+The specifications for these cards are available at@*
+ at uref{http://g10code.com/docs/openpgp-card-1.0.pdf} and@*
@uref{http://g10code.com/docs/openpgp-card-2.0.pdf}.
@node NKS Card
commit f149e05427a370f5985bc3fb142370b043f19924
Author: Werner Koch <wk at gnupg.org>
Date: Tue Jun 3 13:34:24 2014 +0200
doc: Update for modern makeinfo.
* doc/texi.css: Remove.
* doc/Makefile.am (AM_MAKEINFOFLAGS): Use --css-ref.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4d6d475..43d69cd 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -34,7 +34,7 @@ EXTRA_DIST = samplekeys.asc mksamplekeys \
gnupg-card-architecture.pdf \
FAQ gnupg7.texi \
opt-homedir.texi see-also-note.texi specify-user-id.texi \
- gpgv.texi texi.css yat2m.c ChangeLog-2011
+ gpgv.texi yat2m.c ChangeLog-2011
BUILT_SOURCES = gnupg-card-architecture.eps gnupg-card-architecture.png \
gnupg-card-architecture.pdf
@@ -57,7 +57,7 @@ gnupg_TEXINFOS = \
DVIPS = TEXINPUTS="$(srcdir)$(PATH_SEPARATOR)$$TEXINPUTS" dvips
-AM_MAKEINFOFLAGS = -I $(srcdir) --css-include=$(srcdir)/texi.css -D gpgtwoone
+AM_MAKEINFOFLAGS = -I $(srcdir) --css-ref=/share/site.css -D gpgtwoone
YAT2M_OPTIONS = -I $(srcdir) -D gpgtwoone \
--release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard"
@@ -130,15 +130,15 @@ online: gnupg.html gnupg.pdf
set -e; \
echo "Uploading current manuals to www.gnupg.org ..."; \
cp $(srcdir)/gnupg-logo-tr.png gnupg.html/; \
- user=werner ; dashdevel="" ; \
+ user=werner ; webhost="ftp.gnupg.org" ; dashdevel="" ; \
if echo "@PACKAGE_VERSION@" | grep -- "-git" >/dev/null; then \
dashdevel="-devel" ; \
else \
- rsync -v gnupg.pdf $${user}@cvs.gnupg.org:webspace/manuals/ ; \
+ rsync -v gnupg.pdf $${user}@$${webhost}:webspace/manuals/ ; \
fi ; \
cd gnupg.html ; \
- rsync -vr --exclude='.svn' . \
- $${user}@cvs.gnupg.org:webspace/manuals/gnupg$${dashdevel}/
+ rsync -vr --exclude='.git' . \
+ $${user}@$${webhost}:webspace/manuals/gnupg$${dashdevel}/
# Note that you need a recent version of emacs23 with org-mode 7.01h
faq.txt faq.html: faq.org
@@ -155,8 +155,8 @@ faq.txt faq.html: faq.org
faq-online: faq.txt faq.html
set -e; \
- user=werner ; \
+ user=werner ; webhost="ftp.gnupg.org" ; ftphost="ftp.gnupg.org" ; \
echo "Uploading current FAQ to {www,ftp}.gnupg.org ..."; \
- scp faq.html $${user}@ftp.gnupg.org:webspace/manuals/GnuPG-FAQ.html ; \
- scp faq.txt $${user}@ftp.gnupg.org:gcrypt/gnupg/GnuPG-FAQ.txt ; \
+ scp faq.html $${user}@$${webhost}:webspace/manuals/GnuPG-FAQ.html ; \
+ scp faq.txt $${user}@$${ftphost}:gcrypt/gnupg/GnuPG-FAQ.txt ; \
echo "...ready"
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 9a6782a..9c52282 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -2330,12 +2330,17 @@ a message that PGP 2.x will not be able to handle. Note that `PGP
2.x' here means `MIT PGP 2.6.2'. There are other versions of PGP 2.x
available, but the MIT release is a good common baseline.
-This option implies @option{--rfc1991 --disable-mdc
---no-force-v4-certs --escape-from-lines --force-v3-sigs
+This option implies
+ at ifset gpgone
+ at option{--rfc1991 --disable-mdc --no-force-v4-certs
+ --escape-from-lines --force-v3-sigs
+ --cipher-algo IDEA --digest-algo MD5 --compress-algo ZIP}.
+ at end ifset
@ifclear gpgone
---allow-weak-digest-algos
+ at option{--rfc1991 --disable-mdc --no-force-v4-certs
+ --escape-from-lines --force-v3-sigs --allow-weak-digest-algos
+ --cipher-algo IDEA --digest-algo MD5 --compress-algo ZIP}.
@end ifclear
---cipher-algo IDEA --digest-algo MD5 --compress-algo ZIP}.
It also disables @option{--textmode} when encrypting.
@item --pgp6
-----------------------------------------------------------------------
Summary of changes:
artwork/gnupg-logo-420x135tr.png | Bin 0 -> 14471 bytes
doc/Makefile.am | 18 ++++++++--------
doc/debugging.texi | 13 ++++++++----
doc/gnupg-logo.pdf | Bin 11736 -> 0 bytes
doc/gnupg-logo.png | Bin 8988 -> 14471 bytes
doc/gnupg.texi | 13 ++++++------
doc/gpg-agent.texi | 43 +++++++++++++++++++++++++-------------
doc/gpg.texi | 13 ++++++++----
doc/scdaemon.texi | 14 ++++++++-----
9 files changed, 71 insertions(+), 43 deletions(-)
create mode 100644 artwork/gnupg-logo-420x135tr.png
delete mode 100644 doc/gnupg-logo.pdf
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list