Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-08 17:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed endia.h and mempcpy()

Browse Source 
SVN revision: 2320
This commit is contained in:
Stefan Ritt 2010-08-06 10:47:53 +00:00
parent e0517c17c0
commit 73118fa3ee
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/crypt.c
View File

@ -12,12 +12,10 @@
#define MIN(x,y) ((x)<(y)?(x):(y)) #define MIN(x,y) ((x)<(y)?(x):(y))
#define __alignof__(x) sizeof(x) #define __alignof__(x) sizeof(x)
#define alloca(x) malloc(x) #define alloca(x) malloc(x)
#define mempcpy(d, s, n) ((char *)memcpy(d,s,n)+n)
#define ERANGE 34 #define ERANGE 34
typedef unsigned int uint32_t; typedef unsigned int uint32_t;
#else #else
#include <endian.h>
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
#include <stdint.h> #include <stdint.h>
@ -418,8 +416,10 @@ static char *sha256_crypt_r(const char *key, const char *salt, char *buffer, int
/* Create byte sequence P. */ /* Create byte sequence P. */
cp = p_bytes = alloca(key_len); cp = p_bytes = alloca(key_len);
for (cnt = key_len; cnt >= 32; cnt -= 32) for (cnt = key_len; cnt >= 32; cnt -= 32) {
cp = mempcpy(cp, temp_result, 32); memcpy(cp, temp_result, 32);
cp += 32;
}
memcpy(cp, temp_result, cnt); memcpy(cp, temp_result, cnt);
/* Start computation of S byte sequence. */ /* Start computation of S byte sequence. */
@ -434,8 +434,10 @@ static char *sha256_crypt_r(const char *key, const char *salt, char *buffer, int
/* Create byte sequence S. */ /* Create byte sequence S. */
cp = s_bytes = alloca(salt_len); cp = s_bytes = alloca(salt_len);
for (cnt = salt_len; cnt >= 32; cnt -= 32) for (cnt = salt_len; cnt >= 32; cnt -= 32) {
cp = mempcpy(cp, temp_result, 32); memcpy(cp, temp_result, 32);
cp += 32;
}
memcpy(cp, temp_result, cnt); memcpy(cp, temp_result, cnt);
/* Repeatedly run the collected hash value through SHA256 to burn /* Repeatedly run the collected hash value through SHA256 to burn