From: Henning Schild <henning.schild@siemens.com>
To: git@vger.kernel.org
Cc: Ben Toews <mastahyeti@gmail.com>, Jeff King <peff@peff.net>,
Junio C Hamano <gitster@pobox.com>, Taylor Blau <me@ttaylorr.com>,
"brian m . carlson" <sandals@crustytoothpaste.net>,
Eric Sunshine <sunshine@sunshineco.com>,
Henning Schild <henning.schild@siemens.com>
Subject: [PATCH 7/8] gpg-interface: introduce new signature format "X509" using gpgsm
Date: Tue, 3 Jul 2018 14:38:19 +0200 [thread overview]
Message-ID: <1f99ef66bc5e115ec06a3c456658ad54ce405ce3.1530616446.git.henning.schild@siemens.com> (raw)
In-Reply-To: <cover.1530616446.git.henning.schild@siemens.com>
In-Reply-To: <cover.1530616446.git.henning.schild@siemens.com>
This commit allows git to create and check X509 type signatures using
gpgsm.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
Documentation/config.txt | 5 ++++-
gpg-interface.c | 10 +++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index c88903399..337df6e48 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1828,9 +1828,12 @@ gpg.program::
signed, and the program is expected to send the result to its
standard output.
+gpg.programX509::
+ Just like gpg.program, here the default you override is "`gpgsm`".
+
gpg.format::
Specifies which key format to use when signing with `--gpg-sign`.
- Default is "PGP", that is also the only supported value.
+ Default is "PGP" and another possible value is "X509".
gui.commitMsgWidth::
Defines how wide the commit message window is in the
diff --git a/gpg-interface.c b/gpg-interface.c
index aa747278e..85d721007 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -16,13 +16,18 @@ struct gpg_format_data {
#define PGP_SIGNATURE "-----BEGIN PGP SIGNATURE-----"
#define PGP_MESSAGE "-----BEGIN PGP MESSAGE-----"
+#define X509_SIGNATURE "-----BEGIN SIGNED MESSAGE-----"
-enum gpgformats { PGP_FMT };
+enum gpgformats { PGP_FMT, X509_FMT };
struct gpg_format_data gpg_formats[] = {
{ .format = "PGP", .program = "gpg",
.extra_args_verify = { "--keyid-format=long", },
.sigs = { PGP_SIGNATURE, PGP_MESSAGE, },
},
+ { .format = "X509", .program = "gpgsm",
+ .extra_args_verify = { NULL },
+ .sigs = {X509_SIGNATURE, NULL, }
+ },
};
static const char *gpg_format = "PGP";
@@ -190,6 +195,9 @@ int git_gpg_config(const char *var, const char *value, void *cb)
if (!strcmp(var, "gpg.program"))
return git_config_string(&gpg_formats[PGP_FMT].program, var,
value);
+ if (!strcmp(var, "gpg.programX509"))
+ return git_config_string(&gpg_formats[X509_FMT].program, var,
+ value);
return 0;
}
--
2.16.4
next prev parent reply other threads:[~2018-07-03 12:53 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-03 12:38 [PATCH 0/8] X509 (gpgsm) commit signing support Henning Schild
2018-07-03 12:38 ` [PATCH 1/8] builtin/receive-pack: use check_signature from gpg-interface Henning Schild
2018-07-06 19:51 ` Junio C Hamano
2018-07-06 21:35 ` Junio C Hamano
2018-07-09 8:18 ` Henning Schild
2018-07-09 15:55 ` Junio C Hamano
2018-07-03 12:38 ` [PATCH 2/8] gpg-interface: make parse_gpg_output static and remove from interface header Henning Schild
2018-07-03 12:38 ` [PATCH 3/8] gpg-interface: add new config to select how to sign a commit Henning Schild
2018-07-06 1:01 ` brian m. carlson
2018-07-06 8:02 ` Henning Schild
2018-07-06 19:58 ` Junio C Hamano
2018-07-03 12:38 ` [PATCH 4/8] gpg-interface: introduce an abstraction for multiple gpg formats Henning Schild
2018-07-04 7:10 ` Martin Ågren
2018-07-05 13:21 ` Henning Schild
2018-07-06 17:24 ` Junio C Hamano
2018-07-09 8:21 ` Henning Schild
2018-07-09 8:44 ` Eric Sunshine
2018-07-09 15:47 ` Junio C Hamano
2018-07-10 15:37 ` Jeff King
2018-07-10 15:51 ` Junio C Hamano
2018-07-10 15:58 ` Junio C Hamano
2018-07-10 17:15 ` Jeff King
2018-07-03 12:38 ` [PATCH 5/8] t/t7510: check the validation of the new config gpg.format Henning Schild
2018-07-06 20:21 ` Junio C Hamano
2018-07-09 8:27 ` Henning Schild
2018-07-03 12:38 ` [PATCH 6/8] gpg-interface: do not hardcode the key string len anymore Henning Schild
2018-07-06 20:22 ` Junio C Hamano
2018-07-03 12:38 ` Henning Schild [this message]
2018-07-06 1:10 ` [PATCH 7/8] gpg-interface: introduce new signature format "X509" using gpgsm brian m. carlson
2018-07-06 8:01 ` Henning Schild
2018-07-06 20:34 ` Junio C Hamano
2018-07-03 12:38 ` [PATCH 8/8] gpg-interface t: extend the existing GPG tests with GPGSM Henning Schild
2018-07-06 1:14 ` brian m. carlson
2018-07-06 8:01 ` Henning Schild
2018-07-06 1:18 ` [PATCH 0/8] X509 (gpgsm) commit signing support brian m. carlson
2018-07-06 8:01 ` Henning Schild
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1f99ef66bc5e115ec06a3c456658ad54ce405ce3.1530616446.git.henning.schild@siemens.com \
--to=henning.schild@siemens.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mastahyeti@gmail.com \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).