diff options
Diffstat (limited to 'src/lib/libcrypto/ecdh/ecdh.h')
-rw-r--r-- | src/lib/libcrypto/ecdh/ecdh.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/lib/libcrypto/ecdh/ecdh.h b/src/lib/libcrypto/ecdh/ecdh.h index c8c6920aa2..3bcb8b045e 100644 --- a/src/lib/libcrypto/ecdh/ecdh.h +++ b/src/lib/libcrypto/ecdh/ecdh.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ecdh.h,v 1.2 2014/06/12 15:49:29 deraadt Exp $ */ | 1 | /* $OpenBSD: ecdh.h,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 |
@@ -87,15 +87,16 @@ extern "C" { | |||
87 | 87 | ||
88 | const ECDH_METHOD *ECDH_OpenSSL(void); | 88 | const ECDH_METHOD *ECDH_OpenSSL(void); |
89 | 89 | ||
90 | void ECDH_set_default_method(const ECDH_METHOD *); | 90 | void ECDH_set_default_method(const ECDH_METHOD *); |
91 | const ECDH_METHOD *ECDH_get_default_method(void); | 91 | const ECDH_METHOD *ECDH_get_default_method(void); |
92 | int ECDH_set_method(EC_KEY *, const ECDH_METHOD *); | 92 | int ECDH_set_method(EC_KEY *, const ECDH_METHOD *); |
93 | 93 | ||
94 | int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh, | 94 | int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, |
95 | void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen)); | 95 | EC_KEY *ecdh, |
96 | void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen)); | ||
96 | 97 | ||
97 | int ECDH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new | 98 | int ECDH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new |
98 | *new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); | 99 | *new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); |
99 | int ECDH_set_ex_data(EC_KEY *d, int idx, void *arg); | 100 | int ECDH_set_ex_data(EC_KEY *d, int idx, void *arg); |
100 | void *ECDH_get_ex_data(EC_KEY *d, int idx); | 101 | void *ECDH_get_ex_data(EC_KEY *d, int idx); |
101 | 102 | ||