Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Allow querying SID Authentication Block (0x0402) r1.00/1.00 #467

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: Allow querying SID Authentication Block (0x0402) r1.00/1.00 #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions Common/DtaDev.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,12 @@ void DtaDev::discovery0()
disk_info.OPAL20_numUsers = SWAP16(body->opalv200.numlockingUserAuth);
disk_info.OPAL20_rangeCrossing = body->opalv200.rangeCrossing;
break;
case FC_BLOCKSIDAUTH: /* BLOCK SID AUTHENTICATION */
disk_info.BlockSIDAuthentication = 1;
disk_info.BlockSIDAuthentication_SIDValueState = body->blockSIDAuthentication.sidValueState;
disk_info.BlockSIDAuthentication_SIDBlockedState = body->blockSIDAuthentication.sidBlockedState;
disk_info.BlockSIDAuthentication_HardwareReset = body->blockSIDAuthentication.hardwareReset;
break;
default:
if (0xbfff < (SWAP16(body->TPer.featureCode))) {
// silently ignore vendor specific segments as there is no public doc on them
Expand Down Expand Up @@ -297,6 +303,15 @@ void DtaDev::puke()
cout << ", Range Crossing = " << (disk_info.OPAL20_rangeCrossing ? "Y" : "N");
cout << std::endl;
}

if (disk_info.BlockSIDAuthentication) {
cout << "Block SID Authentication (" << HEXON(4) << FC_BLOCKSIDAUTH << ")" << HEXOFF << std::endl;
cout << " SID equals MSID = " << (disk_info.BlockSIDAuthentication_SIDValueState ? "N, " : "Y, ")
<< "SID blocked = " << (disk_info.BlockSIDAuthentication_SIDBlockedState ? "Y, " : "N, ")
<< "HW Reset can clear = " << (disk_info.BlockSIDAuthentication_HardwareReset ? "Y" : "N")
<< std::endl;
}

if (disk_info.Unknown)
cout << "**** " << (uint16_t)disk_info.Unknown << " **** Unknown function codes IGNORED " << std::endl;
}
25 changes: 25 additions & 0 deletions Common/DtaStructures.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ along with sedutil. If not, see <http://www.gnu.org/licenses/>.
#define FC_SINGLEUSER 0x0201
#define FC_OPALV100 0x0200
#define FC_OPALV200 0x0203
#define FC_BLOCKSIDAUTH 0x0402

/** The Discovery 0 Header. As defined in
* Opal SSC Documentation
*/
Expand Down Expand Up @@ -183,6 +185,24 @@ typedef struct _Discovery0SingleUserMode {
uint32_t reserved04;
} Discovery0SingleUserMode;

typedef struct _Discovery0BlockSIDAuthentication {
uint16_t featureCode; /* 0x0402 */
uint8_t reserved_v: 4;
uint8_t version: 4;
uint8_t length;

uint8_t sidValueState: 1;
uint8_t sidBlockedState: 1;
uint8_t reserved01: 6;

uint8_t hardwareReset: 1;
uint8_t reserved02: 7;

uint16_t reserved03;
uint32_t reserved04;
uint32_t reserved05;
} Discovery0BlockSIDAuthentication;

/** Additonal Datastores feature .
*/
typedef struct _Discovery0DatastoreTable {
Expand Down Expand Up @@ -229,6 +249,7 @@ union Discovery0Features {
Discovery0OPALV200 opalv200;
Discovery0OpalV100 opalv100;
Discovery0DatastoreTable datastore;
Discovery0BlockSIDAuthentication blockSIDAuthentication;
};

/** ComPacket (header) for transmissions. */
Expand Down Expand Up @@ -294,6 +315,7 @@ typedef struct _OPAL_DiskInfo {
uint8_t OPAL10 : 1;
uint8_t Properties : 1;
uint8_t ANY_OPAL_SSC : 1;
uint8_t BlockSIDAuthentication: 1;
// values ONLY VALID IF FUNCTION ABOVE IS TRUE!!!!!
uint8_t TPer_ACKNACK : 1;
uint8_t TPer_async : 1;
Expand All @@ -318,6 +340,9 @@ typedef struct _OPAL_DiskInfo {
uint8_t SingleUser_all : 1;
uint8_t SingleUser_policy : 1;
uint32_t SingleUser_lockingObjects;
uint8_t BlockSIDAuthentication_SIDValueState: 1;
uint8_t BlockSIDAuthentication_SIDBlockedState: 1;
uint8_t BlockSIDAuthentication_HardwareReset: 1;
uint16_t DataStore_maxTables;
uint32_t DataStore_maxTableSize;
uint32_t DataStore_alignment;
Expand Down