security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

More changes for CE. gpgsm does now build and run a keylisting.

Browse source
This commit is contained in:
Werner Koch 2010-03-24 12:15:30 +00:00
parent d1591a97f4
commit f080b353ed
28 changed files with 595 additions and 329 deletions
Download patch file Download diff file Expand all files Collapse all files

9
kbx/ChangeLog
View file

@ -1,3 +1,12 @@
2010-03-23 Werner Koch <wk@g10code.com>
* Makefile.am (extra_libs): New.
(kbxutil_LDADD): Use it.
* keybox-update.c: [HAVE_DOSISH_SYSTEM]: Include sysutils.h.
(keybox_compress): Replace rewind by fseek+clearerr.
(rename_tmp_file, keybox_compress): s/remove/gnupg_remove/.
2010-03-10 Werner Koch <wk@g10code.com>
* Makefile.am (kbxutil_LDADD, $(PROGRAMS)): Remove libjnlib.a.

8
kbx/Makefile.am
View file

@ -28,6 +28,12 @@ AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl \
noinst_LIBRARIES = libkeybox.a
bin_PROGRAMS = kbxutil
if HAVE_W32CE_SYSTEM
extra_libs = $(LIBASSUAN_LIBS)
else
extra_libs =
endif
common_sources = \
keybox.h keybox-defs.h keybox-search-desc.h \
keybox-util.c \
@ -47,7 +53,7 @@ libkeybox_a_SOURCES = $(common_sources)
# to do it this way.
kbxutil_SOURCES = kbxutil.c $(common_sources)
kbxutil_LDADD = ../common/libcommon.a ../gl/libgnu.a \
$(KSBA_LIBS) $(LIBGCRYPT_LIBS) \
$(KSBA_LIBS) $(LIBGCRYPT_LIBS) $(extra_libs) \
$(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS)
$(PROGRAMS) : ../common/libcommon.a ../gl/libgnu.a

12
kbx/keybox-update.c
View file

@ -26,6 +26,9 @@
#include <unistd.h>
#include "keybox-defs.h"
#ifdef HAVE_DOSISH_SYSTEM
#include "../common/sysutils.h"
#endif
#define EXTSEP_S "."
@ -174,7 +177,7 @@ rename_tmp_file (const char *bakfname, const char *tmpfname,
if (!secret)
{
#if defined(HAVE_DOSISH_SYSTEM) || defined(__riscos__)
remove (bakfname);
gnupg_remove (bakfname);
#endif
if (rename (fname, bakfname) )
{
@ -184,7 +187,7 @@ rename_tmp_file (const char *bakfname, const char *tmpfname,
/* Then rename the file. */
#if defined(HAVE_DOSISH_SYSTEM) || defined(__riscos__)
remove (fname);
gnupg_remove (fname);
#endif
if (rename (tmpfname, fname) )
{
@ -607,7 +610,8 @@ keybox_compress (KEYBOX_HANDLE hd)
}
}
_keybox_release_blob (blob);
rewind (fp);
fseek (fp, 0, SEEK_SET);
clearerr (fp);
}
/* Create the new file. */
@ -709,7 +713,7 @@ keybox_compress (KEYBOX_HANDLE hd)
/* Rename or remove the temporary file. */
if (rc || !any_changes)
remove (tmpfname);
gnupg_remove (tmpfname);
else
rc = rename_tmp_file (bakfname, tmpfname, fname, hd->secret);