mirror of
https://github.com/ipxe/ipxe
synced 2026-02-28 03:11:18 +03:00
[cmdline] Remove userptr_t from "digest" command
Simplify the implementation of the "digest" command by assuming that the entire image data can be passed directly to digest_update(). Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
@@ -62,10 +62,6 @@ static int digest_exec ( int argc, char **argv,
|
|||||||
struct image *image;
|
struct image *image;
|
||||||
uint8_t digest_ctx[digest->ctxsize];
|
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;
|
||||||
@@ -79,20 +75,10 @@ static int digest_exec ( int argc, char **argv,
|
|||||||
/* Acquire image */
|
/* Acquire image */
|
||||||
if ( ( rc = imgacquire ( argv[i], 0, &image ) ) != 0 )
|
if ( ( rc = imgacquire ( argv[i], 0, &image ) ) != 0 )
|
||||||
continue;
|
continue;
|
||||||
offset = 0;
|
|
||||||
len = image->len;
|
|
||||||
|
|
||||||
/* calculate digest */
|
/* Calculate digest */
|
||||||
digest_init ( digest, digest_ctx );
|
digest_init ( digest, digest_ctx );
|
||||||
while ( len ) {
|
digest_update ( digest, digest_ctx, image->data, image->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 );
|
digest_final ( digest, digest_ctx, digest_out );
|
||||||
|
|
||||||
for ( j = 0 ; j < sizeof ( digest_out ) ; j++ )
|
for ( j = 0 ; j < sizeof ( digest_out ) ; j++ )
|
||||||
|
|||||||
Reference in New Issue
Block a user