From: Ben Laurie <ben@links.org>
Date: Sun, 27 Dec 2015 14:59:04 +0000 (+0000)
Subject: Fix no-engine.
X-Git-Tag: OpenSSL_1_1_0-pre2~148
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=33bed28b399adb42b33d9a23814a62096ab84cb4;p=oweals%2Fopenssl.git

Fix no-engine.

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
---

diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c
index e2ca142057..82d13eb951 100644
--- a/crypto/ec/ec_key.c
+++ b/crypto/ec/ec_key.c
@@ -65,7 +65,7 @@
 #include <string.h>
 #include "ec_lcl.h"
 #include <openssl/err.h>
-#ifndef OPENSSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
 # include <openssl/engine.h>
 #endif
 
diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index bbc4565816..a80fc33ccb 100644
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c
@@ -63,6 +63,7 @@
 #ifndef OPENSSL_NO_ENGINE
 # include <openssl/engine.h>
 #endif
+#include <openssl/evp.h>
 #include "internal/asn1_int.h"
 #include "internal/evp_int.h"
 
diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index d93bb1e587..a4d2299e69 100644
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -1293,7 +1293,7 @@ int EVP_PKEY_derive_init(EVP_PKEY_CTX *ctx);
 int EVP_PKEY_derive_set_peer(EVP_PKEY_CTX *ctx, EVP_PKEY *peer);
 int EVP_PKEY_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen);
 
-typedef int EVP_PKEY_gen_cb (EVP_PKEY_CTX *ctx);
+typedef int EVP_PKEY_gen_cb(EVP_PKEY_CTX *ctx);
 
 int EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx);
 int EVP_PKEY_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey);