security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-24 16:43:28 +02:00
Code Activity

Re-indented.

Browse Source
This commit is contained in:
Werner Koch 2009-10-01 09:56:51 +00:00
parent fafe852c33
commit b432da7574
1 changed files with 527 additions and 478 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

503
g10/plaintext.c
View File

@ -1,6 +1,6 @@
/* plaintext.c - process plaintext packets
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
* 2006 Free Software Foundation, Inc.
* 2006, 2009 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@ -26,7 +26,7 @@
#include <assert.h>
#include <sys/types.h>
#ifdef HAVE_DOSISH_SYSTEM
#include <fcntl.h> /* for setmode() */
# include <fcntl.h> /* for setmode() */
#endif
#include "gpg.h"
@ -40,19 +40,17 @@
#include "i18n.h"
/****************
* Handle a plaintext packet. If MFX is not NULL, update the MDs
* Note: we should use the filter stuff here, but we have to add some
* easy mimic to set a read limit, so we calculate only the
* bytes from the plaintext.
*/
/* Handle a plaintext packet. If MFX is not NULL, update the MDs
* Note: We should have used the filter stuff here, but we have to add
* some easy mimic to set a read limit, so we calculate only the bytes
* from the plaintext. */
int
handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
int nooutput, int clearsig )
handle_plaintext (PKT_plaintext * pt, md_filter_context_t * mfx,
int nooutput, int clearsig)
{
char *fname = NULL;
FILE *fp = NULL;
static off_t count=0;
static off_t count = 0;
int rc = 0;
int c;
int convert = (pt->mode == 't' || pt->mode == 'u');
@ -61,9 +59,9 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
#endif
/* Let people know what the plaintext info is. This allows the
receiving program to try and do something different based on
the format code (say, recode UTF-8 to local). */
if(!nooutput && is_status_enabled())
receiving program to try and do something different based on the
format code (say, recode UTF-8 to local). */
if (!nooutput && is_status_enabled ())
{
char status[50];
@ -73,56 +71,65 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
status message. */
fflush (stdout);
sprintf(status,"%X %lu ",(byte)pt->mode,(ulong)pt->timestamp);
write_status_text_and_buffer(STATUS_PLAINTEXT,
status,pt->name,pt->namelen,0);
snprintf (status, sizeof status,
"%X %lu ", (byte) pt->mode, (ulong) pt->timestamp);
write_status_text_and_buffer (STATUS_PLAINTEXT,
status, pt->name, pt->namelen, 0);
if(!pt->is_partial)
if (!pt->is_partial)
{
sprintf(status,"%lu",(ulong)pt->len);
write_status_text(STATUS_PLAINTEXT_LENGTH,status);
sprintf (status, "%lu", (ulong) pt->len);
write_status_text (STATUS_PLAINTEXT_LENGTH, status);
}
}
/* create the filename as C string */
if( nooutput )
/* Create the filename as C string. */
if (nooutput)
;
else if( opt.outfile ) {
fname = xmalloc( strlen( opt.outfile ) + 1);
strcpy(fname, opt.outfile );
else if (opt.outfile)
{
fname = xmalloc (strlen (opt.outfile) + 1);
strcpy (fname, opt.outfile);
}
else if( pt->namelen == 8 && !memcmp( pt->name, "_CONSOLE", 8 ) ) {
log_info(_("data not saved; use option \"--output\" to save it\n"));
else if (pt->namelen == 8 && !memcmp (pt->name, "_CONSOLE", 8))
{
log_info (_("data not saved; use option \"--output\" to save it\n"));
nooutput = 1;
}
else if( !opt.flags.use_embedded_filename ) {
fname = make_outfile_name( iobuf_get_real_fname(pt->buf) );
if( !fname )
fname = ask_outfile_name( pt->name, pt->namelen );
if( !fname ) {
else if (!opt.flags.use_embedded_filename)
{
fname = make_outfile_name (iobuf_get_real_fname (pt->buf));
if (!fname)
fname = ask_outfile_name (pt->name, pt->namelen);
if (!fname)
{
rc = gpg_error (GPG_ERR_GENERAL); /* Can't create file. */
goto leave;
}
}
else
fname=utf8_to_native(pt->name,pt->namelen,0);
fname = utf8_to_native (pt->name, pt->namelen, 0);
if( nooutput )
if (nooutput)
;
else if ( iobuf_is_pipe_filename (fname) || !*fname)
else if (iobuf_is_pipe_filename (fname) || !*fname)
{
/* No filename or "-" given; write to stdout. */
fp = stdout;
#ifdef HAVE_DOSISH_SYSTEM
setmode ( fileno(fp) , O_BINARY );
setmode (fileno (fp), O_BINARY);
#endif
}
else {
while( !overwrite_filep (fname) ) {
else
{
while (!overwrite_filep (fname))
{
char *tmp = ask_outfile_name (NULL, 0);
if ( !tmp || !*tmp ) {
if (!tmp || !*tmp)
{
xfree (tmp);
rc = gpg_error (GPG_ERR_GENERAL); /* G10ERR_CREATE_FILE*/
/* FIXME: Below used to be G10ERR_CREATE_FILE */
rc = gpg_error (GPG_ERR_GENERAL);
goto leave;
}
xfree (fname);
@ -131,257 +138,279 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
}
#ifndef __riscos__
if( fp || nooutput )
if (fp || nooutput)
;
else if (is_secured_filename (fname))
{
errno = EPERM;
rc = gpg_error_from_syserror ();
log_error(_("error creating `%s': %s\n"), fname, strerror(errno) );
log_error (_("error creating `%s': %s\n"), fname, strerror (errno));
goto leave;
}
else if( !(fp = fopen(fname,"wb")) ) {
else if (!(fp = fopen (fname, "wb")))
{
rc = gpg_error_from_syserror ();
log_error(_("error creating `%s': %s\n"), fname, strerror(errno) );
log_error (_("error creating `%s': %s\n"), fname, strerror (errno));
goto leave;
}
#else /* __riscos__ */
/* If no output filename was given, i.e. we constructed it,
convert all '.' in fname to '/' but not vice versa as
we don't create directories! */
if( !opt.outfile )
for( c=0; fname[c]; ++c )
if( fname[c] == '.' )
if (!opt.outfile)
for (c = 0; fname[c]; ++c)
if (fname[c] == '.')
fname[c] = '/';
if( fp || nooutput )
if (fp || nooutput)
;
else {
fp = fopen(fname,"wb");
if( !fp ) {
log_error(_("error creating `%s': %s\n"), fname, strerror(errno) );
else
{
fp = fopen (fname, "wb");
if (!fp)
{
log_error (_("error creating `%s': %s\n"), fname, strerror (errno));
rc = G10ERR_CREATE_FILE;
if (errno == 106)
log_info("Do output file and input file have the same name?\n");
log_info ("Do output file and input file have the same name?\n");
goto leave;
}
/* If there's a ,xxx extension in the embedded filename,
use that, else check whether the user input (in fname)
has a ,xxx appended, then use that in preference */
if( (c = riscos_get_filetype_from_string( pt->name,
pt->namelen )) != -1 )
if ((c = riscos_get_filetype_from_string (pt->name, pt->namelen)) != -1)
filetype = c;
if( (c = riscos_get_filetype_from_string( fname,
strlen(fname) )) != -1 )
if ((c = riscos_get_filetype_from_string (fname, strlen (fname))) != -1)
filetype = c;
riscos_set_filetype_by_number(fname, filetype);
riscos_set_filetype_by_number (fname, filetype);
}
#endif /* __riscos__ */
if( !pt->is_partial ) {
if (!pt->is_partial)
{
/* We have an actual length (which might be zero). */
if (clearsig) {
if (clearsig)
{
log_error ("clearsig encountered while not expected\n");
rc = G10ERR_UNEXPECTED;
goto leave;
}
if( convert ) { /* text mode */
for( ; pt->len; pt->len-- ) {
if( (c = iobuf_get(pt->buf)) == -1 ) {
if (convert) /* Text mode. */
{
for (; pt->len; pt->len--)
{
if ((c = iobuf_get (pt->buf)) == -1)
{
rc = gpg_error_from_syserror ();
log_error ("problem reading source (%u bytes remaining)\n",
(unsigned)pt->len);
(unsigned) pt->len);
goto leave;
}
if( mfx->md )
gcry_md_putc (mfx->md, c );
if (mfx->md)
gcry_md_putc (mfx->md, c);
#ifndef HAVE_DOSISH_SYSTEM
if( c == '\r' ) /* convert to native line ending */
if (c == '\r') /* convert to native line ending */
continue; /* fixme: this hack might be too simple */
#endif
if( fp )
if (fp)
{
if(opt.max_output && (++count)>opt.max_output)
if (opt.max_output && (++count) > opt.max_output)
{
log_error ("error writing to `%s': %s\n",
fname,"exceeded --max-output limit\n");
fname, "exceeded --max-output limit\n");
rc = gpg_error (GPG_ERR_TOO_LARGE);
goto leave;
}
else if( putc( c, fp ) == EOF )
else if (putc (c, fp) == EOF)
{
if (ferror (fp))
rc = gpg_error_from_syserror ();
else
rc = gpg_error (GPG_ERR_EOF);
log_error ("error writing to `%s': %s\n",
fname, strerror(errno) );
fname, strerror (errno));
goto leave;
}
}
}
}
else { /* binary mode */
byte *buffer = xmalloc( 32768 );
while( pt->len ) {
else /* Binary mode. */
{
byte *buffer = xmalloc (32768);
while (pt->len)
{
int len = pt->len > 32768 ? 32768 : pt->len;
len = iobuf_read( pt->buf, buffer, len );
if( len == -1 ) {
len = iobuf_read (pt->buf, buffer, len);
if (len == -1)
{
rc = gpg_error_from_syserror ();
log_error ("problem reading source (%u bytes remaining)\n",
(unsigned)pt->len);
xfree( buffer );
(unsigned) pt->len);
xfree (buffer);
goto leave;
}
if( mfx->md )
gcry_md_write ( mfx->md, buffer, len );
if( fp )
if (mfx->md)
gcry_md_write (mfx->md, buffer, len);
if (fp)
{
if(opt.max_output && (count+=len)>opt.max_output)
if (opt.max_output && (count += len) > opt.max_output)
{
log_error ("error writing to `%s': %s\n",
fname,"exceeded --max-output limit\n");
fname, "exceeded --max-output limit\n");
rc = gpg_error (GPG_ERR_TOO_LARGE);
xfree( buffer );
xfree (buffer);
goto leave;
}
else if( fwrite( buffer, 1, len, fp ) != len )
else if (fwrite (buffer, 1, len, fp) != len)
{
rc = gpg_error_from_syserror ();
log_error ("error writing to `%s': %s\n",
fname, strerror(errno) );
xfree( buffer );
fname, strerror (errno));
xfree (buffer);
goto leave;
}
}
pt->len -= len;
}
xfree( buffer );
xfree (buffer);
}
}
else if( !clearsig ) {
if( convert ) { /* text mode */
while( (c = iobuf_get(pt->buf)) != -1 ) {
if( mfx->md )
gcry_md_putc (mfx->md, c );
else if (!clearsig)
{
if (convert)
{ /* text mode */
while ((c = iobuf_get (pt->buf)) != -1)
{
if (mfx->md)
gcry_md_putc (mfx->md, c);
#ifndef HAVE_DOSISH_SYSTEM
if( convert && c == '\r' )
if (convert && c == '\r')
continue; /* fixme: this hack might be too simple */
#endif
if( fp )
if (fp)
{
if(opt.max_output && (++count)>opt.max_output)
if (opt.max_output && (++count) > opt.max_output)
{
log_error("Error writing to `%s': %s\n",
fname,"exceeded --max-output limit\n");
log_error ("Error writing to `%s': %s\n",
fname, "exceeded --max-output limit\n");
rc = gpg_error (GPG_ERR_TOO_LARGE);
goto leave;
}
else if( putc( c, fp ) == EOF )
else if (putc (c, fp) == EOF)
{
if ( ferror (fp ) )
if (ferror (fp))
rc = gpg_error_from_syserror ();
else
rc = gpg_error (GPG_ERR_EOF);
log_error("error writing to `%s': %s\n",
fname, strerror(errno) );
log_error ("error writing to `%s': %s\n",
fname, strerror (errno));
goto leave;
}
}
}
}
else { /* binary mode */
byte *buffer = xmalloc( 32768 );
else
{ /* binary mode */
byte *buffer = xmalloc (32768);
int eof_seen = 0;
while ( !eof_seen ) {
while (!eof_seen)
{
/* Why do we check for len < 32768:
* If we won't, we would practically read 2 EOFs but
* the first one has already popped the block_filter
* off and therefore we don't catch the boundary.
* So, always assume EOF if iobuf_read returns less bytes
* then requested */
int len = iobuf_read( pt->buf, buffer, 32768 );
if( len == -1 )
int len = iobuf_read (pt->buf, buffer, 32768);
if (len == -1)
break;
if( len < 32768 )
if (len < 32768)
eof_seen = 1;
if( mfx->md )
gcry_md_write ( mfx->md, buffer, len );
if( fp )
if (mfx->md)
gcry_md_write (mfx->md, buffer, len);
if (fp)
{
if(opt.max_output && (count+=len)>opt.max_output)
if (opt.max_output && (count += len) > opt.max_output)
{
log_error("error writing to `%s': %s\n",
fname,"exceeded --max-output limit\n");
log_error ("error writing to `%s': %s\n",
fname, "exceeded --max-output limit\n");
rc = gpg_error (GPG_ERR_TOO_LARGE);
xfree( buffer );
xfree (buffer);
goto leave;
}
else if( fwrite( buffer, 1, len, fp ) != len ) {
rc = (errno? gpg_error_from_syserror ()
else if (fwrite (buffer, 1, len, fp) != len)
{
rc = (errno ? gpg_error_from_syserror ()
: gpg_error (GPG_ERR_INTERNAL));
log_error ("error writing to `%s': %s\n",
fname, strerror(errno) );
xfree( buffer );
fname, strerror (errno));
xfree (buffer);
goto leave;
}
}
}
xfree( buffer );
xfree (buffer);
}
pt->buf = NULL;
}
else { /* clear text signature - don't hash the last cr,lf */
else /* Clear text signature - don't hash the last CR,LF. */
{
int state = 0;
while( (c = iobuf_get(pt->buf)) != -1 ) {
if( fp )
while ((c = iobuf_get (pt->buf)) != -1)
{
if(opt.max_output && (++count)>opt.max_output)
if (fp)
{
if (opt.max_output && (++count) > opt.max_output)
{
log_error ("error writing to `%s': %s\n",
fname,"exceeded --max-output limit\n");
fname, "exceeded --max-output limit\n");
rc = gpg_error (GPG_ERR_TOO_LARGE);
goto leave;
}
else if( putc( c, fp ) == EOF )
else if (putc (c, fp) == EOF)
{
rc = (errno? gpg_error_from_syserror ()
rc = (errno ? gpg_error_from_syserror ()
: gpg_error (GPG_ERR_INTERNAL));
log_error ("error writing to `%s': %s\n",
fname, strerror(errno) );
fname, strerror (errno));
goto leave;
}
}
if( !mfx->md )
if (!mfx->md)
continue;
if( state == 2 ) {
gcry_md_putc (mfx->md, '\r' );
gcry_md_putc (mfx->md, '\n' );
if (state == 2)
{
gcry_md_putc (mfx->md, '\r');
gcry_md_putc (mfx->md, '\n');
state = 0;
}
if( !state ) {
if( c == '\r' )
if (!state)
{
if (c == '\r')
state = 1;
else if( c == '\n' )
else if (c == '\n')
state = 2;
else
gcry_md_putc(mfx->md, c );
gcry_md_putc (mfx->md, c);
}
else if( state == 1 ) {
if( c == '\n' )
else if (state == 1)
{
if (c == '\n')
state = 2;
else {
gcry_md_putc(mfx->md, '\r' );
if( c == '\r' )
else
{
gcry_md_putc (mfx->md, '\r');
if (c == '\r')
state = 1;
else {
else
{
state = 0;
gcry_md_putc(mfx->md, c );
gcry_md_putc (mfx->md, c);
}
}
}
@ -389,63 +418,72 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
pt->buf = NULL;
}
if( fp && fp != stdout && fclose(fp) ) {
rc = (errno? gpg_error_from_syserror ()
if (fp && fp != stdout && fclose (fp))
{
rc = (errno ? gpg_error_from_syserror ()
: gpg_error (GPG_ERR_INTERNAL));
log_error ("error closing `%s': %s\n", fname, strerror(errno) );
log_error ("error closing `%s': %s\n", fname, strerror (errno));
fp = NULL;
goto leave;
}
fp = NULL;
leave:
/* Make sure that stdout gets flushed after the plaintext has
been handled. This is for extra security as we do a
flush anyway before checking the signature. */
/* Make sure that stdout gets flushed after the plaintext has been
handled. This is for extra security as we do a flush anyway
before checking the signature. */
fflush (stdout);
if( fp && fp != stdout )
if (fp && fp != stdout)
fclose (fp);
xfree(fname);
xfree (fname);
return rc;
}
static void
do_hash( gcry_md_hd_t md, gcry_md_hd_t md2, IOBUF fp, int textmode )
do_hash (gcry_md_hd_t md, gcry_md_hd_t md2, IOBUF fp, int textmode)
{
text_filter_context_t tfx;
int c;
if( textmode ) {
memset( &tfx, 0, sizeof tfx);
iobuf_push_filter( fp, text_filter, &tfx );
if (textmode)
{
memset (&tfx, 0, sizeof tfx);
iobuf_push_filter (fp, text_filter, &tfx);
}
if( md2 ) { /* work around a strange behaviour in pgp2 */
if (md2)
{ /* work around a strange behaviour in pgp2 */
/* It seems that at least PGP5 converts a single CR to a CR,LF too */
int lc = -1;
while( (c = iobuf_get(fp)) != -1 ) {
if( c == '\n' && lc == '\r' )
while ((c = iobuf_get (fp)) != -1)
{
if (c == '\n' && lc == '\r')
gcry_md_putc (md2, c);
else if( c == '\n' ) {
else if (c == '\n')
{
gcry_md_putc (md2, '\r');
gcry_md_putc (md2, c);
}
else if( c != '\n' && lc == '\r' ) {
else if (c != '\n' && lc == '\r')
{
gcry_md_putc (md2, '\n');
gcry_md_putc (md2, c);
}
else
gcry_md_putc (md2, c);
if( md )
gcry_md_putc (md, c );
if (md)
gcry_md_putc (md, c);
lc = c;
}
}
else {
while( (c = iobuf_get(fp)) != -1 ) {
if( md )
gcry_md_putc (md, c );
else
{
while ((c = iobuf_get (fp)) != -1)
{
if (md)
gcry_md_putc (md, c);
}
}
}
@ -457,7 +495,7 @@ do_hash( gcry_md_hd_t md, gcry_md_hd_t md2, IOBUF fp, int textmode )
*/
int
ask_for_detached_datafile (gcry_md_hd_t md, gcry_md_hd_t md2,
const char *inname, int textmode )
const char *inname, int textmode)
{
progress_filter_context_t *pfx;
char *answer = NULL;
@ -465,58 +503,65 @@ ask_for_detached_datafile (gcry_md_hd_t md, gcry_md_hd_t md2,
int rc = 0;
pfx = new_progress_context ();
fp = open_sigfile ( inname, pfx ); /* Open default file. */
fp = open_sigfile (inname, pfx); /* Open default file. */
if( !fp && !opt.batch ) {
int any=0;
tty_printf(_("Detached signature.\n"));
do {
if (!fp && !opt.batch)
{
int any = 0;
tty_printf (_("Detached signature.\n"));
do
{
char *name;
xfree(answer);
tty_enable_completion(NULL);
name = cpr_get("detached_signature.filename",
xfree (answer);
tty_enable_completion (NULL);
name = cpr_get ("detached_signature.filename",
_("Please enter name of data file: "));
tty_disable_completion();
cpr_kill_prompt();
answer=make_filename(name,(void *)NULL);
xfree(name);
tty_disable_completion ();
cpr_kill_prompt ();
answer = make_filename (name, (void *) NULL);
xfree (name);
if( any && !*answer ) {
rc = gpg_error (GPG_ERR_GENERAL); /*G10ERR_READ_FILE*/
if (any && !*answer)
{
rc = gpg_error (GPG_ERR_GENERAL); /*G10ERR_READ_FILE */
goto leave;
}
fp = iobuf_open(answer);
fp = iobuf_open (answer);
if (fp && is_secured_file (iobuf_get_fd (fp)))
{
iobuf_close (fp);
fp = NULL;
errno = EPERM;
}
if( !fp && errno == ENOENT ) {
tty_printf("No such file, try again or hit enter to quit.\n");
if (!fp && errno == ENOENT)
{
tty_printf ("No such file, try again or hit enter to quit.\n");
any++;
}
else if( !fp )
else if (!fp)
{
rc = gpg_error_from_syserror ();
log_error(_("can't open `%s': %s\n"), answer, strerror(errno));
log_error (_("can't open `%s': %s\n"), answer,
strerror (errno));
goto leave;
}
} while( !fp );
}
while (!fp);
}
if( !fp ) {
if( opt.verbose )
log_info(_("reading stdin ...\n"));
fp = iobuf_open( NULL );
assert(fp);
if (!fp)
{
if (opt.verbose)
log_info (_("reading stdin ...\n"));
fp = iobuf_open (NULL);
assert (fp);
}
do_hash( md, md2, fp, textmode );
iobuf_close(fp);
do_hash (md, md2, fp, textmode);
iobuf_close (fp);
leave:
xfree(answer);
leave:
xfree (answer);
release_progress_context (pfx);
return rc;
}
@ -528,8 +573,8 @@ ask_for_detached_datafile (gcry_md_hd_t md, gcry_md_hd_t md2,
* If FILES is NULL, hash stdin.
*/
int
hash_datafiles( gcry_md_hd_t md, gcry_md_hd_t md2, strlist_t files,
const char *sigfilename, int textmode )
hash_datafiles (gcry_md_hd_t md, gcry_md_hd_t md2, strlist_t files,
const char *sigfilename, int textmode)
{
progress_filter_context_t *pfx;
IOBUF fp;
@ -537,12 +582,14 @@ hash_datafiles( gcry_md_hd_t md, gcry_md_hd_t md2, strlist_t files,
pfx = new_progress_context ();
if( !files ) {
if (!files)
{
/* check whether we can open the signed material */
fp = open_sigfile( sigfilename, pfx );
if( fp ) {
do_hash( md, md2, fp, textmode );
iobuf_close(fp);
fp = open_sigfile (sigfilename, pfx);
if (fp)
{
do_hash (md, md2, fp, textmode);
iobuf_close (fp);
release_progress_context (pfx);
return 0;
}
@ -552,24 +599,26 @@ hash_datafiles( gcry_md_hd_t md, gcry_md_hd_t md2, strlist_t files,
}
for (sl=files; sl; sl = sl->next ) {
fp = iobuf_open( sl->d );
for (sl = files; sl; sl = sl->next)
{
fp = iobuf_open (sl->d);
if (fp && is_secured_file (iobuf_get_fd (fp)))
{
iobuf_close (fp);
fp = NULL;
errno = EPERM;
}
if( !fp ) {
if (!fp)
{
int rc = gpg_error_from_syserror ();
log_error(_("can't open signed data `%s'\n"),
print_fname_stdin(sl->d));
log_error (_("can't open signed data `%s'\n"),
print_fname_stdin (sl->d));
release_progress_context (pfx);
return rc;
}
handle_progress (pfx, fp, sl->d);
do_hash( md, md2, fp, textmode );
iobuf_close(fp);
do_hash (md, md2, fp, textmode);
iobuf_close (fp);
}
release_progress_context (pfx);
@ -580,8 +629,8 @@ hash_datafiles( gcry_md_hd_t md, gcry_md_hd_t md2, strlist_t files,
/* Hash the data from file descriptor DATA_FD and append the hash to hash
contexts MD and MD2. */
int
hash_datafile_by_fd ( gcry_md_hd_t md, gcry_md_hd_t md2, int data_fd,
int textmode )
hash_datafile_by_fd (gcry_md_hd_t md, gcry_md_hd_t md2, int data_fd,
int textmode)
{
progress_filter_context_t *pfx = new_progress_context ();
iobuf_t fp;
@ -593,10 +642,10 @@ hash_datafile_by_fd ( gcry_md_hd_t md, gcry_md_hd_t md2, int data_fd,
fp = NULL;
errno = EPERM;
}
if ( !fp )
if (!fp)
{
int rc = gpg_error_from_syserror ();
log_error ( _("can't open signed data fd=%d: %s\n"),
log_error (_("can't open signed data fd=%d: %s\n"),
data_fd, strerror (errno));
release_progress_context (pfx);
return rc;
@ -604,9 +653,9 @@ hash_datafile_by_fd ( gcry_md_hd_t md, gcry_md_hd_t md2, int data_fd,
handle_progress (pfx, fp, NULL);
do_hash ( md, md2, fp, textmode);
do_hash (md, md2, fp, textmode);
iobuf_close(fp);
iobuf_close (fp);
release_progress_context (pfx);
return 0;
@ -619,26 +668,26 @@ hash_datafile_by_fd ( gcry_md_hd_t md, gcry_md_hd_t md2, int data_fd,
filenames at all, set the field empty. */
PKT_plaintext *
setup_plaintext_name(const char *filename,IOBUF iobuf)
setup_plaintext_name (const char *filename, IOBUF iobuf)
{
PKT_plaintext *pt;
if(filename || opt.set_filename)
if (filename || opt.set_filename)
{
char *s;
if(opt.set_filename)
s=make_basename(opt.set_filename,iobuf_get_real_fname(iobuf));
else if(filename && !opt.flags.utf8_filename)
if (opt.set_filename)
s = make_basename (opt.set_filename, iobuf_get_real_fname (iobuf));
else if (filename && !opt.flags.utf8_filename)
{
char *tmp=native_to_utf8(filename);
s=make_basename(tmp,iobuf_get_real_fname(iobuf));
xfree(tmp);
char *tmp = native_to_utf8 (filename);
s = make_basename (tmp, iobuf_get_real_fname (iobuf));
xfree (tmp);
}
else
s=make_basename(filename,iobuf_get_real_fname(iobuf));
s = make_basename (filename, iobuf_get_real_fname (iobuf));
pt = xmalloc (sizeof *pt + strlen(s) - 1);
pt = xmalloc (sizeof *pt + strlen (s) - 1);
pt->namelen = strlen (s);
memcpy (pt->name, s, pt->namelen);
xfree (s);