/*
* Copyright (c) 1999, 2000-2001 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License"). You may not use this file except in compliance with the
- * License. Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
*
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
*
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
/*
static DWORD mutexCreatorId = 0;
#endif
+#if 0
#pragma mark -
#pragma mark * * * Static Utility functions * * *
+#endif
/* All error checking should be done in the function that calls these */
static void
prng_do_SHA1(GEN_CTX *ctx)
{
- SHA1_CTX sha;
+ YSHA1_CTX sha;
- SHA1Init(&sha);
- SHA1Update(&sha,ctx->IV,20);
- SHA1Update(&sha,ctx->out,20);
- SHA1Final(ctx->out,&sha);
+ YSHA1Init(&sha);
+ YSHA1Update(&sha,ctx->IV,20);
+ YSHA1Update(&sha,ctx->out,20);
+ YSHA1Final(ctx->out,&sha);
ctx->index = 0;
}
static void
prng_make_new_state(GEN_CTX *ctx,BYTE *newState)
{
- SHA1_CTX sha;
+ YSHA1_CTX sha;
memcpy(ctx->IV,newState,20);
- SHA1Init(&sha);
- SHA1Update(&sha,ctx->IV,20);
- SHA1Final(ctx->out,&sha);
+ YSHA1Init(&sha);
+ YSHA1Update(&sha,ctx->IV,20);
+ YSHA1Final(ctx->out,&sha);
ctx->numout = 0;
ctx->index = 0;
}
prng_slow_init(PRNG *p)
/* This fails silently and must be fixed. */
{
- SHA1_CTX* ctx = NULL;
+ YSHA1_CTX* ctx = NULL;
MMPTR mmctx = MM_NULL;
BYTE* bigbuf = NULL;
MMPTR mmbigbuf = MM_NULL;
if(mmbuf == MM_NULL) {goto cleanup_slow_init;}
buf = (BYTE*)mmGetPtr(mmbuf);
- mmctx = mmMalloc(sizeof(SHA1_CTX));
+ mmctx = mmMalloc(sizeof(YSHA1_CTX));
if(mmctx == MM_NULL) {goto cleanup_slow_init;}
- ctx = (SHA1_CTX*)mmGetPtr(mmctx);
+ ctx = (YSHA1_CTX*)mmGetPtr(mmctx);
/* Initialize the secret state. */
/* Init entropy pool */
- SHA1Init(&p->pool);
+ YSHA1Init(&p->pool);
/* Init output generator */
polllength = prng_slow_poll(bigbuf,SPLEN);
- SHA1Init(ctx);
- SHA1Update(ctx,bigbuf,polllength);
- SHA1Final(buf,ctx);
+ YSHA1Init(ctx);
+ YSHA1Update(ctx,bigbuf,polllength);
+ YSHA1Final(buf,ctx);
prng_make_new_state(&p->outstate, buf);
cleanup_slow_init:
/* In-place modifed bubble sort */
static void
-bubbleSort(UINT *data,UINT len)
+bubbleSort( UINT *data, LONG len )
{
- UINT i,last,newlast,temp;
+ LONG i,last,newlast;
+ UINT temp;
last = len-1;
while(last!=-1)
}
}
+#if 0
#pragma mark -
#pragma mark * * * Public functions * * *
+#endif
/* Set up the PRNG */
prng_error_status
/* Initialize the secret state. */
/* FIXME - might want to make this an option here and have the caller
* do it after we return....? */
- SHA1Init(&p->pool);
+ YSHA1Init(&p->pool);
#if SLOW_POLL_ENABLE
prng_slow_init(p); /* Does a slow poll and then calls prng_make_state(...) */
#else
#if defined(macintosh) || defined(__APPLE__)
#if (defined(TARGET_API_MAC_OSX) || defined(KERNEL_BUILD))
struct timeval tv;
- int32_t endTime;
- #else TARGET_API_MAC_CARBON
+ int64_t endTime, curTime;
+ #else /* TARGET_API_MAC_CARBON */
UnsignedWide uwide; /* struct needed for Microseconds() */
LONGLONG start;
LONGLONG now;
#if (defined(TARGET_API_MAC_OSX) || defined(KERNEL_BUILD))
/* note we can't loop for more than a million microseconds */
#ifdef KERNEL_BUILD
- microtime (&tv);
+ microuptime (&tv);
#else
gettimeofday(&tv, NULL);
#endif
- endTime = tv.tv_usec + ticks;
- if(endTime > 1000000) {
- /* handle rollover now */
- endTime -= 1000000;
- }
+ endTime = (int64_t)tv.tv_sec*1000000LL + (int64_t)tv.tv_usec + ticks;
#else /* TARGET_API_MAC_OSX */
Microseconds(&uwide);
start = UnsignedWideToUInt64(uwide);
{
/* Do a couple of iterations between time checks */
prngOutput(p, buf,64);
- SHA1Update(&p->pool,buf,64);
+ YSHA1Update(&p->pool,buf,64);
prngOutput(p, buf,64);
- SHA1Update(&p->pool,buf,64);
+ YSHA1Update(&p->pool,buf,64);
prngOutput(p, buf,64);
- SHA1Update(&p->pool,buf,64);
+ YSHA1Update(&p->pool,buf,64);
prngOutput(p, buf,64);
- SHA1Update(&p->pool,buf,64);
+ YSHA1Update(&p->pool,buf,64);
prngOutput(p, buf,64);
- SHA1Update(&p->pool,buf,64);
+ YSHA1Update(&p->pool,buf,64);
#if defined(macintosh) || defined(__APPLE__)
#if defined(TARGET_API_MAC_OSX) || defined(KERNEL_BUILD)
#ifdef TARGET_API_MAC_OSX
gettimeofday(&tv, NULL);
#else
- microtime (&tv);
+ microuptime (&tv);
+ curTime = (int64_t)tv.tv_sec*1000000LL + (int64_t)tv.tv_usec;
#endif
- } while(tv.tv_usec < endTime);
+ } while(curTime < endTime);
#else
Microseconds(&uwide);
now = UnsignedWideToUInt64(uwide);
#else
} while ( (now-start) < ticks) ;
#endif
- SHA1Final(dig,&p->pool);
- SHA1Update(&p->pool,dig,20);
- SHA1Final(dig,&p->pool);
+ YSHA1Final(dig,&p->pool);
+ YSHA1Update(&p->pool,dig,20);
+ YSHA1Final(dig,&p->pool);
/* Reset secret state */
- SHA1Init(&p->pool);
+ YSHA1Init(&p->pool);
prng_make_new_state(&p->outstate,dig);
/* Clear counter variables */
PCHECK(buf);
/* Put the data into the entropy, add some data from the unknown state, reseed */
- SHA1Update(&p->pool,buf,20); /* Put it into the entropy pool */
+ YSHA1Update(&p->pool,buf,20); /* Put it into the entropy pool */
prng_do_SHA1(&p->outstate); /* Output 20 more bytes and */
- SHA1Update(&p->pool,p->outstate.out,20);/* add it to the pool as well. */
+ YSHA1Update(&p->pool,p->outstate.out,20);/* add it to the pool as well. */
prngForceReseed(p, ticks); /* Do a reseed */
return prngOutput(p, buf,20); /* Return the first 20 bytes of output in buf */
}
prng_error_status
prngStretch(BYTE *inbuf,UINT inbuflen,BYTE *outbuf,UINT outbuflen) {
long int left,prev;
- SHA1_CTX ctx;
+ YSHA1_CTX ctx;
BYTE dig[20];
PCHECK(inbuf);
}
else /* Extend using SHA1 hash of inbuf */
{
- SHA1Init(&ctx);
- SHA1Update(&ctx,inbuf,inbuflen);
- SHA1Final(dig,&ctx);
+ YSHA1Init(&ctx);
+ YSHA1Update(&ctx,inbuf,inbuflen);
+ YSHA1Final(dig,&ctx);
for(prev=0,left=outbuflen;left>0;prev+=20,left-=20)
{
- SHA1Update(&ctx,dig,20);
- SHA1Final(dig,&ctx);
+ YSHA1Update(&ctx,dig,20);
+ YSHA1Final(dig,&ctx);
memcpy(outbuf+prev,dig,(left>20)?20:left);
}
trashMemory(dig,20*sizeof(BYTE));
/* Add entropy to the PRNG from a source */
prng_error_status
-prngInput(PRNG *p, BYTE *inbuf,UINT inbuflen,UINT poolnum,UINT estbits)
+prngInput(PRNG *p, BYTE *inbuf,UINT inbuflen,UINT poolnum, __unused UINT estbits)
{
#ifndef YARROW_KERNEL
comp_error_status resp;
if(poolnum >= TOTAL_SOURCES) {return PRNG_ERR_OUT_OF_BOUNDS;}
/* Add to entropy pool */
- SHA1Update(&p->pool,inbuf,inbuflen);
+ YSHA1Update(&p->pool,inbuf,inbuflen);
#ifndef YARROW_KERNEL
/* skip this step for the kernel */
prngAllowReseed(PRNG *p, LONGLONG ticks)
{
UINT temp[TOTAL_SOURCES];
- UINT i,sum;
+ LONG i;
+ UINT sum;
#ifndef KERNEL_BUILD
float ratio;
#endif
+#ifndef KERNEL_BUILD
comp_error_status resp;
-
+#endif
CHECKSTATE(p);
projects / apple / xnu.git / blobdiff