mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
See ChangeLog: Wed Sep 15 16:22:17 CEST 1999 Werner Koch
This commit is contained in:
parent
52139a60cf
commit
dcaaa9223e
30 changed files with 4146 additions and 272 deletions
|
@ -1,3 +1,8 @@
|
|||
Wed Sep 15 16:22:17 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||
|
||||
|
||||
* g10.c: New option --entropy-dll-name
|
||||
|
||||
Mon Sep 13 10:51:29 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||
|
||||
|
||||
|
|
13
g10/g10.c
13
g10/g10.c
|
@ -177,6 +177,7 @@ enum cmd_and_opt_values { aNull = 0,
|
|||
oAllowNonSelfsignedUID,
|
||||
oNoLiteral,
|
||||
oSetFilesize,
|
||||
oEntropyDLLName,
|
||||
aTest };
|
||||
|
||||
|
||||
|
@ -338,6 +339,7 @@ static ARGPARSE_OPTS opts[] = {
|
|||
{ oAllowNonSelfsignedUID, "allow-non-selfsigned-uid", 0, "@" },
|
||||
{ oNoLiteral, "no-literal", 0, "@" },
|
||||
{ oSetFilesize, "set-filesize", 20, "@" },
|
||||
{ oEntropyDLLName, "entropy-dll-name", 2, "@" },
|
||||
{0} };
|
||||
|
||||
|
||||
|
@ -438,6 +440,9 @@ build_list( const char *text, const char * (*mapf)(int), int (*chkf)(int) )
|
|||
static void
|
||||
i18n_init(void)
|
||||
{
|
||||
#ifdef USE_SIMPLE_GETTEXT
|
||||
set_gettext_file( PACKAGE );
|
||||
#else
|
||||
#ifdef ENABLE_NLS
|
||||
#ifdef HAVE_LC_MESSAGES
|
||||
setlocale( LC_TIME, "" );
|
||||
|
@ -448,6 +453,7 @@ i18n_init(void)
|
|||
bindtextdomain( PACKAGE, G10_LOCALEDIR );
|
||||
textdomain( PACKAGE );
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -859,6 +865,13 @@ main( int argc, char **argv )
|
|||
opt.set_filesize = pargs.r.ret_ulong;
|
||||
break;
|
||||
|
||||
case oEntropyDLLName:
|
||||
#ifdef USE_STATIC_RNDW32
|
||||
log_info("set dllname to `%s'\n", pargs.r.ret_str );
|
||||
rndw32_set_dll_name( pargs.r.ret_str );
|
||||
#endif
|
||||
break;
|
||||
|
||||
default : pargs.err = configfp? 1:2; break;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -210,7 +210,7 @@ static struct helptexts { const char *key; const char *help; } helptexts[] = {
|
|||
)},
|
||||
|
||||
{ "detached_signature.filename", N_(
|
||||
"Give the name fo the file to which the signature applies"
|
||||
"Give the name of the file to which the signature applies"
|
||||
)},
|
||||
|
||||
/* openfile.c (overwrite_filep) */
|
||||
|
|
|
@ -312,7 +312,9 @@ proc_encrypted( CTX c, PACKET *pkt )
|
|||
|
||||
/*log_debug("dat: %sencrypted data\n", c->dek?"":"conventional ");*/
|
||||
if( !c->dek && !c->last_was_session_key ) {
|
||||
/* assume this is old conventional encrypted data */
|
||||
/* assume this is old conventional encrypted data
|
||||
* Actually we should use IDEA and MD5 in this case, but becuase
|
||||
* IDEA is patented we can't do so */
|
||||
c->dek = passphrase_to_dek( NULL, 0,
|
||||
opt.def_cipher_algo ? opt.def_cipher_algo
|
||||
: DEFAULT_CIPHER_ALGO, NULL, 0 );
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue