From c411b485b63a671a1e276700cff025c73997233c Mon Sep 17 00:00:00 2001 From: Michael Kubacki Date: Sun, 5 Dec 2021 14:54:12 -0800 Subject: SecurityPkg: Apply uncrustify changes REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737 Apply uncrustify changes to .c/.h files in the SecurityPkg package Cc: Andrew Fish Cc: Leif Lindholm Cc: Michael D Kinney Signed-off-by: Michael Kubacki Reviewed-by: Jian J Wang --- .../Library/TcgStorageOpalLib/TcgStorageOpalUtil.c | 878 +++++++++++---------- 1 file changed, 446 insertions(+), 432 deletions(-) (limited to 'SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c') diff --git a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c b/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c index b4927a0872..19edcb5d8d 100644 --- a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c +++ b/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c @@ -11,7 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include "TcgStorageOpalLibInternal.h" -#define OPAL_MSID_LENGTH 128 +#define OPAL_MSID_LENGTH 128 /** Creates a session with OPAL_UID_ADMIN_SP as OPAL_ADMIN_SP_PSID_AUTHORITY, then reverts device using Admin SP Revert method. @@ -23,37 +23,38 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ TCG_RESULT EFIAPI -OpalUtilPsidRevert( - OPAL_SESSION *Session, - const VOID *Psid, - UINT32 PsidLength +OpalUtilPsidRevert ( + OPAL_SESSION *Session, + const VOID *Psid, + UINT32 PsidLength ) { - UINT8 MethodStatus; - TCG_RESULT Ret; - UINT32 RemovalTimeOut; + UINT8 MethodStatus; + TCG_RESULT Ret; + UINT32 RemovalTimeOut; - NULL_CHECK(Session); - NULL_CHECK(Psid); + NULL_CHECK (Session); + NULL_CHECK (Psid); RemovalTimeOut = GetRevertTimeOut (Session); DEBUG ((DEBUG_INFO, "OpalUtilPsidRevert: Timeout value = %d\n", RemovalTimeOut)); - Ret = OpalStartSession( - Session, - OPAL_UID_ADMIN_SP, - TRUE, - PsidLength, - Psid, - OPAL_ADMIN_SP_PSID_AUTHORITY, - &MethodStatus); - if (Ret == TcgResultSuccess && MethodStatus == TCG_METHOD_STATUS_CODE_SUCCESS) { - Ret = OpalPyrite2PsidRevert(Session, RemovalTimeOut); + Ret = OpalStartSession ( + Session, + OPAL_UID_ADMIN_SP, + TRUE, + PsidLength, + Psid, + OPAL_ADMIN_SP_PSID_AUTHORITY, + &MethodStatus + ); + if ((Ret == TcgResultSuccess) && (MethodStatus == TCG_METHOD_STATUS_CODE_SUCCESS)) { + Ret = OpalPyrite2PsidRevert (Session, RemovalTimeOut); if (Ret != TcgResultSuccess) { // // If revert was successful, session was already ended by TPer, so only end session on failure // - OpalEndSession(Session); + OpalEndSession (Session); } } @@ -78,31 +79,31 @@ OpalUtilPsidRevert( **/ TCG_RESULT EFIAPI -OpalUtilSetAdminPasswordAsSid( - OPAL_SESSION *Session, - const VOID *GeneratedSid, - UINT32 SidLength, - const VOID *Password, - UINT32 PassLength +OpalUtilSetAdminPasswordAsSid ( + OPAL_SESSION *Session, + const VOID *GeneratedSid, + UINT32 SidLength, + const VOID *Password, + UINT32 PassLength ) { - UINT8 MethodStatus; - TCG_RESULT Ret; - - NULL_CHECK(Session); - NULL_CHECK(GeneratedSid); - NULL_CHECK(Password); - - Ret = OpalStartSession( - Session, - OPAL_UID_ADMIN_SP, - TRUE, - SidLength, - GeneratedSid, - OPAL_ADMIN_SP_SID_AUTHORITY, - &MethodStatus - ); - if (Ret != TcgResultSuccess || MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { + UINT8 MethodStatus; + TCG_RESULT Ret; + + NULL_CHECK (Session); + NULL_CHECK (GeneratedSid); + NULL_CHECK (Password); + + Ret = OpalStartSession ( + Session, + OPAL_UID_ADMIN_SP, + TRUE, + SidLength, + GeneratedSid, + OPAL_ADMIN_SP_SID_AUTHORITY, + &MethodStatus + ); + if ((Ret != TcgResultSuccess) || (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS)) { DEBUG ((DEBUG_INFO, "start session with admin SP as SID authority failed: Ret=%d MethodStatus=%u\n", Ret, MethodStatus)); goto done; } @@ -110,16 +111,16 @@ OpalUtilSetAdminPasswordAsSid( // // 1. Update SID = new Password // - Ret = OpalSetPassword( - Session, - OPAL_UID_ADMIN_SP_C_PIN_SID, - Password, - PassLength, - &MethodStatus - ); - - if (Ret != TcgResultSuccess || MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { - OpalEndSession(Session); + Ret = OpalSetPassword ( + Session, + OPAL_UID_ADMIN_SP_C_PIN_SID, + Password, + PassLength, + &MethodStatus + ); + + if ((Ret != TcgResultSuccess) || (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS)) { + OpalEndSession (Session); DEBUG ((DEBUG_INFO, "set Password failed: Ret=%d MethodStatus=%u\n", Ret, MethodStatus)); goto done; } @@ -127,9 +128,9 @@ OpalUtilSetAdminPasswordAsSid( // // 2. Activate locking SP // - Ret = OpalActivateLockingSp(Session, &MethodStatus); - OpalEndSession(Session); - if (Ret != TcgResultSuccess || MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { + Ret = OpalActivateLockingSp (Session, &MethodStatus); + OpalEndSession (Session); + if ((Ret != TcgResultSuccess) || (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS)) { DEBUG ((DEBUG_INFO, "activate locking SP failed: Ret=%d MethodStatus=%u\n", Ret, MethodStatus)); goto done; } @@ -138,6 +139,7 @@ done: if (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { Ret = TcgResultFailure; } + return Ret; } @@ -160,36 +162,37 @@ done: **/ TCG_RESULT EFIAPI -OpalUtilSetOpalLockingRange( - OPAL_SESSION *Session, - const VOID *Password, - UINT32 PassLength, - TCG_UID LockingRangeUid, - UINT64 RangeStart, - UINT64 RangeLength, - BOOLEAN ReadLockEnabled, - BOOLEAN WriteLockEnabled, - BOOLEAN ReadLocked, - BOOLEAN WriteLocked +OpalUtilSetOpalLockingRange ( + OPAL_SESSION *Session, + const VOID *Password, + UINT32 PassLength, + TCG_UID LockingRangeUid, + UINT64 RangeStart, + UINT64 RangeLength, + BOOLEAN ReadLockEnabled, + BOOLEAN WriteLockEnabled, + BOOLEAN ReadLocked, + BOOLEAN WriteLocked ) { - UINT8 MethodStatus; - TCG_RESULT Ret; + UINT8 MethodStatus; + TCG_RESULT Ret; - NULL_CHECK(Session); - NULL_CHECK(Password); + NULL_CHECK (Session); + NULL_CHECK (Password); // // Start session with Locking SP using current admin Password // - Ret = OpalStartSession( - Session, - OPAL_UID_LOCKING_SP, - TRUE, - PassLength, - Password, - OPAL_LOCKING_SP_ADMIN1_AUTHORITY, - &MethodStatus); + Ret = OpalStartSession ( + Session, + OPAL_UID_LOCKING_SP, + TRUE, + PassLength, + Password, + OPAL_LOCKING_SP_ADMIN1_AUTHORITY, + &MethodStatus + ); if ((Ret != TcgResultSuccess) || (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS)) { DEBUG ((DEBUG_INFO, "start session with locking SP failed: Ret=%d MethodStatus=%u\n", Ret, MethodStatus)); goto done; @@ -198,19 +201,20 @@ OpalUtilSetOpalLockingRange( // // Enable locking range // - Ret = OpalSetLockingRange( - Session, - LockingRangeUid, - RangeStart, - RangeLength, - ReadLockEnabled, - WriteLockEnabled, - ReadLocked, - WriteLocked, - &MethodStatus); - - OpalEndSession(Session); - if (Ret != TcgResultSuccess || MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { + Ret = OpalSetLockingRange ( + Session, + LockingRangeUid, + RangeStart, + RangeLength, + ReadLockEnabled, + WriteLockEnabled, + ReadLocked, + WriteLocked, + &MethodStatus + ); + + OpalEndSession (Session); + if ((Ret != TcgResultSuccess) || (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS)) { DEBUG ((DEBUG_INFO, "set locking range failed: Ret=%d MethodStatus=0x%x\n", Ret, MethodStatus)); } @@ -218,6 +222,7 @@ done: if (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { Ret = TcgResultFailure; } + return Ret; } @@ -235,7 +240,7 @@ done: **/ TCG_RESULT EFIAPI -OpalUtilSetAdminPassword( +OpalUtilSetAdminPassword ( OPAL_SESSION *Session, const VOID *OldPassword, UINT32 OldPasswordLength, @@ -243,26 +248,26 @@ OpalUtilSetAdminPassword( UINT32 NewPasswordLength ) { - TCG_RESULT Ret; - UINT8 MethodStatus; + TCG_RESULT Ret; + UINT8 MethodStatus; - NULL_CHECK(Session); - NULL_CHECK(OldPassword); - NULL_CHECK(NewPassword); + NULL_CHECK (Session); + NULL_CHECK (OldPassword); + NULL_CHECK (NewPassword); // // Unknown ownership // - Ret = OpalStartSession( - Session, - OPAL_UID_ADMIN_SP, - TRUE, - OldPasswordLength, - OldPassword, - OPAL_ADMIN_SP_SID_AUTHORITY, - &MethodStatus - ); - if (Ret != TcgResultSuccess || MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { + Ret = OpalStartSession ( + Session, + OPAL_UID_ADMIN_SP, + TRUE, + OldPasswordLength, + OldPassword, + OPAL_ADMIN_SP_SID_AUTHORITY, + &MethodStatus + ); + if ((Ret != TcgResultSuccess) || (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS)) { DEBUG ((DEBUG_INFO, "start session with admin SP using old Password failed\n")); goto done; } @@ -270,23 +275,23 @@ OpalUtilSetAdminPassword( // // Update SID = new pw // - Ret = OpalSetPassword(Session, OPAL_UID_ADMIN_SP_C_PIN_SID, NewPassword, NewPasswordLength, &MethodStatus); - OpalEndSession(Session); - if (Ret != TcgResultSuccess || MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { + Ret = OpalSetPassword (Session, OPAL_UID_ADMIN_SP_C_PIN_SID, NewPassword, NewPasswordLength, &MethodStatus); + OpalEndSession (Session); + if ((Ret != TcgResultSuccess) || (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS)) { DEBUG ((DEBUG_INFO, "set new admin SP Password failed\n")); goto done; } - Ret = OpalStartSession( - Session, - OPAL_UID_LOCKING_SP, - TRUE, - OldPasswordLength, - OldPassword, - OPAL_LOCKING_SP_ADMIN1_AUTHORITY, - &MethodStatus - ); - if (Ret != TcgResultSuccess || MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { + Ret = OpalStartSession ( + Session, + OPAL_UID_LOCKING_SP, + TRUE, + OldPasswordLength, + OldPassword, + OPAL_LOCKING_SP_ADMIN1_AUTHORITY, + &MethodStatus + ); + if ((Ret != TcgResultSuccess) || (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS)) { DEBUG ((DEBUG_INFO, "start session with locking SP using old Password failed\n")); goto done; } @@ -294,9 +299,9 @@ OpalUtilSetAdminPassword( // // Update admin locking SP to new pw // - Ret = OpalSetPassword(Session, OPAL_LOCKING_SP_C_PIN_ADMIN1, NewPassword, NewPasswordLength, &MethodStatus); - OpalEndSession(Session); - if (Ret != TcgResultSuccess || MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { + Ret = OpalSetPassword (Session, OPAL_LOCKING_SP_C_PIN_ADMIN1, NewPassword, NewPasswordLength, &MethodStatus); + OpalEndSession (Session); + if ((Ret != TcgResultSuccess) || (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS)) { DEBUG ((DEBUG_INFO, "set new locking SP Password failed\n")); goto done; } @@ -305,6 +310,7 @@ done: if (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { Ret = TcgResultFailure; } + return Ret; } @@ -321,43 +327,43 @@ done: **/ TCG_RESULT EFIAPI -OpalUtilSetUserPassword( - OPAL_SESSION *Session, - const VOID *OldPassword, - UINT32 OldPasswordLength, - const VOID *NewPassword, - UINT32 NewPasswordLength +OpalUtilSetUserPassword ( + OPAL_SESSION *Session, + const VOID *OldPassword, + UINT32 OldPasswordLength, + const VOID *NewPassword, + UINT32 NewPasswordLength ) { - UINT8 MethodStatus; - TCG_RESULT Ret; + UINT8 MethodStatus; + TCG_RESULT Ret; - NULL_CHECK(Session); - NULL_CHECK(OldPassword); - NULL_CHECK(NewPassword); + NULL_CHECK (Session); + NULL_CHECK (OldPassword); + NULL_CHECK (NewPassword); // // See if updating user1 authority // - Ret = OpalStartSession( - Session, - OPAL_UID_LOCKING_SP, - TRUE, - OldPasswordLength, - OldPassword, - OPAL_LOCKING_SP_USER1_AUTHORITY, - &MethodStatus - ); - if (Ret == TcgResultSuccess && MethodStatus == TCG_METHOD_STATUS_CODE_SUCCESS) { - Ret = OpalSetPassword( - Session, - OPAL_LOCKING_SP_C_PIN_USER1, - NewPassword, - NewPasswordLength, - &MethodStatus - ); - OpalEndSession(Session); - if (Ret == TcgResultSuccess && MethodStatus == TCG_METHOD_STATUS_CODE_SUCCESS) { + Ret = OpalStartSession ( + Session, + OPAL_UID_LOCKING_SP, + TRUE, + OldPasswordLength, + OldPassword, + OPAL_LOCKING_SP_USER1_AUTHORITY, + &MethodStatus + ); + if ((Ret == TcgResultSuccess) && (MethodStatus == TCG_METHOD_STATUS_CODE_SUCCESS)) { + Ret = OpalSetPassword ( + Session, + OPAL_LOCKING_SP_C_PIN_USER1, + NewPassword, + NewPasswordLength, + &MethodStatus + ); + OpalEndSession (Session); + if ((Ret == TcgResultSuccess) && (MethodStatus == TCG_METHOD_STATUS_CODE_SUCCESS)) { return Ret; } } @@ -369,16 +375,16 @@ OpalUtilSetUserPassword( // // Start session with Locking SP using current admin Password // - Ret = OpalStartSession( - Session, - OPAL_UID_LOCKING_SP, - TRUE, - OldPasswordLength, - OldPassword, - OPAL_LOCKING_SP_ADMIN1_AUTHORITY, - &MethodStatus - ); - if (Ret != TcgResultSuccess || MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { + Ret = OpalStartSession ( + Session, + OPAL_UID_LOCKING_SP, + TRUE, + OldPasswordLength, + OldPassword, + OPAL_LOCKING_SP_ADMIN1_AUTHORITY, + &MethodStatus + ); + if ((Ret != TcgResultSuccess) || (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS)) { DEBUG ((DEBUG_INFO, "StartSession with locking SP as admin1 authority failed\n")); goto done; } @@ -386,16 +392,16 @@ OpalUtilSetUserPassword( // // Enable User1 and set its PIN // - Ret = OpalSetLockingSpAuthorityEnabledAndPin( - Session, - OPAL_LOCKING_SP_C_PIN_USER1, - OPAL_LOCKING_SP_USER1_AUTHORITY, - NewPassword, - NewPasswordLength, - &MethodStatus - ); - OpalEndSession(Session); - if (Ret != TcgResultSuccess || MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { + Ret = OpalSetLockingSpAuthorityEnabledAndPin ( + Session, + OPAL_LOCKING_SP_C_PIN_USER1, + OPAL_LOCKING_SP_USER1_AUTHORITY, + NewPassword, + NewPasswordLength, + &MethodStatus + ); + OpalEndSession (Session); + if ((Ret != TcgResultSuccess) || (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS)) { DEBUG ((DEBUG_INFO, "OpalSetLockingSpAuthorityEnabledAndPin failed\n")); goto done; } @@ -404,6 +410,7 @@ done: if (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { Ret = TcgResultFailure; } + return Ret; } @@ -419,28 +426,29 @@ done: TCG_RESULT EFIAPI OpalUtilVerifyPassword ( - OPAL_SESSION *Session, - const VOID *Password, - UINT32 PasswordLength, - TCG_UID HostSigningAuthority + OPAL_SESSION *Session, + const VOID *Password, + UINT32 PasswordLength, + TCG_UID HostSigningAuthority ) { - TCG_RESULT Ret; - UINT8 MethodStatus; - - NULL_CHECK(Session); - NULL_CHECK(Password); - - Ret = OpalStartSession( - Session, - OPAL_UID_LOCKING_SP, - TRUE, - PasswordLength, - Password, - HostSigningAuthority, - &MethodStatus); - if (Ret == TcgResultSuccess && MethodStatus == TCG_METHOD_STATUS_CODE_SUCCESS) { - OpalEndSession(Session); + TCG_RESULT Ret; + UINT8 MethodStatus; + + NULL_CHECK (Session); + NULL_CHECK (Password); + + Ret = OpalStartSession ( + Session, + OPAL_UID_LOCKING_SP, + TRUE, + PasswordLength, + Password, + HostSigningAuthority, + &MethodStatus + ); + if ((Ret == TcgResultSuccess) && (MethodStatus == TCG_METHOD_STATUS_CODE_SUCCESS)) { + OpalEndSession (Session); return TcgResultSuccess; } @@ -459,55 +467,55 @@ OpalUtilVerifyPassword ( **/ TCG_RESULT EFIAPI -OpalUtilSecureErase( - OPAL_SESSION *Session, - const VOID *Password, - UINT32 PasswordLength, - BOOLEAN *PasswordFailed +OpalUtilSecureErase ( + OPAL_SESSION *Session, + const VOID *Password, + UINT32 PasswordLength, + BOOLEAN *PasswordFailed ) { - UINT8 MethodStatus; - TCG_RESULT Ret; + UINT8 MethodStatus; + TCG_RESULT Ret; - NULL_CHECK(Session); - NULL_CHECK(Password); - NULL_CHECK(PasswordFailed); + NULL_CHECK (Session); + NULL_CHECK (Password); + NULL_CHECK (PasswordFailed); // // Try to generate a new key with admin1 // - Ret = OpalStartSession( - Session, - OPAL_UID_LOCKING_SP, - TRUE, - PasswordLength, - Password, - OPAL_LOCKING_SP_ADMIN1_AUTHORITY, - &MethodStatus - ); - - if (Ret == TcgResultSuccess && MethodStatus == TCG_METHOD_STATUS_CODE_SUCCESS) { - Ret = OpalGlobalLockingRangeGenKey(Session, &MethodStatus); + Ret = OpalStartSession ( + Session, + OPAL_UID_LOCKING_SP, + TRUE, + PasswordLength, + Password, + OPAL_LOCKING_SP_ADMIN1_AUTHORITY, + &MethodStatus + ); + + if ((Ret == TcgResultSuccess) && (MethodStatus == TCG_METHOD_STATUS_CODE_SUCCESS)) { + Ret = OpalGlobalLockingRangeGenKey (Session, &MethodStatus); *PasswordFailed = FALSE; - OpalEndSession(Session); + OpalEndSession (Session); } else { // // Try to generate a new key with user1 // - Ret = OpalStartSession( - Session, - OPAL_UID_LOCKING_SP, - TRUE, - PasswordLength, - Password, - OPAL_LOCKING_SP_USER1_AUTHORITY, - &MethodStatus - ); - - if (Ret == TcgResultSuccess && MethodStatus == TCG_METHOD_STATUS_CODE_SUCCESS) { - Ret = OpalGlobalLockingRangeGenKey(Session, &MethodStatus); + Ret = OpalStartSession ( + Session, + OPAL_UID_LOCKING_SP, + TRUE, + PasswordLength, + Password, + OPAL_LOCKING_SP_USER1_AUTHORITY, + &MethodStatus + ); + + if ((Ret == TcgResultSuccess) && (MethodStatus == TCG_METHOD_STATUS_CODE_SUCCESS)) { + Ret = OpalGlobalLockingRangeGenKey (Session, &MethodStatus); *PasswordFailed = FALSE; - OpalEndSession(Session); + OpalEndSession (Session); } else { *PasswordFailed = TRUE; } @@ -516,6 +524,7 @@ OpalUtilSecureErase( if (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { Ret = TcgResultFailure; } + return Ret; } @@ -530,46 +539,47 @@ OpalUtilSecureErase( **/ TCG_RESULT EFIAPI -OpalUtilDisableUser( - OPAL_SESSION *Session, - const VOID *Password, - UINT32 PasswordLength, - BOOLEAN *PasswordFailed +OpalUtilDisableUser ( + OPAL_SESSION *Session, + const VOID *Password, + UINT32 PasswordLength, + BOOLEAN *PasswordFailed ) { - UINT8 MethodStatus; - TCG_RESULT Ret; + UINT8 MethodStatus; + TCG_RESULT Ret; - NULL_CHECK(Session); - NULL_CHECK(Password); - NULL_CHECK(PasswordFailed); + NULL_CHECK (Session); + NULL_CHECK (Password); + NULL_CHECK (PasswordFailed); // // Start session with Locking SP using current admin Password // - Ret = OpalStartSession( - Session, - OPAL_UID_LOCKING_SP, - TRUE, - PasswordLength, - Password, - OPAL_LOCKING_SP_ADMIN1_AUTHORITY, - &MethodStatus - ); - if (Ret != TcgResultSuccess || MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { + Ret = OpalStartSession ( + Session, + OPAL_UID_LOCKING_SP, + TRUE, + PasswordLength, + Password, + OPAL_LOCKING_SP_ADMIN1_AUTHORITY, + &MethodStatus + ); + if ((Ret != TcgResultSuccess) || (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS)) { DEBUG ((DEBUG_INFO, "StartSession with Locking SP as Admin1 failed\n")); *PasswordFailed = TRUE; goto done; } *PasswordFailed = FALSE; - Ret = OpalDisableUser(Session, &MethodStatus); - OpalEndSession(Session); + Ret = OpalDisableUser (Session, &MethodStatus); + OpalEndSession (Session); done: if (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { Ret = TcgResultFailure; } + return Ret; } @@ -587,39 +597,39 @@ done: **/ TCG_RESULT EFIAPI -OpalUtilRevert( - OPAL_SESSION *Session, - BOOLEAN KeepUserData, - const VOID *Password, - UINT32 PasswordLength, - BOOLEAN *PasswordFailed, - UINT8 *Msid, - UINT32 MsidLength +OpalUtilRevert ( + OPAL_SESSION *Session, + BOOLEAN KeepUserData, + const VOID *Password, + UINT32 PasswordLength, + BOOLEAN *PasswordFailed, + UINT8 *Msid, + UINT32 MsidLength ) { - UINT8 MethodStatus; - TCG_RESULT Ret; - UINT32 RemovalTimeOut; + UINT8 MethodStatus; + TCG_RESULT Ret; + UINT32 RemovalTimeOut; - NULL_CHECK(Session); - NULL_CHECK(Msid); - NULL_CHECK(Password); - NULL_CHECK(PasswordFailed); + NULL_CHECK (Session); + NULL_CHECK (Msid); + NULL_CHECK (Password); + NULL_CHECK (PasswordFailed); RemovalTimeOut = GetRevertTimeOut (Session); DEBUG ((DEBUG_INFO, "OpalUtilRevert: Timeout value = %d\n", RemovalTimeOut)); - Ret = OpalStartSession( - Session, - OPAL_UID_LOCKING_SP, - TRUE, - PasswordLength, - Password, - OPAL_LOCKING_SP_ADMIN1_AUTHORITY, - &MethodStatus - ); - - if (Ret != TcgResultSuccess || MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { + Ret = OpalStartSession ( + Session, + OPAL_UID_LOCKING_SP, + TRUE, + PasswordLength, + Password, + OPAL_LOCKING_SP_ADMIN1_AUTHORITY, + &MethodStatus + ); + + if ((Ret != TcgResultSuccess) || (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS)) { DEBUG ((DEBUG_INFO, "error starting session: Ret=%d, MethodStatus=%u\n", Ret, MethodStatus)); *PasswordFailed = TRUE; goto done; @@ -629,13 +639,13 @@ OpalUtilRevert( // // Try to revert with admin1 // - Ret = OpalPyrite2AdminRevert(Session, KeepUserData, &MethodStatus, RemovalTimeOut); - if (Ret != TcgResultSuccess || MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { + Ret = OpalPyrite2AdminRevert (Session, KeepUserData, &MethodStatus, RemovalTimeOut); + if ((Ret != TcgResultSuccess) || (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS)) { // // Device ends the session on successful revert, so only call OpalEndSession when fail. // DEBUG ((DEBUG_INFO, "OpalAdminRevert as admin failed\n")); - OpalEndSession(Session); + OpalEndSession (Session); } Ret = OpalUtilSetSIDtoMSID (Session, Password, PasswordLength, Msid, MsidLength); @@ -644,6 +654,7 @@ done: if (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { Ret = TcgResultFailure; } + return Ret; } @@ -660,41 +671,41 @@ done: TCG_RESULT EFIAPI OpalUtilSetSIDtoMSID ( - OPAL_SESSION *Session, - const VOID *Password, - UINT32 PasswordLength, - UINT8 *Msid, - UINT32 MsidLength + OPAL_SESSION *Session, + const VOID *Password, + UINT32 PasswordLength, + UINT8 *Msid, + UINT32 MsidLength ) { - TCG_RESULT Ret; - UINT8 MethodStatus; + TCG_RESULT Ret; + UINT8 MethodStatus; - NULL_CHECK(Session); - NULL_CHECK(Msid); - NULL_CHECK(Password); + NULL_CHECK (Session); + NULL_CHECK (Msid); + NULL_CHECK (Password); // // Start session with admin sp to update SID to MSID // - Ret = OpalStartSession( - Session, - OPAL_UID_ADMIN_SP, - TRUE, - PasswordLength, - Password, - OPAL_ADMIN_SP_SID_AUTHORITY, - &MethodStatus - ); - if (Ret != TcgResultSuccess || MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { + Ret = OpalStartSession ( + Session, + OPAL_UID_ADMIN_SP, + TRUE, + PasswordLength, + Password, + OPAL_ADMIN_SP_SID_AUTHORITY, + &MethodStatus + ); + if ((Ret != TcgResultSuccess) || (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS)) { goto done; } // // Update SID pin // - Ret = OpalSetPassword(Session, OPAL_UID_ADMIN_SP_C_PIN_SID, Msid, MsidLength, &MethodStatus); - OpalEndSession(Session); + Ret = OpalSetPassword (Session, OPAL_UID_ADMIN_SP_C_PIN_SID, Msid, MsidLength, &MethodStatus); + OpalEndSession (Session); done: if (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { @@ -716,41 +727,41 @@ done: **/ TCG_RESULT EFIAPI -OpalUtilUpdateGlobalLockingRange( - OPAL_SESSION *Session, - const VOID *Password, - UINT32 PasswordLength, - BOOLEAN ReadLocked, - BOOLEAN WriteLocked +OpalUtilUpdateGlobalLockingRange ( + OPAL_SESSION *Session, + const VOID *Password, + UINT32 PasswordLength, + BOOLEAN ReadLocked, + BOOLEAN WriteLocked ) { - UINT8 MethodStatus; - TCG_RESULT Ret; + UINT8 MethodStatus; + TCG_RESULT Ret; - NULL_CHECK(Session); - NULL_CHECK(Password); + NULL_CHECK (Session); + NULL_CHECK (Password); // // Try to start session with Locking SP as admin1 authority // - Ret = OpalStartSession( - Session, - OPAL_UID_LOCKING_SP, - TRUE, - PasswordLength, - Password, - OPAL_LOCKING_SP_ADMIN1_AUTHORITY, - &MethodStatus - ); - if (Ret == TcgResultSuccess && MethodStatus == TCG_METHOD_STATUS_CODE_SUCCESS) { - Ret = OpalUpdateGlobalLockingRange( - Session, - ReadLocked, - WriteLocked, - &MethodStatus - ); - OpalEndSession(Session); - if (Ret == TcgResultSuccess && MethodStatus == TCG_METHOD_STATUS_CODE_SUCCESS) { + Ret = OpalStartSession ( + Session, + OPAL_UID_LOCKING_SP, + TRUE, + PasswordLength, + Password, + OPAL_LOCKING_SP_ADMIN1_AUTHORITY, + &MethodStatus + ); + if ((Ret == TcgResultSuccess) && (MethodStatus == TCG_METHOD_STATUS_CODE_SUCCESS)) { + Ret = OpalUpdateGlobalLockingRange ( + Session, + ReadLocked, + WriteLocked, + &MethodStatus + ); + OpalEndSession (Session); + if ((Ret == TcgResultSuccess) && (MethodStatus == TCG_METHOD_STATUS_CODE_SUCCESS)) { goto done; } } @@ -762,22 +773,22 @@ OpalUtilUpdateGlobalLockingRange( // // Try user1 authority // - Ret = OpalStartSession( - Session, - OPAL_UID_LOCKING_SP, - TRUE, - PasswordLength, - Password, - OPAL_LOCKING_SP_USER1_AUTHORITY, - &MethodStatus - ); - if (Ret != TcgResultSuccess || MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { + Ret = OpalStartSession ( + Session, + OPAL_UID_LOCKING_SP, + TRUE, + PasswordLength, + Password, + OPAL_LOCKING_SP_USER1_AUTHORITY, + &MethodStatus + ); + if ((Ret != TcgResultSuccess) || (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS)) { DEBUG ((DEBUG_INFO, "StartSession with Locking SP as User1 failed\n")); goto done; } - Ret = OpalUpdateGlobalLockingRange(Session, ReadLocked, WriteLocked, &MethodStatus); - OpalEndSession(Session); + Ret = OpalUpdateGlobalLockingRange (Session, ReadLocked, WriteLocked, &MethodStatus); + OpalEndSession (Session); done: if (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { @@ -791,6 +802,7 @@ done: Ret = TcgResultFailure; } } + return Ret; } @@ -805,29 +817,29 @@ done: **/ TCG_RESULT EFIAPI -OpalUtilGetMsid( - OPAL_SESSION *Session, - UINT8 *Msid, - UINT32 MsidBufferLength, - UINT32 *MsidLength +OpalUtilGetMsid ( + OPAL_SESSION *Session, + UINT8 *Msid, + UINT32 MsidBufferLength, + UINT32 *MsidLength ) { - UINT8 MethodStatus; - TCG_RESULT Ret; - - NULL_CHECK(Session); - NULL_CHECK(Msid); - NULL_CHECK(MsidLength); - - Ret = OpalStartSession( - Session, - OPAL_UID_ADMIN_SP, - TRUE, - 0, - NULL, - TCG_UID_NULL, - &MethodStatus - ); + UINT8 MethodStatus; + TCG_RESULT Ret; + + NULL_CHECK (Session); + NULL_CHECK (Msid); + NULL_CHECK (MsidLength); + + Ret = OpalStartSession ( + Session, + OPAL_UID_ADMIN_SP, + TRUE, + 0, + NULL, + TCG_UID_NULL, + &MethodStatus + ); if ((Ret == TcgResultSuccess) && (MethodStatus == TCG_METHOD_STATUS_CODE_SUCCESS)) { Ret = OpalGetMsid (Session, MsidBufferLength, Msid, MsidLength); OpalEndSession (Session); @@ -854,10 +866,10 @@ OpalUtilGetMsid( **/ OPAL_OWNER_SHIP EFIAPI -OpalUtilDetermineOwnership( - OPAL_SESSION *Session, - UINT8 *Msid, - UINT32 MsidLength +OpalUtilDetermineOwnership ( + OPAL_SESSION *Session, + UINT8 *Msid, + UINT32 MsidLength ) { UINT8 MethodStatus; @@ -872,21 +884,22 @@ OpalUtilDetermineOwnership( // // Start Session as SID_UID with ADMIN_SP using MSID PIN // - Ret = OpalStartSession( - Session, - OPAL_UID_ADMIN_SP, - TRUE, - MsidLength, - Msid, - OPAL_ADMIN_SP_SID_AUTHORITY, - &MethodStatus); + Ret = OpalStartSession ( + Session, + OPAL_UID_ADMIN_SP, + TRUE, + MsidLength, + Msid, + OPAL_ADMIN_SP_SID_AUTHORITY, + &MethodStatus + ); if ((Ret == TcgResultSuccess) && (MethodStatus == TCG_METHOD_STATUS_CODE_SUCCESS)) { // // now we know that SID PIN == MSID PIN // Owner = OpalOwnershipNobody; - OpalEndSession(Session); + OpalEndSession (Session); } return Owner; @@ -905,12 +918,12 @@ OpalUtilDetermineOwnership( **/ BOOLEAN EFIAPI -OpalUtilAdminPasswordExists( - IN UINT16 OwnerShip, - IN TCG_LOCKING_FEATURE_DESCRIPTOR *LockingFeature +OpalUtilAdminPasswordExists ( + IN UINT16 OwnerShip, + IN TCG_LOCKING_FEATURE_DESCRIPTOR *LockingFeature ) { - NULL_CHECK(LockingFeature); + NULL_CHECK (LockingFeature); // if it is Unknown who owns the device // then someone has set password previously through our UI @@ -935,46 +948,47 @@ OpalUtilAdminPasswordExists( TCG_RESULT EFIAPI OpalUtilGetActiveDataRemovalMechanism ( - OPAL_SESSION *Session, - const VOID *GeneratedSid, - UINT32 SidLength, - UINT8 *ActiveDataRemovalMechanism + OPAL_SESSION *Session, + const VOID *GeneratedSid, + UINT32 SidLength, + UINT8 *ActiveDataRemovalMechanism ) { - TCG_RESULT Ret; - UINT8 MethodStatus; - - NULL_CHECK(Session); - NULL_CHECK(GeneratedSid); - NULL_CHECK(ActiveDataRemovalMechanism); - - Ret = OpalStartSession( - Session, - OPAL_UID_ADMIN_SP, - TRUE, - SidLength, - GeneratedSid, - OPAL_ADMIN_SP_ANYBODY_AUTHORITY, - &MethodStatus - ); - if (Ret != TcgResultSuccess || MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { + TCG_RESULT Ret; + UINT8 MethodStatus; + + NULL_CHECK (Session); + NULL_CHECK (GeneratedSid); + NULL_CHECK (ActiveDataRemovalMechanism); + + Ret = OpalStartSession ( + Session, + OPAL_UID_ADMIN_SP, + TRUE, + SidLength, + GeneratedSid, + OPAL_ADMIN_SP_ANYBODY_AUTHORITY, + &MethodStatus + ); + if ((Ret != TcgResultSuccess) || (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS)) { DEBUG ((DEBUG_INFO, "Start session with admin SP as SID authority failed: Ret=%d MethodStatus=%u\n", Ret, MethodStatus)); if (MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) { Ret = TcgResultFailure; } + return Ret; } Ret = OpalPyrite2GetActiveDataRemovalMechanism ( - Session, - ActiveDataRemovalMechanism - ); + Session, + ActiveDataRemovalMechanism + ); if (Ret != TcgResultSuccess) { DEBUG ((DEBUG_INFO, "Pyrite2 Get Active Data Removal Mechanism failed: Ret=%d\n", Ret)); } - OpalEndSession(Session); + OpalEndSession (Session); return Ret; } @@ -988,8 +1002,8 @@ OpalUtilGetActiveDataRemovalMechanism ( **/ UINT32 CalculateDataRemovalTime ( - IN BOOLEAN IsMinute, - IN UINT16 Time + IN BOOLEAN IsMinute, + IN UINT16 Time ) { if (IsMinute) { @@ -1013,26 +1027,26 @@ GetDataRemovalTime ( ) { switch (Index) { - case OverwriteDataErase: - return CalculateDataRemovalTime (Descriptor->FormatBit0, SwapBytes16 (Descriptor->TimeBit0)); + case OverwriteDataErase: + return CalculateDataRemovalTime (Descriptor->FormatBit0, SwapBytes16 (Descriptor->TimeBit0)); - case BlockErase: - return CalculateDataRemovalTime (Descriptor->FormatBit1, SwapBytes16 (Descriptor->TimeBit1)); + case BlockErase: + return CalculateDataRemovalTime (Descriptor->FormatBit1, SwapBytes16 (Descriptor->TimeBit1)); - case CryptoErase: - return CalculateDataRemovalTime (Descriptor->FormatBit2, SwapBytes16 (Descriptor->TimeBit2)); + case CryptoErase: + return CalculateDataRemovalTime (Descriptor->FormatBit2, SwapBytes16 (Descriptor->TimeBit2)); - case Unmap: - return CalculateDataRemovalTime (Descriptor->FormatBit3, SwapBytes16 (Descriptor->TimeBit3)); + case Unmap: + return CalculateDataRemovalTime (Descriptor->FormatBit3, SwapBytes16 (Descriptor->TimeBit3)); - case ResetWritePointers: - return CalculateDataRemovalTime (Descriptor->FormatBit4, SwapBytes16 (Descriptor->TimeBit4)); + case ResetWritePointers: + return CalculateDataRemovalTime (Descriptor->FormatBit4, SwapBytes16 (Descriptor->TimeBit4)); - case VendorSpecificErase: - return CalculateDataRemovalTime (Descriptor->FormatBit5, SwapBytes16 (Descriptor->TimeBit5)); + case VendorSpecificErase: + return CalculateDataRemovalTime (Descriptor->FormatBit5, SwapBytes16 (Descriptor->TimeBit5)); - default: - return 0; + default: + return 0; } } @@ -1046,8 +1060,8 @@ GetDataRemovalTime ( TCG_RESULT EFIAPI OpalUtilGetDataRemovalMechanismLists ( - IN OPAL_SESSION *Session, - OUT UINT32 *RemovalMechanismLists + IN OPAL_SESSION *Session, + OUT UINT32 *RemovalMechanismLists ) { TCG_RESULT Ret; @@ -1056,19 +1070,19 @@ OpalUtilGetDataRemovalMechanismLists ( UINT8 Index; UINT8 BitValue; - NULL_CHECK(Session); - NULL_CHECK(RemovalMechanismLists); + NULL_CHECK (Session); + NULL_CHECK (RemovalMechanismLists); DataSize = sizeof (Descriptor); - Ret = OpalGetFeatureDescriptor (Session, TCG_FEATURE_DATA_REMOVAL, &DataSize, &Descriptor); + Ret = OpalGetFeatureDescriptor (Session, TCG_FEATURE_DATA_REMOVAL, &DataSize, &Descriptor); if (Ret != TcgResultSuccess) { return TcgResultFailure; } ASSERT (Descriptor.RemovalMechanism != 0); - for (Index = 0; Index < ResearvedMechanism; Index ++) { - BitValue = (BOOLEAN) BitFieldRead8 (Descriptor.RemovalMechanism, Index, Index); + for (Index = 0; Index < ResearvedMechanism; Index++) { + BitValue = (BOOLEAN)BitFieldRead8 (Descriptor.RemovalMechanism, Index, Index); if (BitValue == 0) { RemovalMechanismLists[Index] = 0; @@ -1088,7 +1102,7 @@ OpalUtilGetDataRemovalMechanismLists ( **/ UINT32 GetRevertTimeOut ( - IN OPAL_SESSION *Session + IN OPAL_SESSION *Session ) { TCG_RESULT TcgResult; @@ -1100,7 +1114,7 @@ GetRevertTimeOut ( UINT8 ActiveDataRemovalMechanism; TcgResult = OpalGetSupportedAttributesInfo (Session, &SupportedAttributes, &BaseComId); - if (TcgResult != TcgResultSuccess || SupportedAttributes.DataRemoval == 0) { + if ((TcgResult != TcgResultSuccess) || (SupportedAttributes.DataRemoval == 0)) { return 0; } -- cgit v1.2.3