crypto/fsl: Make function names consistent for blob encapsulation/decapsulation.

This patch does the following:

1. The function names for encapsulation and decapsulation
were inconsitent in freescale's implementation and cmd_blob file.
This patch corrects the issues.
2. The function protopye is also modified to change the length parameter
from u8 to u32 to allow encapsulation and decapsulation of larger images.
3. Modified the description of km paramter in the command usage for better
readability.

Signed-off-by: Gaurav Rana <gaurav.rana@freescale.com>
Reviewed-by: Ruchika Gupta <ruchika.gupta@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
master
gaurav rana 9 years ago committed by York Sun
parent 0e1bf614d5
commit 7ee8c4795d
  1. 18
      common/cmd_blob.c
  2. 4
      drivers/crypto/fsl/fsl_blob.c

@ -90,17 +90,19 @@ static char blob_help_text[] =
"enc src dst len km - Encapsulate and create blob of data\n" "enc src dst len km - Encapsulate and create blob of data\n"
" $len bytes long at address $src and\n" " $len bytes long at address $src and\n"
" store the result at address $dst.\n" " store the result at address $dst.\n"
" $km is the 16 byte key modifier\n" " $km is the address where the key\n"
" is also required for generation/use as\n" " modifier is stored.\n"
" key for cryptographic operation. Key\n" " The modifier is required for generation\n"
" modifier should be 16 byte long.\n" " /use as key for cryptographic operation.\n"
" Key modifier should be 16 byte long.\n"
"blob dec src dst len km - Decapsulate the blob of data at address\n" "blob dec src dst len km - Decapsulate the blob of data at address\n"
" $src and store result of $len byte at\n" " $src and store result of $len byte at\n"
" addr $dst.\n" " addr $dst.\n"
" $km is the 16 byte key modifier\n" " $km is the address where the key\n"
" is also required for generation/use as\n" " modifier is stored.\n"
" key for cryptographic operation. Key\n" " The modifier is required for generation\n"
" modifier should be 16 byte long.\n"; " /use as key for cryptographic operation.\n"
" Key modifier should be 16 byte long.\n";
U_BOOT_CMD( U_BOOT_CMD(
blob, 6, 1, do_blob, blob, 6, 1, do_blob,

@ -11,7 +11,7 @@
#include "desc.h" #include "desc.h"
#include "jr.h" #include "jr.h"
int blob_decrypt(u8 *key_mod, u8 *src, u8 *dst, u8 len) int blob_decap(u8 *key_mod, u8 *src, u8 *dst, u32 len)
{ {
int ret, i = 0; int ret, i = 0;
u32 *desc; u32 *desc;
@ -36,7 +36,7 @@ int blob_decrypt(u8 *key_mod, u8 *src, u8 *dst, u8 len)
return ret; return ret;
} }
int blob_encrypt(u8 *key_mod, u8 *src, u8 *dst, u8 len) int blob_encap(u8 *key_mod, u8 *src, u8 *dst, u32 len)
{ {
int ret, i = 0; int ret, i = 0;
u32 *desc; u32 *desc;

Loading…
Cancel
Save