mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-03 12:11:33 +01:00
See ChangeLog: Sun Feb 28 19:11:00 CET 1999 Werner Koch
This commit is contained in:
parent
694099b9af
commit
0f5bb383b5
@ -1,3 +1,7 @@
|
|||||||
|
Sun Feb 28 19:11:00 CET 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||||
|
|
||||||
|
* configure.in (dld): Test disabled.
|
||||||
|
|
||||||
Fri Feb 26 17:55:41 CET 1999 Werner Koch <wk@isil.d.shuttle.de>
|
Fri Feb 26 17:55:41 CET 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||||
|
|
||||||
* encode.c (encode_simple): temporary fix.
|
* encode.c (encode_simple): temporary fix.
|
||||||
|
1
TODO
1
TODO
@ -20,6 +20,7 @@
|
|||||||
* when decryptiong multiple key: print a warning only if no usable pubkey
|
* when decryptiong multiple key: print a warning only if no usable pubkey
|
||||||
encrypt package was found. Extension: display a list of all recipients.
|
encrypt package was found. Extension: display a list of all recipients.
|
||||||
|
|
||||||
|
* Can't import ring1.pgp. Compressed keys? Should print a warning.
|
||||||
|
|
||||||
Nice to have
|
Nice to have
|
||||||
------------
|
------------
|
||||||
|
19
configure.in
19
configure.in
@ -245,14 +245,17 @@ if test "$try_dynload" = yes ; then
|
|||||||
dnl work for freebsd
|
dnl work for freebsd
|
||||||
AC_DEFINE(DLSYM_NEEDS_UNDERSCORE)
|
AC_DEFINE(DLSYM_NEEDS_UNDERSCORE)
|
||||||
use_gnupg_extensions=yes
|
use_gnupg_extensions=yes
|
||||||
else
|
dnl else
|
||||||
AC_CHECK_LIB(dld,dld_link)
|
dnl
|
||||||
if test "$ac_cv_lib_dld_dld_link" = "yes"; then
|
dnl DLD is not ready for use. So I better disable this test
|
||||||
AC_DEFINE(USE_DYNAMIC_LINKING)
|
dnl
|
||||||
AC_DEFINE(HAVE_DLD_DLD_LINK)
|
dnl AC_CHECK_LIB(dld,dld_link)
|
||||||
DYNLINK_LDFLAGS="$CFLAGS_RDYNAMIC"
|
dnl if test "$ac_cv_lib_dld_dld_link" = "yes"; then
|
||||||
use_gnupg_extensions=yes
|
dnl AC_DEFINE(USE_DYNAMIC_LINKING)
|
||||||
fi
|
dnl AC_DEFINE(HAVE_DLD_DLD_LINK)
|
||||||
|
dnl DYNLINK_LDFLAGS="$CFLAGS_RDYNAMIC"
|
||||||
|
dnl use_gnupg_extensions=yes
|
||||||
|
dnl fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
|
@ -1,3 +1,15 @@
|
|||||||
|
Sun Feb 28 19:11:00 CET 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||||
|
|
||||||
|
* 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 <wk@isil.d.shuttle.de>
|
Fri Feb 26 17:55:41 CET 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||||
|
|
||||||
* pkclist.c (build_pk_list): Return error if there are no recipients.
|
* pkclist.c (build_pk_list): Return error if there are no recipients.
|
||||||
|
@ -1337,11 +1337,12 @@ menu_select_uid( KBNODE keyblock, int idx )
|
|||||||
/* and toggle the new index */
|
/* and toggle the new index */
|
||||||
for( i=0, node = keyblock; node; node = node->next ) {
|
for( i=0, node = keyblock; node; node = node->next ) {
|
||||||
if( node->pkt->pkttype == PKT_USER_ID ) {
|
if( node->pkt->pkttype == PKT_USER_ID ) {
|
||||||
if( ++i == idx )
|
if( ++i == idx ) {
|
||||||
if( (node->flag & NODFLG_SELUID) )
|
if( (node->flag & NODFLG_SELUID) )
|
||||||
node->flag &= ~NODFLG_SELUID;
|
node->flag &= ~NODFLG_SELUID;
|
||||||
else
|
else
|
||||||
node->flag |= NODFLG_SELUID;
|
node->flag |= NODFLG_SELUID;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1384,11 +1385,12 @@ menu_select_key( KBNODE keyblock, int idx )
|
|||||||
for( i=0, node = keyblock; node; node = node->next ) {
|
for( i=0, node = keyblock; node; node = node->next ) {
|
||||||
if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY
|
if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY
|
||||||
|| node->pkt->pkttype == PKT_SECRET_SUBKEY ) {
|
|| node->pkt->pkttype == PKT_SECRET_SUBKEY ) {
|
||||||
if( ++i == idx )
|
if( ++i == idx ) {
|
||||||
if( (node->flag & NODFLG_SELKEY) )
|
if( (node->flag & NODFLG_SELKEY) )
|
||||||
node->flag &= ~NODFLG_SELKEY;
|
node->flag &= ~NODFLG_SELKEY;
|
||||||
else
|
else
|
||||||
node->flag |= NODFLG_SELKEY;
|
node->flag |= NODFLG_SELKEY;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
10
g10/keygen.c
10
g10/keygen.c
@ -555,17 +555,18 @@ static int
|
|||||||
has_invalid_email_chars( const char *s )
|
has_invalid_email_chars( const char *s )
|
||||||
{
|
{
|
||||||
int at_seen=0;
|
int at_seen=0;
|
||||||
|
static char valid_chars[] = "01234567890_-."
|
||||||
|
"abcdefghijklmnopqrstuvwxyz"
|
||||||
|
"ABCDEFGHIJKLMNOPQRSTUVWXYZ";
|
||||||
|
|
||||||
for( ; *s; s++ ) {
|
for( ; *s; s++ ) {
|
||||||
if( *s & 0x80 )
|
if( *s & 0x80 )
|
||||||
return 1;
|
return 1;
|
||||||
if( *s == '@' )
|
if( *s == '@' )
|
||||||
at_seen=1;
|
at_seen=1;
|
||||||
else if( !at_seen
|
else if( !at_seen && !( !!strchr( valid_chars, *s ) || *s == '+' ) )
|
||||||
&& !strchr("01234567890abcdefghijklmnopqrstuvwxyz_-.+", *s ))
|
|
||||||
return 1;
|
return 1;
|
||||||
else if( at_seen
|
else if( at_seen && !strchr( valid_chars, *s ) )
|
||||||
&& !strchr("01234567890abcdefghijklmnopqrstuvwxyz_-.", *s ) )
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
@ -608,7 +609,6 @@ ask_user_id( int mode )
|
|||||||
m_free(amail);
|
m_free(amail);
|
||||||
amail = cpr_get("keygen.email",_("Email address: "));
|
amail = cpr_get("keygen.email",_("Email address: "));
|
||||||
trim_spaces(amail);
|
trim_spaces(amail);
|
||||||
strlwr(amail);
|
|
||||||
cpr_kill_prompt();
|
cpr_kill_prompt();
|
||||||
if( !*amail )
|
if( !*amail )
|
||||||
break; /* no email address is okay */
|
break; /* no email address is okay */
|
||||||
|
@ -132,7 +132,7 @@ list_one( STRLIST names, int secret )
|
|||||||
}
|
}
|
||||||
do {
|
do {
|
||||||
merge_keys_and_selfsig( keyblock );
|
merge_keys_and_selfsig( keyblock );
|
||||||
list_keyblock( keyblock, 0 );
|
list_keyblock( keyblock, 1 );
|
||||||
release_kbnode( keyblock );
|
release_kbnode( keyblock );
|
||||||
} while( !get_seckey_next( ctx, NULL, &keyblock ) );
|
} while( !get_seckey_next( ctx, NULL, &keyblock ) );
|
||||||
get_seckey_end( ctx );
|
get_seckey_end( ctx );
|
||||||
|
@ -740,6 +740,7 @@ do_proc_packets( CTX c, IOBUF a )
|
|||||||
if( opt.list_packets ) {
|
if( opt.list_packets ) {
|
||||||
switch( pkt->pkttype ) {
|
switch( pkt->pkttype ) {
|
||||||
case PKT_PUBKEY_ENC: proc_pubkey_enc( c, pkt ); break;
|
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_ENCRYPTED: proc_encrypted( c, pkt ); break;
|
||||||
case PKT_COMPRESSED: proc_compressed( c, pkt ); break;
|
case PKT_COMPRESSED: proc_compressed( c, pkt ); break;
|
||||||
default: newpkt = 0; break;
|
default: newpkt = 0; break;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user