[openssl-commits] [openssl] master update

[Ben Laurie]

The branch master has been updated
       via  33bed28b399adb42b33d9a23814a62096ab84cb4 (commit)
      from  41977c53cd04f52b2b5e56d31ace782577620ac3 (commit)


- Log -----------------------------------------------------------------
commit 33bed28b399adb42b33d9a23814a62096ab84cb4
Author: Ben Laurie <ben at links.org>
Date:   Sun Dec 27 14:59:04 2015 +0000

    Fix no-engine.
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/ec/ec_key.c     | 2 +-
 crypto/evp/pmeth_lib.c | 1 +
 include/openssl/evp.h  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c
index e2ca142..82d13eb 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 bbc4565..a80fc33 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 d93bb1e..a4d2299 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);