diff options
Diffstat (limited to 'g10/keygen.c')
| -rw-r--r-- | g10/keygen.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/g10/keygen.c b/g10/keygen.c index d0c50158f..b7e2bf8df 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -2131,6 +2131,7 @@ ask_key_flags_with_mask (int algo, int subkey, unsigned int current, * below for a workaround. */ possible = (openpgp_pk_algo_usage (algo) & mask); possible &= ~PUBKEY_USAGE_RENC; + possible &= ~PUBKEY_USAGE_GROUP; if (algo == PUBKEY_ALGO_ECDH) possible |= (current & (PUBKEY_USAGE_ENC |PUBKEY_USAGE_CERT @@ -4480,7 +4481,8 @@ proc_parameter_file (ctrl_t ctrl, struct para_data_s *para, const char *fname, else { r = get_parameter (para, pKEYUSAGE); - if (r && (r->u.usage & ~openpgp_pk_algo_usage (algo))) + if (r && (r->u.usage + & ~(openpgp_pk_algo_usage (algo) | PUBKEY_USAGE_GROUP))) { log_error ("%s:%d: specified Key-Usage not allowed for algo %d\n", fname, r->lnr, algo); @@ -4517,7 +4519,8 @@ proc_parameter_file (ctrl_t ctrl, struct para_data_s *para, const char *fname, else { r = get_parameter (para, pSUBKEYUSAGE); - if (r && (r->u.usage & ~openpgp_pk_algo_usage (algo))) + if (r && (r->u.usage + & ~(openpgp_pk_algo_usage (algo)|PUBKEY_USAGE_GROUP))) { log_error ("%s:%d: specified Subkey-Usage not allowed" " for algo %d\n", fname, r->lnr, algo); |