diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | Makefile.am | 16 | ||||
| -rw-r--r-- | README | 18 | ||||
| -rw-r--r-- | THANKS | 2 | ||||
| -rw-r--r-- | acconfig.h | 4 | ||||
| -rw-r--r-- | cipher/ChangeLog | 4 | ||||
| -rw-r--r-- | cipher/Makefile.am | 4 | ||||
| -rw-r--r-- | cipher/dsa.c | 1 | ||||
| -rw-r--r-- | cipher/md.c | 2 | ||||
| -rw-r--r-- | configure.in | 25 | ||||
| -rw-r--r-- | mpi/ChangeLog | 4 | ||||
| -rw-r--r-- | mpi/mpi-div.c | 8 | ||||
| -rw-r--r-- | mpi/mpi-inv.c | 3 | ||||
| -rw-r--r-- | mpi/mpi-mpow.c | 2 | ||||
| -rw-r--r-- | mpi/mpiutil.c | 1 |
16 files changed, 61 insertions, 41 deletions
@@ -1,3 +1,9 @@ +Thu Oct 8 10:55:15 1998 Werner Koch (wk@isil.d.shuttle.de) + + * Makefile.am (g10defs.h): creates include file + * acconfig.h: now includes g10defs.h + * configure.in: Removed G10_LOCALEDIR and GNUPG_LIB + Thu Sep 17 18:49:40 1998 Werner Koch (wk@(none)) * Makefile.am (dist-hook): Now creates RPM file. @@ -63,7 +63,7 @@ The Linux files should look like this: cr--r--r-- 1 root sys 1, 9 Feb 16 08:23 /dev/urandom You can create them with: mknod /dev/random c 1 8 - mknod /dev/random c 1 8 + mknod /dev/urandom c 1 9 The FreeBSD files [from the 970202 snapshot]: crw-r--r-- 1 root wheel 2, 3 Feb 25 16:54 /dev/random diff --git a/Makefile.am b/Makefile.am index 138f0d37..49aa4381 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,6 +3,22 @@ SUBDIRS = intl po zlib util mpi cipher tools g10 doc checks EXTRA_DIST = VERSION PROJECTS +all-am: g10defs.h +all-recursive-am: g10defs.h + + +g10defs.h : config.h + @( set -e; \ + echo "/* Generated automatically by Makefile */" ; \ + echo "#ifdef __MINGW32__"; \ + echo "#define G10_LOCALEDIR \"c:/lib/gnupg/locale\""; \ + echo "#define GNUPG_LIBDIR \"c:/lib/gnupg\""; \ + echo "#else";\ + echo "#define G10_LOCALEDIR \"$(prefix)/$(DATADIRNAME)/locale\""; \ + echo "#define GNUPG_LIBDIR \"$(libdir)/gnupg\""; \ + echo "#endif";\ + ) >g10defs.h + dist-hook: @set -e; \ @@ -1,5 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- - GNUPG - The GNU Privacy Guard ------------------------------- Version 0.4 @@ -332,12 +330,12 @@ post them to the mailing list <g10@net.lut.ac.uk> (this is a closed list, please subscribe before posting, see above (~line 33)). ------BEGIN PGP SIGNATURE----- -Version: GNUPG v0.4.0a (GNU/Linux) -Comment: For info finger gcrypt@ftp.guug.de -iQB1AwUBNhtSpB0Z9MEMmFelAQHWNQMAuPaj71rzjjtVNlYDV0MYljPFZqAK7tvmbH3i9Lti -UuvGPCpx1/ej7jwZ2LSQ61O8c/xRwV07chHa5MGmSGT4KZg5g5MejUOliMQJIJwjY5PoZAVb -6F7+hZf5Bt5Jl2J7 -=6Mbb ------END PGP SIGNATURE----- + Supported targets: + ------------------ + powerpc-unknown-linux-gnu (linuxppc) + hppa1.1-hp-hpux10.20 + + + + @@ -28,6 +28,7 @@ John A. Martin jam@jamux.com Jörg Schilling schilling@fokus.gmd.de Karl Fogel kfogel@guanabana.onshore.com Karsten Thygesen karthy@kom.auc.dk +Kazu Yamamoto kazu@iijlab.net Lars Kellogg-Stedman lars@bu.edu Marco d'Itri md@linux.it Mark Adler madler@alumni.caltech.edu @@ -46,6 +47,7 @@ QingLong qinglong@bolizm.ihep.su Ralph Gillen gillen@theochem.uni-duesseldorf.de Roland Rosenfeld roland@spinnaker.rhein.de Serge Munhoven munhoven@mema.ucl.ac.be +SL Baur steve@xemacs.org Steffen Ullrich ccrlphr@xensei.com Steffen Zahn zahn@berlin.snafu.de Thomas Roessler roessler@guug.de @@ -31,9 +31,7 @@ #undef M_GUARD #undef VERSION #undef PACKAGE -#undef G10_LOCALEDIR #undef PRINTABLE_OS_NAME -#undef GNUPG_LIBDIR /* Define if your locale.h file contains LC_MESSAGES. */ #undef HAVE_LC_MESSAGES @@ -85,4 +83,6 @@ @BOTTOM@ +#include "g10defs.h" + #endif /*G10_CONFIG_H*/ diff --git a/cipher/ChangeLog b/cipher/ChangeLog index ad6a76a3..ddd34b65 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,3 +1,7 @@ +1998-10-10 SL Baur <steve@altair.xemacs.org> + + * Makefile.am: fix sed -O substitutions to catch -O6, etc. + Tue Oct 6 10:06:32 1998 Werner Koch (wk@isil.d.shuttle.de) * rand-unix.c (HAVE_GETTIMEOFDAY): Fixed (was ..GETTIMEOFTIME :-) diff --git a/cipher/Makefile.am b/cipher/Makefile.am index 26c625dc..298e0f32 100644 --- a/cipher/Makefile.am +++ b/cipher/Makefile.am @@ -49,11 +49,11 @@ EXTRA_twofish_SOURCES = twofish.c tiger: $(srcdir)/tiger.c `echo $(COMPILE) -shared -fPIC -lc -o tiger $(srcdir)/tiger.c | \ - sed -e 's/-O2/-O1/' ` + sed -e 's/-O[2-9]*/-O1/' ` twofish: $(srcdir)/twofish.c `echo $(COMPILE) -shared -fPIC -lc -o twofish $(srcdir)/twofish.c | \ - sed -e 's/-O2/ /' ` + sed -e 's/-O[0-9]*/ /' ` install-exec-hook: diff --git a/cipher/dsa.c b/cipher/dsa.c index accbca9e..2d5c1734 100644 --- a/cipher/dsa.c +++ b/cipher/dsa.c @@ -293,6 +293,7 @@ verify(MPI r, MPI s, MPI hash, DSA_public_key *pkey ) /* u2 = r * w mod q */ mpi_mulm( u2, r, w, pkey->q ); + /* v = g^u1 * y^u2 mod p mod q */ base[0] = pkey->g; exp[0] = u1; base[1] = pkey->y; exp[1] = u2; diff --git a/cipher/md.c b/cipher/md.c index 0ec6d606..819cc1d0 100644 --- a/cipher/md.c +++ b/cipher/md.c @@ -495,7 +495,7 @@ md_stop_debug( MD_HANDLE md ) #ifdef HAVE_U64_TYPEDEF { /* a kludge to pull in the __muldi3 for Solaris */ volatile u32 a = (u32)(ulong)md; - volatile u32 b = 42; + volatile u64 b = 42; volatile u64 c; c = a * b; } diff --git a/configure.in b/configure.in index 633b3335..ae674ae2 100644 --- a/configure.in +++ b/configure.in @@ -8,17 +8,6 @@ AC_CONFIG_AUX_DIR(scripts) AM_CONFIG_HEADER(config.h) -if test "x$exec_prefix" = xNONE ; then - if test "x$prefix" = xNONE ; then - g10_prefix="$ac_default_prefix" - else - g10_prefix="$prefix" - fi -else - g10_prefix="$exec_prefix" -fi - - VERSION=`cat $srcdir/VERSION` PACKAGE=gnupg ALL_LINGUAS="en de it fr" @@ -84,6 +73,8 @@ AC_PROG_CPP AC_ISC_POSIX AC_PROG_RANLIB AC_PROG_INSTALL +AM_CYGWIN32 + case "${target}" in i386--mingw32) @@ -94,14 +85,11 @@ case "${target}" in RANLIB="i386--mingw32-ranlib" ac_cv_have_dev_random=no AC_DEFINE(USE_RAND_W32) - GNUPG_LIBDIR="c:/lib/gnupg" ;; *) AC_DEFINE(USE_RAND_UNIX) - GNUPG_LIBDIR="$g10_prefix/lib/gnupg" ;; esac -AC_DEFINE_UNQUOTED(GNUPG_LIBDIR, "$GNUPG_LIBDIR") case "${target}" in i386--mingw32) @@ -254,10 +242,7 @@ fi AC_SUBST(ZLIBS) -G10_LOCALEDIR="$g10_prefix/$DATADIRNAME/locale" -AC_SUBST(G10_LOCALEDIR) -AC_DEFINE_UNQUOTED(G10_LOCALEDIR, "$G10_LOCALEDIR") -dnl WK_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl ) +WK_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl ) WK_DO_LINK_FILES @@ -275,5 +260,7 @@ doc/Makefile tools/Makefile zlib/Makefile checks/Makefile -],[echo timestamp >stamp-h; sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]) +],[echo timestamp >stamp-h; \ + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile +]) diff --git a/mpi/ChangeLog b/mpi/ChangeLog index 696fba4d..b2e8296a 100644 --- a/mpi/ChangeLog +++ b/mpi/ChangeLog @@ -1,3 +1,7 @@ +Thu Oct 8 13:28:17 1998 Werner Koch (wk@isil.d.shuttle.de) + + * mpi-mpow.c (mpi_mulpowm): Fixed mem leak (m_free/mpi_free). + Thu Sep 17 18:08:50 1998 Werner Koch (wk@(none)) * hppa1.1/udiv-qrnnd.S: Fix from Steffen Zahn for HPUX 10.20 diff --git a/mpi/mpi-div.c b/mpi/mpi-div.c index 62ac8715..b5f5809f 100644 --- a/mpi/mpi-div.c +++ b/mpi/mpi-div.c @@ -146,8 +146,7 @@ mpi_tdiv_qr( MPI quot, MPI rem, MPI num, MPI den) * We need space for an extra limb in the remainder, because it's * up-shifted (normalized) below. */ rsize = nsize + 1; - if( rem->alloced < rsize ) - mpi_resize( rem, rsize); + mpi_resize( rem, rsize); qsize = rsize - dsize; /* qsize cannot be bigger than this. */ if( qsize <= 0 ) { @@ -165,7 +164,7 @@ mpi_tdiv_qr( MPI quot, MPI rem, MPI num, MPI den) return; } - if( quot && quot->alloced < qsize ) + if( quot ) mpi_resize( quot, qsize); /* Read pointers here, when reallocation is finished. */ @@ -198,7 +197,8 @@ mpi_tdiv_qr( MPI quot, MPI rem, MPI num, MPI den) /* Make sure QP and NP point to different objects. Otherwise the * numerator would be gradually overwritten by the quotient limbs. */ if(qp == np) { /* Copy NP object to temporary space. */ - np = marker[markidx++] = mpi_alloc_limb_space(nsize,mpi_is_secure(quot)); + np = marker[markidx++] = mpi_alloc_limb_space(nsize, + mpi_is_secure(quot)); MPN_COPY(np, qp, nsize); } } diff --git a/mpi/mpi-inv.c b/mpi/mpi-inv.c index 150d87ca..fca60960 100644 --- a/mpi/mpi-inv.c +++ b/mpi/mpi-inv.c @@ -260,6 +260,9 @@ mpi_invm( MPI x, MPI a, MPI n ) mpi_free(u3); mpi_free(v3); mpi_free(t3); + + mpi_free(u); + mpi_free(v); #endif } diff --git a/mpi/mpi-mpow.c b/mpi/mpi-mpow.c index e0ed5310..0a7ef50e 100644 --- a/mpi/mpi-mpow.c +++ b/mpi/mpi-mpow.c @@ -111,7 +111,7 @@ mpi_mulpowm( MPI res, MPI *basearray, MPI *exparray, MPI m) } /* cleanup */ - m_free(tmp); + mpi_free(tmp); for(i=0; i < (1<<k); i++ ) mpi_free(G[i]); m_free(G); diff --git a/mpi/mpiutil.c b/mpi/mpiutil.c index 5dd65aeb..a94cbb49 100644 --- a/mpi/mpiutil.c +++ b/mpi/mpiutil.c @@ -372,4 +372,3 @@ mpi_swap( MPI a, MPI b) tmp = *a; *a = *b; *b = tmp; } - |