diff --git a/AUTHORS b/AUTHORS index 9e6cf1174..8c20802f9 100644 --- a/AUTHORS +++ b/AUTHORS @@ -59,7 +59,7 @@ pt_BR.po jungmann@cwb.matrix.com.br -TRANSLATIONS Janusz A. Urbanowicz ??????????? +TRANSLATIONS Janusz Aleksander Urbanowicz 1999-01-09 pl.po diff --git a/BUGS b/BUGS index 59a411861..c307391ae 100644 --- a/BUGS +++ b/BUGS @@ -44,8 +44,8 @@ and after about half a day in the rsync snapshots. Buserror on IRIX 6.4: Crash while doing a keygen. I think while creating the prime. Other buserrors are reported when doing a "gpg README" on sparc-solaris2.6. - --> I hope I've fixed this: Please, can someone check this. - I can't reproduce it on the alpha I have access to. + --> Solaris fixed. + --> IRIX bug still there [ **] #12 1999-03-10 gpg --list-secret-keys --with-colon SEGVs diff --git a/ChangeLog b/ChangeLog index 0f61ab113..b3b5ed836 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Mar 14 19:34:36 CET 1999 Werner Koch + + * acinclude.m4 (AM_SYS_SYMBOL_UNDERSCORE): Removed becuase it is + now in the latest libtool. + Thu Mar 11 16:39:46 CET 1999 Werner Koch * configure.in: Remmoved the need for libtool diff --git a/TODO b/TODO index 461abb447..9833173c9 100644 --- a/TODO +++ b/TODO @@ -2,6 +2,9 @@ * Replace --trusted-keys by a local certificate (which does not get exported). + * add some status output put for signing and encryption. + replace the puc in primegen with some kind of status-fd outputs. + * Finish the EGD module. * Implement 256 bit key Twofish (wait until the 2nd AES conference). @@ -22,6 +25,18 @@ * when decryptiong multiple key: print a warning only if no usable pubkey encrypt package was found. Extension: display a list of all recipients. +* an ERRSIG argument like + ERRSIG , where is the id of the missing public key + or a new keyword + PUBLIC_MISSING +* a status line complaining about a missing secret key like + SECRET_MISSING , where is the id of the missing secret key +* a status line complaining about a bad passphrase like + BADPASS + + + + Nice to have ------------ diff --git a/acinclude.m4 b/acinclude.m4 index 2d0b69b60..2349da629 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -342,222 +342,5 @@ define(GNUPG_CHECK_MLOCK, fi ]) -##################################################################### -# AM_SYS_SYMBOL_UNDERSCORE, AM_SYS_NM_PARSE: -# This has been taken from glib 1.2.0 acinclude.m4 which states that -# it is copyrighted by the FSF -################################################################### ## -dnl AM_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols -dnl with an underscore? -AC_DEFUN(AM_SYS_SYMBOL_UNDERSCORE, -[AC_REQUIRE([AM_PROG_NM])dnl -AC_REQUIRE([AM_SYS_NM_PARSE])dnl -AC_MSG_CHECKING([for _ prefix in compiled symbols]) -AC_CACHE_VAL(ac_cv_sys_symbol_underscore, -[ac_cv_sys_symbol_underscore=no -cat > conftest.$ac_ext < $ac_nlist) && test -s "$ac_nlist"; then - # See whether the symbols have a leading underscore. - if egrep '^_nm_test_func' "$ac_nlist" >/dev/null; then - ac_cv_sys_symbol_underscore=yes - else - if egrep '^nm_test_func ' "$ac_nlist" >/dev/null; then - : - else - echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC - fi - fi - else - echo "configure: cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC - fi -else - echo "configure: failed program was:" >&AC_FD_CC - cat conftest.c >&AC_FD_CC -fi -rm -rf conftest* -]) -AC_MSG_RESULT($ac_cv_sys_symbol_underscore) -if test x$ac_cv_sys_symbol_underscore = xyes; then - AC_DEFINE(WITH_SYMBOL_UNDERSCORE,1, - [define if compiled symbols have a leading underscore]) -fi -]) - - -dnl AM_SYS_NM_PARSE - Check for command to grab the raw symbol name followed -dnl by C symbol name from nm. -AC_DEFUN(AM_SYS_NM_PARSE, -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AM_PROG_NM])dnl -# Check for command to grab the raw symbol name followed by C symbol from nm. -AC_MSG_CHECKING([command to parse $NM output]) -AC_CACHE_VAL(ac_cv_sys_global_symbol_pipe, -[# These are sane defaults that work on at least a few old systems. -# {They come from Ultrix. What could be older than Ultrix?!! ;)} - -changequote(,)dnl -# Character class describing NM global symbol codes. -ac_symcode='[BCDEGRSTU]' - -# Regexp to match symbols that can be accessed directly from C. -ac_sympat='\([_A-Za-z][_A-Za-z0-9]*\)' - -# Transform the above into a raw symbol and a C symbol. -ac_symxfrm='\1 \1' - -# Define system-specific variables. -case "$host_os" in -aix*) - ac_symcode='[BCDTU]' - ;; -sunos* | cygwin32* | mingw32*) - ac_sympat='_\([_A-Za-z][_A-Za-z0-9]*\)' - ac_symxfrm='_\1 \1' - ;; -irix*) - # Cannot use undefined symbols on IRIX because inlined functions mess us up. - ac_symcode='[BCDEGRST]' - ;; -solaris*) - ac_symcode='[BDTU]' - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then - ac_symcode='[ABCDGISTUW]' -fi - -case "$host_os" in -cygwin32* | mingw32*) - # We do not want undefined symbols on cygwin32. The user must - # arrange to define them via -l arguments. - ac_symcode='[ABCDGISTW]' - ;; -esac -changequote([,])dnl - -# Write the raw and C identifiers. -ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.* $ac_symcode $ac_sympat$/$ac_symxfrm/p'" - -# Check to see that the pipe works correctly. -ac_pipe_works=no -cat > conftest.$ac_ext < $ac_nlist) && test -s "$ac_nlist"; then - - # Try sorting and uniquifying the output. - if sort "$ac_nlist" | uniq > "$ac_nlist"T; then - mv -f "$ac_nlist"T "$ac_nlist" - ac_wcout=`wc "$ac_nlist" 2>/dev/null` -changequote(,)dnl - ac_count=`echo "X$ac_wcout" | sed -e 's,^X,,' -e 's/^[ ]*\([0-9][0-9]*\).*$/\1/'` -changequote([,])dnl - (test "$ac_count" -ge 0) 2>/dev/null || ac_count=-1 - else - rm -f "$ac_nlist"T - ac_count=-1 - fi - - # Make sure that we snagged all the symbols we need. - if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then - if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then - cat < conftest.c -#ifdef __cplusplus -extern "C" { -#endif - -EOF - # Now generate the symbol file. - sed 's/^.* \(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c - - cat <> conftest.c -#if defined (__STDC__) && __STDC__ -# define __ptr_t void * -#else -# define __ptr_t char * -#endif - -/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */ -int dld_preloaded_symbol_count = $ac_count; - -/* The mapping between symbol names and symbols. */ -struct { - char *name; - __ptr_t address; -} -changequote(,)dnl -dld_preloaded_symbols[] = -changequote([,])dnl -{ -EOF - sed 's/^\(.*\) \(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c - cat <<\EOF >> conftest.c - {0, (__ptr_t) 0} -}; - -#ifdef __cplusplus -} -#endif -EOF - # Now try linking the two files. - mv conftest.$ac_objext conftestm.$ac_objext - ac_save_LIBS="$LIBS" - ac_save_CFLAGS="$CFLAGS" - LIBS="conftestm.$ac_objext" - CFLAGS="$CFLAGS$no_builtin_flag" - if AC_TRY_EVAL(ac_link) && test -s conftest; then - ac_pipe_works=yes - else - echo "configure: failed program was:" >&AC_FD_CC - cat conftest.c >&AC_FD_CC - fi - LIBS="$ac_save_LIBS" - CFLAGS="$ac_save_CFLAGS" - else - echo "cannot find nm_test_func in $ac_nlist" >&AC_FD_CC - fi - else - echo "cannot find nm_test_var in $ac_nlist" >&AC_FD_CC - fi - else - echo "cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC - fi -else - echo "$progname: failed program was:" >&AC_FD_CC - cat conftest.c >&AC_FD_CC -fi -rm -rf conftest* - -# Do not use the global_symbol_pipe unless it works. -test "$ac_pipe_works" = yes || ac_cv_sys_global_symbol_pipe= -]) - -ac_result=yes -if test -z "$ac_cv_sys_global_symbol_pipe"; then - ac_result=no -fi -AC_MSG_RESULT($ac_result) -]) -dnl end of AM_SYS_NM_PARSE - dnl *-*wedit:notab*-* Please keep this as the last line. diff --git a/g10/ChangeLog b/g10/ChangeLog index a4841c473..2e682f353 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +Sun Mar 14 19:34:36 CET 1999 Werner Koch + + * keygen.c (do_create): Changed wording of the note (Hugh Daniel) + Thu Mar 11 16:39:46 CET 1999 Werner Koch * tdbdump.c: New diff --git a/g10/keygen.c b/g10/keygen.c index 143ec9837..7fcd86453 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -761,8 +761,8 @@ do_create( int algo, unsigned nbits, KBNODE pub_root, KBNODE sec_root, tty_printf(_( "We need to generate a lot of random bytes. It is a good idea to perform\n" -"some other action (work in another window, move the mouse, utilize the\n" -"network and the disks) during the prime generation; this gives the random\n" +"some other action (type on the keyboard, move the mouse, utilize the\n" +"the disks) during the prime generation; this gives the random\n" "number generator a better chance to gain enough entropy.\n") ); if( algo == PUBKEY_ALGO_ELGAMAL || algo == PUBKEY_ALGO_ELGAMAL_E ) diff --git a/g10/mainproc.c b/g10/mainproc.c index 8ef802b63..c41e72352 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -180,6 +180,8 @@ proc_pubkey_enc( CTX c, PACKET *pkt ) /*printf("enc: encrypted by a pubkey with keyid %08lX\n", enc->keyid[1] );*/ /* Hmmm: why do I have this algo check here - anyway there is * function to check it. */ + if( opt.verbose ) + log_info(_("public key is %08lX\n"), (ulong)enc->keyid[1] ); if( is_ELGAMAL(enc->pubkey_algo) || enc->pubkey_algo == PUBKEY_ALGO_DSA || is_RSA(enc->pubkey_algo) ) { diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 612573a05..bc352d720 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,8 @@ +Sun Mar 14 19:34:36 CET 1999 Werner Koch + + * autogen.sh: Add a check for libtool because some autoconf macros + are needed. + Mon Feb 22 20:04:00 CET 1999 Werner Koch * autogen.sh: Enhanced the version testing code (Philippe Laliberte) diff --git a/scripts/autogen.sh b/scripts/autogen.sh index 47a0f6604..506066180 100755 --- a/scripts/autogen.sh +++ b/scripts/autogen.sh @@ -7,6 +7,7 @@ DIE=no autoconf_vers=2.13 automake_vers=1.4 aclocal_vers=1.4 +libtool_vers=1.2 if (autoconf --version) < /dev/null > /dev/null 2>&1 ; then if (autoconf --version | awk 'NR==1 { if( $3 >= '$autoconf_vers') \ @@ -64,6 +65,22 @@ if (gettext --version /dev/null | awk 'NR==1 { split($4,A,"\."); \ fi +if (libtool --version) < /dev/null > /dev/null 2>&1 ; then + if (libtool --version | awk 'NR==1 { if( $4 >= '$libtool_vers') \ + exit 1; exit 0; }'); + then + echo "**Error**: "\`libtool\'" is too old." + echo ' (version ' $libtool_vers ' or newer is required)' + DIE="yes" + fi +else + echo + echo "**Error**: You must have "\`autoconf\'" installed to compile $PGM." + echo ' (version ' $autoconf_vers ' or newer is required)' + DIE="yes" +fi + + if test "$DIE" = "yes"; then exit 1 fi