[git] GnuPG - branch, master, updated. gnupg-2.1.5-39-gd8bc89a
by Werner Koch
cvs at cvs.gnupg.org
Tue Jun 30 11:58:27 CEST 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 "The GNU Privacy Guard".
The branch, master has been updated
via d8bc89ab885095441147357501f85624feca14fd (commit)
via 740c4af7032fc6da075ba7ab9cb4401ed45d5ab8 (commit)
from 010e4281c3e15e2f86589dd1da419531ead519ef (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 d8bc89ab885095441147357501f85624feca14fd
Author: Werner Koch <wk at gnupg.org>
Date: Tue Jun 30 11:56:01 2015 +0200
Remove obsolete file g10/comment.c.
--
diff --git a/g10/comment.c b/g10/comment.c
deleted file mode 100644
index 085dbad..0000000
--- a/g10/comment.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/* comment.c - write comment stuff
- * Copyright (C) 1998, 2003 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-
-#include "options.h"
-#include "packet.h"
-#include "status.h"
-#include "iobuf.h"
-#include "util.h"
-#include "main.h"
-#include "keydb.h"
-
-
-
-int
-write_comment( iobuf_t out, const char *s )
-{
- PACKET pkt;
- size_t n = strlen(s);
- int rc=0;
-
- pkt.pkttype = PKT_COMMENT;
- if( *s != '#' ) {
- pkt.pkt.comment = xmalloc ( sizeof *pkt.pkt.comment + n );
- pkt.pkt.comment->len = n+1;
- *pkt.pkt.comment->data = '#';
- strcpy(pkt.pkt.comment->data+1, s);
- }
- else {
- pkt.pkt.comment = xmalloc ( sizeof *pkt.pkt.comment + n - 1 );
- pkt.pkt.comment->len = n;
- strcpy(pkt.pkt.comment->data, s);
- }
- if( (rc = build_packet( out, &pkt )) )
- log_error("build_packet(comment) failed: %s\n", gpg_strerror (rc) );
- free_packet( &pkt );
- return rc;
-}
-
-
-KBNODE
-make_comment_node_from_buffer (const char *s, size_t n)
-{
- PACKET *pkt;
-
- pkt = gcry_xcalloc( 1, sizeof *pkt );
- pkt->pkttype = PKT_COMMENT;
- pkt->pkt.comment = gcry_xmalloc( sizeof *pkt->pkt.comment + n - 1 );
- pkt->pkt.comment->len = n;
- strcpy(pkt->pkt.comment->data, s);
- return new_kbnode( pkt );
-}
-
-KBNODE
-make_comment_node( const char *s )
-{
- return make_comment_node_from_buffer (s, strlen (s));
-}
-
-
-KBNODE
-make_mpi_comment_node( const char *s, gcry_mpi_t a )
-{
- PACKET *pkt;
- byte *buf, *pp;
- size_t n1, nb1;
- size_t n = strlen(s);
-
- nb1 = mpi_get_nbits( a );
- if (gcry_mpi_print (GCRYMPI_FMT_PGP, NULL, 0, &n1, a))
- BUG ();
- /* fixme: allocate it on the stack */
- buf = xmalloc (n1);
- if (gcry_mpi_print (GCRYMPI_FMT_PGP, buf, n1, &n1, a))
- BUG ();
-
- pkt = xcalloc (1, sizeof *pkt );
- pkt->pkttype = PKT_COMMENT;
- pkt->pkt.comment = xmalloc ( sizeof *pkt->pkt.comment + n + 2 + n1 );
- pkt->pkt.comment->len = n+1+2+n1;
- pp = pkt->pkt.comment->data;
- memcpy(pp, s, n+1);
- memcpy(pp+n+1, buf, n1 );
- xfree (buf);
- return new_kbnode( pkt );
-}
commit 740c4af7032fc6da075ba7ab9cb4401ed45d5ab8
Author: Werner Koch <wk at gnupg.org>
Date: Tue Jun 30 11:55:17 2015 +0200
doc: Updated HACKING.
--
Added used commit keywords.
Add some comments to the list of files.
diff --git a/doc/HACKING b/doc/HACKING
index 252bc42..f60f15d 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -93,6 +93,23 @@ appear in the ChangeLog.
need. If you really need to do it, use a separate commit for such a
change.
+** Commit log keywords
+
+ - GnuPG-bug-id :: Values are comma or space delimited bug numbers
+ from bug.gnupg.org pertaining to this commit.
+ - Debian-bug-id :: Same as above but from the Debian bug tracker.
+ - CVE-id :: CVE id number pertaining to this commit.
+ - Regression-due-to :: Commit id of the regression fixed by this commit.
+ - Fixes-commit :: Commit id this commit fixes.
+ - Reported-by :: Value is a name or mail address of a bug reporte.
+ - Suggested-by :: Value is a name or mail address of someone how
+ suggested this change.
+ - Co-authored-by :: Name or mail address of a co-author
+ - Some-comments-by :: Name or mail address of the author of
+ additional comments (commit log or code).
+ - Proofread-by :: Sometimes used by translation commits.
+ - Signed-off-by :: Name or mail address of the developer
+
* Windows
** How to build an installer for Windows
@@ -175,13 +192,11 @@ appear in the ChangeLog.
** Detailed Roadmap
- This list of file is not up to date!
+ This list of files is not up to date!
- g10/gpg.c :: Main module with option parsing and all the stuff you
- have to do on startup. Also has the exout handler
- and some helper functions.
-
- - g10/sign.c :: Create signature and optionally encrypt
+ have to do on startup. Also has the exit handler and
+ some helper functions.
- g10/parse-packet.c ::
- g10/build-packet.c ::
@@ -190,22 +205,21 @@ appear in the ChangeLog.
- g10/getkey.c :: Key selection code
- g10/pkclist.c :: Build a list of public keys
- g10/skclist.c :: Build a list of secret keys
- - g10/ringedit.c :: Keyring I/O
+ - g10/keyring.c :: Keyring access functions
- g10/keydb.h ::
- - g10/keyid.c :: Helper functions to get the keyid, fingerprint etc.
-
+ - g10/keyid.c :: Helper functions to get the keyid, fingerprint etc.
- - g10/trustdb.c ::
+ - g10/trustdb.c :: Web-of-Trust computations
- g10/trustdb.h ::
- - g10/tdbdump.c :: Management of the trustdb.gpg
- - g10/tdbio.c ::
- - g10/tdbio.h :: I/O handling for the trustdb.gpg
+ - g10/tdbdump.c :: Export/import/list the trustdb.gpg
+ - g10/tdbio.c :: I/O handling for the trustdb.gpg
+ - g10/tdbio.h ::
- g10/compress.c :: Filter to handle compression
- g10/filter.h :: Declarations for all filter functions
- g10/delkey.c :: Delete a key
- - g10/kbnode.c :: Helper for the KBNODE linked list
+ - g10/kbnode.c :: Helper for the kbnode_t linked list
- g10/main.h :: Prototypes and some constants
- g10/mainproc.c :: Message processing
- g10/armor.c :: Ascii armor filter
@@ -216,33 +230,28 @@ appear in the ChangeLog.
- g10/options.h :: Structure with all the command line options
and related constants
- g10/openfile.c :: Create/Open Files
- - g10/hkp.h :: Keyserver access
- - g10/hkp.c :: Ditto.
+ - g10/keyserver.h :: Keyserver access dispatcher.
- g10/packet.h :: Defintion of OpenPGP structures.
- g10/passphrase.c :: Passphrase handling code
- - g10/pubkey-enc.c ::
- - g10/seckey-cert.c ::
- - g10/seskey.c ::
- - g10/import.c ::
- - g10/export.c ::
- - g10/comment.c ::
- - g10/status.c ::
- - g10/status.h ::
- - g10/sign.c ::
- - g10/plaintext.c ::
- - g10/encr-data.c ::
- - g10/encode.c ::
- - g10/revoke.c ::
- - g10/keylist.c ::
- - g10/sig-check.c ::
- - g10/signal.c ::
- - g10/helptext.c ::
- - g10/verify.c ::
- - g10/decrypt.c ::
- - g10/keyedit.c ::
- - g10/dearmor.c ::
- - g10/keygen.c ::
+ - g10/pubkey-enc.c :: Process a public key encoded packet.
+ - g10/seckey-cert.c :: Not anymore used
+ - g10/seskey.c :: Make sesssion keys etc.
+ - g10/import.c :: Import keys into our key storage.
+ - g10/export.c :: Export keys to the OpenPGP format.
+ - g10/sign.c :: Create signature and optionally encrypt.
+ - g10/plaintext.c :: Process plaintext packets.
+ - g10/decrypt-data.c :: Decrypt an encrypted data packet
+ - g10/encrypt.c :: Main encryption driver
+ - g10/revoke.c :: Create recovation certificates.
+ - g10/keylist.c :: Print information about OpenPGP keys
+ - g10/sig-check.c :: Check a signature
+ - g10/helptext.c :: Show online help texts
+ - g10/verify.c :: Verify signed data.
+ - g10/decrypt.c :: Decrypt and verify data.
+ - g10/keyedit.c :: Edit properties of a key.
+ - g10/dearmor.c :: Armor utility.
+ - g10/keygen.c :: Generate a key pair
** Memory allocation
@@ -263,7 +272,7 @@ Use only the functions:
- xfree
-The *secure versions allocated memory in the secure memory. That is,
+The *secure versions allocate memory in the secure memory. That is,
swapping out of this memory is avoided and is gets overwritten on
free. Use this for passphrases, session keys and other sensitive
material. This memory set aside for secure memory is linited to a few
@@ -294,7 +303,7 @@ worry about this. When it sees a compressed packet it pushes the
uncompress filter and the next read byte is one which has already been
uncompressed by this filter. Same goes for enciphered packet,
plaintext packets and so on. The file g10/encode.c might be a good
-staring point to see how it is used - actually this is the other way:
+starting point to see how it is used - actually this is the other way:
constructing messages using pushed filters but it may be easier to
understand.
diff --git a/g10/keygen.c b/g10/keygen.c
index fa5907d..796d18f 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -1,4 +1,4 @@
-/* keygen.c - generate a key pair
+/* keygen.c - Generate a key pair
* Copyright (C) 1998-2007, 2009-2011 Free Software Foundation, Inc.
* Copyright (C) 2014, 2015 Werner Koch
*
diff --git a/g10/revoke.c b/g10/revoke.c
index 6680ac7..6e82187 100644
--- a/g10/revoke.c
+++ b/g10/revoke.c
@@ -1,4 +1,4 @@
-/* revoke.c
+/* revoke.c - Create recovation certificates.
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003,
* 2004 Free Software Foundation, Inc.
*
-----------------------------------------------------------------------
Summary of changes:
doc/HACKING | 87 +++++++++++++++++++++++++---------------------
g10/comment.c | 108 ----------------------------------------------------------
g10/keygen.c | 2 +-
g10/revoke.c | 2 +-
4 files changed, 50 insertions(+), 149 deletions(-)
delete mode 100644 g10/comment.c
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list