DH: fix: add simple getters for commonly used struct members

amends 6db7fadf0975

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6290)

diff --git a/doc/man3/DH_get0_pqg.pod b/doc/man3/DH_get0_pqg.pod
index 6b25556ef7bf1ca43f15f961e02d08279fa68024..00e8ef573abde8be3b3e7d92afcf3af89baff1ca 100644 (file)
--- a/doc/man3/DH_get0_pqg.pod
+++ b/doc/man3/DH_get0_pqg.pod
@@ -41,6 +41,8 @@ If the parameters have not yet been set then B<*p>, B<*q> and B<*g> will be set
 to NULL. Otherwise they are set to pointers to their respective values. These
 point directly to the internal representations of the values and therefore
 should not be freed directly.
+Any of the out parameters B<p>, B<q>, and B<g> can be NULL, in which case no
+value will be returned for that parameter.
 
 The B<p>, B<q> and B<g> values can be set by calling DH_set0_pqg() and passing
 the new values for B<p>, B<q> and B<g> as parameters to the function. Calling
@@ -54,6 +56,8 @@ private key will be stored in B<*priv_key>. Either may be NULL if they have not
 been set yet, although if the private key has been set then the public key must
 be. The values point to the internal representation of the public key and
 private key values. This memory should not be freed directly.
+Any of the out parameters B<pub_key> and B<priv_key> can be NULL, in which case
+no value will be returned for that parameter.
 
 The public and private key values can be set using DH_set0_key(). Either
 parameter may be NULL, which means the corresponding DH field is left
@@ -93,7 +97,7 @@ duplicate.  The same applies to DH_get0_pqg() and DH_set0_pqg().
 DH_set0_pqg() and DH_set0_key() return 1 on success or 0 on failure.
 
 DH_get0_p(), DH_get0_q(), DH_get0_g(), DH_get0_priv_key(), and DH_get0_pub_key()
-return the respective value.
+return the respective value, or NULL if it is unset.
 
 DH_test_flags() returns the current state of the flags in the DH object.
 

diff --git a/util/libcrypto.num b/util/libcrypto.num
index 937b7187e1bf50d1090e370ec4fd7ce6e75fae05..bef3aa9b6a7eaade63ac7d1042f0f8f538d0172a 100644 (file)
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -4528,8 +4528,8 @@ conf_ssl_name_find                      4469      1_1_0i  EXIST::FUNCTION:
 conf_ssl_get_cmd                        4470   1_1_0i  EXIST::FUNCTION:
 conf_ssl_get                            4471   1_1_0i  EXIST::FUNCTION:
 X509_VERIFY_PARAM_get_hostflags         4472   1_1_0i  EXIST::FUNCTION:
-DH_get0_p                               4473   1_1_0i  EXIST::FUNCTION:DH
-DH_get0_q                               4474   1_1_0i  EXIST::FUNCTION:DH
-DH_get0_g                               4475   1_1_0i  EXIST::FUNCTION:DH
-DH_get0_priv_key                        4476   1_1_0i  EXIST::FUNCTION:DH
-DH_get0_pub_key                         4477   1_1_0i  EXIST::FUNCTION:DH
+DH_get0_p                               4473   1_1_1   EXIST::FUNCTION:DH
+DH_get0_q                               4474   1_1_1   EXIST::FUNCTION:DH
+DH_get0_g                               4475   1_1_1   EXIST::FUNCTION:DH
+DH_get0_priv_key                        4476   1_1_1   EXIST::FUNCTION:DH
+DH_get0_pub_key                         4477   1_1_1   EXIST::FUNCTION:DH