[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  01ce6f746d5daaec6210bc13851f81f7d4ef38ec (commit)
      from  270862b470d43a283996e681b74fbbb27c7f12e4 (commit)


- Log -----------------------------------------------------------------
commit 01ce6f746d5daaec6210bc13851f81f7d4ef38ec
Author: Rich Salz <rsalz at openssl.org>
Date:   Sun Mar 20 10:10:18 2016 -0400

    Move blake2_loclh to blake2 directory
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>

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

Summary of changes:
 crypto/{include/internal => blake2}/blake2_locl.h | 0
 crypto/blake2/blake2b.c                           | 2 +-
 crypto/blake2/blake2s.c                           | 2 +-
 crypto/blake2/m_blake2b.c                         | 2 +-
 crypto/blake2/m_blake2s.c                         | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename crypto/{include/internal => blake2}/blake2_locl.h (100%)

diff --git a/crypto/include/internal/blake2_locl.h b/crypto/blake2/blake2_locl.h
similarity index 100%
rename from crypto/include/internal/blake2_locl.h
rename to crypto/blake2/blake2_locl.h
diff --git a/crypto/blake2/blake2b.c b/crypto/blake2/blake2b.c
index 6219490..6f04412 100644
--- a/crypto/blake2/blake2b.c
+++ b/crypto/blake2/blake2b.c
@@ -19,7 +19,7 @@
 #include <openssl/crypto.h>
 #include "e_os.h"
 
-#include "internal/blake2_locl.h"
+#include "blake2_locl.h"
 #include "blake2_impl.h"
 
 static const uint64_t blake2b_IV[8] =
diff --git a/crypto/blake2/blake2s.c b/crypto/blake2/blake2s.c
index 75be06a..f940aa1 100644
--- a/crypto/blake2/blake2s.c
+++ b/crypto/blake2/blake2s.c
@@ -19,7 +19,7 @@
 #include <openssl/crypto.h>
 #include "e_os.h"
 
-#include "internal/blake2_locl.h"
+#include "blake2_locl.h"
 #include "blake2_impl.h"
 
 static const uint32_t blake2s_IV[8] =
diff --git a/crypto/blake2/m_blake2b.c b/crypto/blake2/m_blake2b.c
index b74bdbd..e06bb5b 100644
--- a/crypto/blake2/m_blake2b.c
+++ b/crypto/blake2/m_blake2b.c
@@ -21,7 +21,7 @@
 
 # include <openssl/evp.h>
 # include <openssl/objects.h>
-# include "internal/blake2_locl.h"
+# include "blake2_locl.h"
 # include "internal/evp_int.h"
 
 static int init(EVP_MD_CTX *ctx)
diff --git a/crypto/blake2/m_blake2s.c b/crypto/blake2/m_blake2s.c
index 01974d9..6150e98 100644
--- a/crypto/blake2/m_blake2s.c
+++ b/crypto/blake2/m_blake2s.c
@@ -21,7 +21,7 @@
 
 # include <openssl/evp.h>
 # include <openssl/objects.h>
-# include "internal/blake2_locl.h"
+# include "blake2_locl.h"
 # include "internal/evp_int.h"
 
 static int init(EVP_MD_CTX *ctx)