security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-26 15:37:03 +01:00
Code Activity

* g10.c (strusage, build_list): Add compress algorithms to --version list.

Browse Source 
Show algorithm numbers when --verbose --version is done.
This commit is contained in:
David Shaw 2002-05-26 03:42:39 +00:00
parent 2656589782
commit de2f0905b5
2 changed files with 50 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/ChangeLog
View File

@ -1,3 +1,9 @@
2002-05-25 David Shaw <dshaw@jabberwocky.com>
* g10.c (strusage, build_list): Add compress algorithms to
--version list. Show algorithm numbers when --verbose --version
is done.
2002-05-22 David Shaw <dshaw@jabberwocky.com> 2002-05-22 David Shaw <dshaw@jabberwocky.com>
* options.h, main.h, keygen.c (keygen_set_set_prefs, * options.h, main.h, keygen.c (keygen_set_set_prefs,

57
g10/g10.c
View File

@ -575,7 +575,7 @@ int g10_errors_seen = 0;
static int utf8_strings = 0; static int utf8_strings = 0;
static int maybe_setuid = 1; static int maybe_setuid = 1;
static char *build_list( const char *text, static char *build_list( const char *text, char letter,
const char *(*mapf)(int), int (*chkf)(int) ); const char *(*mapf)(int), int (*chkf)(int) );
static void set_cmd( enum cmd_and_opt_values *ret_cmd, static void set_cmd( enum cmd_and_opt_values *ret_cmd,
enum cmd_and_opt_values new_cmd ); enum cmd_and_opt_values new_cmd );
@ -615,23 +615,29 @@ strusage( int level )
#endif /* __riscos__ */ #endif /* __riscos__ */
case 33: p = _("\nSupported algorithms:\n"); break; case 33: p = _("\nSupported algorithms:\n"); break;
case 34: case 34:
if( !ciphers )
ciphers = build_list("Cipher: ", cipher_algo_to_string,
check_cipher_algo );
p = ciphers;
break;
case 35:
if( !pubkeys ) if( !pubkeys )
pubkeys = build_list("Pubkey: ", pubkey_algo_to_string, pubkeys = build_list("Pubkey: ", 0, pubkey_algo_to_string,
check_pubkey_algo ); check_pubkey_algo );
p = pubkeys; p = pubkeys;
break; break;
case 35:
if( !ciphers )
ciphers = build_list("Cipher: ", 'S', cipher_algo_to_string,
check_cipher_algo );
p = ciphers;
break;
case 36: case 36:
if( !digests ) if( !digests )
digests = build_list("Hash: ", digest_algo_to_string, digests = build_list("Hash: ", 'H', digest_algo_to_string,
check_digest_algo ); check_digest_algo );
p = digests; p = digests;
break; break;
case 37:
if(opt.verbose)
p = "Compress: Uncompressed (Z0), ZIP (Z1), ZLIB (Z2)\n";
else
p = "Compress: Uncompressed, ZIP, ZLIB\n";
break;
default: p = default_strusage(level); default: p = default_strusage(level);
@ -641,27 +647,52 @@ strusage( int level )
static char * static char *
build_list( const char *text, const char * (*mapf)(int), int (*chkf)(int) ) build_list( const char *text, char letter,
const char * (*mapf)(int), int (*chkf)(int) )
{ {
int i; int i;
const char *s; const char *s;
size_t n=strlen(text)+2; size_t n=strlen(text)+2;
char *list, *p; char *list, *p, *line=NULL;
if( maybe_setuid ) if( maybe_setuid )
secmem_init( 0 ); /* drop setuid */ secmem_init( 0 ); /* drop setuid */
for(i=1; i <= 110; i++ ) for(i=1; i <= 110; i++ )
if( !chkf(i) && (s=mapf(i)) ) if( !chkf(i) && (s=mapf(i)) )
n += strlen(s) + 2; n += strlen(s) + 7 + 2;
list = m_alloc( 21 + n ); *list = 0; list = m_alloc( 21 + n ); *list = 0;
for(p=NULL, i=1; i <= 110; i++ ) { for(p=NULL, i=1; i <= 110; i++ ) {
if( !chkf(i) && (s=mapf(i)) ) { if( !chkf(i) && (s=mapf(i)) ) {
if( !p ) if( !p ) {
p = stpcpy( list, text ); p = stpcpy( list, text );
line=p;
}
else else
p = stpcpy( p, ", "); p = stpcpy( p, ", ");
if(strlen(line)>60) {
int spaces=strlen(text);
list=m_realloc(list,n+spaces+1);
/* realloc could move the block, so find the end again */
p=list;
while(*p)
p++;
p=stpcpy(p, "\n");
line=p;
for(;spaces;spaces--)
p=stpcpy(p, " ");
}
p = stpcpy(p, s ); p = stpcpy(p, s );
if(opt.verbose && letter)
{
char num[8];
sprintf(num," (%c%d)",letter,i);
p = stpcpy(p,num);
}
} }
} }
if( p ) if( p )