mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Updated ZH po file.
Allow de/encryption using legacy type 20 keys. Updated config.{sub,guess}
This commit is contained in:
parent
2e7eadbc1e
commit
81685cc799
12 changed files with 1839 additions and 1512 deletions
|
@ -2137,8 +2137,11 @@ merge_selfsigs_subkey( KBNODE keyblock, KBNODE subnode )
|
|||
subpk->has_expired = key_expire >= curtime? 0 : key_expire;
|
||||
subpk->expiredate = key_expire;
|
||||
|
||||
/* algo doesn't exist */
|
||||
if(check_pubkey_algo(subpk->pubkey_algo))
|
||||
/* Check that algo exists. Elgamal sign+encrypt are only allowed
|
||||
with option --rfc2440. */
|
||||
if (RFC2440 && subpk->pubkey_algo == PUBKEY_ALGO_ELGAMAL)
|
||||
;
|
||||
else if(check_pubkey_algo(subpk->pubkey_algo))
|
||||
return;
|
||||
|
||||
subpk->is_valid = 1;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue