diff options
| author | Matt Caswell <matt@openssl.org> | 2016-06-16 10:07:32 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-06-16 13:34:44 +0100 |
| commit | b84e12266f85156f58804ff94ea110890f13b52d (patch) | |
| tree | 32de263358b118264aaf5e0c702cbc5f3637721c /crypto/rsa | |
| parent | cf3404fcc77aaf592c95326cbdd25612a8af6878 (diff) | |
Fix the build and tests following constification of DH, DSA, RSA
Misc fixes following the constification of the DH, DSA and RSA
getters.
Reviewed-by: Stephen Henson <steve@openssl.org>
Diffstat (limited to 'crypto/rsa')
| -rw-r--r-- | crypto/rsa/rsa_lib.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c index 540dc93fd5..87a326184c 100644 --- a/crypto/rsa/rsa_lib.c +++ b/crypto/rsa/rsa_lib.c @@ -236,8 +236,8 @@ int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) * parameters MUST be non-NULL for n and e. d may be * left NULL (in case only the public key is used). */ - if (r->n == NULL && n == NULL - || r->e == NULL && e == NULL) + if ((r->n == NULL && n == NULL) + || (r->e == NULL && e == NULL)) return 0; if (n != NULL) { @@ -261,8 +261,8 @@ int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q) /* If the fields p and q in r are NULL, the corresponding input * parameters MUST be non-NULL. */ - if (r->p == NULL && p == NULL - || r->q == NULL && q == NULL) + if ((r->p == NULL && p == NULL) + || (r->q == NULL && q == NULL)) return 0; if (p != NULL) { @@ -282,9 +282,9 @@ int RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp) /* If the fields dmp1, dmq1 and iqmp in r are NULL, the corresponding input * parameters MUST be non-NULL. */ - if (r->dmp1 == NULL && dmp1 == NULL - || r->dmq1 == NULL && dmq1 == NULL - || r->iqmp == NULL && iqmp == NULL) + if ((r->dmp1 == NULL && dmp1 == NULL) + || (r->dmq1 == NULL && dmq1 == NULL) + || (r->iqmp == NULL && iqmp == NULL)) return 0; if (dmp1 != NULL) { |