mirror of
git://git.gnupg.org/gnupg.git
synced 2024-09-08 13:06:22 +02:00
![James Bottomley](/assets/img/avatar_default.png)
* tpm2d: New directory. * Makefile.am (SUBDIRS): Add directory. * configure.ac: Detect libtss and decide whether to build tpm2d. * am/cmacros.am: Add a define. * util.h (GNUPG_MODULE_NAME_TPM2DAEMON): New. * common/homedir.c (gnupg_module_name): Add tpm2d. * common/mapstrings.c (macros): Add "TPM2DAEMON". * tools/gpgconf.h (GC_COMPONENT_TPM2DAEMON): New. * tools/gpgconf-comp.c (known_options_tpm2daemon): New. (gc_component): Add TPM2. (tpm2daemon_runtime_change): New. * tpm2d/Makefile.am: New. * tpm2d/command.c: New. * tpm2d/ibm-tss.h: New. * tpm2d/tpm2.c: New. * tpm2d/tpm2.h: New. * tpm2d/tpm2daemon.c: New. * tpm2d/tpm2daemon.h: New. --- This commit adds and plumbs in a tpm2daemon to the build to mirror the operation of scdaemon. The architecture of the code is that tpm2daemon.c itself is pretty much a clone of scd/scdaemon.c just with updated function prefixes (this argues there could be some further consolidation of the daemon handling code). Note that although this commit causes the daemon to be built and installed, nothing actually starts it or uses it yet. Command handling ---------------- command.c is copied from the command handler in scd.c except that the command implementation is now done in terms of tpm2 commands and the wire protocol is far simpler. The tpm2daemon only responds to 4 commands IMPORT: import a standard s-expression private key and export it to TPM2 format. This conversion cannot be undone and the private key now can *only* be used by the TPM2. To anyone who gets hold of the private key now, it's just an encrypted binary blob. PKSIGN: create a signature from the tpm2 key. The TPM2 form private key is retrieved by KEYDATA and the hash to be signed by EXTRA. Note there is no hash specifier because the tpm2 tss deduces the hash type from the length of the EXTRA data. This is actually a limitation of the tpm2 command API and it will be interesting to see how this fares if the tpm2 ever supports say sha3-256 hashes. PKDECRYPT: decrypt (RSA case) or derive (ECC case) a symmetric key. The tpm2 for private key is retrieved by KEYDATA and the information used to create the symmetric key by EXTRA. KILLTPM2D: stop the daemon All the tpm2 primitives used by command.c are in tpm2.h and all the tpm2 specific gunk is confined to tpm2.c, which is the only piece of this that actually does calls into the tss library. Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com> Changes from James' patch: - gpgconf: The displayed name is "TPM" and not "TPM2". That string is used by GUIs and should be something the user understands. For example we also use "network" instead of "Dirmngr". - Removed some commented includes. - Use 16 as emulation of GPG_ERR_SOURCE_TPM2. - Silenced a C90 compiler warning and flags unused parameters. - Removed "if HAVE_LIBS" from tpm2/Makefile.am and add missing files so that make distcheck works. Signed-off-by: Werner Koch <wk@gnupg.org>
169 lines
4.1 KiB
C
169 lines
4.1 KiB
C
/* mapstrings.c - Static string mapping
|
|
* Copyright (C) 2014 Werner Koch
|
|
*
|
|
* This file is part of GnuPG.
|
|
*
|
|
* This file is free software; you can redistribute it and/or modify
|
|
* it under the terms of either
|
|
*
|
|
* - the GNU Lesser General Public License as published by the Free
|
|
* Software Foundation; either version 3 of the License, or (at
|
|
* your option) any later version.
|
|
*
|
|
* or
|
|
*
|
|
* - the GNU General Public License as published by the Free
|
|
* Software Foundation; either version 2 of the License, or (at
|
|
* your option) any later version.
|
|
*
|
|
* or both in parallel, as here.
|
|
*
|
|
* This file 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 <https://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include <stdlib.h>
|
|
#include <errno.h>
|
|
|
|
#include "util.h"
|
|
#include "stringhelp.h"
|
|
#include "membuf.h"
|
|
|
|
|
|
static struct {
|
|
const char *name;
|
|
const char *value;
|
|
} macros[] = {
|
|
#ifdef PACKAGE_BUGREPORT
|
|
{ "EMAIL", PACKAGE_BUGREPORT },
|
|
#else
|
|
{ "EMAIL", "bug@example.org" },
|
|
#endif
|
|
{ "GNUPG", GNUPG_NAME },
|
|
{ "GPG", GPG_NAME },
|
|
{ "GPGSM", GPGSM_NAME },
|
|
{ "GPG_AGENT", GPG_AGENT_NAME },
|
|
{ "SCDAEMON", SCDAEMON_NAME },
|
|
{ "TPM2DAEMON",TPM2DAEMON_NAME},
|
|
{ "DIRMNGR", DIRMNGR_NAME },
|
|
{ "G13", G13_NAME },
|
|
{ "GPGCONF", GPGCONF_NAME },
|
|
{ "GPGTAR", GPGTAR_NAME }
|
|
};
|
|
|
|
|
|
|
|
/* A list to remember already done mappings. */
|
|
struct mapping_s
|
|
{
|
|
struct mapping_s *next;
|
|
const char *key;
|
|
const char *value;
|
|
};
|
|
static struct mapping_s *mappings;
|
|
|
|
|
|
/* If STRING has already been mapped, return the mapped string. If
|
|
not return NULL. */
|
|
static const char *
|
|
already_mapped (const char *string)
|
|
{
|
|
struct mapping_s *m;
|
|
|
|
for (m=mappings; m; m = m->next)
|
|
if (m->key == string && !strcmp (m->key, string))
|
|
return m->value;
|
|
return NULL;
|
|
}
|
|
|
|
|
|
/* Store NEWSTRING under key STRING and return NEWSTRING. */
|
|
static const char *
|
|
store_mapping (const char *string, char *newstring)
|
|
{
|
|
struct mapping_s *m;
|
|
|
|
m = xmalloc (sizeof *m);
|
|
m->key = string;
|
|
m->value = newstring;
|
|
m->next = mappings;
|
|
mappings = m;
|
|
return newstring;
|
|
}
|
|
|
|
|
|
/* Find the first macro in STRING. Return a pointer to the
|
|
replacement value, set BEGPTR to the leading '@', and set ENDPTR to
|
|
the terminating '@'. If no macro is found return NULL. */
|
|
const char *
|
|
find_macro (const char *string, const char **begptr,
|
|
const char **endptr)
|
|
{
|
|
const char *s, *s2, *s3;
|
|
int idx;
|
|
|
|
s = string;
|
|
if (!s)
|
|
return NULL;
|
|
|
|
for (; (s2 = strchr (s, '@')); s = s2)
|
|
{
|
|
s2++;
|
|
if (*s2 >= 'A' && *s2 <= 'Z' && (s3 = (strchr (s2, '@'))))
|
|
{
|
|
for (idx=0; idx < DIM (macros); idx++)
|
|
if (strlen (macros[idx].name) == (s3 - s2)
|
|
&& !memcmp (macros[idx].name, s2, (s3 - s2)))
|
|
{
|
|
*begptr = s2 - 1;
|
|
*endptr = s3;
|
|
return macros[idx].value;
|
|
}
|
|
}
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
|
|
/* If STRING includes known @FOO@ macros, replace these macros and
|
|
return a new static string. Warning: STRING must have been
|
|
allocated statically. Note that this function allocates memory
|
|
which will not be released (similar to gettext). */
|
|
const char *
|
|
map_static_macro_string (const char *string)
|
|
{
|
|
const char *s, *s2, *s3, *value;
|
|
membuf_t mb;
|
|
char *p;
|
|
|
|
if ((s = already_mapped (string)))
|
|
return s;
|
|
s = string;
|
|
value = find_macro (s, &s2, &s3);
|
|
if (!value)
|
|
return string; /* No macros at all. */
|
|
|
|
init_membuf (&mb, strlen (string) + 100);
|
|
do
|
|
{
|
|
put_membuf (&mb, s, s2 - s);
|
|
put_membuf_str (&mb, value);
|
|
s = s3 + 1;
|
|
}
|
|
while ((value = find_macro (s, &s2, &s3)));
|
|
put_membuf_str (&mb, s);
|
|
put_membuf (&mb, "", 1);
|
|
|
|
p = get_membuf_shrink (&mb, NULL);
|
|
if (!p)
|
|
log_fatal ("map_static_macro_string failed: %s\n", strerror (errno));
|
|
|
|
return store_mapping (string, p);
|
|
}
|