From: Matt Caswell <matt@openssl.org>
Date: Wed, 15 Nov 2017 16:24:32 +0000 (+0000)
Subject: Remove the curve448/decaf sub-directory
X-Git-Tag: OpenSSL_1_1_1-pre2~122
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8385b0fc0215b378b61891582b0579659d0b9f4;p=thirdparty%2Fopenssl.git

Remove the curve448/decaf sub-directory

Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/5105)
---

diff --git a/crypto/ec/curve448/decaf/common.h b/crypto/ec/curve448/curve448utils.h
similarity index 100%
rename from crypto/ec/curve448/decaf/common.h
rename to crypto/ec/curve448/curve448utils.h
diff --git a/crypto/ec/curve448/point_448.h b/crypto/ec/curve448/point_448.h
index 1757129e84c..066bd70c275 100644
--- a/crypto/ec/curve448/point_448.h
+++ b/crypto/ec/curve448/point_448.h
@@ -15,7 +15,7 @@
 #ifndef __DECAF_POINT_448_H__
 #define __DECAF_POINT_448_H__ 1
 
-#include <decaf/common.h>
+#include "curve448utils.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/crypto/ec/curve448/shake.h b/crypto/ec/curve448/shake.h
index ae125b923ab..4a9ae5d3031 100644
--- a/crypto/ec/curve448/shake.h
+++ b/crypto/ec/curve448/shake.h
@@ -15,7 +15,7 @@
 #include <sys/types.h>
 #include <stdlib.h> /* for NULL */
 
-#include <decaf/common.h>
+#include "curve448utils.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/crypto/ec/curve448/utils.c b/crypto/ec/curve448/utils.c
index 80a6ea5b5b1..b28a1649809 100644
--- a/crypto/ec/curve448/utils.c
+++ b/crypto/ec/curve448/utils.c
@@ -8,7 +8,7 @@
  * @brief Decaf utility functions.
  */
 
-#include <decaf/common.h>
+#include "curve448utils.h"
 
 void decaf_bzero (
     void *s,
diff --git a/crypto/ec/curve448/word.h b/crypto/ec/curve448/word.h
index 7c7644ad2cd..b62487797d8 100644
--- a/crypto/ec/curve448/word.h
+++ b/crypto/ec/curve448/word.h
@@ -17,7 +17,7 @@ extern int posix_memalign(void **, size_t, size_t);
 #include <stdint.h>
 #include "arch_intrinsics.h"
 
-#include <decaf/common.h>
+#include "curve448utils.h"
 
 #ifndef _BSD_SOURCE
 #define _BSD_SOURCE 1