vpaes-ppc.pl: fix bug in IV handling and comply with ABI.

[openssl.git] / crypto / ecdh / ech_key.c

diff --git a/crypto/ecdh/ech_key.c b/crypto/ecdh/ech_key.c
index f000b8c8adbf6472412e2d1ace05e6cffa6cbc35..ebd56ee2c9cf868cbc0604b0f611b99740f2ad66 100644 (file)
--- 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,16 @@
  *
  */
 
-#include "ecdh.h"
-#include <openssl/engine.h>
+#define OPENSSL_FIPSAPI
 
-int ECDH_compute_key(unsigned char *key, const EC_POINT *pub_key, EC_KEY *eckey)
+#include "ech_locl.h"
+
+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);
 }