diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 12 | ||||
| -rw-r--r-- | g10/keyedit.c | 6 | ||||
| -rw-r--r-- | g10/keygen.c | 10 | ||||
| -rw-r--r-- | g10/keylist.c | 2 | ||||
| -rw-r--r-- | g10/mainproc.c | 1 |
5 files changed, 23 insertions, 8 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 0b89f6da8..11636394a 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,15 @@ +Sun Feb 28 19:11:00 CET 1999 Werner Koch <[email protected]> + + * keygen.c (ask_user_id): Don't change the case of email addresses. + (has_invalid_email_chars): Adjusted. + + * keylist.c (list_one): Really list serect keys (Remi Guyomarch) + + * keyedit.c (menu_select_uid): Add some braces to make egcs happy. + (menu_select_key): Ditto. + + * mainproc.c (do_proc_packets): List sym-enc packets (Remi Guyomarch) + Fri Feb 26 17:55:41 CET 1999 Werner Koch <[email protected]> * pkclist.c (build_pk_list): Return error if there are no recipients. diff --git a/g10/keyedit.c b/g10/keyedit.c index f6e06c036..f16a19cb6 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -1337,11 +1337,12 @@ menu_select_uid( KBNODE keyblock, int idx ) /* and toggle the new index */ for( i=0, node = keyblock; node; node = node->next ) { if( node->pkt->pkttype == PKT_USER_ID ) { - if( ++i == idx ) + if( ++i == idx ) { if( (node->flag & NODFLG_SELUID) ) node->flag &= ~NODFLG_SELUID; else node->flag |= NODFLG_SELUID; + } } } @@ -1384,11 +1385,12 @@ menu_select_key( KBNODE keyblock, int idx ) for( i=0, node = keyblock; node; node = node->next ) { if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY || node->pkt->pkttype == PKT_SECRET_SUBKEY ) { - if( ++i == idx ) + if( ++i == idx ) { if( (node->flag & NODFLG_SELKEY) ) node->flag &= ~NODFLG_SELKEY; else node->flag |= NODFLG_SELKEY; + } } } diff --git a/g10/keygen.c b/g10/keygen.c index dd812e729..1e40186c9 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -555,17 +555,18 @@ static int has_invalid_email_chars( const char *s ) { int at_seen=0; + static char valid_chars[] = "01234567890_-." + "abcdefghijklmnopqrstuvwxyz" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; for( ; *s; s++ ) { if( *s & 0x80 ) return 1; if( *s == '@' ) at_seen=1; - else if( !at_seen - && !strchr("01234567890abcdefghijklmnopqrstuvwxyz_-.+", *s )) + else if( !at_seen && !( !!strchr( valid_chars, *s ) || *s == '+' ) ) return 1; - else if( at_seen - && !strchr("01234567890abcdefghijklmnopqrstuvwxyz_-.", *s ) ) + else if( at_seen && !strchr( valid_chars, *s ) ) return 1; } return 0; @@ -608,7 +609,6 @@ ask_user_id( int mode ) m_free(amail); amail = cpr_get("keygen.email",_("Email address: ")); trim_spaces(amail); - strlwr(amail); cpr_kill_prompt(); if( !*amail ) break; /* no email address is okay */ diff --git a/g10/keylist.c b/g10/keylist.c index a5456d52d..1861cd824 100644 --- a/g10/keylist.c +++ b/g10/keylist.c @@ -132,7 +132,7 @@ list_one( STRLIST names, int secret ) } do { merge_keys_and_selfsig( keyblock ); - list_keyblock( keyblock, 0 ); + list_keyblock( keyblock, 1 ); release_kbnode( keyblock ); } while( !get_seckey_next( ctx, NULL, &keyblock ) ); get_seckey_end( ctx ); diff --git a/g10/mainproc.c b/g10/mainproc.c index 7f3d3745e..fcb9f5db5 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -740,6 +740,7 @@ do_proc_packets( CTX c, IOBUF a ) if( opt.list_packets ) { switch( pkt->pkttype ) { case PKT_PUBKEY_ENC: proc_pubkey_enc( c, pkt ); break; + case PKT_SYMKEY_ENC: proc_symkey_enc( c, pkt ); break; case PKT_ENCRYPTED: proc_encrypted( c, pkt ); break; case PKT_COMPRESSED: proc_compressed( c, pkt ); break; default: newpkt = 0; break; |