mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-21 14:47:03 +01:00
See ChangeLog: Thu Mar 2 15:37:46 CET 2000 Werner Koch
This commit is contained in:
Werner Koch
parent
7ae8d22f9b
commit
97f82721df
@ -1,3 +1,7 @@
|
||||
Thu Mar 2 15:37:46 CET 2000 Werner Koch <wk@gnupg.de>
|
||||
|
||||
* configure.in: Add check for clock_gettime
|
||||
|
||||
Wed Feb 23 10:07:57 CET 2000 Werner Koch <wk@gnupg.de>
|
||||
|
||||
* configure.in (ALL_LINGUAS): Add nl.
|
||||
|
||||
3
NOTES
3
NOTES
@ -11,3 +11,6 @@ Some other reported cpu-vendor-os strings:
|
||||
sparc-sun-sunos4.1.2
|
||||
i386-pc-sysv4.2 (USL Unixware v1.1.2)
|
||||
|
||||
gpg 1.0.1 okay with MP-RAS 3.02.01 Edition 5 using gcc 2.95.2 and EGD
|
||||
By <CSpeicher@eisi.com>
|
||||
|
||||
|
||||
1
THANKS
1
THANKS
@ -96,6 +96,7 @@ Richard Outerbridge outer@interlog.com
|
||||
Roddy Strachan roddy@satlink.com.au
|
||||
Roland Rosenfeld roland@spinnaker.rhein.de
|
||||
Ross Golder rossigee@bigfoot.com
|
||||
Sam Roberts sam@cogent.ca
|
||||
Serge Munhoven munhoven@mema.ucl.ac.be
|
||||
SL Baur steve@xemacs.org
|
||||
Stefan Karrmann S.Karrmann@gmx.net
|
||||
|
||||
@ -1,3 +1,17 @@
|
||||
Thu Mar 2 15:37:46 CET 2000 Werner Koch <wk@gnupg.de>
|
||||
|
||||
* random.c (fast_random_poll): Add clock_gettime() as fallback for
|
||||
system which support this POSIX.4 fucntion. By Sam Roberts.
|
||||
|
||||
* rndunix.c: Add some more headers for QNX. By Sam Roberts.
|
||||
|
||||
* random.c (read_seed_file): Removed the S_ISLNK test becuase it
|
||||
is already covered by !S_ISREG and is not defined in Unixware.
|
||||
Reported by Dave Dykstra.
|
||||
|
||||
* sha1.c (sha1_get_info): Removed those stupid double lines. Dave
|
||||
is really a good lint.
|
||||
|
||||
Wed Feb 23 10:07:57 CET 2000 Werner Koch <wk@gnupg.de>
|
||||
|
||||
* twofish.c (twofish_get_info): Add some const to the casts. By Martin
|
||||
|
||||
@ -43,6 +43,9 @@
|
||||
#ifdef HAVE_GETTIMEOFDAY
|
||||
#include <sys/times.h>
|
||||
#endif
|
||||
#ifdef HAVE_CLOCK_GETTIME
|
||||
#include <time.h>
|
||||
#endif
|
||||
#ifdef HAVE_GETRUSAGE
|
||||
#include <sys/resource.h>
|
||||
#endif
|
||||
@ -306,7 +309,7 @@ read_seed_file()
|
||||
close(fd);
|
||||
return 0;
|
||||
}
|
||||
if( !S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode) ) {
|
||||
if( !S_ISREG(sb.st_mode) ) {
|
||||
log_info(_("`%s' is not a regular file - ignored\n"), seed_file_name );
|
||||
close(fd);
|
||||
return 0;
|
||||
@ -557,6 +560,13 @@ fast_random_poll()
|
||||
add_randomness( &tv.tv_sec, sizeof(tv.tv_sec), 1 );
|
||||
add_randomness( &tv.tv_usec, sizeof(tv.tv_usec), 1 );
|
||||
}
|
||||
#elif HAVE_CLOCK_GETTIME
|
||||
{ struct timespec tv;
|
||||
if( clock_gettime( CLOCK_REALTIME, &tv ) == -1 )
|
||||
BUG();
|
||||
add_randomness( &tv.tv_sec, sizeof(tv.tv_sec), 1 );
|
||||
add_randomness( &tv.tv_nsec, sizeof(tv.tv_nsec), 1 );
|
||||
}
|
||||
#else /* use times */
|
||||
#ifndef HAVE_DOSISH_SYSTEM
|
||||
{ struct tms buf;
|
||||
|
||||
@ -75,9 +75,9 @@
|
||||
#ifndef __QNX__
|
||||
#include <sys/resource.h>
|
||||
#endif /* __QNX__ */
|
||||
#ifdef _AIX
|
||||
#if defined( _AIX ) || defined( __QNX__ )
|
||||
#include <sys/select.h>
|
||||
#endif /* _AIX */
|
||||
#endif /* _AIX || __QNX__ */
|
||||
#ifndef __QNX__
|
||||
#include <sys/shm.h>
|
||||
#include <sys/signal.h>
|
||||
@ -89,6 +89,10 @@
|
||||
#endif /* __hpux 9.x, after that it's in unistd.h */
|
||||
#include <sys/wait.h>
|
||||
/* #include <kitchensink.h> */
|
||||
#ifdef __QNX__
|
||||
#include <signal.h>
|
||||
#include <process.h>
|
||||
#endif /* __QNX__ */
|
||||
#include <errno.h>
|
||||
|
||||
#include "types.h" /* for byte and u32 typedefs */
|
||||
|
||||
@ -337,10 +337,6 @@ sha1_get_info( int algo, size_t *contextsize,
|
||||
*r_asnoid = asn;
|
||||
*r_asnlen = DIM(asn);
|
||||
*r_mdlen = 20;
|
||||
*r_init = (void (*)(void *))sha1_init;
|
||||
*r_write = (void (*)(void *, byte*, size_t))sha1_write;
|
||||
*r_final = (void (*)(void *))sha1_final;
|
||||
*r_read = (byte *(*)(void *))sha1_read;
|
||||
*(void (**)(SHA1_CONTEXT *))r_init = sha1_init;
|
||||
*(void (**)(SHA1_CONTEXT *, byte*, size_t))r_write = sha1_write;
|
||||
*(void (**)(SHA1_CONTEXT *))r_final = sha1_final;
|
||||
|
||||
@ -392,7 +392,7 @@ fi
|
||||
dnl Checks for library functions.
|
||||
AC_FUNC_VPRINTF
|
||||
AC_CHECK_FUNCS(strerror stpcpy strlwr stricmp tcgetattr rand strtoul mmap)
|
||||
AC_CHECK_FUNCS(memmove gettimeofday getrusage gethrtime setrlimit)
|
||||
AC_CHECK_FUNCS(memmove gettimeofday getrusage gethrtime setrlimit clock_gettime)
|
||||
AC_CHECK_FUNCS(memicmp atexit raise getpagesize strftime nl_langinfo)
|
||||
|
||||
GNUPG_CHECK_MLOCK
|
||||
|
||||
@ -1,3 +1,13 @@
|
||||
Thu Mar 2 15:37:46 CET 2000 Werner Koch <wk@gnupg.de>
|
||||
|
||||
* pubkey-enc.c (get_it): Print a note about unknown cipher algos.
|
||||
|
||||
* g10.c (opts): Add a note to the help listing about the man page
|
||||
and removed some options from the help listing.
|
||||
|
||||
* keyedit.c (print_and_check_one_sig): Use a new function to truncate
|
||||
the output of the user ID. Suggested by Jan-Benedict Glaw.
|
||||
|
||||
Wed Feb 23 10:07:57 CET 2000 Werner Koch <wk@gnupg.de>
|
||||
|
||||
* helptext.c: typo fix.
|
||||
|
||||
16
g10/g10.c
16
g10/g10.c
@ -276,12 +276,12 @@ static ARGPARSE_OPTS opts[] = {
|
||||
{ oCharset, "charset" , 2, N_("|NAME|set terminal charset to NAME") },
|
||||
{ oOptions, "options" , 2, N_("read options from file")},
|
||||
|
||||
{ oDebug, "debug" ,4|16, N_("set debugging flags")},
|
||||
{ oDebugAll, "debug-all" ,0, N_("enable full debugging")},
|
||||
{ oDebug, "debug" ,4|16, "@"},
|
||||
{ oDebugAll, "debug-all" ,0, "@"},
|
||||
{ oStatusFD, "status-fd" ,1, N_("|FD|write status info to this FD") },
|
||||
{ oNoComment, "no-comment", 0, N_("do not write comment packets")},
|
||||
{ oCompletesNeeded, "completes-needed", 1, N_("(default is 1)")},
|
||||
{ oMarginalsNeeded, "marginals-needed", 1, N_("(default is 3)")},
|
||||
{ oNoComment, "no-comment", 0, "@"},
|
||||
{ oCompletesNeeded, "completes-needed", 1, "@"},
|
||||
{ oMarginalsNeeded, "marginals-needed", 1, "@"},
|
||||
{ oMaxCertDepth, "max-cert-depth", 1, "@" },
|
||||
{ oLoadExtension, "load-extension" ,2, N_("|FILE|load extension module FILE")},
|
||||
{ oRFC1991, "rfc1991", 0, N_("emulate the mode described in RFC1991")},
|
||||
@ -297,7 +297,11 @@ static ARGPARSE_OPTS opts[] = {
|
||||
{ oThrowKeyid, "throw-keyid", 0, N_("throw keyid field of encrypted packets")},
|
||||
{ oNotation, "notation-data", 2, N_("|NAME=VALUE|use this notation data")},
|
||||
|
||||
{ 302, NULL, 0, N_("@\nExamples:\n\n"
|
||||
{ 302, NULL, 0, N_(
|
||||
"@\n(See the man page for a complete listing of all commands and options)\n"
|
||||
)},
|
||||
|
||||
{ 303, NULL, 0, N_("@\nExamples:\n\n"
|
||||
" -se -r Bob [file] sign and encrypt for user Bob\n"
|
||||
" --clearsign [file] make a clear text signature\n"
|
||||
" --detach-sign [file] make a detached signature\n"
|
||||
|
||||
@ -158,7 +158,7 @@ print_and_check_one_sig( KBNODE keyblock, KBNODE node,
|
||||
else {
|
||||
size_t n;
|
||||
char *p = get_user_id( sig->keyid, &n );
|
||||
tty_print_utf8_string( p, n > 40? 40 : n );
|
||||
tty_print_utf8_string2( p, n, 40 );
|
||||
m_free(p);
|
||||
}
|
||||
tty_printf("\n");
|
||||
|
||||
@ -152,6 +152,10 @@ get_it( PKT_pubkey_enc *k, DEK *dek, PKT_secret_key *sk, u32 *keyid )
|
||||
write_status(STATUS_RSA_OR_IDEA);
|
||||
rc = check_cipher_algo( dek->algo );
|
||||
if( rc ) {
|
||||
if( !opt.quiet && rc == G10ERR_CIPHER_ALGO ) {
|
||||
log_info(_("cipher algorithm %d is unknown or disabled\n"),
|
||||
dek->algo);
|
||||
}
|
||||
dek->algo = 0;
|
||||
goto leave;
|
||||
}
|
||||
|
||||
@ -24,6 +24,7 @@ int tty_batchmode( int onoff );
|
||||
void tty_printf( const char *fmt, ... );
|
||||
void tty_print_string( byte *p, size_t n );
|
||||
void tty_print_utf8_string( byte *p, size_t n );
|
||||
void tty_print_utf8_string2( byte *p, size_t n, size_t max_n );
|
||||
char *tty_get( const char *prompt );
|
||||
char *tty_get_hidden( const char *prompt );
|
||||
void tty_kill_prompt(void);
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
Thu Mar 2 15:37:46 CET 2000 Werner Koch <wk@gnupg.de>
|
||||
|
||||
* config.guess: Add support for QNX. By Sam Roberts.
|
||||
* config.sub: Ditto.
|
||||
|
||||
Thu Sep 23 09:49:25 1999 Werner Koch (wk@gnupg.org)
|
||||
|
||||
* commit: Remove leading and trailing empty lines when copying
|
||||
|
||||
3
scripts/config.guess
vendored
3
scripts/config.guess
vendored
@ -68,6 +68,9 @@ trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
|
||||
# Note: order is significant - the case branches are not exclusive.
|
||||
|
||||
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||
*:QNX:*:*)
|
||||
echo i386-pc-qnx
|
||||
exit 0 ;;
|
||||
alpha:OSF1:*:*)
|
||||
if test $UNAME_RELEASE = "V4.0"; then
|
||||
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
|
||||
|
||||
3
scripts/config.sub
vendored
3
scripts/config.sub
vendored
@ -881,6 +881,9 @@ case $os in
|
||||
-solaris)
|
||||
os=-solaris2
|
||||
;;
|
||||
-qnx)
|
||||
os=-qnx
|
||||
;;
|
||||
-svr4*)
|
||||
os=-sysv4
|
||||
;;
|
||||
|
||||
185
scripts/gnupgbug
Normal file
185
scripts/gnupgbug
Normal file
@ -0,0 +1,185 @@
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
# File a bug against the GNU Privacy Guard.
|
||||
#
|
||||
|
||||
#
|
||||
# Copyright (c) 2000 Thomas Roessler <roessler@guug.de>
|
||||
#
|
||||
#
|
||||
# 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
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program 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, write to the Free Software
|
||||
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
#
|
||||
|
||||
SUBMIT="submit@bugs.guug.de"
|
||||
DEBIAN_SUBMIT="submit@bugs.debian.org"
|
||||
|
||||
|
||||
include_file ()
|
||||
{
|
||||
echo
|
||||
echo "--- Begin $1"
|
||||
sed -e 's/^-/- -/' $1 | egrep -v '^[ ]*(#|$)'
|
||||
echo "--- End $1"
|
||||
echo
|
||||
}
|
||||
|
||||
case `echo -n` in
|
||||
"") n=-n; c= ;;
|
||||
*) n=; c='\c' ;;
|
||||
esac
|
||||
|
||||
|
||||
exec > /dev/tty
|
||||
exec < /dev/tty
|
||||
|
||||
SCRATCH=${TMPDIR-/tmp}/`basename $0`.`hostname`.$$
|
||||
|
||||
mkdir ${SCRATCH} || \
|
||||
{
|
||||
echo "`basename $0`: Can't create temporary directory." >& 2 ;
|
||||
exit 1 ;
|
||||
}
|
||||
|
||||
trap "rm -r -f ${SCRATCH} ; trap '' 0 ; exit" 0 1 2
|
||||
|
||||
TEMPLATE=${SCRATCH}/template.txt
|
||||
|
||||
echo "Please enter a one-line description of the problem you experience:"
|
||||
echo $n "> $c"
|
||||
read SUBJECT
|
||||
|
||||
echo $n "Do you want to include your personal GnuPG configuration files? [Y|n]$c"
|
||||
read personal
|
||||
case "$personal" in
|
||||
[nN]*) personal=no ;;
|
||||
*) personal=yes ;;
|
||||
esac
|
||||
|
||||
if test -f /etc/debian_version ; then
|
||||
DEBIAN=yes
|
||||
echo $n "Checking whether GnuPG has been installed as a package... $c"
|
||||
GNUPGVERSION="`dpkg -l gnupg | grep ^i | awk '{print $3}'`" 2> /dev/null
|
||||
if test "$GNUPGVERSION" ; then
|
||||
DPKG=yes
|
||||
else
|
||||
DPKG=no
|
||||
fi
|
||||
echo "$DPKG"
|
||||
if test "$DPKG" = "no" ; then
|
||||
echo $n "File this bug with Debian? [Y|n]$c"
|
||||
read $DPKG
|
||||
case "$DPKG" in
|
||||
[nN]) DPKG=no ;;
|
||||
*) DPKG=yes ;;
|
||||
esac
|
||||
fi
|
||||
else
|
||||
DEBIAN=no
|
||||
DPKG=no
|
||||
fi
|
||||
|
||||
test "$MUTTVERSION" || MUTTVERSION="`mutt -v | head -1 | awk '{print $2}' | tr -d i`"
|
||||
test "$DPKG" = "yes" && SUBMIT="$SUBMIT, $DEBIAN_SUBMIT"
|
||||
|
||||
|
||||
exec > ${TEMPLATE}
|
||||
|
||||
echo "Subject: mutt-$MUTTVERSION: $SUBJECT"
|
||||
echo "To: $SUBMIT"
|
||||
echo "Cc: $LOGNAME"
|
||||
echo
|
||||
echo "Package: mutt"
|
||||
echo "Version: $MUTTVERSION"
|
||||
echo
|
||||
echo "-- Please type your report below this line"
|
||||
echo
|
||||
echo
|
||||
echo
|
||||
|
||||
if test "$DEBIAN" = "yes" ; then
|
||||
echo "Obtaining Debian-specific information..." > /dev/tty
|
||||
bug -p -s dummy mutt | \
|
||||
sed -n -e "/^-- System Information/,/^---/p" | \
|
||||
grep -v '^---'
|
||||
fi
|
||||
|
||||
echo
|
||||
echo "-- Mutt Version Information"
|
||||
echo
|
||||
mutt -v
|
||||
|
||||
if test "$personal" = "yes" ; then
|
||||
CANDIDATES=".muttrc-${MUTTVERSION} .muttrc .mutt/muttrc-${MUTTVERSION} .mutt/muttrc"
|
||||
MATCHED="none"
|
||||
for f in $CANDIDATES; do
|
||||
if test -f "${HOME}/$f" ; then
|
||||
MATCHED="${HOME}/$f"
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
if test "$MATCHED" = "none" ; then
|
||||
echo "Warning: Can't find your personal .muttrc." >&2
|
||||
else
|
||||
include_file $MATCHED
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$global" = "yes" ; then
|
||||
CANDIDATES="Muttrc-${MUTTVERSION} Muttrc"
|
||||
DIRECTORIES="/etc /usr/local/share/mutt"
|
||||
MATCHED="none"
|
||||
for d in $DIRECTORIES ; do
|
||||
for f in $CANDIDATES; do
|
||||
if test -f $d/$f ; then
|
||||
MATCHED="$d/$f"
|
||||
break
|
||||
fi
|
||||
done
|
||||
test "$MATCHED" = "none" || break
|
||||
done
|
||||
|
||||
if test "$MATCHED" = "none" ; then
|
||||
echo "Warning: Can't find global Muttrc." >&2
|
||||
else
|
||||
include_file $MATCHED
|
||||
fi
|
||||
fi
|
||||
|
||||
exec > /dev/tty
|
||||
|
||||
cp $TEMPLATE $SCRATCH/mutt-bug.txt
|
||||
|
||||
input="e"
|
||||
while : ; do
|
||||
if test "$input" = "e" ; then
|
||||
${VISUAL-vi} $SCRATCH/mutt-bug.txt
|
||||
if cmp $SCRATCH/mutt-bug.txt ${TEMPLATE} > /dev/null ; then
|
||||
echo "Warning: Bug report was not modified!"
|
||||
fi
|
||||
fi
|
||||
|
||||
echo $n "Submit, Edit, Print, Quit? [S|e|p|q]$c"
|
||||
read _input
|
||||
input="`echo $_input | tr EPSQ epsq`"
|
||||
case $input in
|
||||
e*) ;;
|
||||
p*) ${PAGER-more} $SCRATCH/mutt-bug.txt ;;
|
||||
s*|"") /usr/sbin/sendmail -t < $SCRATCH/mutt-bug.txt ; exit ;;
|
||||
q*) exit
|
||||
esac
|
||||
done
|
||||
|
||||
@ -1,3 +1,7 @@
|
||||
Thu Mar 2 15:37:46 CET 2000 Werner Koch <wk@gnupg.de>
|
||||
|
||||
* ttyio.c (tty_print_utf8_string2): New to allow a max output size.
|
||||
|
||||
Wed Feb 23 10:07:57 CET 2000 Werner Koch <wk@gnupg.de>
|
||||
|
||||
* miscutil.c (asctimestamp): Fix for possible buffer overflow by
|
||||
|
||||
19
util/ttyio.c
19
util/ttyio.c
@ -236,7 +236,7 @@ tty_print_string( byte *p, size_t n )
|
||||
}
|
||||
|
||||
void
|
||||
tty_print_utf8_string( byte *p, size_t n )
|
||||
tty_print_utf8_string2( byte *p, size_t n, size_t max_n )
|
||||
{
|
||||
size_t i;
|
||||
char *buf;
|
||||
@ -251,15 +251,26 @@ tty_print_utf8_string( byte *p, size_t n )
|
||||
}
|
||||
if( i < n ) {
|
||||
buf = utf8_to_native( p, n );
|
||||
if( strlen( buf ) > max_n ) {
|
||||
buf[max_n] = 0;
|
||||
}
|
||||
/*(utf8 conversion already does the control character quoting)*/
|
||||
tty_printf("%s", buf );
|
||||
m_free( buf );
|
||||
}
|
||||
else
|
||||
else {
|
||||
if( n > max_n ) {
|
||||
n = max_n;
|
||||
}
|
||||
tty_print_string( p, n );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
void
|
||||
tty_print_utf8_string( byte *p, size_t n )
|
||||
{
|
||||
tty_print_utf8_string( p, n, n )
|
||||
}
|
||||
|
||||
|
||||
static char *
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user