diff options
Diffstat (limited to 'sm')
| -rw-r--r-- | sm/certreqgen.c | 3 | ||||
| -rw-r--r-- | sm/encrypt.c | 5 | ||||
| -rw-r--r-- | sm/gpgsm.c | 1 | ||||
| -rw-r--r-- | sm/gpgsm.h | 1 |
4 files changed, 2 insertions, 8 deletions
diff --git a/sm/certreqgen.c b/sm/certreqgen.c index 63c35a227..d85dffffd 100644 --- a/sm/certreqgen.c +++ b/sm/certreqgen.c @@ -732,8 +732,7 @@ proc_parameters (ctrl_t ctrl, struct para_data_s *para, "(6:genkey(3:rsa(5:nbits%d:%s)))", (int)strlen (numbuf), numbuf); } - else if ((opt.compat_flags & COMPAT_ALLOW_ECC_ENCR) - && (algo == GCRY_PK_ECC || algo == GCRY_PK_EDDSA)) + else if (algo == GCRY_PK_ECC || algo == GCRY_PK_EDDSA) { const char *curve = get_parameter_value (para, pKEYCURVE, 0); const char *flags; diff --git a/sm/encrypt.c b/sm/encrypt.c index 7c8a96481..c6c59cfae 100644 --- a/sm/encrypt.c +++ b/sm/encrypt.c @@ -483,10 +483,7 @@ encrypt_dek (const DEK dek, ksba_cert_t cert, int pk_algo, s_data = NULL; /* (avoid compiler warning) */ if (pk_algo == GCRY_PK_ECC) { - if (!(opt.compat_flags & COMPAT_ALLOW_ECC_ENCR)) - rc = gpg_error (GPG_ERR_NOT_SUPPORTED); - else - rc = ecdh_encrypt (dek, s_pkey, &s_ciph); + rc = ecdh_encrypt (dek, s_pkey, &s_ciph); } else { diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 8819cc12e..25fdfe57b 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -469,7 +469,6 @@ static struct debug_flags_s debug_flags [] = static struct compatibility_flags_s compatibility_flags [] = { { COMPAT_ALLOW_KA_TO_ENCR, "allow-ka-to-encr" }, - { COMPAT_ALLOW_ECC_ENCR, "allow-ecc-encr" }, { 0, NULL } }; diff --git a/sm/gpgsm.h b/sm/gpgsm.h index 4140c9709..3946b5679 100644 --- a/sm/gpgsm.h +++ b/sm/gpgsm.h @@ -183,7 +183,6 @@ struct * policies: 1.3.6.1.4.1.7924.1.1:N: */ #define COMPAT_ALLOW_KA_TO_ENCR 1 -#define COMPAT_ALLOW_ECC_ENCR 2 /* Forward declaration for an object defined in server.c */ |