Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
4d4a7dbf
Commit
4d4a7dbf
authored
Mar 28, 2018
by
bgermann
Committed by
Patrick Steinhardt
May 30, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sha1dc: update to fix errors with endianess
This updates the version of SHA1DC to c3e1304ea3.
parent
b89988c7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
67 additions
and
23 deletions
+67
-23
src/hash/sha1dc/sha1.c
+67
-23
No files found.
src/hash/sha1dc/sha1.c
View file @
4d4a7dbf
...
@@ -10,6 +10,9 @@
...
@@ -10,6 +10,9 @@
#include <memory.h>
#include <memory.h>
#include <stdio.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdlib.h>
#ifdef __unix__
#include <sys/types.h>
/* make sure macros like _BIG_ENDIAN visible */
#endif
#endif
#endif
#ifdef SHA1DC_CUSTOM_INCLUDE_SHA1_C
#ifdef SHA1DC_CUSTOM_INCLUDE_SHA1_C
...
@@ -23,6 +26,13 @@
...
@@ -23,6 +26,13 @@
#include "sha1.h"
#include "sha1.h"
#include "ubc_check.h"
#include "ubc_check.h"
#if (defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || \
defined(i386) || defined(__i386) || defined(__i386__) || defined(__i486__) || \
defined(__i586__) || defined(__i686__) || defined(_M_IX86) || defined(__X86__) || \
defined(_X86_) || defined(__THW_INTEL__) || defined(__I86__) || defined(__INTEL__) || \
defined(__386) || defined(_M_X64) || defined(_M_AMD64))
#define SHA1DC_ON_INTEL_LIKE_PROCESSOR
#endif
/*
/*
Because Little-Endian architectures are most common,
Because Little-Endian architectures are most common,
...
@@ -32,29 +42,70 @@
...
@@ -32,29 +42,70 @@
If you are compiling on a big endian platform and your compiler does not define one of these,
If you are compiling on a big endian platform and your compiler does not define one of these,
you will have to add whatever macros your tool chain defines to indicate Big-Endianness.
you will have to add whatever macros your tool chain defines to indicate Big-Endianness.
*/
*/
#ifdef SHA1DC_BIGENDIAN
#undef SHA1DC_BIGENDIAN
#endif
#if (defined(_BYTE_ORDER) || defined(__BYTE_ORDER) || defined(__BYTE_ORDER__))
#if defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__)
/*
#if ((defined(_BYTE_ORDER) && (_BYTE_ORDER == _BIG_ENDIAN)) || \
* Should detect Big Endian under GCC since at least 4.6.0 (gcc svn
(defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN)) || \
* rev #165881). See
(defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __BIG_ENDIAN__)) )
* https://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html
*
* This also works under clang since 3.2, it copied the GCC-ism. See
* clang.git's 3b198a97d2 ("Preprocessor: add __BYTE_ORDER__
* predefined macro", 2012-07-27)
*/
#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
#define SHA1DC_BIGENDIAN
#define SHA1DC_BIGENDIAN
#endif
#endif
#else
/* Not under GCC-alike */
#elif defined(__BYTE_ORDER) && defined(__BIG_ENDIAN)
#if (defined(_BIG_ENDIAN) || defined(__BIG_ENDIAN) || defined(__BIG_ENDIAN__) || \
/*
defined(__ARMEB__) || defined(__THUMBEB__) || defined(__AARCH64EB__) || \
* Should detect Big Endian under glibc.git since 14245eb70e ("entered
defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || \
* into RCS", 1992-11-25). Defined in <endian.h> which will have been
defined(__sparc))
* brought in by standard headers. See glibc.git and
* https://sourceforge.net/p/predef/wiki/Endianness/
*/
#if __BYTE_ORDER == __BIG_ENDIAN
#define SHA1DC_BIGENDIAN
#define SHA1DC_BIGENDIAN
#endif
#endif
/* Not under GCC-alike or glibc */
#elif defined(_BYTE_ORDER) && defined(_BIG_ENDIAN) && defined(_LITTLE_ENDIAN)
/*
* *BSD and newlib (embeded linux, cygwin, etc).
* the defined(_BIG_ENDIAN) && defined(_LITTLE_ENDIAN) part prevents
* this condition from matching with Solaris/sparc.
* (Solaris defines only one endian macro)
*/
#if _BYTE_ORDER == _BIG_ENDIAN
#define SHA1DC_BIGENDIAN
#endif
#endif
/* Not under GCC-alike or glibc or *BSD or newlib */
#elif (defined(__ARMEB__) || defined(__THUMBEB__) || defined(__AARCH64EB__) || \
defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || \
defined(__sparc))
/*
* Should define Big Endian for a whitelist of known processors. See
* https://sourceforge.net/p/predef/wiki/Endianness/ and
* http://www.oracle.com/technetwork/server-storage/solaris/portingtosolaris-138514.html
*/
#define SHA1DC_BIGENDIAN
/* Not under GCC-alike or glibc or *BSD or newlib or <processor whitelist> */
#elif defined(SHA1DC_ON_INTEL_LIKE_PROCESSOR)
/*
* As a last resort before we do anything else we're not 100% sure
* about below, we blacklist specific processors here. We could add
* more, see e.g. https://wiki.debian.org/ArchitectureSpecificsMemo
*/
#else
/* Not under GCC-alike or glibc or *BSD or newlib or <processor whitelist> or <processor blacklist> */
/* We do nothing more here for now */
/*#error "Uncomment this to see if you fall through all the detection"*/
#endif
/* Big Endian detection */
#if (defined(SHA1DC_FORCE_LITTLEENDIAN) && defined(SHA1DC_BIGENDIAN))
#if (defined(SHA1DC_FORCE_LITTLEENDIAN) && defined(SHA1DC_BIGENDIAN))
#undef SHA1DC_BIGENDIAN
#undef SHA1DC_BIGENDIAN
#endif
#endif
...
@@ -63,15 +114,8 @@
...
@@ -63,15 +114,8 @@
#endif
#endif
/*ENDIANNESS SELECTION*/
/*ENDIANNESS SELECTION*/
#if (defined SHA1DC_FORCE_UNALIGNED_ACCESS || \
#if defined(SHA1DC_FORCE_UNALIGNED_ACCESS) || defined(SHA1DC_ON_INTEL_LIKE_PROCESSOR)
defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || \
defined(i386) || defined(__i386) || defined(__i386__) || defined(__i486__) || \
defined(__i586__) || defined(__i686__) || defined(_M_IX86) || defined(__X86__) || \
defined(_X86_) || defined(__THW_INTEL__) || defined(__I86__) || defined(__INTEL__) || \
defined(__386) || defined(_M_X64) || defined(_M_AMD64))
#define SHA1DC_ALLOW_UNALIGNED_ACCESS
#define SHA1DC_ALLOW_UNALIGNED_ACCESS
#endif
/*UNALIGNMENT DETECTION*/
#endif
/*UNALIGNMENT DETECTION*/
...
@@ -918,7 +962,7 @@ static void sha1recompress_fast_ ## t (uint32_t ihvin[5], uint32_t ihvout[5], co
...
@@ -918,7 +962,7 @@ static void sha1recompress_fast_ ## t (uint32_t ihvin[5], uint32_t ihvout[5], co
#ifdef _MSC_VER
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(push)
#pragma warning(disable: 4127)
/* Comp
li
er complains about the checks in the above macro being constant. */
#pragma warning(disable: 4127)
/* Comp
il
er complains about the checks in the above macro being constant. */
#endif
#endif
#ifdef DOSTORESTATE0
#ifdef DOSTORESTATE0
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment