add make CONF=pthread for modern systems
This commit is contained in:
Russ Cox
parent
189f67ae9b
commit
4f14409f56
|
|
@ -0,0 +1,22 @@
|
|||
# Unix
|
||||
#PTHREAD= # for Mac
|
||||
PTHREAD=-pthread -DPTHREAD
|
||||
AR=ar
|
||||
AS=no-as-here
|
||||
RANLIB=ranlib
|
||||
X11=/usr/X11R6
|
||||
CC=gcc
|
||||
CFLAGS=-Wall -Wno-missing-braces -ggdb -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -I$(X11)/include -D_THREAD_SAFE $(PTHREAD) -O2
|
||||
O=o
|
||||
OS=posix
|
||||
GUI=x11
|
||||
LDADD=-L$(X11)/lib64 -L$(X11)/lib -lX11 -ggdb
|
||||
LDFLAGS=$(PTHREAD)
|
||||
TARG=drawterm
|
||||
# AUDIO=none
|
||||
AUDIO=unix
|
||||
|
||||
all: default
|
||||
|
||||
libmachdep.a:
|
||||
(cd posix-port && make)
|
||||
|
|
@ -14,6 +14,7 @@
|
|||
|
||||
typedef struct Cursor Cursor;
|
||||
|
||||
#undef long
|
||||
#define Font XFont
|
||||
#define Screen XScreen
|
||||
#define Display XDisplay
|
||||
|
|
@ -31,6 +32,7 @@ typedef struct Cursor Cursor;
|
|||
#undef Screen
|
||||
#undef Display
|
||||
#undef Cursor
|
||||
#define long int
|
||||
|
||||
/* perfect approximation to NTSC = .299r+.587g+.114b when 0 ≤ r,g,b < 256 */
|
||||
#define RGB2K(r,g,b) ((156763*(r)+307758*(g)+59769*(b))>>19)
|
||||
|
|
|
|||
|
|
@ -121,7 +121,12 @@ extern char* utfrrune(char*, long);
|
|||
|
||||
typedef struct Lock
|
||||
{
|
||||
#ifdef PTHREAD
|
||||
int init;
|
||||
pthread_mutex_t mutex;
|
||||
#else
|
||||
long key;
|
||||
#endif
|
||||
} Lock;
|
||||
|
||||
typedef struct QLock
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
#undef _FORTIFY_SOURCE /* stupid ubuntu warnings */
|
||||
#define __BSD_VISIBLE 1 /* FreeBSD 5.x */
|
||||
#define _BSD_SOURCE 1
|
||||
#define _NETBSD_SOURCE 1 /* NetBSD */
|
||||
|
|
@ -24,7 +25,10 @@
|
|||
#include <inttypes.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
#ifdef PTHREAD
|
||||
#include <pthread.h>
|
||||
#endif
|
||||
|
||||
typedef long long p9_vlong;
|
||||
typedef unsigned long long p9_uvlong;
|
||||
typedef unsigned long long p9_uvlong;
|
||||
typedef uintptr_t uintptr;
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ Queue* lineq; /* processed console input */
|
|||
Queue* serialoq; /* serial console output */
|
||||
Queue* kprintoq; /* console output, for /dev/kprint */
|
||||
long kprintinuse; /* test and set whether /dev/kprint is open */
|
||||
Lock kprintlock;
|
||||
int iprintscreenputs = 0;
|
||||
|
||||
int panicking;
|
||||
|
|
@ -584,10 +585,14 @@ consopen(Chan *c, int omode)
|
|||
break;
|
||||
|
||||
case Qkprint:
|
||||
if(tas(&kprintinuse) != 0){
|
||||
lock(&kprintlock);
|
||||
if(kprintinuse != 0){
|
||||
c->flag &= ~COPEN;
|
||||
unlock(&kprintlock);
|
||||
error(Einuse);
|
||||
}
|
||||
kprintinuse = 1;
|
||||
unlock(&kprintlock);
|
||||
if(kprintoq == nil){
|
||||
kprintoq = qopen(8*1024, Qcoalesce, 0, 0);
|
||||
if(kprintoq == nil){
|
||||
|
|
|
|||
|
|
@ -57,3 +57,7 @@ void drawflushr(Rectangle);
|
|||
void flushmemscreen(Rectangle);
|
||||
uchar *attachscreen(Rectangle*, ulong*, int*, int*, int*, void**);
|
||||
|
||||
void drawqlock(void);
|
||||
void drawqunlock(void);
|
||||
int drawcanqlock(void);
|
||||
void terminit(void);
|
||||
|
|
|
|||
58
libc/lock.c
58
libc/lock.c
|
|
@ -1,6 +1,61 @@
|
|||
#include <u.h>
|
||||
#include <libc.h>
|
||||
|
||||
#ifdef PTHREAD
|
||||
|
||||
static pthread_mutex_t initmutex = PTHREAD_MUTEX_INITIALIZER;
|
||||
|
||||
static void
|
||||
lockinit(Lock *lk)
|
||||
{
|
||||
pthread_mutexattr_t attr;
|
||||
|
||||
pthread_mutex_lock(&initmutex);
|
||||
if(lk->init == 0){
|
||||
pthread_mutexattr_init(&attr);
|
||||
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL);
|
||||
pthread_mutex_init(&lk->mutex, &attr);
|
||||
pthread_mutexattr_destroy(&attr);
|
||||
lk->init = 1;
|
||||
}
|
||||
pthread_mutex_unlock(&initmutex);
|
||||
}
|
||||
|
||||
void
|
||||
lock(Lock *lk)
|
||||
{
|
||||
if(!lk->init)
|
||||
lockinit(lk);
|
||||
if(pthread_mutex_lock(&lk->mutex) != 0)
|
||||
abort();
|
||||
}
|
||||
|
||||
int
|
||||
canlock(Lock *lk)
|
||||
{
|
||||
int r;
|
||||
|
||||
if(!lk->init)
|
||||
lockinit(lk);
|
||||
r = pthread_mutex_trylock(&lk->mutex);
|
||||
if(r == 0)
|
||||
return 1;
|
||||
if(r == EBUSY)
|
||||
return 0;
|
||||
abort();
|
||||
}
|
||||
|
||||
void
|
||||
unlock(Lock *lk)
|
||||
{
|
||||
if(pthread_mutex_unlock(&lk->mutex) != 0)
|
||||
abort();
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
/* old, non-pthread systems */
|
||||
|
||||
int
|
||||
canlock(Lock *lk)
|
||||
{
|
||||
|
|
@ -50,6 +105,8 @@ unlock(Lock *lk)
|
|||
lk->key = 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
void
|
||||
ilock(Lock *lk)
|
||||
{
|
||||
|
|
@ -61,4 +118,3 @@ iunlock(Lock *lk)
|
|||
{
|
||||
unlock(lk);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
ROOT=..
|
||||
include ../Make.config
|
||||
LIB=../libmachdep.a
|
||||
|
||||
OFILES=\
|
||||
getcallerpc.$O\
|
||||
md5block.$O\
|
||||
sha1block.$O\
|
||||
|
||||
default: $(LIB)
|
||||
$(LIB): $(OFILES)
|
||||
$(AR) r $(LIB) $(OFILES)
|
||||
$(RANLIB) $(LIB)
|
||||
|
||||
%.$O: %.c
|
||||
$(CC) $(CFLAGS) $*.c
|
||||
|
||||
%.$O: %.s
|
||||
$(AS) -o $*.$O $*.s
|
||||
|
||||
%.s: %.spp
|
||||
cpp $*.spp >$*.s
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
#include "u.h"
|
||||
#include "libc.h"
|
||||
|
||||
uintptr
|
||||
getcallerpc(void *a)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -0,0 +1,268 @@
|
|||
#include <u.h>
|
||||
#include <libc.h>
|
||||
#include <libsec.h>
|
||||
|
||||
/*
|
||||
* rfc1321 requires that I include this. The code is new. The constants
|
||||
* all come from the rfc (hence the copyright). We trade a table for the
|
||||
* macros in rfc. The total size is a lot less. -- presotto
|
||||
*
|
||||
* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
|
||||
* rights reserved.
|
||||
*
|
||||
* License to copy and use this software is granted provided that it
|
||||
* is identified as the "RSA Data Security, Inc. MD5 Message-Digest
|
||||
* Algorithm" in all material mentioning or referencing this software
|
||||
* or this function.
|
||||
*
|
||||
* License is also granted to make and use derivative works provided
|
||||
* that such works are identified as "derived from the RSA Data
|
||||
* Security, Inc. MD5 Message-Digest Algorithm" in all material
|
||||
* mentioning or referencing the derived work.
|
||||
*
|
||||
* RSA Data Security, Inc. makes no representations concerning either
|
||||
* the merchantability of this software or the suitability of this
|
||||
* software forany particular purpose. It is provided "as is"
|
||||
* without express or implied warranty of any kind.
|
||||
* These notices must be retained in any copies of any part of this
|
||||
* documentation and/or software.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Rotate ammounts used in the algorithm
|
||||
*/
|
||||
enum
|
||||
{
|
||||
S11= 7,
|
||||
S12= 12,
|
||||
S13= 17,
|
||||
S14= 22,
|
||||
|
||||
S21= 5,
|
||||
S22= 9,
|
||||
S23= 14,
|
||||
S24= 20,
|
||||
|
||||
S31= 4,
|
||||
S32= 11,
|
||||
S33= 16,
|
||||
S34= 23,
|
||||
|
||||
S41= 6,
|
||||
S42= 10,
|
||||
S43= 15,
|
||||
S44= 21,
|
||||
};
|
||||
|
||||
static u32int md5tab[] =
|
||||
{
|
||||
/* round 1 */
|
||||
/*[0]*/ 0xd76aa478,
|
||||
0xe8c7b756,
|
||||
0x242070db,
|
||||
0xc1bdceee,
|
||||
0xf57c0faf,
|
||||
0x4787c62a,
|
||||
0xa8304613,
|
||||
0xfd469501,
|
||||
0x698098d8,
|
||||
0x8b44f7af,
|
||||
0xffff5bb1,
|
||||
0x895cd7be,
|
||||
0x6b901122,
|
||||
0xfd987193,
|
||||
0xa679438e,
|
||||
0x49b40821,
|
||||
|
||||
/* round 2 */
|
||||
/*[16]*/0xf61e2562,
|
||||
0xc040b340,
|
||||
0x265e5a51,
|
||||
0xe9b6c7aa,
|
||||
0xd62f105d,
|
||||
0x2441453,
|
||||
0xd8a1e681,
|
||||
0xe7d3fbc8,
|
||||
0x21e1cde6,
|
||||
0xc33707d6,
|
||||
0xf4d50d87,
|
||||
0x455a14ed,
|
||||
0xa9e3e905,
|
||||
0xfcefa3f8,
|
||||
0x676f02d9,
|
||||
0x8d2a4c8a,
|
||||
|
||||
/* round 3 */
|
||||
/*[32]*/0xfffa3942,
|
||||
0x8771f681,
|
||||
0x6d9d6122,
|
||||
0xfde5380c,
|
||||
0xa4beea44,
|
||||
0x4bdecfa9,
|
||||
0xf6bb4b60,
|
||||
0xbebfbc70,
|
||||
0x289b7ec6,
|
||||
0xeaa127fa,
|
||||
0xd4ef3085,
|
||||
0x4881d05,
|
||||
0xd9d4d039,
|
||||
0xe6db99e5,
|
||||
0x1fa27cf8,
|
||||
0xc4ac5665,
|
||||
|
||||
/* round 4 */
|
||||
/*[48]*/0xf4292244,
|
||||
0x432aff97,
|
||||
0xab9423a7,
|
||||
0xfc93a039,
|
||||
0x655b59c3,
|
||||
0x8f0ccc92,
|
||||
0xffeff47d,
|
||||
0x85845dd1,
|
||||
0x6fa87e4f,
|
||||
0xfe2ce6e0,
|
||||
0xa3014314,
|
||||
0x4e0811a1,
|
||||
0xf7537e82,
|
||||
0xbd3af235,
|
||||
0x2ad7d2bb,
|
||||
0xeb86d391,
|
||||
};
|
||||
|
||||
static void decode(u32int*, uchar*, ulong);
|
||||
extern void _md5block(uchar *p, ulong len, u32int *s);
|
||||
|
||||
void
|
||||
_md5block(uchar *p, ulong len, u32int *s)
|
||||
{
|
||||
u32int a, b, c, d, sh;
|
||||
u32int *t;
|
||||
uchar *end;
|
||||
u32int x[16];
|
||||
|
||||
for(end = p+len; p < end; p += 64){
|
||||
a = s[0];
|
||||
b = s[1];
|
||||
c = s[2];
|
||||
d = s[3];
|
||||
|
||||
decode(x, p, 64);
|
||||
|
||||
t = md5tab;
|
||||
sh = 0;
|
||||
for(; sh != 16; t += 4){
|
||||
a += ((c ^ d) & b) ^ d;
|
||||
a += x[sh] + t[0];
|
||||
a = (a << S11) | (a >> (32 - S11));
|
||||
a += b;
|
||||
|
||||
d += ((b ^ c) & a) ^ c;
|
||||
d += x[sh + 1] + t[1];
|
||||
d = (d << S12) | (d >> (32 - S12));
|
||||
d += a;
|
||||
|
||||
c += ((a ^ b) & d) ^ b;
|
||||
c += x[sh + 2] + t[2];
|
||||
c = (c << S13) | (c >> (32 - S13));
|
||||
c += d;
|
||||
|
||||
b += ((d ^ a) & c) ^ a;
|
||||
b += x[sh + 3] + t[3];
|
||||
b = (b << S14) | (b >> (32 - S14));
|
||||
b += c;
|
||||
|
||||
sh += 4;
|
||||
}
|
||||
sh = 1;
|
||||
for(; sh != 1+20*4; t += 4){
|
||||
a += ((b ^ c) & d) ^ c;
|
||||
a += x[sh & 0xf] + t[0];
|
||||
a = (a << S21) | (a >> (32 - S21));
|
||||
a += b;
|
||||
|
||||
d += ((a ^ b) & c) ^ b;
|
||||
d += x[(sh + 5) & 0xf] + t[1];
|
||||
d = (d << S22) | (d >> (32 - S22));
|
||||
d += a;
|
||||
|
||||
c += ((d ^ a) & b) ^ a;
|
||||
c += x[(sh + 10) & 0xf] + t[2];
|
||||
c = (c << S23) | (c >> (32 - S23));
|
||||
c += d;
|
||||
|
||||
b += ((c ^ d) & a) ^ d;
|
||||
b += x[(sh + 15) & 0xf] + t[3];
|
||||
b = (b << S24) | (b >> (32 - S24));
|
||||
b += c;
|
||||
|
||||
sh += 20;
|
||||
}
|
||||
sh = 5;
|
||||
for(; sh != 5+12*4; t += 4){
|
||||
a += b ^ c ^ d;
|
||||
a += x[sh & 0xf] + t[0];
|
||||
a = (a << S31) | (a >> (32 - S31));
|
||||
a += b;
|
||||
|
||||
d += a ^ b ^ c;
|
||||
d += x[(sh + 3) & 0xf] + t[1];
|
||||
d = (d << S32) | (d >> (32 - S32));
|
||||
d += a;
|
||||
|
||||
c += d ^ a ^ b;
|
||||
c += x[(sh + 6) & 0xf] + t[2];
|
||||
c = (c << S33) | (c >> (32 - S33));
|
||||
c += d;
|
||||
|
||||
b += c ^ d ^ a;
|
||||
b += x[(sh + 9) & 0xf] + t[3];
|
||||
b = (b << S34) | (b >> (32 - S34));
|
||||
b += c;
|
||||
|
||||
sh += 12;
|
||||
}
|
||||
sh = 0;
|
||||
for(; sh != 28*4; t += 4){
|
||||
a += c ^ (b | ~d);
|
||||
a += x[sh & 0xf] + t[0];
|
||||
a = (a << S41) | (a >> (32 - S41));
|
||||
a += b;
|
||||
|
||||
d += b ^ (a | ~c);
|
||||
d += x[(sh + 7) & 0xf] + t[1];
|
||||
d = (d << S42) | (d >> (32 - S42));
|
||||
d += a;
|
||||
|
||||
c += a ^ (d | ~b);
|
||||
c += x[(sh + 14) & 0xf] + t[2];
|
||||
c = (c << S43) | (c >> (32 - S43));
|
||||
c += d;
|
||||
|
||||
b += d ^ (c | ~a);
|
||||
b += x[(sh + 21) & 0xf] + t[3];
|
||||
b = (b << S44) | (b >> (32 - S44));
|
||||
b += c;
|
||||
|
||||
sh += 28;
|
||||
}
|
||||
|
||||
s[0] += a;
|
||||
s[1] += b;
|
||||
s[2] += c;
|
||||
s[3] += d;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* decodes input (uchar) into output (u32int). Assumes len is
|
||||
* a multiple of 4.
|
||||
*/
|
||||
static void
|
||||
decode(u32int *output, uchar *input, ulong len)
|
||||
{
|
||||
uchar *e;
|
||||
|
||||
for(e = input+len; input < e; input += 4)
|
||||
*output++ = input[0] | (input[1] << 8) |
|
||||
(input[2] << 16) | (input[3] << 24);
|
||||
}
|
||||
|
|
@ -0,0 +1,189 @@
|
|||
#include <u.h>
|
||||
#include <libc.h>
|
||||
#include <libsec.h>
|
||||
|
||||
void
|
||||
_sha1block(uchar *p, ulong len, u32int *s)
|
||||
{
|
||||
u32int a, b, c, d, e, x;
|
||||
uchar *end;
|
||||
u32int *wp, *wend;
|
||||
u32int w[80];
|
||||
|
||||
/* at this point, we have a multiple of 64 bytes */
|
||||
for(end = p+len; p < end;){
|
||||
a = s[0];
|
||||
b = s[1];
|
||||
c = s[2];
|
||||
d = s[3];
|
||||
e = s[4];
|
||||
|
||||
wend = w + 15;
|
||||
for(wp = w; wp < wend; wp += 5){
|
||||
wp[0] = (p[0]<<24) | (p[1]<<16) | (p[2]<<8) | p[3];
|
||||
e += ((a<<5) | (a>>27)) + wp[0];
|
||||
e += 0x5a827999 + (((c^d)&b)^d);
|
||||
b = (b<<30)|(b>>2);
|
||||
|
||||
wp[1] = (p[4]<<24) | (p[5]<<16) | (p[6]<<8) | p[7];
|
||||
d += ((e<<5) | (e>>27)) + wp[1];
|
||||
d += 0x5a827999 + (((b^c)&a)^c);
|
||||
a = (a<<30)|(a>>2);
|
||||
|
||||
wp[2] = (p[8]<<24) | (p[9]<<16) | (p[10]<<8) | p[11];
|
||||
c += ((d<<5) | (d>>27)) + wp[2];
|
||||
c += 0x5a827999 + (((a^b)&e)^b);
|
||||
e = (e<<30)|(e>>2);
|
||||
|
||||
wp[3] = (p[12]<<24) | (p[13]<<16) | (p[14]<<8) | p[15];
|
||||
b += ((c<<5) | (c>>27)) + wp[3];
|
||||
b += 0x5a827999 + (((e^a)&d)^a);
|
||||
d = (d<<30)|(d>>2);
|
||||
|
||||
wp[4] = (p[16]<<24) | (p[17]<<16) | (p[18]<<8) | p[19];
|
||||
a += ((b<<5) | (b>>27)) + wp[4];
|
||||
a += 0x5a827999 + (((d^e)&c)^e);
|
||||
c = (c<<30)|(c>>2);
|
||||
|
||||
p += 20;
|
||||
}
|
||||
|
||||
wp[0] = (p[0]<<24) | (p[1]<<16) | (p[2]<<8) | p[3];
|
||||
e += ((a<<5) | (a>>27)) + wp[0];
|
||||
e += 0x5a827999 + (((c^d)&b)^d);
|
||||
b = (b<<30)|(b>>2);
|
||||
|
||||
x = wp[-2] ^ wp[-7] ^ wp[-13] ^ wp[-15];
|
||||
wp[1] = (x<<1) | (x>>31);
|
||||
d += ((e<<5) | (e>>27)) + wp[1];
|
||||
d += 0x5a827999 + (((b^c)&a)^c);
|
||||
a = (a<<30)|(a>>2);
|
||||
|
||||
x = wp[-1] ^ wp[-6] ^ wp[-12] ^ wp[-14];
|
||||
wp[2] = (x<<1) | (x>>31);
|
||||
c += ((d<<5) | (d>>27)) + wp[2];
|
||||
c += 0x5a827999 + (((a^b)&e)^b);
|
||||
e = (e<<30)|(e>>2);
|
||||
|
||||
x = wp[0] ^ wp[-5] ^ wp[-11] ^ wp[-13];
|
||||
wp[3] = (x<<1) | (x>>31);
|
||||
b += ((c<<5) | (c>>27)) + wp[3];
|
||||
b += 0x5a827999 + (((e^a)&d)^a);
|
||||
d = (d<<30)|(d>>2);
|
||||
|
||||
x = wp[1] ^ wp[-4] ^ wp[-10] ^ wp[-12];
|
||||
wp[4] = (x<<1) | (x>>31);
|
||||
a += ((b<<5) | (b>>27)) + wp[4];
|
||||
a += 0x5a827999 + (((d^e)&c)^e);
|
||||
c = (c<<30)|(c>>2);
|
||||
|
||||
wp += 5;
|
||||
p += 4;
|
||||
|
||||
wend = w + 40;
|
||||
for(; wp < wend; wp += 5){
|
||||
x = wp[-3] ^ wp[-8] ^ wp[-14] ^ wp[-16];
|
||||
wp[0] = (x<<1) | (x>>31);
|
||||
e += ((a<<5) | (a>>27)) + wp[0];
|
||||
e += 0x6ed9eba1 + (b^c^d);
|
||||
b = (b<<30)|(b>>2);
|
||||
|
||||
x = wp[-2] ^ wp[-7] ^ wp[-13] ^ wp[-15];
|
||||
wp[1] = (x<<1) | (x>>31);
|
||||
d += ((e<<5) | (e>>27)) + wp[1];
|
||||
d += 0x6ed9eba1 + (a^b^c);
|
||||
a = (a<<30)|(a>>2);
|
||||
|
||||
x = wp[-1] ^ wp[-6] ^ wp[-12] ^ wp[-14];
|
||||
wp[2] = (x<<1) | (x>>31);
|
||||
c += ((d<<5) | (d>>27)) + wp[2];
|
||||
c += 0x6ed9eba1 + (e^a^b);
|
||||
e = (e<<30)|(e>>2);
|
||||
|
||||
x = wp[0] ^ wp[-5] ^ wp[-11] ^ wp[-13];
|
||||
wp[3] = (x<<1) | (x>>31);
|
||||
b += ((c<<5) | (c>>27)) + wp[3];
|
||||
b += 0x6ed9eba1 + (d^e^a);
|
||||
d = (d<<30)|(d>>2);
|
||||
|
||||
x = wp[1] ^ wp[-4] ^ wp[-10] ^ wp[-12];
|
||||
wp[4] = (x<<1) | (x>>31);
|
||||
a += ((b<<5) | (b>>27)) + wp[4];
|
||||
a += 0x6ed9eba1 + (c^d^e);
|
||||
c = (c<<30)|(c>>2);
|
||||
}
|
||||
|
||||
wend = w + 60;
|
||||
for(; wp < wend; wp += 5){
|
||||
x = wp[-3] ^ wp[-8] ^ wp[-14] ^ wp[-16];
|
||||
wp[0] = (x<<1) | (x>>31);
|
||||
e += ((a<<5) | (a>>27)) + wp[0];
|
||||
e += 0x8f1bbcdc + ((b&c)|((b|c)&d));
|
||||
b = (b<<30)|(b>>2);
|
||||
|
||||
x = wp[-2] ^ wp[-7] ^ wp[-13] ^ wp[-15];
|
||||
wp[1] = (x<<1) | (x>>31);
|
||||
d += ((e<<5) | (e>>27)) + wp[1];
|
||||
d += 0x8f1bbcdc + ((a&b)|((a|b)&c));
|
||||
a = (a<<30)|(a>>2);
|
||||
|
||||
x = wp[-1] ^ wp[-6] ^ wp[-12] ^ wp[-14];
|
||||
wp[2] = (x<<1) | (x>>31);
|
||||
c += ((d<<5) | (d>>27)) + wp[2];
|
||||
c += 0x8f1bbcdc + ((e&a)|((e|a)&b));
|
||||
e = (e<<30)|(e>>2);
|
||||
|
||||
x = wp[0] ^ wp[-5] ^ wp[-11] ^ wp[-13];
|
||||
wp[3] = (x<<1) | (x>>31);
|
||||
b += ((c<<5) | (c>>27)) + wp[3];
|
||||
b += 0x8f1bbcdc + ((d&e)|((d|e)&a));
|
||||
d = (d<<30)|(d>>2);
|
||||
|
||||
x = wp[1] ^ wp[-4] ^ wp[-10] ^ wp[-12];
|
||||
wp[4] = (x<<1) | (x>>31);
|
||||
a += ((b<<5) | (b>>27)) + wp[4];
|
||||
a += 0x8f1bbcdc + ((c&d)|((c|d)&e));
|
||||
c = (c<<30)|(c>>2);
|
||||
}
|
||||
|
||||
wend = w + 80;
|
||||
for(; wp < wend; wp += 5){
|
||||
x = wp[-3] ^ wp[-8] ^ wp[-14] ^ wp[-16];
|
||||
wp[0] = (x<<1) | (x>>31);
|
||||
e += ((a<<5) | (a>>27)) + wp[0];
|
||||
e += 0xca62c1d6 + (b^c^d);
|
||||
b = (b<<30)|(b>>2);
|
||||
|
||||
x = wp[-2] ^ wp[-7] ^ wp[-13] ^ wp[-15];
|
||||
wp[1] = (x<<1) | (x>>31);
|
||||
d += ((e<<5) | (e>>27)) + wp[1];
|
||||
d += 0xca62c1d6 + (a^b^c);
|
||||
a = (a<<30)|(a>>2);
|
||||
|
||||
x = wp[-1] ^ wp[-6] ^ wp[-12] ^ wp[-14];
|
||||
wp[2] = (x<<1) | (x>>31);
|
||||
c += ((d<<5) | (d>>27)) + wp[2];
|
||||
c += 0xca62c1d6 + (e^a^b);
|
||||
e = (e<<30)|(e>>2);
|
||||
|
||||
x = wp[0] ^ wp[-5] ^ wp[-11] ^ wp[-13];
|
||||
wp[3] = (x<<1) | (x>>31);
|
||||
b += ((c<<5) | (c>>27)) + wp[3];
|
||||
b += 0xca62c1d6 + (d^e^a);
|
||||
d = (d<<30)|(d>>2);
|
||||
|
||||
x = wp[1] ^ wp[-4] ^ wp[-10] ^ wp[-12];
|
||||
wp[4] = (x<<1) | (x>>31);
|
||||
a += ((b<<5) | (b>>27)) + wp[4];
|
||||
a += 0xca62c1d6 + (c^d^e);
|
||||
c = (c<<30)|(c>>2);
|
||||
}
|
||||
|
||||
/* save state */
|
||||
s[0] += a;
|
||||
s[1] += b;
|
||||
s[2] += c;
|
||||
s[3] += d;
|
||||
s[4] += e;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue