narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[digest] split out hashing part

pull/57/head
Bernhard M. Wiedemann 2016-10-10 15:09:07 +02:00
parent 827dd1bfee
commit 80d08fecb7
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/hci/commands/digest_cmd.c
View File

@ -48,6 +48,35 @@ static struct command_descriptor digest_cmd =
COMMAND_DESC ( struct digest_options, digest_opts, 1, MAX_ARGUMENTS, COMMAND_DESC ( struct digest_options, digest_opts, 1, MAX_ARGUMENTS,
"<image> [<image>...]" ); "<image> [<image>...]" );
static int digest_one(char *imageuri, uint8_t *digest_out, struct image **image, struct digest_algorithm *digest) {
uint8_t digest_ctx[digest->ctxsize];
size_t frag_len;
uint8_t buf[128];
size_t offset;
size_t len;
int rc;
/* Acquire image */
if ( ( rc = imgacquire ( imageuri, 0, image ) ) != 0 )
return rc;
offset = 0;
len = (*image)->len;
/* calculate digest */
digest_init ( digest, digest_ctx );
while ( len ) {
frag_len = len;
if ( frag_len > sizeof ( buf ) )
frag_len = sizeof ( buf );
copy_from_user ( buf, (*image)->data, offset, frag_len );
digest_update ( digest, digest_ctx, buf, frag_len );
len -= frag_len;
offset += frag_len;
}
digest_final ( digest, digest_ctx, digest_out );
return 0;
}
/** /**
* The "digest" command * The "digest" command
* *
@ -60,12 +89,7 @@ static int digest_exec ( int argc, char **argv,
struct digest_algorithm *digest ) { struct digest_algorithm *digest ) {
struct digest_options opts; struct digest_options opts;
struct image *image; struct image *image;
uint8_t digest_ctx[digest->ctxsize];
uint8_t digest_out[digest->digestsize]; uint8_t digest_out[digest->digestsize];
uint8_t buf[128];
size_t offset;
size_t len;
size_t frag_len;
int i; int i;
unsigned j; unsigned j;
int rc; int rc;
@ -76,24 +100,8 @@ static int digest_exec ( int argc, char **argv,
for ( i = optind ; i < argc ; i++ ) { for ( i = optind ; i < argc ; i++ ) {
/* Acquire image */ if ( ( rc = digest_one ( argv[i], digest_out, &image, digest) ) != 0 )
if ( ( rc = imgacquire ( argv[i], 0, &image ) ) != 0 )
continue; continue;
offset = 0;
len = image->len;
/* calculate digest */
digest_init ( digest, digest_ctx );
while ( len ) {
frag_len = len;
if ( frag_len > sizeof ( buf ) )
frag_len = sizeof ( buf );
copy_from_user ( buf, image->data, offset, frag_len );
digest_update ( digest, digest_ctx, buf, frag_len );
len -= frag_len;
offset += frag_len;
}
digest_final ( digest, digest_ctx, digest_out );
for ( j = 0 ; j < sizeof ( digest_out ) ; j++ ) for ( j = 0 ; j < sizeof ( digest_out ) ; j++ )
printf ( "%02x", digest_out[j] ); printf ( "%02x", digest_out[j] );