Reorganize local header files

[thirdparty/openssl.git] / crypto / ec / curve448 / arch_32 / arch_intrinsics.h

diff --git a/crypto/ec/curve448/arch_32/arch_intrinsics.h b/crypto/ec/curve448/arch_32/arch_intrinsics.h
index f3908a2589ec31918982e4c1a9da2f9e947a4a9d..80b4d3982873a3c96dddbddddd2bb5724766319e 100644 (file)
--- a/crypto/ec/curve448/arch_32/arch_intrinsics.h
+++ b/crypto/ec/curve448/arch_32/arch_intrinsics.h
@@ -1,22 +1,27 @@
-/* Copyright (c) 2016 Cryptography Research, Inc.
- * Released under the MIT License.  See LICENSE.txt for license information.
+/*
+ * Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016 Cryptography Research, Inc.
+ *
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ *
+ * Originally written by Mike Hamburg
  */
 
-#ifndef __ARCH_ARCH_32_ARCH_INTRINSICS_H__
-#define __ARCH_ARCH_32_ARCH_INTRINSICS_H__
+#ifndef HEADER_ARCH_32_ARCH_INTRINSICS_H
+# define HEADER_ARCH_32_ARCH_INTRINSICS_H
 
-#define ARCH_WORD_BITS 32
+#include "internal/constant_time.h"
 
-static __inline__ __attribute((always_inline,unused))
-uint32_t word_is_zero(uint32_t a) {
-    /* let's hope the compiler isn't clever enough to optimize this. */
-    return (((uint64_t)a)-1)>>32;
-}
+# define ARCH_WORD_BITS 32
+
+#define word_is_zero(a)     constant_time_is_zero_32(a)
 
-static __inline__ __attribute((always_inline,unused))
-uint64_t widemul(uint32_t a, uint32_t b) {
+static ossl_inline uint64_t widemul(uint32_t a, uint32_t b)
+{
     return ((uint64_t)a) * b;
 }
 
-#endif /* __ARCH_ARM_32_ARCH_INTRINSICS_H__ */
-
+#endif                          /* HEADER_ARCH_32_ARCH_INTRINSICS_H */