diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-06-14 15:48:16 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-06-15 20:09:27 +0200 |
| commit | fd809cfdbd6e32b6b67b68c59f6d55fbed7a9327 (patch) | |
| tree | 59cd0002b3161e2892f3f06aeb509d897453c38f /crypto/dh | |
| parent | 9c1a9ccf65d0ea1912675d3a622fa8e51b524b9e (diff) | |
Constify the parameter getters for RSA, DSA and DH
Including documentation changes
Reviewed-by: Stephen Henson <steve@openssl.org>
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Diffstat (limited to 'crypto/dh')
| -rw-r--r-- | crypto/dh/dh_lib.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c index 6a59f7faa4..56f9db6769 100644 --- a/crypto/dh/dh_lib.c +++ b/crypto/dh/dh_lib.c @@ -183,7 +183,8 @@ int DH_security_bits(const DH *dh) } -void DH_get0_pqg(const DH *dh, BIGNUM **p, BIGNUM **q, BIGNUM **g) +void DH_get0_pqg(const DH *dh, + const BIGNUM **p, const BIGNUM **q, const BIGNUM **g) { if (p != NULL) *p = dh->p; @@ -197,11 +198,9 @@ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) { /* If the fields p and g in d are NULL, the corresponding input * parameters MUST be non-NULL. q may remain NULL. - * - * It is an error to give the results from get0 on d - * as input parameters. */ - if (p == dh->p || (dh->q != NULL && q == dh->q) || g == dh->g) + if (dh->p == NULL && p == NULL + || dh->g == NULL && g == NULL) return 0; if (p != NULL) { @@ -235,7 +234,7 @@ int DH_set_length(DH *dh, long length) return 1; } -void DH_get0_key(const DH *dh, BIGNUM **pub_key, BIGNUM **priv_key) +void DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key) { if (pub_key != NULL) *pub_key = dh->pub_key; @@ -245,15 +244,11 @@ void DH_get0_key(const DH *dh, BIGNUM **pub_key, BIGNUM **priv_key) int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key) { - /* If the pub_key in dh is NULL, the corresponding input + /* If the field pub_key in dh is NULL, the corresponding input * parameters MUST be non-NULL. The priv_key field may * be left NULL. - * - * It is an error to give the results from get0 on dh - * as input parameters. */ - if (dh->pub_key == pub_key - || (dh->priv_key != NULL && priv_key == dh->priv_key)) + if (dh->pub_key == NULL && pub_key == NULL) return 0; if (pub_key != NULL) { |