diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-04-11 23:16:31 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-04-11 23:16:31 +0200 |
| commit | 925aa086a27fc06d7dacc866fed975046652cf23 (patch) | |
| tree | 2b8b62259a10351b224a43444ff08592f446efff /drivers/builtin_openssl2/crypto/ecdh/ech_key.c | |
| parent | 89fcd529f3966a2f4977402f9d8f1ec25dfeb53e (diff) | |
| parent | c860574d8ba246b5e2c59578f24accd2ace5e9bc (diff) | |
Merge pull request #4275 from mrezai/openssl-1.0.1s
Update OpenSSL to version 1.0.1s
Diffstat (limited to 'drivers/builtin_openssl2/crypto/ecdh/ech_key.c')
| -rw-r--r-- | drivers/builtin_openssl2/crypto/ecdh/ech_key.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/builtin_openssl2/crypto/ecdh/ech_key.c b/drivers/builtin_openssl2/crypto/ecdh/ech_key.c index 2988899ea2..4f14498962 100644 --- a/drivers/builtin_openssl2/crypto/ecdh/ech_key.c +++ b/drivers/builtin_openssl2/crypto/ecdh/ech_key.c @@ -21,7 +21,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -70,11 +70,12 @@ #include "ech_locl.h" int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, - EC_KEY *eckey, - void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen)) + EC_KEY *eckey, + void *(*KDF) (const void *in, size_t inlen, void *out, + size_t *outlen)) { - ECDH_DATA *ecdh = ecdh_check(eckey); - if (ecdh == NULL) - return 0; - return ecdh->meth->compute_key(out, outlen, pub_key, eckey, KDF); + ECDH_DATA *ecdh = ecdh_check(eckey); + if (ecdh == NULL) + return 0; + return ecdh->meth->compute_key(out, outlen, pub_key, eckey, KDF); } |