[git] GnuPG - branch, STABLE-BRANCH-1-4, updated. gnupg-1.4.11-17-g4fb59b1
by Werner Koch
cvs at cvs.gnupg.org
Fri Jul 22 14:38:25 CEST 2011
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, STABLE-BRANCH-1-4 has been updated
via 4fb59b131359db079df72d6fd1e9c846cbc29d33 (commit)
from 6daa9dbd7cd689758c060cf516d006041dabcdd5 (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 4fb59b131359db079df72d6fd1e9c846cbc29d33
Author: Werner Koch <wk at gnupg.org>
Date: Fri Jul 22 14:00:08 2011 +0200
Print the decoded iteration count witn --list-packets.
Fixes bug#1355.
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 19db8a4..fda3b85 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-22 Werner Koch <wk at g10code.com>
+
+ * parse-packet.c (parse_key): Print the decoded iteration count.
+ Fixes bug#1355.
+
2011-04-05 David Shaw <dshaw at jabberwocky.com>
* photoid.c (generate_photo_id): Check for the JPEG magic numbers
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 2594477..b22c63f 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -120,7 +120,7 @@ set_packet_list_mode( int mode )
be easy to add an option for the listing stream. Note that we
initialize it only once; mainly because some code may switch
the option value later back to 1 and we want to have all output
- to the same stream.
+ to the same stream.
Using stderr is not actually very clean because it bypasses the
logging code but it is a special thing anyay. I am not sure
@@ -459,7 +459,7 @@ parse( IOBUF inp, PACKET *pkt, int onlykeypkts, off_t *retpos,
if (with_uid && pkttype == PKT_USER_ID)
;
- else if( do_skip
+ else if( do_skip
|| !pkttype
|| (onlykeypkts && pkttype != PKT_PUBLIC_SUBKEY
&& pkttype != PKT_PUBLIC_KEY
@@ -858,10 +858,10 @@ dump_sig_subpkt( int hashed, int type, int critical,
"the owner of this ARR key. Detailed info follows:\n",
type, (unsigned)length );
}
-
+
buffer++;
length--;
-
+
fprintf (listfp, "\t%s%ssubpkt %d len %u (", /*)*/
critical ? "critical ":"",
hashed ? "hashed ":"", type, (unsigned)length );
@@ -1606,7 +1606,7 @@ read_protected_v3_mpi (IOBUF inp, unsigned long *length)
}
/* convert buffer into an opaque MPI */
- val = mpi_set_opaque (NULL, buf, p-buf);
+ val = mpi_set_opaque (NULL, buf, p-buf);
return val;
}
@@ -1690,7 +1690,7 @@ parse_key( IOBUF inp, int pkttype, unsigned long pktlen,
sk->version = version;
sk->is_primary = pkttype == PKT_SECRET_KEY;
sk->pubkey_algo = algorithm;
- sk->req_usage = 0;
+ sk->req_usage = 0;
sk->pubkey_usage = 0; /* not yet used */
}
else {
@@ -1703,7 +1703,7 @@ parse_key( IOBUF inp, int pkttype, unsigned long pktlen,
pk->version = version;
pk->is_primary = pkttype == PKT_PUBLIC_KEY;
pk->pubkey_algo = algorithm;
- pk->req_usage = 0;
+ pk->req_usage = 0;
pk->pubkey_usage = 0; /* not yet used */
pk->is_revoked = 0;
pk->is_disabled = 0;
@@ -1831,8 +1831,10 @@ parse_key( IOBUF inp, int pkttype, unsigned long pktlen,
sk->protect.s2k.count = iobuf_get(inp);
pktlen--;
if( list_mode )
- fprintf (listfp, "\tprotect count: %lu\n",
- (ulong)sk->protect.s2k.count);
+ fprintf (listfp, "\tprotect count: %lu (%lu)\n",
+ (ulong)S2K_DECODE_COUNT
+ ((ulong)sk->protect.s2k.count),
+ (ulong)sk->protect.s2k.count);
}
else if( sk->protect.s2k.mode == 1002 ) {
/* Read the serial number. */
@@ -1902,7 +1904,7 @@ parse_key( IOBUF inp, int pkttype, unsigned long pktlen,
* If the user is so careless, not to protect his secret key,
* we can assume, that he operates an open system :=(.
* So we put the key into secure memory when we unprotect it. */
- if( sk->protect.s2k.mode == 1001
+ if( sk->protect.s2k.mode == 1001
|| sk->protect.s2k.mode == 1002 ) {
/* better set some dummy stuff here */
sk->skey[npkey] = mpi_set_opaque(NULL, xstrdup("dummydata"), 10);
@@ -1923,7 +1925,7 @@ parse_key( IOBUF inp, int pkttype, unsigned long pktlen,
for(i=npkey; i < nskey; i++ ) {
if ( sk->is_protected ) {
sk->skey[i] = read_protected_v3_mpi (inp, &pktlen);
- if( list_mode )
+ if( list_mode )
fprintf (listfp, "\tskey[%d]: [encrypted]\n", i);
}
else {
@@ -2294,7 +2296,7 @@ parse_compressed( IOBUF inp, int pkttype, unsigned long pktlen,
*/
zd = pkt->pkt.compressed = xmalloc(sizeof *pkt->pkt.compressed );
zd->algorithm = iobuf_get_noeof(inp);
- zd->len = 0; /* not used */
+ zd->len = 0; /* not used */
zd->new_ctb = new_ctb;
zd->buf = inp;
if( list_mode )
@@ -2327,7 +2329,7 @@ parse_encrypted( IOBUF inp, int pkttype, unsigned long pktlen,
/* fixme: add some pktlen sanity checks */
int version;
- version = iobuf_get_noeof(inp);
+ version = iobuf_get_noeof(inp);
if (orig_pktlen)
pktlen--;
if( version != 1 ) {
-----------------------------------------------------------------------
Summary of changes:
g10/ChangeLog | 5 +++++
g10/parse-packet.c | 28 +++++++++++++++-------------
2 files changed, 20 insertions(+), 13 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list