Fix warnings.

[openssl.git] / crypto / ecdh / ech_ossl.c

diff --git a/crypto/ecdh/ech_ossl.c b/crypto/ecdh/ech_ossl.c
index dab7e8eab892df5cb7816331b66ee1367acc1ceb..2a40ff12dfa8c29c4624e49bb668f2c5d0eebbbf 100644 (file)
--- a/crypto/ecdh/ech_ossl.c
+++ b/crypto/ecdh/ech_ossl.c
@@ -112,6 +112,8 @@ static int ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
        BN_CTX *ctx;
        EC_POINT *tmp=NULL;
        BIGNUM *x=NULL, *y=NULL;
+       const BIGNUM *priv_key;
+       const EC_GROUP* group;
        int ret= -1;
        size_t buflen, len;
        unsigned char *buf=NULL;
@@ -127,27 +129,29 @@ static int ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
        x = BN_CTX_get(ctx);
        y = BN_CTX_get(ctx);
        
-       if (ecdh->priv_key == NULL)
+       priv_key = EC_KEY_get0_private_key(ecdh);
+       if (priv_key == NULL)
                {
                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ECDH_R_NO_PRIVATE_VALUE);
                goto err;
                }
 
-       if ((tmp=EC_POINT_new(ecdh->group)) == NULL)
+       group = EC_KEY_get0_group(ecdh);
+       if ((tmp=EC_POINT_new(group)) == NULL)
                {
                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ERR_R_MALLOC_FAILURE);
                goto err;
                }
 
-       if (!EC_POINT_mul(ecdh->group, tmp, NULL, pub_key, ecdh->priv_key, ctx)) 
+       if (!EC_POINT_mul(group, tmp, NULL, pub_key, priv_key, ctx)) 
                {
                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ECDH_R_POINT_ARITHMETIC_FAILURE);
                goto err;
                }
                
-       if (EC_METHOD_get_field_type(EC_GROUP_method_of(ecdh->group)) == NID_X9_62_prime_field) 
+       if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == NID_X9_62_prime_field) 
                {
-               if (!EC_POINT_get_affine_coordinates_GFp(ecdh->group, tmp, x, y, ctx)) 
+               if (!EC_POINT_get_affine_coordinates_GFp(group, tmp, x, y, ctx)) 
                        {
                        ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ECDH_R_POINT_ARITHMETIC_FAILURE);
                        goto err;
@@ -155,14 +159,14 @@ static int ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
                }
        else
                {
-               if (!EC_POINT_get_affine_coordinates_GF2m(ecdh->group, tmp, x, y, ctx)) 
+               if (!EC_POINT_get_affine_coordinates_GF2m(group, tmp, x, y, ctx)) 
                        {
                        ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ECDH_R_POINT_ARITHMETIC_FAILURE);
                        goto err;
                        }
                }
 
-       buflen = (EC_GROUP_get_degree(ecdh->group) + 7)/8;
+       buflen = (EC_GROUP_get_degree(group) + 7)/8;
        len = BN_num_bytes(x);
        if (len > buflen)
                {