[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  13d928d38b5ba4f8085cf750bf3fd55685f92a61 (commit)
      from  576129cd72ae054d246221f111aabf42b9c6d76d (commit)


- Log -----------------------------------------------------------------
commit 13d928d38b5ba4f8085cf750bf3fd55685f92a61
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Feb 25 19:27:42 2019 +0100

    Rearrange the inclusion of curve448/curve448_lcl.h
    
    The real cause for this change is that test/ec_internal_test.c
    includes ec_lcl.h, and including curve448/curve448_lcl.h from there
    doesn't work so well with compilers who always do inclusions relative
    to the C file being compiled.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8334)
    
    (cherry picked from commit f408e2a352b59f2e7aa2160bfb6285725fe88ea7)

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

Summary of changes:
 crypto/ec/ec_lcl.h   | 1 -
 crypto/ec/ecx_meth.c | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/ec/ec_lcl.h b/crypto/ec/ec_lcl.h
index 312b538..6b90ef3 100644
--- a/crypto/ec/ec_lcl.h
+++ b/crypto/ec/ec_lcl.h
@@ -15,7 +15,6 @@
 #include <openssl/bn.h>
 #include "internal/refcount.h"
 #include "internal/ec_int.h"
-#include "curve448/curve448_lcl.h"
 
 #if defined(__SUNPRO_C)
 # if __SUNPRO_C >= 0x520
diff --git a/crypto/ec/ecx_meth.c b/crypto/ec/ecx_meth.c
index fbe9727..7d133a3 100644
--- a/crypto/ec/ecx_meth.c
+++ b/crypto/ec/ecx_meth.c
@@ -15,6 +15,7 @@
 #include "internal/asn1_int.h"
 #include "internal/evp_int.h"
 #include "ec_lcl.h"
+#include "curve448/curve448_lcl.h"
 
 #define X25519_BITS          253
 #define X25519_SECURITY_BITS 128