mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-27 02:02:45 +02:00
12af2630cf
* agent/findkey.c (write_extended_private_key): New function. (agent_write_private_key): Detect if an existing file is in extended format and update the key within if it is. (read_key_file): Handle the new format. * agent/keyformat.txt: Document the new format. * common/Makefile.am: Add the new files. * common/private-keys.c: New file. * common/private-keys.h: Likewise. * common/t-private-keys.c: Likewise. * common/util.h (alphap, alnump): New macros. * tests/migrations: Add test demonstrating that we can cope with the new format. -- GnuPG 2.3+ will use a new format to store private keys that is both more flexible and easier to read and edit by human beings. The new format stores name,value-pairs using the common mail and http header convention. This patch adds the parser and support code and prepares GnuPG 2.1 for the new format. Signed-off-by: Justus Winter <justus@g10code.com>
58 lines
2.2 KiB
Makefile
58 lines
2.2 KiB
Makefile
# Makefile.am - For tests/openpgp
|
|
# Copyright (C) 2016 g10 Code GmbH
|
|
#
|
|
# 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/>.
|
|
# Process this file with automake to create Makefile.in
|
|
|
|
|
|
# Programs required before we can run these tests.
|
|
required_pgms = ../../g10/gpg$(EXEEXT) ../../agent/gpg-agent$(EXEEXT)
|
|
|
|
AM_CPPFLAGS = -I$(top_srcdir)/common
|
|
include $(top_srcdir)/am/cmacros.am
|
|
|
|
AM_CFLAGS =
|
|
|
|
TESTS_ENVIRONMENT = GPG_AGENT_INFO= LC_ALL=C
|
|
|
|
TESTS = from-classic.test \
|
|
extended-private-key-format.test
|
|
|
|
TEST_FILES = from-classic.gpghome/pubring.gpg.asc \
|
|
from-classic.gpghome/secring.gpg.asc \
|
|
from-classic.gpghome/trustdb.gpg.asc \
|
|
extended-private-key-format.gpghome/trustdb.gpg.asc \
|
|
extended-private-key-format.gpghome/pubring.kbx.asc \
|
|
extended-private-key-format.gpghome/private-keys-v1.d/13FDB8809B17C5547779F9D205C45F47CE0217CE.key.asc \
|
|
extended-private-key-format.gpghome/private-keys-v1.d/343D8AF79796EE107D645A2787A9D9252F924E6F.key.asc \
|
|
extended-private-key-format.gpghome/private-keys-v1.d/8B5ABF3EF9EB8D96B91A0B8C2C4401C91C834C34.key.asc
|
|
|
|
EXTRA_DIST = $(TESTS) $(TEST_FILES)
|
|
|
|
CLEANFILES = prepared.stamp x y yy z out err $(data_files) \
|
|
plain-1 plain-2 plain-3 trustdb.gpg *.lock .\#lk* \
|
|
*.test.log gpg_dearmor gpg.conf gpg-agent.conf S.gpg-agent \
|
|
pubring.gpg pubring.gpg~ pubring.kbx pubring.kbx~ \
|
|
secring.gpg pubring.pkr secring.skr \
|
|
gnupg-test.stop random_seed gpg-agent.log tofu.db
|
|
|
|
clean-local:
|
|
-rm -rf from-classic.gpghome/*.gpg
|
|
|
|
# We need to depend on a couple of programs so that the tests don't
|
|
# start before all programs are built.
|
|
all-local: $(required_pgms)
|