diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2017-01-06 13:36:37 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2017-01-08 01:42:51 +0000 |
| commit | bc1ea030eff79c592250f1a2eed8dc7879217218 (patch) | |
| tree | 2962dbc36058880d4276aae8c56cc27c27c8ca6c /crypto/rsa | |
| parent | b6b885c6b9b4754eace0fe24e4cf2fabd089274e (diff) | |
Use more desciptive macro name rsa_pss_restricted()
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2177)
Diffstat (limited to 'crypto/rsa')
| -rw-r--r-- | crypto/rsa/rsa_pmeth.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/rsa/rsa_pmeth.c b/crypto/rsa/rsa_pmeth.c index 0f71e1e079..55f1f28d38 100644 --- a/crypto/rsa/rsa_pmeth.c +++ b/crypto/rsa/rsa_pmeth.c @@ -45,7 +45,7 @@ typedef struct { } RSA_PKEY_CTX; /* True if PSS parameters are restricted */ -#define rsa_pss_param(rctx) (rctx->min_saltlen != -1) +#define rsa_pss_restricted(rctx) (rctx->min_saltlen != -1) static int pkey_rsa_init(EVP_PKEY_CTX *ctx) { @@ -431,7 +431,7 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) } else { if (p1 < -2) return -2; - if (rsa_pss_param(rctx) && p1 < rctx->min_saltlen) { + if (rsa_pss_restricted(rctx) && p1 < rctx->min_saltlen) { RSAerr(RSA_F_PKEY_RSA_CTRL, RSA_R_PSS_SALTLEN_TOO_SMALL); return 0; } @@ -471,7 +471,7 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) case EVP_PKEY_CTRL_MD: if (!check_padding_md(p2, rctx->pad_mode)) return 0; - if (rsa_pss_param(rctx)) { + if (rsa_pss_restricted(rctx)) { if (EVP_MD_type(rctx->md) == EVP_MD_type(p2)) return 1; RSAerr(RSA_F_PKEY_RSA_CTRL, RSA_R_DIGEST_NOT_ALLOWED); @@ -497,7 +497,7 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) else *(const EVP_MD **)p2 = rctx->md; } else { - if (rsa_pss_param(rctx)) { + if (rsa_pss_restricted(rctx)) { if (EVP_MD_type(rctx->md) == EVP_MD_type(p2)) return 1; RSAerr(RSA_F_PKEY_RSA_CTRL, RSA_R_MGF1_DIGEST_NOT_ALLOWED); |