generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove crib and sabotage.

Browse Source
This commit is contained in:
Ben Laurie 2004-04-11 12:32:43 +00:00
parent 21b9c11e99
commit 364f6fb504
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fips/sha1/fips_standalone_sha1.c
View File

@ -56,9 +56,9 @@
int FIPS_selftest_fail; int FIPS_selftest_fail;
#if 0 #ifdef OPENSSL_FIPS
static void hmac_init(SHA_CTX *md_ctx,SHA_CTX *i_ctx,SHA_CTX *o_ctx, static void hmac_init(SHA_CTX *md_ctx,SHA_CTX *o_ctx,
const char *key) const char *key)
{ {
int len=strlen(key); int len=strlen(key);
@ -68,11 +68,8 @@ static void hmac_init(SHA_CTX *md_ctx,SHA_CTX *i_ctx,SHA_CTX *o_ctx,
if (len > SHA_CBLOCK) if (len > SHA_CBLOCK)
{ {
/* EVP_DigestInit_ex(&ctx->md_ctx,md, impl); */
SHA1_Init(md_ctx); SHA1_Init(md_ctx);
/* EVP_DigestUpdate(&ctx->md_ctx,key,len); */
SHA1_Update(md_ctx,key,len); SHA1_Update(md_ctx,key,len);
/* EVP_DigestFinal_ex(&(ctx->md_ctx),ctx->key,&ctx->key_length); */
SHA1_Final(keymd,md_ctx); SHA1_Final(keymd,md_ctx);
len=20; len=20;
} }
@ -82,32 +79,21 @@ static void hmac_init(SHA_CTX *md_ctx,SHA_CTX *i_ctx,SHA_CTX *o_ctx,
for(i=0 ; i < HMAC_MAX_MD_CBLOCK ; i++) for(i=0 ; i < HMAC_MAX_MD_CBLOCK ; i++)
pad[i]=0x36^keymd[i]; pad[i]=0x36^keymd[i];
/* EVP_DigestInit_ex(&ctx->i_ctx,md, impl); */
SHA1_Init(md_ctx); SHA1_Init(md_ctx);
/* EVP_DigestUpdate(&ctx->i_ctx,pad,EVP_MD_block_size(md)); */
SHA1_Update(md_ctx,pad,SHA_CBLOCK); SHA1_Update(md_ctx,pad,SHA_CBLOCK);
for(i=0 ; i < HMAC_MAX_MD_CBLOCK ; i++) for(i=0 ; i < HMAC_MAX_MD_CBLOCK ; i++)
pad[i]=0x5c^keymd[i]; pad[i]=0x5c^keymd[i];
/* EVP_DigestInit_ex(&ctx->o_ctx,md, impl); */
SHA1_Init(o_ctx); SHA1_Init(o_ctx);
/* EVP_DigestUpdate(&ctx->o_ctx,pad,EVP_MD_block_size(md)); */
SHA1_Update(o_ctx,pad,SHA_CBLOCK); SHA1_Update(o_ctx,pad,SHA_CBLOCK);
/* EVP_MD_CTX_copy_ex(&ctx->md_ctx,&ctx->i_ctx); */
/* memcpy(md_ctx,i_ctx,sizeof *md_ctx); */
} }
static void hmac_final(unsigned char *md,SHA_CTX *md_ctx,SHA_CTX *o_ctx) static void hmac_final(unsigned char *md,SHA_CTX *md_ctx,SHA_CTX *o_ctx)
{ {
unsigned char buf[20]; unsigned char buf[20];
/*EVP_DigestFinal_ex(&ctx->md_ctx,buf,&i); */
SHA1_Final(buf,md_ctx); SHA1_Final(buf,md_ctx);
/*EVP_MD_CTX_copy_ex(&ctx->md_ctx,&ctx->o_ctx); */
/* memcpy(md_ctx,o_ctx,sizeof *md_ctx); */
/*EVP_DigestUpdate(&ctx->md_ctx,buf,i); */
SHA1_Update(o_ctx,buf,sizeof buf); SHA1_Update(o_ctx,buf,sizeof buf);
/*EVP_DigestFinal_ex(&ctx->md_ctx,md,len); */
SHA1_Final(md,o_ctx); SHA1_Final(md,o_ctx);
} }
@ -128,7 +114,7 @@ int main(int argc,char **argv)
for(n=1 ; n < argc ; ++n) for(n=1 ; n < argc ; ++n)
{ {
FILE *f=fopen(argv[n],"rb"); FILE *f=fopen(argv[n],"rb");
SHA_CTX md_ctx,i_ctx,o_ctx; SHA_CTX md_ctx,o_ctx;
unsigned char md[20]; unsigned char md[20];
int i; int i;
@ -138,7 +124,7 @@ int main(int argc,char **argv)
exit(2); exit(2);
} }
hmac_init(&md_ctx,&i_ctx,&o_ctx,key); hmac_init(&md_ctx,&o_ctx,key);
for( ; ; ) for( ; ; )
{ {
char buf[1024]; char buf[1024];

2
fips/sha1/standalone.sha1
View File

@ -1,5 +1,5 @@
HMAC-SHA1(fips_sha1dgst.c)= 87dd5198b5ab3df38549422d3313126085589b60 HMAC-SHA1(fips_sha1dgst.c)= 87dd5198b5ab3df38549422d3313126085589b60
HMAC-SHA1(fips_sha1_selftest.c)= 9719f7e68950250ce4b7726be3e560c24cd72a32 HMAC-SHA1(fips_sha1_selftest.c)= 9719f7e68950250ce4b7726be3e560c24cd72a32
HMAC-SHA1(fips_standalone_sha1.c)= a66055fef7d4dcc59479746e53183738d01b8e6d HMAC-SHA1(fips_standalone_sha1.c)= c17f83ccfe601558b33b6df27d2d82887b8c9dc2
HMAC-SHA1(fips_sha_locl.h)= 199ceca9016ba5514997ce1fcd22be7d4f66e9b5 HMAC-SHA1(fips_sha_locl.h)= 199ceca9016ba5514997ce1fcd22be7d4f66e9b5
HMAC-SHA1(fips_md32_common.h)= 4dd5d27e9bedbbaab6c6c5536b254e040137471e HMAC-SHA1(fips_md32_common.h)= 4dd5d27e9bedbbaab6c6c5536b254e040137471e