diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | NEWS | 10 | ||||
| -rw-r--r-- | TODO | 5 | ||||
| -rw-r--r-- | doc/gpg.sgml | 5 | ||||
| -rw-r--r-- | g10/ChangeLog | 16 | ||||
| -rw-r--r-- | g10/g10.c | 9 | ||||
| -rw-r--r-- | g10/plaintext.c | 7 | ||||
| -rw-r--r-- | util/ChangeLog | 7 | ||||
| -rw-r--r-- | util/iobuf.c | 20 |
9 files changed, 71 insertions, 14 deletions
@@ -1,12 +1,12 @@ -Wed Jul 19 11:26:43 CEST 2000 Werner Koch <wk@> +Wed Jul 19 11:26:43 CEST 2000 Werner Koch <[email protected]> * configure.in (mingw32): Changes to allow for mingw32msvc -Fri Jul 14 10:17:30 CEST 2000 Werner Koch <wk@> +Fri Jul 14 10:17:30 CEST 2000 Werner Koch <[email protected]> * acinclude.m4 (GNUPG_CHECK_MLOCK): Fixed syntax error in C code. -Wed Jul 12 13:32:06 CEST 2000 Werner Koch <wk@> +Wed Jul 12 13:32:06 CEST 2000 Werner Koch <[email protected]> Version 1.0.2 @@ -1,3 +1,13 @@ +Noteworthy changes in the current CVS branch STABLE-BRANCH-1-0 +-------------------------------------------------------------- + + * Fixed problems with piping to/from other MS-Windows software + + * Expiration time of the primary key can be changed again. + + * Revoked user IDs are now marked in the output of --list-key + + Noteworthy changes in version 1.0.2 (2000-07-12) ---------------------------------------------- @@ -1,4 +1,9 @@ + * setmode(BINARY) is missing + + * Don't get the ultimately trusted keys from the secring but store + it permanently in the trustdb. This way we don't need a secring at all. + * Use DSA keys with the test suite. * g10/trustdb.c (make_sig_records): fix the fixme. diff --git a/doc/gpg.sgml b/doc/gpg.sgml index 027105d4f..b57c9ab48 100644 --- a/doc/gpg.sgml +++ b/doc/gpg.sgml @@ -899,8 +899,8 @@ Write log output to file descriptor &ParmN; and not to stderr. <term>--no-comment</term> <listitem><para> Do not write comment packets. This option affects only -the generation of secret keys. Output of option packets -is disabled since version 0.4.2. +the generation of secret keys. Please note, that this has nothing +to do with the comments in clear text signatures. </para></listitem></varlistentry> @@ -908,6 +908,7 @@ is disabled since version 0.4.2. <term>--comment &ParmString;</term> <listitem><para> Use &ParmString; as comment string in clear text signatures. +To suppress those comment strings entirely, use an empty string here. </para></listitem></varlistentry> diff --git a/g10/ChangeLog b/g10/ChangeLog index 99d7e26f2..a70ee77b7 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,30 +1,36 @@ +Thu Jul 27 10:02:38 CEST 2000 Werner Koch <[email protected]> + + * g10.c (main): Use setmode(O_BINARY) for MSDOS while generating random bytes + (print_mds): Likewise for stdin. + * plaintext.c (handle_plaintext): Likewise for stdout. + Mon Jul 24 10:30:17 CEST 2000 Werner Koch <[email protected]> * keyedit.c (menu_expire): expire date for primary key can be set again. -Wed Jul 19 11:26:43 CEST 2000 Werner Koch <wk@> +Wed Jul 19 11:26:43 CEST 2000 Werner Koch <[email protected]> * keylist.c (is_uid_valid): New. (list_keyblock): Print validity information for all user IDs. Note, this has to be done at other places too; for now we have only minimal support. -Wed Jul 12 13:32:06 CEST 2000 Werner Koch <wk@> +Wed Jul 12 13:32:06 CEST 2000 Werner Koch <[email protected]> * helptext.c, pkclist.c: s/superseeded/superseded/ -Mon Jul 10 16:08:57 CEST 2000 Werner Koch <wk@> +Mon Jul 10 16:08:57 CEST 2000 Werner Koch <[email protected]> * parse-packet.c (enum_sig_subpkt): Fixed testing on crtitical bit in case of a NULL buffer. Reported by Peter Marschall. -Wed Jul 5 13:28:45 CEST 2000 Werner Koch <wk@> +Wed Jul 5 13:28:45 CEST 2000 Werner Koch <[email protected]> * keyedit.c, keyid.c: Add some _() * argparse.c: Changed the flag to suppress --version handling to also suppress --help. -Wed Jun 28 11:54:44 CEST 2000 Werner Koch <wk@> +Wed Jun 28 11:54:44 CEST 2000 Werner Koch <[email protected]> * armor.c (armor_filter): Set sigclass to 0 in case of non-dash-escaped clearsig. This makes this mode work again. @@ -25,6 +25,9 @@ #include <string.h> #include <ctype.h> #include <unistd.h> +#ifdef HAVE_DOSISH_SYSTEM + #include <fcntl.h> /* for setmode() */ +#endif #include "packet.h" @@ -1392,6 +1395,9 @@ main( int argc, char **argv ) size_t n = !endless && count < 100? count : 100; p = get_random_bits( n*8, level, 0); + #ifdef HAVE_DOSISH_SYSTEM + setmode ( fileno(stdout), O_BINARY ); + #endif fwrite( p, n, 1, stdout ); m_free(p); if( !endless ) @@ -1590,6 +1596,9 @@ print_mds( const char *fname, int algo ) if( !fname ) { fp = stdin; + #ifdef HAVE_DOSISH_SYSTEM + setmode ( fileno(fp) , O_BINARY ); + #endif pname = m_strdup("[stdin]: "); } else { diff --git a/g10/plaintext.c b/g10/plaintext.c index 4ab20278d..1510ed70b 100644 --- a/g10/plaintext.c +++ b/g10/plaintext.c @@ -24,6 +24,10 @@ #include <string.h> #include <errno.h> #include <assert.h> +#ifdef HAVE_DOSISH_SYSTEM + #include <fcntl.h> /* for setmode() */ +#endif + #include "util.h" #include "memory.h" #include "options.h" @@ -81,6 +85,9 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx, else if( !*fname || (*fname=='-' && !fname[1])) { /* no filename or "-" given; write to stdout */ fp = stdout; + #ifdef HAVE_DOSISH_SYSTEM + setmode ( fileno(fp) , O_BINARY ); + #endif } else if( !overwrite_filep( fname ) ) { rc = G10ERR_CREATE_FILE; diff --git a/util/ChangeLog b/util/ChangeLog index 1f066c763..12b9ba4c6 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,10 @@ +Thu Jul 27 10:02:38 CEST 2000 Werner Koch <[email protected]> + + * iobuf.c: Use setmode() at several places to set stdin and stdout + to binary mode for MSDOS based systems + + * iobuf.c (underflow): Initialize dummy_len to keep memory checker happy. + Fri Jun 9 10:09:52 CEST 2000 Werner Koch <[email protected]> * ttyio.c: Simulate termios with termios. By Dave Dykstra. diff --git a/util/iobuf.c b/util/iobuf.c index 0254ca78c..ad1341984 100644 --- a/util/iobuf.c +++ b/util/iobuf.c @@ -27,6 +27,9 @@ #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> +#ifdef HAVE_DOSISH_SYSTEM + #include <fcntl.h> /* for setmode() */ +#endif #include "memory.h" #include "util.h" @@ -467,7 +470,7 @@ int iobuf_close( IOBUF a ) { IOBUF a2; - size_t dummy_len; + size_t dummy_len=0; int rc=0; if( a && a->directfp ) { @@ -579,7 +582,10 @@ iobuf_open( const char *fname ) int print_only = 0; if( !fname || (*fname=='-' && !fname[1]) ) { - fp = stdin; /* fixme: set binary mode for msdoze */ + fp = stdin; + #ifdef HAVE_DOSISH_SYSTEM + setmode ( fileno(fp) , O_BINARY ); + #endif fname = "[stdin]"; print_only = 1; } @@ -646,6 +652,9 @@ iobuf_create( const char *fname ) if( !fname || (*fname=='-' && !fname[1]) ) { fp = stdout; + #ifdef HAVE_DOSISH_SYSTEM + setmode ( fileno(fp) , O_BINARY ); + #endif fname = "[stdout]"; print_only = 1; } @@ -741,7 +750,10 @@ iobuf_fopen( const char *fname, const char *mode ) int print_only = 0; if( !fname || (*fname=='-' && !fname[1]) ) { - fp = stdin; /* fixme: set binary mode for msdoze */ + fp = stdin; + #ifdef HAVE_DOSISH_SYSTEM + setmode ( fileno(fp) , O_BINARY ); + #endif fname = "[stdin]"; print_only = 1; } @@ -985,7 +997,7 @@ underflow(IOBUF a) } if( a->use == 1 && rc == -1 ) { /* EOF: we can remove the filter */ - size_t dummy_len; + size_t dummy_len=0; /* and tell the filter to free itself */ if( (rc = a->filter(a->filter_ov, IOBUFCTRL_FREE, a->chain, |