crypto: dh - constify struct dh's pointer members

struct dh contains several pointer members corresponding to DH parameters:
->key, ->p and ->g. A subsequent commit will introduce "dh" wrapping
templates of the form "ffdhe2048(dh)", "ffdhe3072(dh)" and so on in order
to provide built-in support for the well-known safe-prime ffdhe group
parameters specified in RFC 7919. These templates will need to set the
group parameter related members of the (serialized) struct dh instance
passed to the inner "dh" kpp_alg instance, i.e. ->p and ->g, to some
constant, static storage arrays.

Turn the struct dh pointer members' types into "pointer to const" in
preparation for this.

Signed-off-by: Nicolai Stange <nstange@suse.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/include/crypto/dh.h b/include/crypto/dh.h
index 2585f0e6bb69d1f55376a662bcc4279e0ca0339f..67f3f6bca527a1df592e869f9026742468c81a15 100644 (file)
--- a/include/crypto/dh.h
+++ b/include/crypto/dh.h
@@ -30,9 +30,9 @@
  * @g_size:    Size of DH generator G
  */
 struct dh {
-       void *key;
-       void *p;
-       void *g;
+       const void *key;
+       const void *p;
+       const void *g;
        unsigned int key_size;
        unsigned int p_size;
        unsigned int g_size;

diff --git a/security/keys/dh.c b/security/keys/dh.c
index 4573fc15617dc8c844a7464831329729b04fb388..b339760a31dd31b9e45846f5d980a11a887be565 100644 (file)
--- a/security/keys/dh.c
+++ b/security/keys/dh.c
@@ -15,7 +15,7 @@
 #include <keys/user-type.h>
 #include "internal.h"
 
-static ssize_t dh_data_from_key(key_serial_t keyid, void **data)
+static ssize_t dh_data_from_key(key_serial_t keyid, const void **data)
 {
        struct key *key;
        key_ref_t key_ref;