diff options
| -rw-r--r-- | crypto/ec/ec_kmeth.c | 6 | ||||
| -rw-r--r-- | crypto/ec/ec_lcl.h | 4 | ||||
| -rw-r--r-- | crypto/ec/ecdh_ossl.c | 2 | ||||
| -rw-r--r-- | include/openssl/ec.h | 9 |
4 files changed, 11 insertions, 10 deletions
diff --git a/crypto/ec/ec_kmeth.c b/crypto/ec/ec_kmeth.c index e754179726..d6c2811fc8 100644 --- a/crypto/ec/ec_kmeth.c +++ b/crypto/ec/ec_kmeth.c @@ -134,7 +134,7 @@ EC_KEY *EC_KEY_new_method(ENGINE *engine) } int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, - EC_KEY *eckey, + const EC_KEY *eckey, void *(*KDF) (const void *in, size_t inlen, void *out, size_t *outlen)) { @@ -190,7 +190,7 @@ void EC_KEY_METHOD_set_compute_key(EC_KEY_METHOD *meth, int (*ckey)(void *out, size_t outlen, const EC_POINT *pub_key, - EC_KEY *ecdh, + const EC_KEY *ecdh, void *(*KDF) (const void *in, size_t inlen, void *out, @@ -268,7 +268,7 @@ void EC_KEY_METHOD_get_compute_key(EC_KEY_METHOD *meth, int (**pck)(void *out, size_t outlen, const EC_POINT *pub_key, - EC_KEY *ecdh, + const EC_KEY *ecdh, void *(*KDF) (const void *in, size_t inlen, void *out, diff --git a/crypto/ec/ec_lcl.h b/crypto/ec/ec_lcl.h index 3cd2345695..ebfaae3a15 100644 --- a/crypto/ec/ec_lcl.h +++ b/crypto/ec/ec_lcl.h @@ -568,7 +568,7 @@ struct ec_key_method_st { int (*set_public)(EC_KEY *key, const EC_POINT *pub_key); int (*keygen)(EC_KEY *key); int (*compute_key)(void *out, size_t outlen, const EC_POINT *pub_key, - EC_KEY *ecdh, + const EC_KEY *ecdh, void *(*KDF) (const void *in, size_t inlen, void *out, size_t *outlen)); @@ -591,7 +591,7 @@ struct ec_key_method_st { int ossl_ec_key_gen(EC_KEY *eckey); int ossl_ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, - EC_KEY *ecdh, + const EC_KEY *ecdh, void *(*KDF) (const void *in, size_t inlen, void *out, size_t *outlen)); diff --git a/crypto/ec/ecdh_ossl.c b/crypto/ec/ecdh_ossl.c index 94339e4ad9..b7f09eba17 100644 --- a/crypto/ec/ecdh_ossl.c +++ b/crypto/ec/ecdh_ossl.c @@ -85,7 +85,7 @@ * Finally an optional KDF is applied. */ int ossl_ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, - EC_KEY *ecdh, + const EC_KEY *ecdh, void *(*KDF) (const void *in, size_t inlen, void *out, size_t *outlen)) { diff --git a/include/openssl/ec.h b/include/openssl/ec.h index 33f1c7319e..1dc2db18cc 100644 --- a/include/openssl/ec.h +++ b/include/openssl/ec.h @@ -1031,8 +1031,9 @@ int ECDH_KDF_X9_62(unsigned char *out, size_t outlen, const EVP_MD *md); int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, - EC_KEY *ecdh, void *(*KDF) (const void *in, size_t inlen, - void *out, size_t *outlen)); + const EC_KEY *ecdh, + void *(*KDF) (const void *in, size_t inlen, + void *out, size_t *outlen)); typedef struct ECDSA_SIG_st ECDSA_SIG; @@ -1188,7 +1189,7 @@ void EC_KEY_METHOD_set_compute_key(EC_KEY_METHOD *meth, int (*ckey)(void *out, size_t outlen, const EC_POINT *pub_key, - EC_KEY *ecdh, + const EC_KEY *ecdh, void *(*KDF) (const void *in, size_t inlen, void *out, @@ -1236,7 +1237,7 @@ void EC_KEY_METHOD_get_compute_key(EC_KEY_METHOD *meth, int (**pck)(void *out, size_t outlen, const EC_POINT *pub_key, - EC_KEY *ecdh, + const EC_KEY *ecdh, void *(*KDF) (const void *in, size_t inlen, void *out, |