X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fecdh%2Fech_key.c;h=52a4649dc6910c7505899bb44c83ad6ed5e712a1;hp=f000b8c8adbf6472412e2d1ace05e6cffa6cbc35;hb=c6dbe908959f1e1b1076f9ed2cb34bf2416c7226;hpb=259cdf2af9d729f41df09a5d938bc998fd9f5b5f diff --git a/crypto/ecdh/ech_key.c b/crypto/ecdh/ech_key.c index f000b8c8ad..52a4649dc6 100644 --- a/crypto/ecdh/ech_key.c +++ b/crypto/ecdh/ech_key.c @@ -14,7 +14,7 @@ * */ /* ==================================================================== - * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. + * Copyright (c) 1998-2003 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -67,13 +67,19 @@ * */ -#include "ecdh.h" +#define OPENSSL_FIPSAPI + +#include "ech_locl.h" +#ifndef OPENSSL_NO_ENGINE #include +#endif -int ECDH_compute_key(unsigned char *key, const EC_POINT *pub_key, EC_KEY *eckey) +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)) { ECDH_DATA *ecdh = ecdh_check(eckey); if (ecdh == NULL) return 0; - return ecdh->meth->compute_key(key, pub_key, eckey); + return ecdh->meth->compute_key(out, outlen, pub_key, eckey, KDF); }