diff options
| author | tb <> | 2023-07-28 09:25:12 +0000 |
|---|---|---|
| committer | tb <> | 2023-07-28 09:25:12 +0000 |
| commit | 2d27f5ba745b8f5de6e3e827829699607f11a54f (patch) | |
| tree | ce61ff1b4805fe8a43c78a559a7efcd0b1254ee1 /src/lib/libcrypto/ec/ec.h | |
| parent | d5a81d6e35ae60f515d5705afb9c2f871823721a (diff) | |
| download | openbsd-2d27f5ba745b8f5de6e3e827829699607f11a54f.tar.gz openbsd-2d27f5ba745b8f5de6e3e827829699607f11a54f.tar.bz2 openbsd-2d27f5ba745b8f5de6e3e827829699607f11a54f.zip | |
Merge ecdh.h into ec.h
The remaining two ECDH interfaces are relocated into ec.h. ecdh.h
remains. It does nothing but include ec.h.
ok jsing
Diffstat (limited to 'src/lib/libcrypto/ec/ec.h')
| -rw-r--r-- | src/lib/libcrypto/ec/ec.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/libcrypto/ec/ec.h b/src/lib/libcrypto/ec/ec.h index aac3537655..686f018a9d 100644 --- a/src/lib/libcrypto/ec/ec.h +++ b/src/lib/libcrypto/ec/ec.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ec.h,v 1.43 2023/07/28 09:16:17 tb Exp $ */ | 1 | /* $OpenBSD: ec.h,v 1.44 2023/07/28 09:25:12 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Originally written by Bodo Moeller for the OpenSSL project. | 3 | * Originally written by Bodo Moeller for the OpenSSL project. |
| 4 | */ | 4 | */ |
| @@ -327,6 +327,11 @@ const EC_KEY_METHOD *EC_KEY_get_method(const EC_KEY *key); | |||
| 327 | int EC_KEY_set_method(EC_KEY *key, const EC_KEY_METHOD *meth); | 327 | int EC_KEY_set_method(EC_KEY *key, const EC_KEY_METHOD *meth); |
| 328 | EC_KEY *EC_KEY_new_method(ENGINE *engine); | 328 | EC_KEY *EC_KEY_new_method(ENGINE *engine); |
| 329 | 329 | ||
| 330 | int ECDH_size(const EC_KEY *ecdh); | ||
| 331 | int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, | ||
| 332 | EC_KEY *ecdh, | ||
| 333 | void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen)); | ||
| 334 | |||
| 330 | typedef struct ECDSA_SIG_st ECDSA_SIG; | 335 | typedef struct ECDSA_SIG_st ECDSA_SIG; |
| 331 | 336 | ||
| 332 | ECDSA_SIG *ECDSA_SIG_new(void); | 337 | ECDSA_SIG *ECDSA_SIG_new(void); |
