mirror of
git://git.gnupg.org/gnupg.git
synced 2024-07-02 02:48:57 +02:00
See ChangeLog: Tue Sep 28 20:56:34 CEST 1999 Werner Koch
This commit is contained in:
parent
9309940802
commit
88a7532f89
|
@ -1,3 +1,7 @@
|
||||||
|
Tue Sep 28 20:54:37 CEST 1999 Werner Koch <wk@gnupg.de>
|
||||||
|
|
||||||
|
* textfilter.c (copy_clearsig_text) [__MINGW32__): Use CR,LF.
|
||||||
|
|
||||||
Fri Sep 17 12:56:42 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
|
Fri Sep 17 12:56:42 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||||
|
|
||||||
* configure.in: Add "-lcap" when capabilities are requested.
|
* configure.in: Add "-lcap" when capabilities are requested.
|
||||||
|
|
3
NEWS
3
NEWS
|
@ -1,7 +1,8 @@
|
||||||
|
|
||||||
* New command --verify-files.
|
* New command --verify-files.
|
||||||
|
|
||||||
* Fixed some minor bugs.
|
* Fixed some minor bugs and the problem with conventional encrypted
|
||||||
|
packets which did use the gpg v3 partial length headers.
|
||||||
|
|
||||||
* Add Indonesian and Portugese translations.
|
* Add Indonesian and Portugese translations.
|
||||||
|
|
||||||
|
|
5
TODO
5
TODO
|
@ -3,11 +3,6 @@
|
||||||
(requested by Herny Spencer) or change the error message to
|
(requested by Herny Spencer) or change the error message to
|
||||||
a more clear one.
|
a more clear one.
|
||||||
|
|
||||||
W32 only:
|
|
||||||
- End of ASCII lines in clearsig files : when you clearsig a ANSI text file
|
|
||||||
(the Windows text format), the ends of line are in Unix format (linefeed)
|
|
||||||
instead of Win32 format (carriage return + linefeed).
|
|
||||||
|
|
||||||
|
|
||||||
Scheduled for 1.1
|
Scheduled for 1.1
|
||||||
-----------------
|
-----------------
|
||||||
|
|
|
@ -269,7 +269,7 @@ only in the local environment.</para></listitem></varlistentry>
|
||||||
<term>revsig</term>
|
<term>revsig</term>
|
||||||
<listitem><para>
|
<listitem><para>
|
||||||
Revoke a signature. GnuPG asks for every
|
Revoke a signature. GnuPG asks for every
|
||||||
every signature which has been done by one of
|
signature which has been done by one of
|
||||||
the secret keys, whether a revocation
|
the secret keys, whether a revocation
|
||||||
certificate should be generated.</para></listitem></varlistentry>
|
certificate should be generated.</para></listitem></varlistentry>
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
|
|
|
@ -1,3 +1,13 @@
|
||||||
|
Tue Sep 28 20:54:37 CEST 1999 Werner Koch <wk@gnupg.de>
|
||||||
|
|
||||||
|
* encode.c (encode_simple): Use new CTB when we don't have the
|
||||||
|
length of the file. This is somewhat strange as the comment above
|
||||||
|
indicates that this part is actually fixed for PGP 5 - maybe I simply
|
||||||
|
lost the source line, tsss.
|
||||||
|
|
||||||
|
* armor.c (armor_filter): Set a flag if no OpenPGP data has been found.
|
||||||
|
* verify.c (verify_signatures): Add an error helptext.
|
||||||
|
|
||||||
Thu Sep 23 19:24:30 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
|
Thu Sep 23 19:24:30 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||||
|
|
||||||
* openfile.c (open_outfile): Fixed the 8dot3 handling.
|
* openfile.c (open_outfile): Fixed the 8dot3 handling.
|
||||||
|
|
|
@ -999,6 +999,7 @@ armor_filter( void *opaque, int control,
|
||||||
}
|
}
|
||||||
else if( !afx->any_data && !afx->inp_bypass ) {
|
else if( !afx->any_data && !afx->inp_bypass ) {
|
||||||
log_error(_("no valid OpenPGP data found.\n"));
|
log_error(_("no valid OpenPGP data found.\n"));
|
||||||
|
afx->no_openpgp_data = 1;
|
||||||
write_status_text( STATUS_NODATA, "1" );
|
write_status_text( STATUS_NODATA, "1" );
|
||||||
}
|
}
|
||||||
if( afx->truncated )
|
if( afx->truncated )
|
||||||
|
|
|
@ -177,6 +177,7 @@ encode_simple( const char *filename, int mode )
|
||||||
pt->timestamp = make_timestamp();
|
pt->timestamp = make_timestamp();
|
||||||
pt->mode = opt.textmode? 't' : 'b';
|
pt->mode = opt.textmode? 't' : 'b';
|
||||||
pt->len = filesize;
|
pt->len = filesize;
|
||||||
|
pt->new_ctb = !pt->len && !opt.rfc1991;
|
||||||
pt->buf = inp;
|
pt->buf = inp;
|
||||||
pkt.pkttype = PKT_PLAINTEXT;
|
pkt.pkttype = PKT_PLAINTEXT;
|
||||||
pkt.pkt.plaintext = pt;
|
pkt.pkt.plaintext = pt;
|
||||||
|
|
|
@ -35,6 +35,9 @@ typedef struct {
|
||||||
int only_keyblocks; /* skip all headers but ".... key block" */
|
int only_keyblocks; /* skip all headers but ".... key block" */
|
||||||
const char *hdrlines; /* write these headerlines */
|
const char *hdrlines; /* write these headerlines */
|
||||||
|
|
||||||
|
/* these fileds must be initialized to zero */
|
||||||
|
int no_openpgp_data; /* output flag: "No valid OpenPGP data found" */
|
||||||
|
|
||||||
/* the following fields must be initialized to zero */
|
/* the following fields must be initialized to zero */
|
||||||
int inp_checked; /* set if the input has been checked */
|
int inp_checked; /* set if the input has been checked */
|
||||||
int inp_bypass; /* set if the input is not armored */
|
int inp_bypass; /* set if the input is not armored */
|
||||||
|
|
|
@ -183,11 +183,32 @@ copy_clearsig_text( IOBUF out, IOBUF inp, MD_HANDLE md,
|
||||||
iobuf_put( out, '-' );
|
iobuf_put( out, '-' );
|
||||||
iobuf_put( out, ' ' );
|
iobuf_put( out, ' ' );
|
||||||
}
|
}
|
||||||
|
#ifdef __MINGW32__
|
||||||
|
/* make sure the lines do end in CR,LF */
|
||||||
|
if( n > 1 && ( (buffer[n-2] == '\r' && buffer[n-1] == '\n' )
|
||||||
|
|| (buffer[n-2] == '\n' && buffer[n-1] == '\r'))) {
|
||||||
|
iobuf_write( out, buffer, n-2 );
|
||||||
|
iobuf_put( out, '\r');
|
||||||
|
iobuf_put( out, '\n');
|
||||||
|
}
|
||||||
|
else if( n && buffer[n-1] == '\n' ) {
|
||||||
|
iobuf_write( out, buffer, n-1 );
|
||||||
|
iobuf_put( out, '\r');
|
||||||
|
iobuf_put( out, '\n');
|
||||||
|
}
|
||||||
|
else
|
||||||
|
iobuf_write( out, buffer, n );
|
||||||
|
|
||||||
|
#else
|
||||||
iobuf_write( out, buffer, n );
|
iobuf_write( out, buffer, n );
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/* at eof */
|
/* at eof */
|
||||||
if( !pending_lf ) { /* make sure that the file ends with a LF */
|
if( !pending_lf ) { /* make sure that the file ends with a LF */
|
||||||
|
#ifndef __MINGW32__
|
||||||
|
iobuf_put( out, '\r');
|
||||||
|
#endif
|
||||||
iobuf_put( out, '\n');
|
iobuf_put( out, '\n');
|
||||||
if( !escape_dash )
|
if( !escape_dash )
|
||||||
md_putc( md, '\n' );
|
md_putc( md, '\n' );
|
||||||
|
|
16
g10/verify.c
16
g10/verify.c
|
@ -59,6 +59,7 @@ verify_signatures( int nfiles, char **files )
|
||||||
int i, rc;
|
int i, rc;
|
||||||
STRLIST sl;
|
STRLIST sl;
|
||||||
|
|
||||||
|
memset( &afx, 0, sizeof afx);
|
||||||
sigfile = nfiles? *files : NULL;
|
sigfile = nfiles? *files : NULL;
|
||||||
|
|
||||||
/* open the signature file */
|
/* open the signature file */
|
||||||
|
@ -68,12 +69,8 @@ verify_signatures( int nfiles, char **files )
|
||||||
return G10ERR_OPEN_FILE;
|
return G10ERR_OPEN_FILE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( !opt.no_armor ) {
|
if( !opt.no_armor && use_armor_filter( fp ) )
|
||||||
if( use_armor_filter( fp ) ) {
|
iobuf_push_filter( fp, armor_filter, &afx );
|
||||||
memset( &afx, 0, sizeof afx);
|
|
||||||
iobuf_push_filter( fp, armor_filter, &afx );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
sl = NULL;
|
sl = NULL;
|
||||||
for(i=1 ; i < nfiles; i++ )
|
for(i=1 ; i < nfiles; i++ )
|
||||||
|
@ -81,6 +78,13 @@ verify_signatures( int nfiles, char **files )
|
||||||
rc = proc_signature_packets( NULL, fp, sl, sigfile );
|
rc = proc_signature_packets( NULL, fp, sl, sigfile );
|
||||||
free_strlist(sl);
|
free_strlist(sl);
|
||||||
iobuf_close(fp);
|
iobuf_close(fp);
|
||||||
|
if( afx.no_openpgp_data && rc == -1 ) {
|
||||||
|
log_error(_("the signature could not be verified.\n"
|
||||||
|
"Please remember that the signature file (.sig or .asc)\n"
|
||||||
|
"should be the first file given on the command line.\n") );
|
||||||
|
rc = 0;
|
||||||
|
}
|
||||||
|
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user