mirror of
git://git.gnupg.org/gnupg.git
synced 2024-05-28 21:50:02 +02:00
![Werner Koch](/assets/img/avatar_default.png)
* kbx/kbx-client-util.c: New. * kbx/kbx-client-util.h: New. * kbx/Makefile.am (client_sources): New. * g10/keydb.c (parse_keyblock_image): Rename to keydb_parse_keyblock and make global. * g10/call-keyboxd.c: Include kbx-client-util.h. (struct keyboxd_local_s): Remove struct datastream. Add field kcd. Remove per_session_init_done. (lock_datastream, unlock_datastream): Remove. (prepare_data_pipe, datastream_thread): Remove. (keydb_get_keyblock_do_parse): Remove. (gpg_keyboxd_deinit_session_data): Release the KCD object. (open_context): Use of kbx_client_data_new. (keydb_get_keyblock): Simplify. (keydb_search): Use kbx_client_data_cmd and _wait. -- The data specific part of the code has been moved from gpg to a new module in kbx/ so that it can also be used by gpgsm. The OpenPGP parsing while reading the data has been replaced by storing the data in memory and parse it later. That makes a nice interface and abstracts the fd-passing/D-lines handling away. Signed-off-by: Werner Koch <wk@gnupg.org>
108 lines
3.0 KiB
Makefile
108 lines
3.0 KiB
Makefile
# Keybox Makefile
|
|
# Copyright (C) 2001, 2002, 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 <https://www.gnu.org/licenses/>.
|
|
|
|
## Process this file with automake to produce Makefile.in
|
|
|
|
EXTRA_DIST = mkerrors keyboxd-w32info.rc
|
|
|
|
AM_CPPFLAGS =
|
|
|
|
include $(top_srcdir)/am/cmacros.am
|
|
if HAVE_W32_SYSTEM
|
|
resource_objs += keyboxd-w32info.o
|
|
endif
|
|
|
|
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
|
|
|
|
bin_PROGRAMS = kbxutil
|
|
noinst_LIBRARIES = libkeybox.a libkeybox509.a
|
|
if BUILD_KEYBOXD
|
|
libexec_PROGRAMS = keyboxd
|
|
else
|
|
libexec_PROGRAMS =
|
|
endif
|
|
|
|
if HAVE_W32CE_SYSTEM
|
|
extra_libs = $(LIBASSUAN_LIBS)
|
|
else
|
|
extra_libs =
|
|
endif
|
|
|
|
common_libs = $(libcommon)
|
|
commonpth_libs = $(libcommonpth)
|
|
|
|
common_sources = \
|
|
keybox.h keybox-defs.h keybox-search-desc.h \
|
|
keybox-util.c \
|
|
keybox-init.c \
|
|
keybox-blob.c \
|
|
keybox-file.c \
|
|
keybox-search.c \
|
|
keybox-update.c \
|
|
keybox-openpgp.c \
|
|
keybox-dump.c
|
|
|
|
client_sources = \
|
|
kbx-client-util.h \
|
|
kbx-client-util.c
|
|
|
|
|
|
libkeybox_a_SOURCES = $(common_sources) $(client_sources)
|
|
libkeybox509_a_SOURCES = $(common_sources) $(client_sources)
|
|
|
|
libkeybox_a_CFLAGS = $(AM_CFLAGS)
|
|
libkeybox509_a_CFLAGS = $(AM_CFLAGS) -DKEYBOX_WITH_X509=1
|
|
|
|
|
|
# We need W32SOCKLIBS because the init subsystem code in libcommon
|
|
# requires it - although we don't actually need it. It is easier
|
|
# to do it this way.
|
|
kbxutil_SOURCES = kbxutil.c $(common_sources)
|
|
kbxutil_CFLAGS = $(AM_CFLAGS) -DKEYBOX_WITH_X509=1
|
|
kbxutil_LDADD = $(common_libs) \
|
|
$(KSBA_LIBS) $(LIBGCRYPT_LIBS) $(extra_libs) \
|
|
$(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS) \
|
|
$(NETLIBS)
|
|
|
|
|
|
keyboxd_SOURCES = \
|
|
keyboxd.c keyboxd.h \
|
|
kbxserver.c \
|
|
frontend.c frontend.h \
|
|
backend.h backend-support.c \
|
|
backend-cache.c \
|
|
backend-kbx.c \
|
|
backend-sqlite.c \
|
|
$(common_sources)
|
|
|
|
keyboxd_CFLAGS = $(AM_CFLAGS) -DKEYBOX_WITH_X509=1 \
|
|
$(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS) $(SQLITE3_CFLAGS) \
|
|
$(INCICONV)
|
|
keyboxd_LDADD = $(commonpth_libs) \
|
|
$(KSBA_LIBS) $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
|
|
$(SQLITE3_LIBS) $(GPG_ERROR_LIBS) \
|
|
$(LIBINTL) $(NETLIBS) $(LIBICONV) \
|
|
$(resource_objs)
|
|
keyboxd_LDFLAGS = $(extra_bin_ldflags)
|
|
keyboxd_DEPENDENCIES = $(resource_objs)
|
|
|
|
|
|
# Make sure that all libs are build before we use them. This is
|
|
# important for things like make -j2.
|
|
$(PROGRAMS): $(common_libs) $(commonpth_libs)
|