security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-09-21 15:01:41 +02:00
Code Activity

gpg: Re-indent a function.

Browse Source 
--
This commit is contained in:
Werner Koch 2014-09-18 14:50:02 +02:00
parent 2f065d7ab6
commit 0af533abd3
1 changed files with 89 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
g10/gpg.c
View File

@ -4349,6 +4349,7 @@ print_hashline( gcry_md_hd_t md, int algo, const char *fname )
es_fputs (":\n", es_stdout); es_fputs (":\n", es_stdout);
} }
static void static void
print_mds( const char *fname, int algo ) print_mds( const char *fname, int algo )
{ {
@ -4357,13 +4358,15 @@ print_mds( const char *fname, int algo )
size_t n; size_t n;
gcry_md_hd_t md; gcry_md_hd_t md;
if( !fname ) { if (!fname)
{
fp = stdin; fp = stdin;
#ifdef HAVE_DOSISH_SYSTEM #ifdef HAVE_DOSISH_SYSTEM
setmode ( fileno(fp) , O_BINARY ); setmode ( fileno(fp) , O_BINARY );
#endif #endif
} }
else { else
{
fp = fopen (fname, "rb" ); fp = fopen (fname, "rb" );
if (fp && is_secured_file (fileno (fp))) if (fp && is_secured_file (fileno (fp)))
{ {
@ -4372,7 +4375,8 @@ print_mds( const char *fname, int algo )
gpg_err_set_errno (EPERM); gpg_err_set_errno (EPERM);
} }
} }
if( !fp ) { if (!fp)
{
log_error("%s: %s\n", fname?fname:"[stdin]", strerror(errno) ); log_error("%s: %s\n", fname?fname:"[stdin]", strerror(errno) );
return; return;
} }
@ -4380,7 +4384,8 @@ print_mds( const char *fname, int algo )
gcry_md_open (&md, 0, 0); gcry_md_open (&md, 0, 0);
if (algo) if (algo)
gcry_md_enable (md, algo); gcry_md_enable (md, algo);
else { else
{
if (!openpgp_md_test_algo (GCRY_MD_MD5)) if (!openpgp_md_test_algo (GCRY_MD_MD5))
gcry_md_enable (md, GCRY_MD_MD5); gcry_md_enable (md, GCRY_MD_MD5);
gcry_md_enable (md, GCRY_MD_SHA1); gcry_md_enable (md, GCRY_MD_SHA1);
@ -4398,14 +4403,18 @@ print_mds( const char *fname, int algo )
while ((n=fread (buf, 1, DIM(buf), fp))) while ((n=fread (buf, 1, DIM(buf), fp)))
gcry_md_write (md, buf, n); gcry_md_write (md, buf, n);
if (ferror(fp)) if (ferror(fp))
log_error ("%s: %s\n", fname?fname:"[stdin]", strerror(errno)); log_error ("%s: %s\n", fname?fname:"[stdin]", strerror(errno));
else { else
{
gcry_md_final (md); gcry_md_final (md);
if ( opt.with_colons ) { if (opt.with_colons)
{
if ( algo ) if ( algo )
print_hashline (md, algo, fname); print_hashline (md, algo, fname);
else { else
{
if (!openpgp_md_test_algo (GCRY_MD_MD5)) if (!openpgp_md_test_algo (GCRY_MD_MD5))
print_hashline( md, GCRY_MD_MD5, fname ); print_hashline( md, GCRY_MD_MD5, fname );
print_hashline( md, GCRY_MD_SHA1, fname ); print_hashline( md, GCRY_MD_SHA1, fname );
@ -4421,10 +4430,12 @@ print_mds( const char *fname, int algo )
print_hashline ( md, GCRY_MD_SHA512, fname ); print_hashline ( md, GCRY_MD_SHA512, fname );
} }
} }
else { else
{
if (algo) if (algo)
print_hex (md, -algo, fname); print_hex (md, -algo, fname);
else { else
{
if (!openpgp_md_test_algo (GCRY_MD_MD5)) if (!openpgp_md_test_algo (GCRY_MD_MD5))
print_hex (md, GCRY_MD_MD5, fname); print_hex (md, GCRY_MD_MD5, fname);
print_hex (md, GCRY_MD_SHA1, fname ); print_hex (md, GCRY_MD_SHA1, fname );