projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hide the definition of ECDSA_METHOD and ECDSA_DATA (and mutatis mutandis
[openssl.git]
/
crypto
/
ecdh
/
ech_key.c
diff --git
a/crypto/ecdh/ech_key.c
b/crypto/ecdh/ech_key.c
index f000b8c8adbf6472412e2d1ace05e6cffa6cbc35..f44da9298b5e5655a103f9b1646fcf969b76640f 100644
(file)
--- a/
crypto/ecdh/ech_key.c
+++ b/
crypto/ecdh/ech_key.c
@@
-14,7
+14,7
@@
*
*/
/* ====================================================================
*
*/
/* ====================================================================
- * Copyright (c) 1998-200
2
The OpenSSL Project. All rights reserved.
+ * Copyright (c) 1998-200
3
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
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@
-67,13
+67,17
@@
*
*/
*
*/
-#include "ecdh.h"
+#include "ech_locl.h"
+#ifndef OPENSSL_NO_ENGINE
#include <openssl/engine.h>
#include <openssl/engine.h>
+#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;
{
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
);
}
}