openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 90b06ac7: only use faster SHA-1 code on machines with good libc 

Merge commit '90b06ac786f859895ac503cf42759c2706205700' into eclair-plus-aosp

* commit '90b06ac786f859895ac503cf42759c2706205700':
  only use faster SHA-1 code on machines with good libc
This commit is contained in:
Doug Zongker 2009-08-21 11:13:13 -07:00 committed by Android Git Automerger
parent 70670ff0d8 90b06ac786
commit b8ebbcc88c
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/mincrypt/sha.h
View File

@ -29,7 +29,6 @@
#define _EMBEDDED_SHA_H_
#include <inttypes.h>
#include <endian.h>
#ifdef __cplusplus
extern "C" {
@ -38,7 +37,7 @@ extern "C" {
typedef struct SHA_CTX {
uint64_t count;
uint32_t state[5];
#if __BYTE_ORDER == __LITTLE_ENDIAN
#if defined(HAVE_ENDIAN_H) && defined(HAVE_LITTLE_ENDIAN)
union {
uint8_t b[64];
uint32_t w[16];

14
libmincrypt/sha.c
View File

@ -25,13 +25,15 @@
** ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <byteswap.h>
#include <endian.h>
#include <memory.h>
#include "mincrypt/sha.h"
#if __BYTE_ORDER == __LITTLE_ENDIAN
// Some machines lack byteswap.h and endian.h. These have to use the
// slower code, even if they're little-endian.
#if defined(HAVE_ENDIAN_H) && defined(HAVE_LITTLE_ENDIAN)
#include <byteswap.h>
#include <memory.h>
// This version is about 28% faster than the generic version below,
// but assumes little-endianness.
@ -186,7 +188,7 @@ const uint8_t* SHA_final(SHA_CTX* ctx) {
return ctx->buf.b;
}
#else // __BYTE_ORDER == BIG_ENDIAN
#else // #if defined(HAVE_ENDIAN_H) && defined(HAVE_LITTLE_ENDIAN)
#define rol(bits, value) (((value) << (bits)) | ((value) >> (32 - (bits))))