Skip to contentSkip to conversation

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

PATCH Superseded Gaurav Rana 2 participants 3 messages Feb 20, 2015 – Feb 24, 2015 Crypto API

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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.

---
Changes in v2:
Modify blob_help_text[] array.

 common/cmd_blob.c             | 18 ++++++++++--------
 drivers/crypto/fsl/fsl_blob.c |  4 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)
common/cmd_blob.c +10 -8
index 82ecaf0..6178939 100644
@@ -90,17 +90,19 @@ static char blob_help_text[] =
 	"enc src dst len km - Encapsulate and create blob of data\n"
 	"                          $len bytes long at address $src and\n"
 	"                          store the result at address $dst.\n"
-	"                          $km is the 16 byte key modifier\n"
-	"                          is also required for generation/use as\n"
-	"                          key for cryptographic operation. Key\n"
-	"                          modifier should be 16 byte long.\n"
+	"                          $km is the address where the key\n"
+	"                          modifier is stored.\n"
+	"                          The modifier is required for generation\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"
 	"                          $src and store result of $len byte at\n"
 	"                          addr $dst.\n"
-	"                          $km is the 16 byte key modifier\n"
-	"                          is also required for generation/use as\n"
-	"                          key for cryptographic operation. Key\n"
-	"                          modifier should be 16 byte long.\n";
+	"                          $km is the address where the key\n"
+	"                          modifier is stored.\n"
+	"                          The modifier is required for generation\n"
+	"                          /use as key for cryptographic operation.\n"
+	"                          Key modifier should be 16 byte long.\n"
 
 U_BOOT_CMD(
 	blob, 6, 1, do_blob,
drivers/crypto/fsl/fsl_blob.c +2 -2
index bc01075..9923bcb 100644
@@ -11,7 +11,7 @@
 #include "desc.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;
 	u32 *desc;
@@ -36,7 +36,7 @@ int blob_decrypt(u8 *key_mod, u8 *src, u8 *dst, u8 len)
 	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;
 	u32 *desc;
Signature · 1 line
1.8.1.4
#1 lore raw

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

Quoted 39 lines · Gaurav Rana

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.

---
Changes in v2:
Modify blob_help_text[] array.

 common/cmd_blob.c             | 18 ++++++++++--------
 drivers/crypto/fsl/fsl_blob.c |  4 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)
common/cmd_blob.c +5 -4
index 82ecaf0..6178939 100644
@@ -90,17 +90,19 @@ static char blob_help_text[] =
 	"enc src dst len km - Encapsulate and create blob of data\n"
 	"                          $len bytes long at address $src and\n"
 	"                          store the result at address $dst.\n"
-	"                          $km is the 16 byte key modifier\n"
-	"                          is also required for generation/use as\n"
-	"                          key for cryptographic operation. Key\n"
-	"                          modifier should be 16 byte long.\n"
+	"                          $km is the address where the key\n"
+	"                          modifier is stored.\n"
+	"                          The modifier is required for generation\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"
 	"                          $src and store result of $len byte at\n"

common/cmd_blob.c static char blob_help_text[] = · line 105

Quoted 10 lines
common/cmd_blob.c +5 -4
 	"                          addr $dst.\n"
-	"                          $km is the 16 byte key modifier\n"
-	"                          is also required for generation/use as\n"
-	"                          key for cryptographic operation. Key\n"
-	"                          modifier should be 16 byte long.\n";
+	"                          $km is the address where the key\n"
+	"                          modifier is stored.\n"
+	"                          The modifier is required for generation\n"
+	"                          /use as key for cryptographic operation.\n"
+	"                          Key modifier should be 16 byte long.\n"

You removed the semicolon here. Did you see any compiling error?

York

#2 lore raw

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

Quoted 46 lines · York Sun
Quoted 43 lines · Gaurav Rana

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.

---
Changes in v2:
Modify blob_help_text[] array.

 common/cmd_blob.c             | 18 ++++++++++--------
 drivers/crypto/fsl/fsl_blob.c |  4 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)
common/cmd_blob.c +5 -7
index 82ecaf0..6178939 100644
@@ -90,17 +90,19 @@ static char blob_help_text[] =
 	"enc src dst len km - Encapsulate and create blob of data\n"
 	"                          $len bytes long at address $src and\n"
 	"                          store the result at address $dst.\n"
-	"                          $km is the 16 byte key modifier\n"
-	"                          is also required for generation/use as\n"
-	"                          key for cryptographic operation. Key\n"
-	"                          modifier should be 16 byte long.\n"
+	"                          $km is the address where the key\n"
+	"                          modifier is stored.\n"
+	"                          The modifier is required for generation\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"
 	"                          $src and store result of $len byte at\n"
 	"                          addr $dst.\n"
-	"                          $km is the 16 byte key modifier\n"
-	"                          is also required for generation/use as\n"
-	"                          key for cryptographic operation. Key\n"
Quoted 9 lines

common/cmd_blob.c static char blob_help_text[] = · line 105

Quoted 6 lines
common/cmd_blob.c +5 -1
-	"                          modifier should be 16 byte long.\n";
+	"                          $km is the address where the key\n"
+	"                          modifier is stored.\n"
+	"                          The modifier is required for generation\n"
+	"                          /use as key for cryptographic operation.\n"
+	"                          Key modifier should be 16 byte long.\n"

You removed the semicolon here. Did you see any compiling error?

I think the semicolon should be added back. Otherwise, secure boot boards fail to compile. I tested on LS1, P4, T2 targets. If you don't have other changes, I can fix this one.

York