security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

* convert-from-106, lspgpot: Check for gpg binary before proceeding. 

Don't hardcode the path to gpg.

* gpgsplit.c (handle_bzip2): Remove two cut and paste typecast errors.
Noted by Stefan Bellon.
This commit is contained in:
David Shaw 2004-01-12 02:48:42 +00:00
parent 666c582e36
commit 967a61cdb8
4 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/ChangeLog
View File

@ -1,3 +1,11 @@
2004-01-11 David Shaw <dshaw@jabberwocky.com>
* convert-from-106, lspgpot: Check for gpg binary before
proceeding. Don't hardcode the path to gpg.
* gpgsplit.c (handle_bzip2): Remove two cut and paste typecast
errors. Noted by Stefan Bellon.
2003-12-28 Stefan Bellon <sbellon@sbellon.de>
* gpgsplit.c [__riscos__]: Removal of unnecessary #ifdef

9
tools/convert-from-106
View File

@ -1,5 +1,5 @@
#!/bin/sh
# Copyright (C) 2002 Free Software Foundation, Inc.
# Copyright (C) 2002, 2004 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -15,7 +15,12 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
gpg="../g10/gpg --no-greeting --no-secmem-warning";
if ! gpg --version > /dev/null 2>&1 ; then
echo "GnuPG not available!"
exit 1
fi
gpg="gpg --no-greeting --no-secmem-warning"
echo "This script converts your public keyring and trustdb from GnuPG"
echo "1.0.6 or earlier to the 1.0.7 and later format."

4
tools/gpgsplit.c
View File

@ -472,7 +472,7 @@ handle_bzip2(int algo,FILE *fpin,FILE *fpout)
{
n = bzs.avail_in;
if (!n)
bzs.next_in = (Bytef *) inbuf;
bzs.next_in = inbuf;
count = inbufsize - n;
for (nread=0;
nread < count && (c=getc (fpin)) != EOF;
@ -487,7 +487,7 @@ handle_bzip2(int algo,FILE *fpin,FILE *fpout)
}
bzs.avail_in = n;
}
bzs.next_out = (Bytef *) outbuf;
bzs.next_out = outbuf;
bzs.avail_out = outbufsize;
if (!zinit_done)

10
tools/lspgpot
View File

@ -10,14 +10,18 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
../g10/gpg --dry-run --with-fingerprint --with-colons $* | awk '
if ! gpg --version > /dev/null 2>&1 ; then
echo "GnuPG not available!"
exit 1
fi
gpg --dry-run --with-fingerprint --with-colons $* | awk '
BEGIN { FS=":"
printf "# Ownertrust listing generated by lspgpot\n"
printf "# This can be imported using the command:\n"
printf "# ggp --import-ownertrust\n\n" }
printf "# gpg --import-ownertrust\n\n" }
$1 == "fpr" { fpr = $10 }
$1 == "rtv" && $2 == 1 && $3 == 2 { printf "%s:3:\n", fpr; next }
$1 == "rtv" && $2 == 1 && $3 == 5 { printf "%s:4:\n", fpr; next }
$1 == "rtv" && $2 == 1 && $3 == 6 { printf "%s:5:\n", fpr; next }
'