Constify EC_KEY_*_oct2priv() input buffer

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1300)

diff --git a/crypto/ec/ec_25519.c b/crypto/ec/ec_25519.c
index 035a415347e3105abccf3be54a4128b775abcb1e..df0ad8a0c0a738062133b1c84deb37dab0ab04a4 100644 (file)
--- a/crypto/ec/ec_25519.c
+++ b/crypto/ec/ec_25519.c
@@ -155,7 +155,7 @@ static int x25519_keycopy(EC_KEY *dest, const EC_KEY *src)
     return x25519_init_private(dest, src->custom_data);
 }
 
-static int x25519_oct2priv(EC_KEY *eckey, unsigned char *buf, size_t len)
+static int x25519_oct2priv(EC_KEY *eckey, const unsigned char *buf, size_t len)
 {
     if (len != EC_X25519_KEYLEN)
         return 0;

diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c
index b3ea1b046d538d74227184c27253ae37466001b7..01faa621631fa3f1b799fdc05f151ccc8b35c3e8 100644 (file)
--- a/crypto/ec/ec_key.c
+++ b/crypto/ec/ec_key.c
@@ -546,7 +546,8 @@ int EC_KEY_oct2key(EC_KEY *key, const unsigned char *buf, size_t len,
     return 1;
 }
 
-size_t EC_KEY_priv2oct(const EC_KEY *eckey, unsigned char *buf, size_t len)
+size_t EC_KEY_priv2oct(const EC_KEY *eckey, 
+                       unsigned char *buf, size_t len)
 {
     if (eckey->group == NULL || eckey->group->meth == NULL)
         return 0;
@@ -581,7 +582,7 @@ size_t ec_key_simple_priv2oct(const EC_KEY *eckey,
     return buf_len;
 }
 
-int EC_KEY_oct2priv(EC_KEY *eckey, unsigned char *buf, size_t len)
+int EC_KEY_oct2priv(EC_KEY *eckey, const unsigned char *buf, size_t len)
 {
     if (eckey->group == NULL || eckey->group->meth == NULL)
         return 0;
@@ -592,7 +593,7 @@ int EC_KEY_oct2priv(EC_KEY *eckey, unsigned char *buf, size_t len)
     return eckey->group->meth->oct2priv(eckey, buf, len);
 }
 
-int ec_key_simple_oct2priv(EC_KEY *eckey, unsigned char *buf, size_t len)
+int ec_key_simple_oct2priv(EC_KEY *eckey, const unsigned char *buf, size_t len)
 {
     if (eckey->priv_key == NULL)
         eckey->priv_key = BN_secure_new();

diff --git a/crypto/ec/ec_lcl.h b/crypto/ec/ec_lcl.h
index 2cef3bced4ad86923cc48638a12d434cf599c886..5b79340a141f162deab51d3ca415421e7f6482a6 100644 (file)
--- a/crypto/ec/ec_lcl.h
+++ b/crypto/ec/ec_lcl.h
@@ -159,7 +159,7 @@ struct ec_method_st {
     int (*field_set_to_one) (const EC_GROUP *, BIGNUM *r, BN_CTX *);
     /* private key operations */
     size_t (*priv2oct)(const EC_KEY *eckey, unsigned char *buf, size_t len);
-    int (*oct2priv)(EC_KEY *eckey, unsigned char *buf, size_t len);
+    int (*oct2priv)(EC_KEY *eckey, const unsigned char *buf, size_t len);
     int (*set_private)(EC_KEY *eckey, const BIGNUM *priv_key);
     int (*keygen)(EC_KEY *eckey);
     int (*keycheck)(const EC_KEY *eckey);
@@ -553,7 +553,7 @@ const EC_METHOD *EC_GFp_nistz256_method(void);
 
 size_t ec_key_simple_priv2oct(const EC_KEY *eckey,
                               unsigned char *buf, size_t len);
-int ec_key_simple_oct2priv(EC_KEY *eckey, unsigned char *buf, size_t len);
+int ec_key_simple_oct2priv(EC_KEY *eckey, const unsigned char *buf, size_t len);
 int ec_key_simple_generate_key(EC_KEY *eckey);
 int ec_key_simple_generate_public_key(EC_KEY *eckey);
 int ec_key_simple_check_key(const EC_KEY *eckey);

diff --git a/doc/crypto/EC_KEY_new.pod b/doc/crypto/EC_KEY_new.pod
index b6bd432579e5df34e75851c15fa42f6a391e8952..83a2c6d097f5c9dc31b13694d61c4df3399de6c3 100644 (file)
--- a/doc/crypto/EC_KEY_new.pod
+++ b/doc/crypto/EC_KEY_new.pod
@@ -49,7 +49,7 @@ EC_KEY objects
  size_t EC_KEY_key2buf(const EC_KEY *eckey, point_conversion_form_t form,
                        unsigned char **pbuf, BN_CTX *ctx);
 
- int EC_KEY_oct2priv(EC_KEY *eckey, unsigned char *buf, size_t len);
+ int EC_KEY_oct2priv(EC_KEY *eckey, const unsigned char *buf, size_t len);
  size_t EC_KEY_priv2oct(const EC_KEY *eckey, unsigned char *buf, size_t len);
 
  size_t EC_KEY_priv2buf(const EC_KEY *eckey, unsigned char **pbuf);

diff --git a/include/openssl/ec.h b/include/openssl/ec.h
index ebeb3e9a4b919aba8c9dd05451add69617f6f7d3..a9ce2088d5de12d33d5eeef13bf6ba003566820c 100644 (file)
--- a/include/openssl/ec.h
+++ b/include/openssl/ec.h
@@ -906,7 +906,7 @@ int EC_KEY_oct2key(EC_KEY *key, const unsigned char *buf, size_t len,
  *  \return 1 on success and 0 if an error occurred
  */
 
-int EC_KEY_oct2priv(EC_KEY *key, unsigned char *buf, size_t len);
+int EC_KEY_oct2priv(EC_KEY *key, const unsigned char *buf, size_t len);
 
 /** Encodes a EC_KEY private key to an octet string
  *  \param  key    key to encode