diff options
Diffstat (limited to 'src/lib/libcrypto/ecdh/ech_key.c')
-rw-r--r-- | src/lib/libcrypto/ecdh/ech_key.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/libcrypto/ecdh/ech_key.c b/src/lib/libcrypto/ecdh/ech_key.c index b0bba7f826..9a8091fe19 100644 --- a/src/lib/libcrypto/ecdh/ech_key.c +++ b/src/lib/libcrypto/ecdh/ech_key.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ech_key.c,v 1.2 2014/06/12 15:49:29 deraadt Exp $ */ | 1 | /* $OpenBSD: ech_key.c,v 1.3 2015/09/13 10:46:20 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. | 3 | * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. |
4 | * | 4 | * |
@@ -21,7 +21,7 @@ | |||
21 | * are met: | 21 | * are met: |
22 | * | 22 | * |
23 | * 1. Redistributions of source code must retain the above copyright | 23 | * 1. Redistributions of source code must retain the above copyright |
24 | * notice, this list of conditions and the following disclaimer. | 24 | * notice, this list of conditions and the following disclaimer. |
25 | * | 25 | * |
26 | * 2. Redistributions in binary form must reproduce the above copyright | 26 | * 2. Redistributions in binary form must reproduce the above copyright |
27 | * notice, this list of conditions and the following disclaimer in | 27 | * notice, this list of conditions and the following disclaimer in |
@@ -69,9 +69,10 @@ | |||
69 | 69 | ||
70 | #include "ech_locl.h" | 70 | #include "ech_locl.h" |
71 | 71 | ||
72 | int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, | 72 | int |
73 | EC_KEY *eckey, | 73 | ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, |
74 | void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen)) | 74 | EC_KEY *eckey, |
75 | void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen)) | ||
75 | { | 76 | { |
76 | ECDH_DATA *ecdh = ecdh_check(eckey); | 77 | ECDH_DATA *ecdh = ecdh_check(eckey); |
77 | if (ecdh == NULL) | 78 | if (ecdh == NULL) |