security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-09 12:54:23 +01:00
Code Activity

* g10.c (print_mds): Check that SHA384 and 512 are available before using

Browse Source 
them as they are no longer always available.

* exec.c (set_exec_path): Add debugging line.

* Makefile.am: Use the more correct @PACKAGE@ rather than "gnupg".
This commit is contained in:
David Shaw 2003-02-11 15:05:33 +00:00
parent ff8406b3d8
commit 4eafcfb13b
4 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
g10/ChangeLog
View File

@ -1,3 +1,12 @@
2003-02-11 David Shaw <dshaw@jabberwocky.com>
* g10.c (print_mds): Check that SHA384 and 512 are available
before using them as they are no longer always available.
* exec.c (set_exec_path): Add debugging line.
* Makefile.am: Use the more correct @PACKAGE@ rather than "gnupg".
2003-02-06 David Shaw <dshaw@jabberwocky.com> 2003-02-06 David Shaw <dshaw@jabberwocky.com>
* Makefile.am: Pass GNUPG_LIBEXECDIR as part of CFLAGS so it can * Makefile.am: Pass GNUPG_LIBEXECDIR as part of CFLAGS so it can

2
g10/Makefile.am
View File

@ -23,7 +23,7 @@ EXTRA_DIST = options.skel
# it seems that we can't use this with automake 1.5 # it seems that we can't use this with automake 1.5
#OMIT_DEPENDENCIES = zlib.h zconf.h #OMIT_DEPENDENCIES = zlib.h zconf.h
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
libexecdir = @libexecdir@/gnupg libexecdir = @libexecdir@/@PACKAGE@
CFLAGS = @CFLAGS@ -DGNUPG_LIBEXECDIR="\"$(libexecdir)\"" CFLAGS = @CFLAGS@ -DGNUPG_LIBEXECDIR="\"$(libexecdir)\""
needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a

3
g10/exec.c
View File

@ -112,6 +112,9 @@ int set_exec_path(const char *path,int method)
strcat(p,path); strcat(p,path);
if(DBG_EXTPROG)
log_debug("set_exec_path method %d: %s\n",method,p);
/* Notice that path is never freed. That is intentional due to the /* Notice that path is never freed. That is intentional due to the
way putenv() works. This leaks a few bytes if we call way putenv() works. This leaks a few bytes if we call
set_exec_path multiple times. */ set_exec_path multiple times. */

18
g10/g10.c
View File

@ -2709,8 +2709,10 @@ print_mds( const char *fname, int algo )
if( !check_digest_algo(DIGEST_ALGO_TIGER) ) if( !check_digest_algo(DIGEST_ALGO_TIGER) )
md_enable( md, DIGEST_ALGO_TIGER ); md_enable( md, DIGEST_ALGO_TIGER );
md_enable( md, DIGEST_ALGO_SHA256 ); md_enable( md, DIGEST_ALGO_SHA256 );
md_enable( md, DIGEST_ALGO_SHA384 ); if( !check_digest_algo(DIGEST_ALGO_SHA384) )
md_enable( md, DIGEST_ALGO_SHA512 ); md_enable( md, DIGEST_ALGO_SHA384 );
if( !check_digest_algo(DIGEST_ALGO_SHA512) )
md_enable( md, DIGEST_ALGO_SHA512 );
} }
while( (n=fread( buf, 1, DIM(buf), fp )) ) while( (n=fread( buf, 1, DIM(buf), fp )) )
@ -2729,8 +2731,10 @@ print_mds( const char *fname, int algo )
if( !check_digest_algo(DIGEST_ALGO_TIGER) ) if( !check_digest_algo(DIGEST_ALGO_TIGER) )
print_hashline( md, DIGEST_ALGO_TIGER, fname ); print_hashline( md, DIGEST_ALGO_TIGER, fname );
print_hashline( md, DIGEST_ALGO_SHA256, fname ); print_hashline( md, DIGEST_ALGO_SHA256, fname );
print_hashline( md, DIGEST_ALGO_SHA384, fname ); if( !check_digest_algo(DIGEST_ALGO_SHA384) )
print_hashline( md, DIGEST_ALGO_SHA512, fname ); print_hashline( md, DIGEST_ALGO_SHA384, fname );
if( !check_digest_algo(DIGEST_ALGO_SHA512) )
print_hashline( md, DIGEST_ALGO_SHA512, fname );
} }
} }
else { else {
@ -2743,8 +2747,10 @@ print_mds( const char *fname, int algo )
if( !check_digest_algo(DIGEST_ALGO_TIGER) ) if( !check_digest_algo(DIGEST_ALGO_TIGER) )
print_hex( md, DIGEST_ALGO_TIGER, fname ); print_hex( md, DIGEST_ALGO_TIGER, fname );
print_hex( md, DIGEST_ALGO_SHA256, fname ); print_hex( md, DIGEST_ALGO_SHA256, fname );
print_hex( md, DIGEST_ALGO_SHA384, fname ); if( !check_digest_algo(DIGEST_ALGO_SHA384) )
print_hex( md, DIGEST_ALGO_SHA512, fname ); print_hex( md, DIGEST_ALGO_SHA384, fname );
if( !check_digest_algo(DIGEST_ALGO_SHA512) )
print_hex( md, DIGEST_ALGO_SHA512, fname );
} }
} }
} }