security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

See ChangeLog: Sun May 23 14:20:22 CEST 1999 Werner Koch

Browse source
This commit is contained in:
Werner Koch 1999-05-23 12:29:05 +00:00
parent 9131432b4d
commit c7447e78e2
22 changed files with 2650 additions and 2486 deletions
Download patch file Download diff file Expand all files Collapse all files

12
g10/ChangeLog
View file

@ -1,3 +1,15 @@
Sun May 23 14:20:22 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
* pkclist.c (check_signatures_trust): Print a warning and return
immediateley if opt.always_trust is true.
* g10.c (main): Corrected handling of no-default-keyring
* pkclist.c (algo_available): Disable Twofish until we have settled
how to do the MDC.
* hkp.c: Disable everything for mingw32
Sat May 22 22:47:26 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
* mainproc.c (check_sig_and_print): Add sig creation time to the

4
g10/g10.c
View file

@ -849,11 +849,11 @@ main( int argc, char **argv )
if( cmd != aDeArmor && cmd != aEnArmor
&& !(cmd == aKMode && argc == 2 ) ) {
if( !sec_nrings || default_keyring ) /* add default secret rings */
if( !sec_nrings && default_keyring ) /* add default secret rings */
add_keyblock_resource("secring.gpg", 0, 1);
for(sl = sec_nrings; sl; sl = sl->next )
add_keyblock_resource( sl->d, 0, 1 );
if( !nrings || default_keyring ) /* add default ring */
if( !nrings && default_keyring ) /* add default ring */
add_keyblock_resource("pubring.gpg", 0, 0);
for(sl = nrings; sl; sl = sl->next )
add_keyblock_resource( sl->d, 0, 0 );

12
g10/hkp.c
View file

@ -49,6 +49,9 @@ static int urlencode_filter( void *opaque, int control,
int
hkp_ask_import( u32 *keyid )
{
#ifdef HAVE_DOSISH_SYSTEM
return -1;
#else
struct http_context hd;
char *request;
int rc;
@ -75,6 +78,7 @@ hkp_ask_import( u32 *keyid )
m_free( request );
return rc;
#endif
}
@ -82,6 +86,9 @@ hkp_ask_import( u32 *keyid )
int
hkp_import( STRLIST users )
{
#ifdef HAVE_DOSISH_SYSTEM
return -1;
#else
if( !opt.keyserver_name ) {
log_error("no keyserver known (use option --keyserver)\n");
return -1;
@ -97,12 +104,16 @@ hkp_import( STRLIST users )
hkp_ask_import( kid );
}
return 0;
#endif
}
int
hkp_export( STRLIST users )
{
#ifdef HAVE_DOSISH_SYSTEM
return -1;
#else
int rc;
armor_filter_context_t afx;
IOBUF temp = iobuf_temp();
@ -177,6 +188,7 @@ hkp_export( STRLIST users )
}
http_close( &hd );
return rc;
#endif
}
static int

4
g10/openfile.c
View file

@ -101,7 +101,7 @@ open_outfile( const char *iname, int mode, IOBUF *a )
name = opt.outfile;
else {
#ifdef USE_ONLY_8DOT3
#error please implement this
#warning please implement 8.3 files
#endif
buf = m_alloc(strlen(iname)+4+1);
strcpy(stpcpy(buf,iname), mode==1 ? ".asc" :
@ -135,7 +135,7 @@ open_sigfile( const char *iname )
size_t len;
#ifdef USE_ONLY_8DOT3
#error please implement this
#warning please implement 8.3 files
#endif
if( iname && !(*iname == '-' && !iname[1]) ) {
len = strlen(iname);

9
g10/pkclist.c
View file

@ -428,6 +428,13 @@ check_signatures_trust( PKT_signature *sig )
int did_add = 0;
int rc=0;
if( opt.always_trust ) {
log_info(_("WARNING: Using untrusted key!\n"));
return 0;
}
rc = get_pubkey( pk, sig->keyid );
if( rc ) { /* this should not happen */
log_error("Ooops; the key vanished - can't check the trust\n");
@ -686,6 +693,8 @@ static int
algo_available( int preftype, int algo )
{
if( preftype == PREFTYPE_SYM ) {
if( algo == CIPHER_ALGO_TWOFISH )
return 0; /* we don't want to generate Twofish messages for now*/
return algo && !check_cipher_algo( algo );
}
else if( preftype == PREFTYPE_HASH ) {