summaryrefslogtreecommitdiff
path: root/Cryptlib/OpenSSL/crypto/ecdh/ech_key.c
diff options
context:
space:
mode:
authorGary Ching-Pang Lin <glin@suse.com>2015-05-12 13:51:02 -0400
committerPeter Jones <pjones@redhat.com>2015-05-12 13:51:02 -0400
commitf3653b08a475372a0849cd9a3387a5997ce121c9 (patch)
treea3149decea22d31dfe81cc7054f55d65fc45f46a /Cryptlib/OpenSSL/crypto/ecdh/ech_key.c
parentf3af1acfec86794ae2d78f63cab100503bfc9a7b (diff)
downloadefi-boot-shim-f3653b08a475372a0849cd9a3387a5997ce121c9.tar.gz
efi-boot-shim-f3653b08a475372a0849cd9a3387a5997ce121c9.zip
Update Cryptlib and openssl
Update Cryptlib to r16559 and openssl to 0.9.8zf Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/ecdh/ech_key.c')
-rw-r--r--Cryptlib/OpenSSL/crypto/ecdh/ech_key.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/Cryptlib/OpenSSL/crypto/ecdh/ech_key.c b/Cryptlib/OpenSSL/crypto/ecdh/ech_key.c
index f44da929..4045fb2f 100644
--- a/Cryptlib/OpenSSL/crypto/ecdh/ech_key.c
+++ b/Cryptlib/OpenSSL/crypto/ecdh/ech_key.c
@@ -21,7 +21,7 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
@@ -69,15 +69,16 @@
#include "ech_locl.h"
#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
+# include <openssl/engine.h>
#endif
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))
+ 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(out, outlen, pub_key, eckey, KDF);
+ ECDH_DATA *ecdh = ecdh_check(eckey);
+ if (ecdh == NULL)
+ return 0;
+ return ecdh->meth->compute_key(out, outlen, pub_key, eckey, KDF);
}