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 1757129e84c48e4f9a0595d313822036710cda59..066bd70c275b74f5d2be6e9542a721064c31b540 100644 (file)
--- 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 ae125b923ab8506042d321e53368ca38907dbee2..4a9ae5d303140823241ce154f0439220509c9176 100644 (file)
--- 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 80a6ea5b5b1a16d41fd5abfd96f262ef6897ab1b..b28a1649809b24116e73084ab333b6118cec98f0 100644 (file)
--- 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 7c7644ad2cdc26f2bfab7591ce9bb48147089929..b62487797d83f5c52801d761474f2cb6672e0bc4 100644 (file)
--- 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