SecurityPkg TcgStorageOpalLib: Update ComId for Block SID command.

The ComId for Block SID authentication command is
0x0005 according to "TCG Storage Feature Set: Block
SID Authentication Specification Version 1.0.0". Update code to
follow this spec requirement.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>

diff --git a/MdePkg/Include/IndustryStandard/TcgStorageCore.h b/MdePkg/Include/IndustryStandard/TcgStorageCore.h
index 9549c00b333ad5a45195d91fbff940468935d41a..74253f804d1c48f17364af3032a47170fcae5e29 100644 (file)
--- a/MdePkg/Include/IndustryStandard/TcgStorageCore.h
+++ b/MdePkg/Include/IndustryStandard/TcgStorageCore.h
@@ -261,6 +261,10 @@ ATA 8 Rev6a Table 68 7.57.6.2
 \r
 #define TCG_RESERVED_COMID 0x0000\r
 \r
+// Defined in TCG Storage Feature Set:Block SID Authentication spec,\r
+// ComId used for BlockSid command is hardcode 0x0005.\r
+#define TCG_BLOCKSID_COMID 0x0005\r
+\r
 #pragma pack(1)\r
 typedef struct {\r
   UINT8   Reserved[6];\r

diff --git a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c b/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c
index 2db5ffeba9c86b33f0eb735965a28f703ecb2cc9..f60a427012bc4480359a23f2d28cdf6a348cdb8b 100644 (file)
--- a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c
+++ b/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c
@@ -258,7 +258,7 @@ OpalBlockSid(
                   Session->Sscp,\r
                   Session->MediaId,\r
                   TCG_OPAL_SECURITY_PROTOCOL_2,\r
-                  Session->OpalBaseComId,\r
+                  TCG_BLOCKSID_COMID,   // hardcode ComID 0x0005\r
                   1,\r
                   Buffer,\r
                   BUFFER_SIZE\r