diff options
Diffstat (limited to 'src/lib/libcrypto/ecdh/ech_locl.h')
-rw-r--r-- | src/lib/libcrypto/ecdh/ech_locl.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/lib/libcrypto/ecdh/ech_locl.h b/src/lib/libcrypto/ecdh/ech_locl.h index 077c7dab95..8338007393 100644 --- a/src/lib/libcrypto/ecdh/ech_locl.h +++ b/src/lib/libcrypto/ecdh/ech_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ech_locl.h,v 1.3 2015/02/07 13:19:15 doug Exp $ */ | 1 | /* $OpenBSD: ech_locl.h,v 1.4 2015/09/13 10:46:20 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2000-2005 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2000-2005 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -7,7 +7,7 @@ | |||
7 | * are met: | 7 | * are met: |
8 | * | 8 | * |
9 | * 1. Redistributions of source code must retain the above copyright | 9 | * 1. Redistributions of source code must retain the above copyright |
10 | * notice, this list of conditions and the following disclaimer. | 10 | * notice, this list of conditions and the following disclaimer. |
11 | * | 11 | * |
12 | * 2. Redistributions in binary form must reproduce the above copyright | 12 | * 2. Redistributions in binary form must reproduce the above copyright |
13 | * notice, this list of conditions and the following disclaimer in | 13 | * notice, this list of conditions and the following disclaimer in |
@@ -62,14 +62,13 @@ | |||
62 | extern "C" { | 62 | extern "C" { |
63 | #endif | 63 | #endif |
64 | 64 | ||
65 | struct ecdh_method | 65 | struct ecdh_method { |
66 | { | ||
67 | const char *name; | 66 | const char *name; |
68 | int (*compute_key)(void *key, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh, | 67 | int (*compute_key)(void *key, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh, |
69 | void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen)); | 68 | void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen)); |
70 | int flags; | 69 | int flags; |
71 | char *app_data; | 70 | char *app_data; |
72 | }; | 71 | }; |
73 | 72 | ||
74 | /* If this flag is set the ECDH method is FIPS compliant and can be used | 73 | /* If this flag is set the ECDH method is FIPS compliant and can be used |
75 | * in FIPS mode. This is set in the validated module method. If an | 74 | * in FIPS mode. This is set in the validated module method. If an |