When using EVP_PKEY_derive with a KDF set, a negative error from
authorMatt Caswell <matt@openssl.org>
Wed, 19 Nov 2014 20:09:19 +0000 (20:09 +0000)
committerMatt Caswell <matt@openssl.org>
Thu, 20 Nov 2014 15:21:37 +0000 (15:21 +0000)
ECDH_compute_key is silently ignored and the KDF is run on duff data

Thanks to github user tomykaira for the suggested fix.

Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
(cherry picked from commit 8d02bebddf4b69f7f260adfed4be4f498dcbd16c)

crypto/ec/ec_pmeth.c

index 81ad4d4..e66e690 100644 (file)
@@ -244,8 +244,8 @@ static int pkey_ec_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen)
        outlen = *keylen;
                
        ret = ECDH_compute_key(key, outlen, pubkey, eckey, 0);
-       if (ret < 0)
-               return ret;
+       if (ret <= 0)
+               return 0;
        *keylen = ret;
        return 1;
        }