suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows: project and other repairs for rktio changes

Browse Source 
Should have been part of cda4e5befe.
This commit is contained in:
Matthew Flatt 2018-06-27 06:42:05 -06:00
parent b13f723ac6
commit 5b8aa67ea4
3 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
racket/src/rktio/rktio_sha2.c
View File

@ -31,9 +31,8 @@
#include <string.h> #include <string.h>
/* rktio requires certain integer sizes, anyway: */ /* rktio requires certain integer sizes, anyway: */
typedef unsigned int uint32_sha1_t; typedef unsigned int uint32_sha2_t;
typedef unsigned char uint8_sha1_t; typedef uintptr_t size_sha2_t;
typedef uintptr_t size_sha1_t;
typedef rktio_sha2_ctx_t mbedtls_sha256_context; typedef rktio_sha2_ctx_t mbedtls_sha256_context;
@ -48,10 +47,10 @@ typedef rktio_sha2_ctx_t mbedtls_sha256_context;
#ifndef GET_UINT32_BE #ifndef GET_UINT32_BE
#define GET_UINT32_BE(n,b,i) \ #define GET_UINT32_BE(n,b,i) \
do { \ do { \
(n) = ( (uint32_t) (b)[(i) ] << 24 ) \ (n) = ( (uint32_sha2_t) (b)[(i) ] << 24 ) \
| ( (uint32_t) (b)[(i) + 1] << 16 ) \ | ( (uint32_sha2_t) (b)[(i) + 1] << 16 ) \
| ( (uint32_t) (b)[(i) + 2] << 8 ) \ | ( (uint32_sha2_t) (b)[(i) + 2] << 8 ) \
| ( (uint32_t) (b)[(i) + 3] ); \ | ( (uint32_sha2_t) (b)[(i) + 3] ); \
} while( 0 ) } while( 0 )
#endif #endif
@ -108,7 +107,7 @@ static int mbedtls_sha256_starts_ret( mbedtls_sha256_context *ctx, int is224 )
return( 0 ); return( 0 );
} }
static const uint32_t K[] = static const uint32_sha2_t K[] =
{ {
0x428A2F98, 0x71374491, 0xB5C0FBCF, 0xE9B5DBA5, 0x428A2F98, 0x71374491, 0xB5C0FBCF, 0xE9B5DBA5,
0x3956C25B, 0x59F111F1, 0x923F82A4, 0xAB1C5ED5, 0x3956C25B, 0x59F111F1, 0x923F82A4, 0xAB1C5ED5,
@ -156,8 +155,8 @@ static const uint32_t K[] =
static int mbedtls_internal_sha256_process( mbedtls_sha256_context *ctx, static int mbedtls_internal_sha256_process( mbedtls_sha256_context *ctx,
const unsigned char data[64] ) const unsigned char data[64] )
{ {
uint32_t temp1, temp2, W[64]; uint32_sha2_t temp1, temp2, W[64];
uint32_t A[8]; uint32_sha2_t A[8];
unsigned int i; unsigned int i;
for( i = 0; i < 8; i++ ) for( i = 0; i < 8; i++ )
@ -216,11 +215,11 @@ static int mbedtls_internal_sha256_process( mbedtls_sha256_context *ctx,
*/ */
static int mbedtls_sha256_update_ret( mbedtls_sha256_context *ctx, static int mbedtls_sha256_update_ret( mbedtls_sha256_context *ctx,
const unsigned char *input, const unsigned char *input,
size_t ilen ) size_sha2_t ilen )
{ {
int ret; int ret;
size_t fill; size_sha2_t fill;
uint32_t left; uint32_sha2_t left;
if( ilen == 0 ) if( ilen == 0 )
return( 0 ); return( 0 );
@ -228,10 +227,10 @@ static int mbedtls_sha256_update_ret( mbedtls_sha256_context *ctx,
left = ctx->total[0] & 0x3F; left = ctx->total[0] & 0x3F;
fill = 64 - left; fill = 64 - left;
ctx->total[0] += (uint32_t) ilen; ctx->total[0] += (uint32_sha2_t) ilen;
ctx->total[0] &= 0xFFFFFFFF; ctx->total[0] &= 0xFFFFFFFF;
if( ctx->total[0] < (uint32_t) ilen ) if( ctx->total[0] < (uint32_sha2_t) ilen )
ctx->total[1]++; ctx->total[1]++;
if( left && ilen >= fill ) if( left && ilen >= fill )
@ -276,8 +275,8 @@ static int mbedtls_sha256_finish_ret( mbedtls_sha256_context *ctx,
unsigned char output[32] ) unsigned char output[32] )
{ {
int ret; int ret;
uint32_t last, padn; uint32_sha2_t last, padn;
uint32_t high, low; uint32_sha2_t high, low;
unsigned char msglen[8]; unsigned char msglen[8];
high = ( ctx->total[0] >> 29 ) high = ( ctx->total[0] >> 29 )
@ -321,7 +320,7 @@ static const unsigned char sha256_test_buf[3][57] =
{ "" } { "" }
}; };
static const size_t sha256_test_buflen[3] = static const size_sha2_t sha256_test_buflen[3] =
{ {
3, 56, 1000 3, 56, 1000
}; };

8
racket/src/worksp/librktio/librktio.vcproj
View File

@ -178,6 +178,14 @@
RelativePath="..\..\rktio\rktio_convert.c" RelativePath="..\..\rktio\rktio_convert.c"
> >
</File> </File>
<File
RelativePath="..\..\rktio\rktio_sha1.c"
>
</File>
<File
RelativePath="..\..\rktio\rktio_sha2.c"
>
</File>
<File <File
RelativePath="..\..\rktio\rktio_dll.c" RelativePath="..\..\rktio\rktio_dll.c"
> >

2
racket/src/worksp/librktio/librktio.vcxproj
View File

@ -133,6 +133,8 @@
<ClCompile Include="..\..\rktio\rktio_time.c" /> <ClCompile Include="..\..\rktio\rktio_time.c" />
<ClCompile Include="..\..\rktio\rktio_syslog.c" /> <ClCompile Include="..\..\rktio\rktio_syslog.c" />
<ClCompile Include="..\..\rktio\rktio_convert.c" /> <ClCompile Include="..\..\rktio\rktio_convert.c" />
<ClCompile Include="..\..\rktio\rktio_sha1.c" />
<ClCompile Include="..\..\rktio\rktio_sha2.c" />
<ClCompile Include="..\..\rktio\rktio_dll.c" /> <ClCompile Include="..\..\rktio\rktio_dll.c" />
<ClCompile Include="..\..\rktio\rktio_error.c" /> <ClCompile Include="..\..\rktio\rktio_error.c" />
<ClCompile Include="..\..\rktio\rktio_hash.c" /> <ClCompile Include="..\..\rktio\rktio_hash.c" />