diff --git a/Common/Class_Skeleton.cpp b/Common/Class_Skeleton.cpp deleted file mode 100644 index 17c708e1..00000000 --- a/Common/Class_Skeleton.cpp +++ /dev/null @@ -1,29 +0,0 @@ -/* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo - -This file is part of msed. - -msed is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -msed is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with msed. If not, see . - -* C:E********************************************************************** */ -#include "os.h" -#include "Class_Skeleton.h" - -Class_Skeleton::Class_Skeleton() -{ -} - -Class_Skeleton::~Class_Skeleton() -{ -} diff --git a/Common/Class_Skeleton.h b/Common/Class_Skeleton.h deleted file mode 100644 index d533a059..00000000 --- a/Common/Class_Skeleton.h +++ /dev/null @@ -1,27 +0,0 @@ -/* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo - -This file is part of msed. - -msed is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -msed is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with msed. If not, see . - -* C:E********************************************************************** */ -#pragma once - -class Class_Skeleton { -public: - Class_Skeleton(); - ~Class_Skeleton(); -}; - diff --git a/Common/Copyright.txt b/Common/Copyright.txt index caa46c26..996cd443 100644 --- a/Common/Copyright.txt +++ b/Common/Copyright.txt @@ -1,19 +1,19 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. - This file is part of msed. +This file is part of sedutil. - msed is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. +sedutil is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. - msed is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +sedutil is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with msed. If not, see . +You should have received a copy of the GNU General Public License +along with sedutil. If not, see . -* C:E********************************************************************** */ \ No newline at end of file + * C:E********************************************************************** */ diff --git a/Common/MsedAnnotatedDump.cpp b/Common/DtaAnnotatedDump.cpp similarity index 93% rename from Common/MsedAnnotatedDump.cpp rename to Common/DtaAnnotatedDump.cpp index db1d850a..568da9f4 100644 --- a/Common/MsedAnnotatedDump.cpp +++ b/Common/DtaAnnotatedDump.cpp @@ -1,5 +1,5 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -20,20 +20,20 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include "MsedDevEnterprise.h" -#include "MsedHashPwd.h" -#include "MsedEndianFixup.h" -#include "MsedStructures.h" -#include "MsedCommand.h" -#include "MsedResponse.h" -#include "MsedSession.h" -#include "MsedHexDump.h" -#include "MsedAnnotatedDump.h" +#include "DtaDevEnterprise.h" +#include "DtaHashPwd.h" +#include "DtaEndianFixup.h" +#include "DtaStructures.h" +#include "DtaCommand.h" +#include "DtaResponse.h" +#include "DtaSession.h" +#include "DtaHexDump.h" +#include "DtaAnnotatedDump.h" using namespace std; -//////////////////////////////////////////////////////////////////////////////// -CMsedToken::CMsedToken(void) : +/////////////////////////////////////////////////////////////////////////////// +DtaToken::DtaToken(void) : //////////////////////////////////////////////////////////////////////////////// m_TokenType (NONE), m_HeaderLength (0), @@ -47,13 +47,13 @@ CMsedToken::CMsedToken(void) : } //////////////////////////////////////////////////////////////////////////////// -CMsedToken::~CMsedToken(void) +DtaToken::~DtaToken(void) //////////////////////////////////////////////////////////////////////////////// { } //////////////////////////////////////////////////////////////////////////////// -void CMsedToken::str2int(uint8_t * buf, bool byte) +void DtaToken::str2int(uint8_t * buf, bool byte) //////////////////////////////////////////////////////////////////////////////// { // user says it's a byte string, or it's so large it must be @@ -98,10 +98,10 @@ void CMsedToken::str2int(uint8_t * buf, bool byte) } //////////////////////////////////////////////////////////////////////////////// -void CMsedToken::parse(uint8_t * buf, uint32_t buflen) +void DtaToken::parse(uint8_t * buf, uint32_t buflen) //////////////////////////////////////////////////////////////////////////////// { - LOG(D1) << "Entering CMsedToken::parse " << buflen; + LOG(D1) << "Entering CDtaToken::parse " << buflen; m_token = buf; const CAtomHeader & atom = * (CAtomHeader *) buf; @@ -163,7 +163,7 @@ void CMsedToken::parse(uint8_t * buf, uint32_t buflen) } //////////////////////////////////////////////////////////////////////////////// -int CMsedToken::print(FILE *stream, uint32_t buflen) +int DtaToken::print(FILE *stream, uint32_t buflen) //////////////////////////////////////////////////////////////////////////////// { int ret = 0; @@ -202,7 +202,7 @@ int CMsedToken::print(FILE *stream, uint32_t buflen) } //////////////////////////////////////////////////////////////////////////////// -int CMsedToken::printTokenType(FILE *stream, uint8_t token) +int DtaToken::printTokenType(FILE *stream, uint8_t token) //////////////////////////////////////////////////////////////////////////////// { // see Table 04 p. 35 in TSG Storage Architecture Core Specification 2.0 @@ -248,7 +248,7 @@ int CMsedToken::printTokenType(FILE *stream, uint8_t token) } //////////////////////////////////////////////////////////////////////////////// -int CMsedToken::printUID(FILE *stream, uint8_t buf[8]) +int DtaToken::printUID(FILE *stream, uint8_t buf[8]) //////////////////////////////////////////////////////////////////////////////// { struct uidlist @@ -313,7 +313,7 @@ int CMsedToken::printUID(FILE *stream, uint8_t buf[8]) } //////////////////////////////////////////////////////////////////////////////// -int CMsedToken::printAscii(FILE *stream, uint8_t * buf, uint32_t buflen) +int DtaToken::printAscii(FILE *stream, uint8_t * buf, uint32_t buflen) //////////////////////////////////////////////////////////////////////////////// { int ret = 0; @@ -337,7 +337,7 @@ int CMsedToken::printAscii(FILE *stream, uint8_t * buf, uint32_t buflen) } //////////////////////////////////////////////////////////////////////////////// -uint8_t MsedAnnotatedDump(ATACOMMAND cmd, void * buffer, uint32_t bufferlen) +uint8_t DtaAnnotatedDump(ATACOMMAND cmd, void * buffer, uint32_t bufferlen) //////////////////////////////////////////////////////////////////////////////// { FILE * stream = stderr; @@ -384,7 +384,7 @@ uint8_t MsedAnnotatedDump(ATACOMMAND cmd, void * buffer, uint32_t bufferlen) // scan buffer while(p < q) { - CMsedToken token; + DtaToken token; token.parse(p, (uint32_t)(q-p)); token.print(stream, (uint32_t)(q-p)); diff --git a/Common/MsedAnnotatedDump.h b/Common/DtaAnnotatedDump.h similarity index 94% rename from Common/MsedAnnotatedDump.h rename to Common/DtaAnnotatedDump.h index 2f891829..a4fb3b52 100644 --- a/Common/MsedAnnotatedDump.h +++ b/Common/DtaAnnotatedDump.h @@ -1,5 +1,5 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -100,12 +100,12 @@ typedef union } CAtomHeader; #pragma pack(pop) //////////////////////////////////////////////////////////////////////////////// -class CMsedToken +class DtaToken //////////////////////////////////////////////////////////////////////////////// { public: - CMsedToken(void); - ~CMsedToken(void); + DtaToken(void); + ~DtaToken(void); void parse(uint8_t * buf, uint32_t buflen); @@ -138,5 +138,5 @@ class CMsedToken }; //////////////////////////////////////////////////////////////////////////////// -extern uint8_t MsedAnnotatedDump(ATACOMMAND cmd, void * buffer, uint32_t bufferlen); +extern uint8_t DtaAnnotatedDump(ATACOMMAND cmd, void * buffer, uint32_t bufferlen); //////////////////////////////////////////////////////////////////////////////// diff --git a/Common/MsedCommand.cpp b/Common/DtaCommand.cpp similarity index 68% rename from Common/MsedCommand.cpp rename to Common/DtaCommand.cpp index 36010d98..fcbf711f 100644 --- a/Common/MsedCommand.cpp +++ b/Common/DtaCommand.cpp @@ -1,34 +1,34 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ #include "os.h" #include -#include "MsedCommand.h" -#include "MsedEndianFixup.h" -#include "MsedHexDump.h" -#include "MsedStructures.h" +#include "DtaCommand.h" +#include "DtaEndianFixup.h" +#include "DtaHexDump.h" +#include "DtaStructures.h" using namespace std; -MsedCommand::MsedCommand() +DtaCommand::DtaCommand() { - LOG(D1) << "Creating MsedCommand()"; + LOG(D1) << "Creating DtaCommand()"; cmdbuf = commandbuffer + IO_BUFFER_ALIGNMENT; cmdbuf = (uint8_t*)((uintptr_t)cmdbuf & (uintptr_t)~(IO_BUFFER_ALIGNMENT - 1)); respbuf = responsebuffer + IO_BUFFER_ALIGNMENT; @@ -36,9 +36,9 @@ MsedCommand::MsedCommand() } /* Fill in the header information and format the call */ -MsedCommand::MsedCommand(OPAL_UID InvokingUid, OPAL_METHOD method) +DtaCommand::DtaCommand(OPAL_UID InvokingUid, OPAL_METHOD method) { - LOG(D1) << "Creating MsedCommand(ID, InvokingUid, method)"; + LOG(D1) << "Creating DtaCommand(ID, InvokingUid, method)"; cmdbuf = commandbuffer + IO_BUFFER_ALIGNMENT; cmdbuf = (uint8_t*)((uintptr_t)cmdbuf & (uintptr_t)~(IO_BUFFER_ALIGNMENT - 1)); respbuf = responsebuffer + IO_BUFFER_ALIGNMENT; @@ -47,24 +47,24 @@ MsedCommand::MsedCommand(OPAL_UID InvokingUid, OPAL_METHOD method) } void -MsedCommand::reset() +DtaCommand::reset() { - LOG(D1) << "Entering MsedCommand::reset()"; + LOG(D1) << "Entering DtaCommand::reset()"; memset(cmdbuf, 0, IO_BUFFER_LENGTH); memset(respbuf, 0, IO_BUFFER_LENGTH); bufferpos = sizeof (OPALHeader); } void -MsedCommand::reset(OPAL_UID InvokingUid, vector method){ - LOG(D1) << "Entering MsedCommand::reset(OPAL_UID,uint8_t)"; +DtaCommand::reset(OPAL_UID InvokingUid, vector method){ + LOG(D1) << "Entering DtaCommand::reset(OPAL_UID,uint8_t)"; reset(); cmdbuf[bufferpos++] = OPAL_TOKEN::CALL; addToken(InvokingUid); addToken(method); } void -MsedCommand::reset(vector InvokingUid, vector method){ - LOG(D1) << "Entering MsedCommand::reset(uint8_t,uint8_t)"; +DtaCommand::reset(vector InvokingUid, vector method){ + LOG(D1) << "Entering DtaCommand::reset(uint8_t,uint8_t)"; reset(); cmdbuf[bufferpos++] = OPAL_TOKEN::CALL; addToken(InvokingUid); @@ -72,9 +72,9 @@ MsedCommand::reset(vector InvokingUid, vector method){ } void -MsedCommand::reset(OPAL_UID InvokingUid, OPAL_METHOD method) +DtaCommand::reset(OPAL_UID InvokingUid, OPAL_METHOD method) { - LOG(D1) << "Entering MsedCommand::reset(OPAL_UID, OPAL_METHOD)"; + LOG(D1) << "Entering DtaCommand::reset(OPAL_UID, OPAL_METHOD)"; reset(); cmdbuf[bufferpos++] = OPAL_TOKEN::CALL; addToken(InvokingUid); @@ -84,10 +84,10 @@ MsedCommand::reset(OPAL_UID InvokingUid, OPAL_METHOD method) } void -MsedCommand::addToken(uint64_t number) +DtaCommand::addToken(uint64_t number) { int startat = 0; - LOG(D1) << "Entering MsedCommand::addToken(uint64_t)"; + LOG(D1) << "Entering DtaCommand::addToken(uint64_t)"; if (number < 64) { cmdbuf[bufferpos++] = (uint8_t) number & 0x000000000000003f; } @@ -115,7 +115,7 @@ MsedCommand::addToken(uint64_t number) } void -MsedCommand::addToken(vector token) +DtaCommand::addToken(vector token) { LOG(D1) << "Entering addToken(vector)"; for (uint32_t i = 0; i < token.size(); i++) { @@ -124,9 +124,9 @@ MsedCommand::addToken(vector token) } void -MsedCommand::addToken(const char * bytestring) +DtaCommand::addToken(const char * bytestring) { - LOG(D1) << "Entering MsedCommand::addToken(const char * )"; + LOG(D1) << "Entering DtaCommand::addToken(const char * )"; uint16_t length = (uint16_t) strlen(bytestring); if (length == 0) { /* null token e.g. default password */ @@ -153,39 +153,39 @@ MsedCommand::addToken(const char * bytestring) } void -MsedCommand::addToken(OPAL_TOKEN token) +DtaCommand::addToken(OPAL_TOKEN token) { - LOG(D1) << "Entering MsedCommand::addToken(OPAL_TOKEN)"; + LOG(D1) << "Entering DtaCommand::addToken(OPAL_TOKEN)"; cmdbuf[bufferpos++] = (uint8_t) token; } void -MsedCommand::addToken(OPAL_SHORT_ATOM token) +DtaCommand::addToken(OPAL_SHORT_ATOM token) { - LOG(D1) << "Entering MsedCommand::addToken(OPAL_SHORT_ATOM)"; + LOG(D1) << "Entering DtaCommand::addToken(OPAL_SHORT_ATOM)"; cmdbuf[bufferpos++] = (uint8_t)token; } void -MsedCommand::addToken(OPAL_TINY_ATOM token) +DtaCommand::addToken(OPAL_TINY_ATOM token) { - LOG(D1) << "Entering MsedCommand::addToken(OPAL_TINY_ATOM)"; + LOG(D1) << "Entering DtaCommand::addToken(OPAL_TINY_ATOM)"; cmdbuf[bufferpos++] = (uint8_t) token; } void -MsedCommand::addToken(OPAL_UID token) +DtaCommand::addToken(OPAL_UID token) { - LOG(D1) << "Entering MsedCommand::addToken(OPAL_UID)"; + LOG(D1) << "Entering DtaCommand::addToken(OPAL_UID)"; cmdbuf[bufferpos++] = OPAL_SHORT_ATOM::BYTESTRING8; memcpy(&cmdbuf[bufferpos], &OPALUID[token][0], 8); bufferpos += 8; } void -MsedCommand::complete(uint8_t EOD) +DtaCommand::complete(uint8_t EOD) { - LOG(D1) << "Entering MsedCommand::complete(uint8_t EOD)"; + LOG(D1) << "Entering DtaCommand::complete(uint8_t EOD)"; if (EOD) { cmdbuf[bufferpos++] = OPAL_TOKEN::ENDOFDATA; cmdbuf[bufferpos++] = OPAL_TOKEN::STARTLIST; @@ -211,9 +211,9 @@ MsedCommand::complete(uint8_t EOD) } void -MsedCommand::changeInvokingUid(std::vector Invoker) +DtaCommand::changeInvokingUid(std::vector Invoker) { - LOG(D1) << "Entering MsedCommand::changeInvokingUid()"; + LOG(D1) << "Entering DtaCommand::changeInvokingUid()"; int offset = sizeof (OPALHeader) + 1; /* bytes 2-9 */ for (uint32_t i = 0; i < Invoker.size(); i++) { cmdbuf[offset + i] = Invoker[i]; @@ -222,35 +222,35 @@ MsedCommand::changeInvokingUid(std::vector Invoker) } void * -MsedCommand::getCmdBuffer() +DtaCommand::getCmdBuffer() { return cmdbuf; } void * -MsedCommand::getRespBuffer() +DtaCommand::getRespBuffer() { return respbuf; } void -MsedCommand::dumpCommand() +DtaCommand::dumpCommand() { OPALHeader * hdr = (OPALHeader *)cmdbuf; - MsedHexDump(cmdbuf, SWAP32(hdr->cp.length) + sizeof(OPALComPacket)); + DtaHexDump(cmdbuf, SWAP32(hdr->cp.length) + sizeof(OPALComPacket)); } void -MsedCommand::dumpResponse() +DtaCommand::dumpResponse() { OPALHeader *hdr = (OPALHeader *)respbuf; - MsedHexDump(respbuf, SWAP32(hdr->cp.length) + sizeof(OPALComPacket)); + DtaHexDump(respbuf, SWAP32(hdr->cp.length) + sizeof(OPALComPacket)); } void -MsedCommand::setcomID(uint16_t comID) +DtaCommand::setcomID(uint16_t comID) { OPALHeader * hdr; hdr = (OPALHeader *) cmdbuf; - LOG(D1) << "Entering MsedCommand::setcomID()"; + LOG(D1) << "Entering DtaCommand::setcomID()"; hdr->cp.extendedComID[0] = ((comID & 0xff00) >> 8); hdr->cp.extendedComID[1] = (comID & 0x00ff); hdr->cp.extendedComID[2] = 0x00; @@ -258,24 +258,24 @@ MsedCommand::setcomID(uint16_t comID) } void -MsedCommand::setTSN(uint32_t TSN) +DtaCommand::setTSN(uint32_t TSN) { - LOG(D1) << "Entering MsedCommand::setTSN()"; + LOG(D1) << "Entering DtaCommand::setTSN()"; OPALHeader * hdr; hdr = (OPALHeader *) cmdbuf; hdr->pkt.TSN = TSN; } void -MsedCommand::setHSN(uint32_t HSN) +DtaCommand::setHSN(uint32_t HSN) { - LOG(D1) << "Entering MsedCommand::setHSN()"; + LOG(D1) << "Entering DtaCommand::setHSN()"; OPALHeader * hdr; hdr = (OPALHeader *) cmdbuf; hdr->pkt.HSN = HSN; } -MsedCommand::~MsedCommand() +DtaCommand::~DtaCommand() { - LOG(D1) << "Destroying MsedCommand"; + LOG(D1) << "Destroying DtaCommand"; } diff --git a/Common/MsedCommand.h b/Common/DtaCommand.h similarity index 89% rename from Common/MsedCommand.h rename to Common/DtaCommand.h index c0b09548..d12e5bf4 100644 --- a/Common/MsedCommand.h +++ b/Common/DtaCommand.h @@ -1,28 +1,28 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ #pragma once #include -#include "MsedLexicon.h" -class MsedDevOpal; -class MsedDevEnterprise; +#include "DtaLexicon.h" +class DtaDevOpal; +class DtaDevEnterprise; using namespace std; @@ -33,22 +33,22 @@ using namespace std; * Core Specification R2.00 V2.00 Section 3.2.1.2 for all * the gory details. * -* @see MsedLexicon.h for structs, typedefs and enums used to encode +* @see DtaLexicon.h for structs, typedefs and enums used to encode * the bytestream. */ -class MsedCommand { - friend class MsedDevOpal; - friend class MsedDevEnterprise; +class DtaCommand { + friend class DtaDevOpal; + friend class DtaDevEnterprise; public: /** Default constructor, allocates the command and resonse buffers. */ - MsedCommand(); + DtaCommand(); /** Constructor that initializes the incokingUid and method fields. * @param InvokingUid The UID used to call the SSC method * @param method The SSC method to be called */ - MsedCommand(OPAL_UID InvokingUid, OPAL_METHOD method); + DtaCommand(OPAL_UID InvokingUid, OPAL_METHOD method); /** destructor frees the command and response buffers */ - ~MsedCommand(); + ~DtaCommand(); /** Add a Token to the bytstream of type OPAL_TOKEN. */ void addToken(OPAL_TOKEN token); /** Add a Token to the bytstream of type OPL_SHORT ATOM. */ diff --git a/Common/MsedConstants.h b/Common/DtaConstants.h similarity index 59% rename from Common/MsedConstants.h rename to Common/DtaConstants.h index 6cef66eb..71a1f731 100644 --- a/Common/MsedConstants.h +++ b/Common/DtaConstants.h @@ -1,20 +1,20 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ /** Length of the IO buffers used */ @@ -32,17 +32,17 @@ along with msed. If not, see . /** iomanip command to return to standard ascii output */ #define HEXOFF std::dec << std::setw(0) << std::setfill(' ') /** Return Codes */ -#define MSEDERROR_UNSUPORTED_LOCKING_RANGE 0x81 -#define MSEDERROR_OBJECT_CREATE_FAILED 0x82 -#define MSEDERROR_INVALID_PARAMETER 0x83 -#define MSEDERROR_OPEN_ERR 0x84 -#define MSEDERROR_INVALID_LIFECYCLE 0x85 -#define MSEDERROR_INVALID_COMMAND 0x86 -#define MSEDERROR_AUTH_FAILED 0x87 -#define MSEDERROR_COMMAND_ERROR 0x88 -#define MSEDERROR_NO_METHOD_STATUS 0x89 -#define MSEDERROR_NO_LOCKING_INFO 0x8a +#define DTAERROR_UNSUPORTED_LOCKING_RANGE 0x81 +#define DTAERROR_OBJECT_CREATE_FAILED 0x82 +#define DTAERROR_INVALID_PARAMETER 0x83 +#define DTAERROR_OPEN_ERR 0x84 +#define DTAERROR_INVALID_LIFECYCLE 0x85 +#define DTAERROR_INVALID_COMMAND 0x86 +#define DTAERROR_AUTH_FAILED 0x87 +#define DTAERROR_COMMAND_ERROR 0x88 +#define DTAERROR_NO_METHOD_STATUS 0x89 +#define DTAERROR_NO_LOCKING_INFO 0x8a /** Locking Range Configurations */ -#define MSED_DISABLELOCKING 0x00 -#define MSED_READLOCKINGENABLED 0x01 -#define MSED_WRITELOCKINGENABLED 0x02 +#define DTA_DISABLELOCKING 0x00 +#define DTA_READLOCKINGENABLED 0x01 +#define DTA_WRITELOCKINGENABLED 0x02 diff --git a/Common/MsedDev.cpp b/Common/DtaDev.cpp similarity index 88% rename from Common/MsedDev.cpp rename to Common/DtaDev.cpp index acee9f9a..e48461a2 100644 --- a/Common/MsedDev.cpp +++ b/Common/DtaDev.cpp @@ -1,20 +1,20 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ /** Base device class. @@ -26,69 +26,69 @@ along with msed. If not, see . #include #include #include -#include "MsedDev.h" -#include "MsedStructures.h" -#include "MsedConstants.h" -#include "MsedEndianFixup.h" -#include "MsedHexDump.h" +#include "DtaDev.h" +#include "DtaStructures.h" +#include "DtaConstants.h" +#include "DtaEndianFixup.h" +#include "DtaHexDump.h" using namespace std; /** Device Class (Base) represents a single disk device. * This is the functionality that is common to all OS's and SSC's */ -MsedDev::MsedDev() +DtaDev::DtaDev() { } -MsedDev::~MsedDev() +DtaDev::~DtaDev() { } -uint8_t MsedDev::isOpal2() +uint8_t DtaDev::isOpal2() { - LOG(D1) << "Entering MsedDev::isOpal2 " << (uint16_t) disk_info.OPAL20; + LOG(D1) << "Entering DtaDev::isOpal2 " << (uint16_t) disk_info.OPAL20; return disk_info.OPAL20; } -uint8_t MsedDev::isOpal1() +uint8_t DtaDev::isOpal1() { - LOG(D1) << "Entering MsedDev::isOpal1() " << (uint16_t)disk_info.OPAL10; + LOG(D1) << "Entering DtaDev::isOpal1() " << (uint16_t)disk_info.OPAL10; return disk_info.OPAL10; } -uint8_t MsedDev::isEprise() +uint8_t DtaDev::isEprise() { - LOG(D1) << "Entering MsedDev::isEprise " << (uint16_t) disk_info.Enterprise; + LOG(D1) << "Entering DtaDev::isEprise " << (uint16_t) disk_info.Enterprise; return disk_info.Enterprise; } -uint8_t MsedDev::isAnySSC() +uint8_t DtaDev::isAnySSC() { - LOG(D1) << "Entering MsedDev::isAnySSC " << (uint16_t)disk_info.ANY_OPAL_SSC; + LOG(D1) << "Entering DtaDev::isAnySSC " << (uint16_t)disk_info.ANY_OPAL_SSC; return disk_info.ANY_OPAL_SSC; } -uint8_t MsedDev::isPresent() +uint8_t DtaDev::isPresent() { - LOG(D1) << "Entering MsedDev::isPresent() " << (uint16_t) isOpen; + LOG(D1) << "Entering DtaDev::isPresent() " << (uint16_t) isOpen; return isOpen; } -uint8_t MsedDev::MBREnabled() +uint8_t DtaDev::MBREnabled() { - LOG(D1) << "Entering MsedDev::MBRENabled" << (uint16_t) disk_info.OPAL20; + LOG(D1) << "Entering DtaDev::MBRENabled" << (uint16_t) disk_info.OPAL20; return disk_info.Locking_MBREnabled; } -char *MsedDev::getFirmwareRev() +char *DtaDev::getFirmwareRev() { return (char *)&disk_info.firmwareRev; } -char *MsedDev::getModelNum() +char *DtaDev::getModelNum() { return (char *)&disk_info.modelNum; } -char *MsedDev::getSerialNum() +char *DtaDev::getSerialNum() { return (char *)&disk_info.serialNum; } -void MsedDev::discovery0() +void DtaDev::discovery0() { - LOG(D1) << "Entering MsedDev::discovery0()"; + LOG(D1) << "Entering DtaDev::discovery0()"; uint8_t lastRC; void * d0Response = NULL; uint8_t * epos, *cpos; @@ -105,7 +105,7 @@ void MsedDev::discovery0() epos = cpos = (uint8_t *) d0Response; hdr = (Discovery0Header *) d0Response; LOG(D3) << "Dumping D0Response"; - IFLOG(D3) MsedHexDump(hdr, SWAP32(hdr->length)); + IFLOG(D3) DtaHexDump(hdr, SWAP32(hdr->length)); epos = epos + SWAP32(hdr->length); cpos = cpos + 48; // TODO: check header version @@ -191,9 +191,9 @@ void MsedDev::discovery0() while (cpos < epos); } -void MsedDev::puke() +void DtaDev::puke() { - LOG(D1) << "Entering MsedDev::puke()"; + LOG(D1) << "Entering DtaDev::puke()"; /* IDENTIFY */ cout << endl << dev << (disk_info.devType == DEVICE_TYPE_ATA ? " ATA" : disk_info.devType == DEVICE_TYPE_SAS ? " SAS" : " OTHER "); cout << disk_info.modelNum << " " << disk_info.firmwareRev << " " << disk_info.serialNum << endl; diff --git a/Common/MsedDev.h b/Common/DtaDev.h similarity index 92% rename from Common/MsedDev.h rename to Common/DtaDev.h index 94b88070..697a0ba9 100644 --- a/Common/MsedDev.h +++ b/Common/DtaDev.h @@ -1,29 +1,29 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ #pragma once -#include "MsedStructures.h" -#include "MsedLexicon.h" +#include "DtaStructures.h" +#include "DtaLexicon.h" #include -#include "MsedResponse.h" -class MsedCommand; -class MsedSession; +#include "DtaResponse.h" +class DtaCommand; +class DtaSession; using namespace std; /** Base class for a disk device. @@ -31,12 +31,12 @@ using namespace std; * object. The methods defined here are called by other parts of the program * so must be present in all devices */ -class MsedDev { +class DtaDev { public: /** Default constructor, does nothing */ - MsedDev(); + DtaDev(); /** Default destructor, does nothing*/ - virtual ~MsedDev(); + virtual ~DtaDev(); /** Does the device conform to the OPAL 2.0 SSC */ uint8_t isOpal2(); /** Does the device conform to the OPAL 1.0 SSC */ @@ -95,9 +95,9 @@ class MsedDev { virtual void identify() = 0; /* * virtual functions required to be implemented - * because they are called by msed.cpp + * because they are called by sedutil.cpp */ - /** User command to prepare the device for management by msed. + /** User command to prepare the device for management by sedutil. * Specific to the SSC that the device supports * @param password the password that is to be assigned to the SSC master entities */ @@ -253,14 +253,14 @@ class MsedDev { virtual uint8_t printDefaultPassword() = 0; /* * virtual functions required to be implemented - * because they are called by MsedSession.cpp + * because they are called by DtaSession.cpp */ /** Send a command to the device and wait for the response * @param cmd the MswdCommand object containing the command - * @param response the MsedResonse object containing the response + * @param response the DtaResonse object containing the response * @param protocol The security protocol number to use for the command */ - virtual uint8_t exec(MsedCommand * cmd, MsedResponse & resp, uint8_t protocol = 0x01) = 0; + virtual uint8_t exec(DtaCommand * cmd, DtaResponse & resp, uint8_t protocol = 0x01) = 0; /** return the communications ID to be used for sessions to this device */ virtual uint16_t comID() = 0; bool no_hash_passwords; /** disables hashing of passwords */ @@ -268,8 +268,8 @@ class MsedDev { const char * dev; /**< character string representing the device in the OS lexicon */ uint8_t isOpen = FALSE; /**< The device has been opened */ OPAL_DiskInfo disk_info; /**< Structure containing info from identify and discovery 0 */ - MsedResponse response; /**< shared response object */ - MsedResponse propertiesResponse; /**< response fron properties exchange */ - MsedSession *session; /**< shared session object pointer */ + DtaResponse response; /**< shared response object */ + DtaResponse propertiesResponse; /**< response fron properties exchange */ + DtaSession *session; /**< shared session object pointer */ uint8_t discovery0buffer[IO_BUFFER_LENGTH + IO_BUFFER_ALIGNMENT]; }; diff --git a/Common/MsedDevEnterprise.cpp b/Common/DtaDevEnterprise.cpp similarity index 79% rename from Common/MsedDevEnterprise.cpp rename to Common/DtaDevEnterprise.cpp index 57bac751..760023ac 100644 --- a/Common/MsedDevEnterprise.cpp +++ b/Common/DtaDevEnterprise.cpp @@ -1,20 +1,20 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ #include "os.h" @@ -22,15 +22,15 @@ along with msed. If not, see . #include #include #include -#include "MsedDevEnterprise.h" -#include "MsedHashPwd.h" -#include "MsedEndianFixup.h" -#include "MsedStructures.h" -#include "MsedCommand.h" -#include "MsedResponse.h" -#include "MsedSession.h" -#include "MsedHexDump.h" -#include "MsedAnnotatedDump.h" +#include "DtaDevEnterprise.h" +#include "DtaHashPwd.h" +#include "DtaEndianFixup.h" +#include "DtaStructures.h" +#include "DtaCommand.h" +#include "DtaResponse.h" +#include "DtaSession.h" +#include "DtaHexDump.h" +#include "DtaAnnotatedDump.h" #ifdef _MSC_VER #pragma warning(push) #pragma warning(disable:4100) @@ -88,7 +88,7 @@ static void user2cpin(vector & dst, vector & src) } //////////////////////////////////////////////////////////////////////////////// -uint16_t MsedDevEnterprise::getMaxRanges(char * password) +uint16_t DtaDevEnterprise::getMaxRanges(char * password) //////////////////////////////////////////////////////////////////////////////// { // 5.7.2.1.5 MaxRanges @@ -99,7 +99,7 @@ uint16_t MsedDevEnterprise::getMaxRanges(char * password) // Therefore: 0 <= supported range <= MaxRanges // create session - session = new MsedSession(this); + session = new DtaSession(this); if (session->start(OPAL_UID::ENTERPRISE_LOCKINGSP_UID)) { delete session; @@ -124,11 +124,11 @@ uint16_t MsedDevEnterprise::getMaxRanges(char * password) } //////////////////////////////////////////////////////////////////////////////// -uint16_t MsedDevEnterprise::getMaxRangesOpal(char * password) +uint16_t DtaDevEnterprise::getMaxRangesOpal(char * password) //////////////////////////////////////////////////////////////////////////////// { // create session - session = new MsedSession(this); + session = new DtaSession(this); if (session->start(OPAL_UID::ENTERPRISE_LOCKINGSP_UID)) { delete session; @@ -153,16 +153,16 @@ uint16_t MsedDevEnterprise::getMaxRangesOpal(char * password) return MaxRanges; } -MsedDevEnterprise::MsedDevEnterprise(const char * devref) +DtaDevEnterprise::DtaDevEnterprise(const char * devref) { - MsedDevOS::init(devref); + DtaDevOS::init(devref); assert(isEprise()); if (properties()) { LOG(E) << "Properties exchange failed"; } } -MsedDevEnterprise::~MsedDevEnterprise() +DtaDevEnterprise::~DtaDevEnterprise() { } -uint8_t MsedDevEnterprise::initialSetup(char * password) +uint8_t DtaDevEnterprise::initialSetup(char * password) { LOG(D1) << "Entering initialSetup()"; if (takeOwnership(password)) { @@ -176,7 +176,7 @@ uint8_t MsedDevEnterprise::initialSetup(char * password) } if (configureLockingRange(0, - (MSED_READLOCKINGENABLED | MSED_WRITELOCKINGENABLED), password)) { + (DTA_READLOCKINGENABLED | DTA_WRITELOCKINGENABLED), password)) { LOG(E) << "Initial setup failed - unable to enable read/write locking"; return 0xff; } @@ -185,15 +185,15 @@ uint8_t MsedDevEnterprise::initialSetup(char * password) LOG(D1) << "Exiting initialSetup()"; return 0; } -uint8_t MsedDevEnterprise::setup_SUM(uint8_t lockingrange, uint64_t start, uint64_t length, char *Admin1Password, char * password) +uint8_t DtaDevEnterprise::setup_SUM(uint8_t lockingrange, uint64_t start, uint64_t length, char *Admin1Password, char * password) { - LOG(D1) << "Entering MsedDevEnterprise::setup_SUM"; - LOG(I) << "setup_SUM not supported on MsedDevEnterprise"; + LOG(D1) << "Entering DtaDevEnterprise::setup_SUM"; + LOG(I) << "setup_SUM not supported on DtaDevEnterprise"; return 1; } -uint8_t MsedDevEnterprise::configureLockingRange(uint8_t lockingrange, uint8_t enabled, char * password) +uint8_t DtaDevEnterprise::configureLockingRange(uint8_t lockingrange, uint8_t enabled, char * password) { - LOG(D1) << "Entering MsedDevEnterprise::configureLockingRange()"; + LOG(D1) << "Entering DtaDevEnterprise::configureLockingRange()"; //** BandMaster0 UID of Table 28 Locking SP Authority table, p. 70 of Enterprise SSC rev 3.00 std::vector user; @@ -205,7 +205,7 @@ uint8_t MsedDevEnterprise::configureLockingRange(uint8_t lockingrange, uint8_t e set8(object, OPALUID[OPAL_UID::OPAL_LOCKINGRANGE_GLOBAL]); setband(object, lockingrange); - session = new MsedSession(this); + session = new DtaSession(this); if (session->start(OPAL_UID::ENTERPRISE_LOCKINGSP_UID, password, user)) { delete session; return 0xff; @@ -218,7 +218,7 @@ uint8_t MsedDevEnterprise::configureLockingRange(uint8_t lockingrange, uint8_t e vector method; set8(method, OPALMETHOD[OPAL_METHOD::ESET]); - MsedCommand *set = new MsedCommand(); + DtaCommand *set = new DtaCommand(); set->reset(object, method); set->addToken(OPAL_TOKEN::STARTLIST); set->addToken(OPAL_TOKEN::STARTLIST); @@ -227,11 +227,11 @@ uint8_t MsedDevEnterprise::configureLockingRange(uint8_t lockingrange, uint8_t e set->addToken(OPAL_TOKEN::STARTLIST); set->addToken(OPAL_TOKEN::STARTNAME); set->addToken("ReadLockEnabled"); - set->addToken((enabled & MSED_READLOCKINGENABLED) ? OPAL_TRUE : OPAL_FALSE); + set->addToken((enabled & DTA_READLOCKINGENABLED) ? OPAL_TRUE : OPAL_FALSE); set->addToken(OPAL_TOKEN::ENDNAME); set->addToken(OPAL_TOKEN::STARTNAME); set->addToken("WriteLockEnabled"); - set->addToken((enabled & MSED_WRITELOCKINGENABLED) ? OPAL_TRUE : OPAL_FALSE); + set->addToken((enabled & DTA_WRITELOCKINGENABLED) ? OPAL_TRUE : OPAL_FALSE); set->addToken(OPAL_TOKEN::ENDNAME); set->addToken(OPAL_TOKEN::STARTNAME); set->addToken("LockOnReset"); @@ -253,12 +253,12 @@ uint8_t MsedDevEnterprise::configureLockingRange(uint8_t lockingrange, uint8_t e delete set; delete session; LOG(I) << "Locking range configured " << (uint16_t) enabled; - LOG(D1) << "Exiting MsedDevEnterprise::configureLockingRange()"; + LOG(D1) << "Exiting DtaDevEnterprise::configureLockingRange()"; return 0; } -uint8_t MsedDevEnterprise::rekeyLockingRange(uint8_t lockingrange, char * password) +uint8_t DtaDevEnterprise::rekeyLockingRange(uint8_t lockingrange, char * password) { - LOG(D1) << "Entering MsedDevEnterprise::rekeyLockingRange()"; + LOG(D1) << "Entering DtaDevEnterprise::rekeyLockingRange()"; uint8_t lastRC; //** BandMaster0 UID of Table 28 Locking SP Authority table, p. 70 of Enterprise SSC rev 3.00 @@ -271,10 +271,10 @@ uint8_t MsedDevEnterprise::rekeyLockingRange(uint8_t lockingrange, char * passwo set8(table, OPALUID[OPAL_UID::OPAL_LOCKINGRANGE_GLOBAL]); setband(table, lockingrange); - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } if ((lastRC = session->start(OPAL_UID::ENTERPRISE_LOCKINGSP_UID, password, user)) != 0) { delete session; @@ -291,11 +291,11 @@ uint8_t MsedDevEnterprise::rekeyLockingRange(uint8_t lockingrange, char * passwo delete session; return 0; } - MsedCommand *rekey = new MsedCommand(); + DtaCommand *rekey = new DtaCommand(); if (NULL == rekey) { LOG(E) << "Unable to create command object "; delete session; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } rekey->reset(OPAL_UID::OPAL_AUTHORITY_TABLE, OPAL_METHOD::GENKEY); rekey->changeInvokingUid(ActiveKey); @@ -311,24 +311,24 @@ uint8_t MsedDevEnterprise::rekeyLockingRange(uint8_t lockingrange, char * passwo delete rekey; delete session; LOG(I) << "LockingRange" << (uint16_t)lockingrange << " reKeyed "; - LOG(D1) << "Exiting MsedDevEnterprise::rekeyLockingRange()"; + LOG(D1) << "Exiting DtaDevEnterprise::rekeyLockingRange()"; return 0; } -uint8_t MsedDevEnterprise::revertLockingSP(char * password, uint8_t keep) +uint8_t DtaDevEnterprise::revertLockingSP(char * password, uint8_t keep) { - LOG(D1) << "Entering MsedDevEnterprise::revertLockingSP()"; + LOG(D1) << "Entering DtaDevEnterprise::revertLockingSP()"; if(password == NULL) { LOG(D4) << "Referencing formal parameters " << keep; } uint8_t lastRC; - MsedCommand *cmd = new MsedCommand(); + DtaCommand *cmd = new DtaCommand(); if (NULL == cmd) { LOG(E) << "Unable to create command object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; delete cmd; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } OPAL_UID uid = OPAL_UID::OPAL_SID_UID; if ((lastRC = session->start(OPAL_UID::OPAL_ADMINSP_UID, password, uid)) != 0) { @@ -353,12 +353,12 @@ uint8_t MsedDevEnterprise::revertLockingSP(char * password, uint8_t keep) LOG(I) << "revertLockingSP completed successfully"; delete cmd; delete session; - LOG(D1) << "Exiting MsedDevEnterprise::revertLockingSP()"; + LOG(D1) << "Exiting DtaDevEnterprise::revertLockingSP()"; return 0; } -uint8_t MsedDevEnterprise::setPassword(char * password, char * userid, char * newpassword) +uint8_t DtaDevEnterprise::setPassword(char * password, char * userid, char * newpassword) { - LOG(D1) << "Entering MsedDevEnterprise::setPassword" ; + LOG(D1) << "Entering DtaDevEnterprise::setPassword" ; if (11 > strnlen(userid, 15)) { LOG(E) << "Invalid Userid " << userid; return 0xff; @@ -391,7 +391,7 @@ uint8_t MsedDevEnterprise::setPassword(char * password, char * userid, char * ne return 0xff; } string defaultPassword = response.getString(5); - session = new MsedSession(this); + session = new DtaSession(this); session->dontHashPwd(); if (session->start(OPAL_UID::ENTERPRISE_LOCKINGSP_UID, (char *)defaultPassword.c_str(), user)) { @@ -401,7 +401,7 @@ uint8_t MsedDevEnterprise::setPassword(char * password, char * userid, char * ne } else { - session = new MsedSession(this); + session = new DtaSession(this); if (session->start(OPAL_UID::ENTERPRISE_LOCKINGSP_UID, password, user)) { delete session; @@ -410,7 +410,7 @@ uint8_t MsedDevEnterprise::setPassword(char * password, char * userid, char * ne } std::vector hash; - MsedHashPwd(hash, newpassword, this); + DtaHashPwd(hash, newpassword, this); if (setTable(usercpin, "PIN", hash)) { LOG(E) << "Unable to set user " << userid << " new password "; delete session; @@ -418,37 +418,37 @@ uint8_t MsedDevEnterprise::setPassword(char * password, char * userid, char * ne } LOG(I) << userid << " password changed"; delete session; - LOG(D1) << "Exiting MsedDevEnterprise::setPassword()"; + LOG(D1) << "Exiting DtaDevEnterprise::setPassword()"; return 0; } -uint8_t MsedDevEnterprise::setNewPassword_SUM(char * password, char * userid, char * newpassword) +uint8_t DtaDevEnterprise::setNewPassword_SUM(char * password, char * userid, char * newpassword) { - LOG(D1) << "Entering MsedDevEnterprise::setNewPassword_SUM()"; + LOG(D1) << "Entering DtaDevEnterprise::setNewPassword_SUM()"; LOG(I) << "setNewPassword_SUM is not in the Enterprise SSC and not supported"; - LOG(D1) << "Exiting MsedDevEnterprise::setNewPassword_SUM()"; + LOG(D1) << "Exiting DtaDevEnterprise::setNewPassword_SUM()"; return 0; } -uint8_t MsedDevEnterprise::setMBREnable(uint8_t mbrstate, char * Admin1Password) +uint8_t DtaDevEnterprise::setMBREnable(uint8_t mbrstate, char * Admin1Password) { - LOG(D1) << "Entering MsedDevEnterprise::setMBREnable"; + LOG(D1) << "Entering DtaDevEnterprise::setMBREnable"; if (NULL == Admin1Password) { LOG(E) << "This shouldn't happen " << mbrstate; } LOG(I) << "MBR shadowing is optional in the Enterprise SSC and not supported"; - LOG(D1) << "Exiting MsedDevEnterprise::setMBREnable"; + LOG(D1) << "Exiting DtaDevEnterprise::setMBREnable"; return 0; } -uint8_t MsedDevEnterprise::setMBRDone(uint8_t mbrstate, char * Admin1Password) +uint8_t DtaDevEnterprise::setMBRDone(uint8_t mbrstate, char * Admin1Password) { - LOG(D1) << "Entering MsedDevEnterprise::setMBRDone"; + LOG(D1) << "Entering DtaDevEnterprise::setMBRDone"; if (NULL == Admin1Password) { LOG(E) << "This shouldn't happen " << mbrstate; } LOG(I) << "MBR shadowing is optional in the Enterprise SSC and not supported"; - LOG(D1) << "Exiting MsedDevEnterprise::setMBRDone"; + LOG(D1) << "Exiting DtaDevEnterprise::setMBRDone"; return 0; } -uint8_t MsedDevEnterprise::setupLockingRange(uint8_t lockingrange, uint64_t start, uint64_t length, char * password) +uint8_t DtaDevEnterprise::setupLockingRange(uint8_t lockingrange, uint64_t start, uint64_t length, char * password) { uint8_t lastRC; - LOG(D1) << "Entering MsedDevEnterprise::setupLockingRange"; + LOG(D1) << "Entering DtaDevEnterprise::setupLockingRange"; // look up MaxRanges const uint16_t MaxRanges = getMaxRanges(password); if (MaxRanges == 0 || MaxRanges >= 1024) return 0xff; @@ -473,7 +473,7 @@ uint8_t MsedDevEnterprise::setupLockingRange(uint8_t lockingrange, uint64_t star vector method; set8(method, OPALMETHOD[OPAL_METHOD::ESET]); - MsedCommand *set = new MsedCommand(); + DtaCommand *set = new DtaCommand(); set->reset(object, method); set->addToken(OPAL_TOKEN::STARTLIST); set->addToken(OPAL_TOKEN::STARTLIST); @@ -514,10 +514,10 @@ uint8_t MsedDevEnterprise::setupLockingRange(uint8_t lockingrange, uint64_t star set->addToken(OPAL_TOKEN::ENDLIST); set->complete(); - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } if ((lastRC = session->start(OPAL_UID::ENTERPRISE_LOCKINGSP_UID, password, user)) != 0) { delete session; @@ -537,21 +537,21 @@ uint8_t MsedDevEnterprise::setupLockingRange(uint8_t lockingrange, uint64_t star } LOG(I) << "LockingRange" << (uint16_t)lockingrange << " starting block " << start << " for " << length << " blocks configured as unlocked range"; - LOG(D1) << "Exiting MsedDevEnterprise::setupLockingRange"; + LOG(D1) << "Exiting DtaDevEnterprise::setupLockingRange"; return 0; } -uint8_t MsedDevEnterprise::setupLockingRange_SUM(uint8_t lockingrange, uint64_t start, +uint8_t DtaDevEnterprise::setupLockingRange_SUM(uint8_t lockingrange, uint64_t start, uint64_t length, char * password) { - LOG(D1) << "Entering MsedDevEnterprise::setupLockingRange_SUM"; + LOG(D1) << "Entering DtaDevEnterprise::setupLockingRange_SUM"; if (0 == lockingrange) { LOG(E) << start << length << password; } - LOG(D1) << "Exiting MsedDevEnterprise::setupLockingRange_SUM"; + LOG(D1) << "Exiting DtaDevEnterprise::setupLockingRange_SUM"; return 0; } //////////////////////////////////////////////////////////////////////////////// -uint8_t MsedDevEnterprise::listLockingRanges(char * password, int16_t rangeid) +uint8_t DtaDevEnterprise::listLockingRanges(char * password, int16_t rangeid) //////////////////////////////////////////////////////////////////////////////// { - LOG(D) << "Entering MsedDevEnterprise::listLockingRanges"; + LOG(D) << "Entering DtaDevEnterprise::listLockingRanges"; if (NULL == password) { LOG(E) << "password NULL"; } // look up MaxRanges @@ -581,7 +581,7 @@ uint8_t MsedDevEnterprise::listLockingRanges(char * password, int16_t rangeid) LOG(I) << "Band[" << i << "]"; - session = new MsedSession(this); + session = new DtaSession(this); if (session->start(OPAL_UID::ENTERPRISE_LOCKINGSP_UID, password, user)) { LOG(I) << " could not establish session for row[" << i << "]"; @@ -645,7 +645,7 @@ uint8_t MsedDevEnterprise::listLockingRanges(char * password, int16_t rangeid) const bool WriteLocked = response.getUint8(5+4*7) != 0; // LockOnReset list has at least one element const bool LockOnReset = response.tokenIs(5+4*8) == STARTLIST - && response.tokenIs(5+4*8+1) == MSED_TOKENID_UINT; + && response.tokenIs(5+4*8+1) == DTA_TOKENID_UINT; delete session; LOG(I) << " Name " << Name; @@ -658,14 +658,14 @@ uint8_t MsedDevEnterprise::listLockingRanges(char * password, int16_t rangeid) LOG(I) << " WriteLocked " << WriteLocked; LOG(I) << " LockOnReset " << LockOnReset; } - LOG(D1) << "Exiting MsedDevEnterprise::listLockingRanges"; + LOG(D1) << "Exiting DtaDevEnterprise::listLockingRanges"; return 0; } -uint8_t MsedDevEnterprise::setLockingRange(uint8_t lockingrange, uint8_t lockingstate, +uint8_t DtaDevEnterprise::setLockingRange(uint8_t lockingrange, uint8_t lockingstate, char * password) { - LOG(D1) << "Entering MsedDevEnterprise::setLockingRange"; + LOG(D1) << "Entering DtaDevEnterprise::setLockingRange"; // convert Opal lockingstate to boolean OPAL_TOKEN locked; @@ -708,7 +708,7 @@ uint8_t MsedDevEnterprise::setLockingRange(uint8_t lockingrange, uint8_t locking vector method; set8(method, OPALMETHOD[OPAL_METHOD::ESET]); - MsedCommand *set = new MsedCommand(); + DtaCommand *set = new DtaCommand(); set->reset(object, method); set->addToken(OPAL_TOKEN::STARTLIST); set->addToken(OPAL_TOKEN::STARTLIST); @@ -727,7 +727,7 @@ uint8_t MsedDevEnterprise::setLockingRange(uint8_t lockingrange, uint8_t locking set->addToken(OPAL_TOKEN::ENDLIST); set->addToken(OPAL_TOKEN::ENDLIST); set->complete(); - session = new MsedSession(this); + session = new DtaSession(this); if (session->start(OPAL_UID::ENTERPRISE_LOCKINGSP_UID, password, user)) { delete session; @@ -743,39 +743,39 @@ uint8_t MsedDevEnterprise::setLockingRange(uint8_t lockingrange, uint8_t locking delete set; delete session; LOG(I) << "Locking range Read/Write set " << (uint16_t)locked; - LOG(D1) << "Exiting MsedDevEnterprise::setLockingRange"; + LOG(D1) << "Exiting DtaDevEnterprise::setLockingRange"; return 0; } -uint8_t MsedDevEnterprise::setLockingRange_SUM(uint8_t lockingrange, uint8_t lockingstate, +uint8_t DtaDevEnterprise::setLockingRange_SUM(uint8_t lockingrange, uint8_t lockingstate, char * password) { - LOG(D1) << "Entering MsedDevEnterprise::setLockingRange_SUM()"; + LOG(D1) << "Entering DtaDevEnterprise::setLockingRange_SUM()"; LOG(E) << "setLockingRange_SUM not implemented"; - LOG(D1) << "Exiting MsedDevEnterprise::setLockingRange_SUM()"; + LOG(D1) << "Exiting DtaDevEnterprise::setLockingRange_SUM()"; return 0; } -uint8_t MsedDevEnterprise::enableUser(char * password, char * userid) +uint8_t DtaDevEnterprise::enableUser(char * password, char * userid) { - LOG(D1) << "Entering MsedDevEnterprise::enableUser"; + LOG(D1) << "Entering DtaDevEnterprise::enableUser"; LOG(E) << "enableUser not implemented"; if (!password && !userid) { LOG(E) << "Formal Parameters"; } - LOG(D1) << "Exiting MsedDevEnterprise::enableUser()"; + LOG(D1) << "Exiting DtaDevEnterprise::enableUser()"; return 0xff; } -uint8_t MsedDevEnterprise::revertTPer(char * password, uint8_t PSID) +uint8_t DtaDevEnterprise::revertTPer(char * password, uint8_t PSID) { - LOG(D1) << "Entering MsedDevEnterprise::revertTPer()"; + LOG(D1) << "Entering DtaDevEnterprise::revertTPer()"; if (password == NULL) { LOG(D4) << "Referencing formal parameters " << PSID; } uint8_t lastRC; - MsedCommand *cmd = new MsedCommand(); + DtaCommand *cmd = new DtaCommand(); if (NULL == cmd) { LOG(E) << "Unable to create command object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; delete cmd; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } OPAL_UID uid = OPAL_UID::OPAL_SID_UID; if (PSID) { @@ -800,13 +800,13 @@ uint8_t MsedDevEnterprise::revertTPer(char * password, uint8_t PSID) LOG(I) << "revertTper completed successfully"; delete cmd; delete session; - LOG(D1) << "Exiting MsedDevEnterprise::revertTPer()"; + LOG(D1) << "Exiting DtaDevEnterprise::revertTPer()"; return 0; } -uint8_t MsedDevEnterprise::eraseLockingRange(uint8_t lockingrange, char * password) +uint8_t DtaDevEnterprise::eraseLockingRange(uint8_t lockingrange, char * password) { uint8_t lastRC; - LOG(D1) << "Entering MsedDevEnterprise::eraseLockingRange"; + LOG(D1) << "Entering DtaDevEnterprise::eraseLockingRange"; // look up MaxRanges const uint16_t MaxRanges = getMaxRanges(password); @@ -831,16 +831,16 @@ uint8_t MsedDevEnterprise::eraseLockingRange(uint8_t lockingrange, char * passwo vector method; set8(method, OPALMETHOD[OPAL_METHOD::ERASE]); - MsedCommand *erase = new MsedCommand(); + DtaCommand *erase = new DtaCommand(); erase->reset(object, method); erase->addToken(OPAL_TOKEN::STARTLIST); erase->addToken(OPAL_TOKEN::ENDLIST); erase->complete(); - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } if ((lastRC = session->start(OPAL_UID::ENTERPRISE_LOCKINGSP_UID, password, user)) != 0) { delete session; @@ -855,45 +855,45 @@ uint8_t MsedDevEnterprise::eraseLockingRange(uint8_t lockingrange, char * passwo delete erase; delete session; LOG(I) << "LockingRange" << (uint16_t)lockingrange << " erased"; - LOG(D1) << "Exiting MsedDevEnterprise::eraseLockingRange"; + LOG(D1) << "Exiting DtaDevEnterprise::eraseLockingRange"; return 0; } -uint8_t MsedDevEnterprise::loadPBA(char * password, char * filename) { - LOG(D1) << "Entering MsedDevEnterprise::loadPBAimage()" << filename << " " << dev; +uint8_t DtaDevEnterprise::loadPBA(char * password, char * filename) { + LOG(D1) << "Entering DtaDevEnterprise::loadPBAimage()" << filename << " " << dev; if (password == NULL) { LOG(D4) << "Referencing formal parameters " << filename; } LOG(I) << "loadPBA is not implemented. It is not a mandatory part of "; LOG(I) << "the enterprise SSC "; - LOG(D1) << "Exiting MsedDevEnterprise::loadPBAimage()"; + LOG(D1) << "Exiting DtaDevEnterprise::loadPBAimage()"; return 0; } -uint8_t MsedDevEnterprise::activateLockingSP(char * password) +uint8_t DtaDevEnterprise::activateLockingSP(char * password) { - LOG(D1) << "Entering MsedDevEnterprise::activateLockingSP()"; + LOG(D1) << "Entering DtaDevEnterprise::activateLockingSP()"; if (password == NULL) { LOG(D4) << "Referencing formal parameters "; } LOG(E) << "activate Locking SP is not a part of the Enterprise SSC "; - LOG(D1) << "Exiting MsedDevEnterprise::activatLockingSP()"; + LOG(D1) << "Exiting DtaDevEnterprise::activatLockingSP()"; return 0; } -uint8_t MsedDevEnterprise::activateLockingSP_SUM(uint8_t lockingrange, char * password) +uint8_t DtaDevEnterprise::activateLockingSP_SUM(uint8_t lockingrange, char * password) { - LOG(D1) << "Entering MsedDevEnterprise::activateLockingSP_SUM()"; + LOG(D1) << "Entering DtaDevEnterprise::activateLockingSP_SUM()"; if (password == NULL) { LOG(D4) << "Referencing formal parameters "; } LOG(E) << "activate Locking SP SUM is not a part of the Enterprise SSC "; - LOG(D1) << "Exiting MsedDevEnterprise::activateLockingSP_SUM()"; + LOG(D1) << "Exiting DtaDevEnterprise::activateLockingSP_SUM()"; return 0; } -uint8_t MsedDevEnterprise::eraseLockingRange_SUM(uint8_t lockingrange, char * password) +uint8_t DtaDevEnterprise::eraseLockingRange_SUM(uint8_t lockingrange, char * password) { - LOG(D1) << "Entering MsedDevEnterprise::eraseLockingRange_SUM()"; + LOG(D1) << "Entering DtaDevEnterprise::eraseLockingRange_SUM()"; if (password == NULL) { LOG(D4) << "Referencing formal parameters "; } LOG(E) << "Erase Locking Range SUM is not a part of the Enterprise SSC "; - LOG(D1) << "Exiting MsedDevEnterprise::eraseLockingRange_SUM()"; + LOG(D1) << "Exiting DtaDevEnterprise::eraseLockingRange_SUM()"; return 0; } -uint8_t MsedDevEnterprise::takeOwnership(char * newpassword) +uint8_t DtaDevEnterprise::takeOwnership(char * newpassword) { string defaultPassword; - LOG(D1) << "Entering MsedDevEnterprise::takeOwnership()"; + LOG(D1) << "Entering DtaDevEnterprise::takeOwnership()"; if (getDefaultPassword()) { LOG(E) << "takeOwnership failed unable to retrieve MSID"; return 0xff; @@ -911,20 +911,20 @@ uint8_t MsedDevEnterprise::takeOwnership(char * newpassword) LOG(D1) << "Exiting takeOwnership()"; return 0; } -uint8_t MsedDevEnterprise::initLSPUsers(char * defaultPassword, char * newPassword) +uint8_t DtaDevEnterprise::initLSPUsers(char * defaultPassword, char * newPassword) { vector user, usercpin, hash, erasemaster, table; - LOG(D1) << "Entering MsedDevEnterprise::initLSPUsers()"; + LOG(D1) << "Entering DtaDevEnterprise::initLSPUsers()"; // do erasemaster - session = new MsedSession(this); + session = new DtaSession(this); session->dontHashPwd(); set8(erasemaster, OPALUID[OPAL_UID::ENTERPRISE_ERASEMASTER_UID]); if (session->start(OPAL_UID::ENTERPRISE_LOCKINGSP_UID, defaultPassword, erasemaster)) { delete session; return 0xff; } - MsedHashPwd(hash, newPassword, this); + DtaHashPwd(hash, newPassword, this); user2cpin(usercpin, erasemaster); if (setTable(usercpin, "PIN", hash)) { LOG(E) << "Unable to set new EraseMaster password "; @@ -942,13 +942,13 @@ uint8_t MsedDevEnterprise::initLSPUsers(char * defaultPassword, char * newPasswo for (uint16_t i = 0; i <= MaxRanges; i++) { setband(user, i); LOG(D3) << "initializing BandMaster" << (uint16_t) i; - session = new MsedSession(this); + session = new DtaSession(this); session->dontHashPwd(); if (session->start(OPAL_UID::ENTERPRISE_LOCKINGSP_UID, defaultPassword, user)) { delete session; return 0xff; } - MsedHashPwd(hash, newPassword, this); + DtaHashPwd(hash, newPassword, this); user2cpin(usercpin, user); if (setTable(usercpin, "PIN", hash)) { LOG(E) << "Unable to set BandMaster" << (uint16_t) i << " new password "; @@ -959,14 +959,14 @@ uint8_t MsedDevEnterprise::initLSPUsers(char * defaultPassword, char * newPasswo delete session; } - LOG(D1) << "Exiting MsedDevEnterprise::initLSPUsers()"; + LOG(D1) << "Exiting DtaDevEnterprise::initLSPUsers()"; return 0; } -uint8_t MsedDevEnterprise::getDefaultPassword() +uint8_t DtaDevEnterprise::getDefaultPassword() { - LOG(D1) << "Entering MsedDevEnterprise::getDefaultPassword()"; + LOG(D1) << "Entering DtaDevEnterprise::getDefaultPassword()"; vector hash; - session = new MsedSession(this); + session = new DtaSession(this); if (session->start(OPAL_UID::OPAL_ADMINSP_UID)) { LOG(E) << "Unable to start Unauthenticated session " << dev; delete session; @@ -985,7 +985,7 @@ uint8_t MsedDevEnterprise::getDefaultPassword() LOG(D1) << "Exiting getDefaultPassword()"; return 0; } -uint8_t MsedDevEnterprise::printDefaultPassword() +uint8_t DtaDevEnterprise::printDefaultPassword() { const uint8_t rc = getDefaultPassword(); if (rc) { @@ -996,10 +996,10 @@ uint8_t MsedDevEnterprise::printDefaultPassword() fprintf(stdout, "MSID: %s\n", (char *)defaultPassword.c_str()); return 0; } -uint8_t MsedDevEnterprise::setSIDPassword(char * oldpassword, char * newpassword, +uint8_t DtaDevEnterprise::setSIDPassword(char * oldpassword, char * newpassword, uint8_t hasholdpwd, uint8_t hashnewpwd) { - LOG(D1) << "Entering MsedDevEnterprise::setSIDPassword()"; + LOG(D1) << "Entering DtaDevEnterprise::setSIDPassword()"; vector user; set8(user, OPALUID[OPAL_SID_UID]); @@ -1015,7 +1015,7 @@ uint8_t MsedDevEnterprise::setSIDPassword(char * oldpassword, char * newpassword return 0xff; } string defaultPassword = response.getString(5); - session = new MsedSession(this); + session = new DtaSession(this); session->dontHashPwd(); if (session->start(OPAL_UID::OPAL_ADMINSP_UID, (char *)defaultPassword.c_str(), user)) { @@ -1025,7 +1025,7 @@ uint8_t MsedDevEnterprise::setSIDPassword(char * oldpassword, char * newpassword } else { - session = new MsedSession(this); + session = new DtaSession(this); if (!hasholdpwd) session->dontHashPwd(); if (session->start(OPAL_UID::OPAL_ADMINSP_UID, oldpassword, user)) { @@ -1036,7 +1036,7 @@ uint8_t MsedDevEnterprise::setSIDPassword(char * oldpassword, char * newpassword vector hash; if (hashnewpwd) { - MsedHashPwd(hash, newpassword, this); + DtaHashPwd(hash, newpassword, this); } else { @@ -1054,21 +1054,21 @@ uint8_t MsedDevEnterprise::setSIDPassword(char * oldpassword, char * newpassword return 0xff; } delete session; - LOG(D1) << "Exiting MsedDevEnterprise::setSIDPassword()"; + LOG(D1) << "Exiting DtaDevEnterprise::setSIDPassword()"; return 0; } -uint8_t MsedDevEnterprise::setTable(vector table, const char *name, +uint8_t DtaDevEnterprise::setTable(vector table, const char *name, OPAL_TOKEN value) { vector token; token.push_back((uint8_t) value); return(setTable(table, name, token)); } -uint8_t MsedDevEnterprise::setTable(vector table, const char *name, +uint8_t DtaDevEnterprise::setTable(vector table, const char *name, vector value) { - LOG(D1) << "Entering MsedDevEnterprise::setTable"; - MsedCommand *set = new MsedCommand(); + LOG(D1) << "Entering DtaDevEnterprise::setTable"; + DtaCommand *set = new DtaCommand(); set->reset(OPAL_UID::OPAL_AUTHORITY_TABLE, OPAL_METHOD::ESET); set->changeInvokingUid(table); set->addToken(OPAL_TOKEN::STARTLIST); @@ -1090,14 +1090,14 @@ uint8_t MsedDevEnterprise::setTable(vector table, const char *name, return 0xff; } delete set; - LOG(D1) << "Leaving MsedDevEnterprise::setTable"; + LOG(D1) << "Leaving DtaDevEnterprise::setTable"; return 0; } -uint8_t MsedDevEnterprise::getTable(vector table, const char * startcol, +uint8_t DtaDevEnterprise::getTable(vector table, const char * startcol, const char * endcol) { - LOG(D1) << "Entering MsedDevEnterprise::getTable"; - MsedCommand *get = new MsedCommand(); + LOG(D1) << "Entering DtaDevEnterprise::getTable"; + DtaCommand *get = new DtaCommand(); get->reset(OPAL_UID::OPAL_AUTHORITY_TABLE, OPAL_METHOD::EGET); get->changeInvokingUid(table); get->addToken(OPAL_TOKEN::STARTLIST); @@ -1120,18 +1120,18 @@ uint8_t MsedDevEnterprise::getTable(vector table, const char * startcol delete get; return 0; } -uint16_t MsedDevEnterprise::comID() +uint16_t DtaDevEnterprise::comID() { - LOG(D1) << "Entering MsedDevEnterprise::comID()"; + LOG(D1) << "Entering DtaDevEnterprise::comID()"; return disk_info.Enterprise_basecomID; } -uint8_t MsedDevEnterprise::exec(MsedCommand * cmd, MsedResponse & resp, uint8_t protocol) +uint8_t DtaDevEnterprise::exec(DtaCommand * cmd, DtaResponse & resp, uint8_t protocol) { uint8_t rc = 0; OPALHeader * hdr = (OPALHeader *) cmd->getCmdBuffer(); LOG(D3) << endl << "Dumping command buffer"; - IFLOG(D) MsedAnnotatedDump(IF_SEND, cmd->getCmdBuffer(), IO_BUFFER_LENGTH); - IFLOG(D3) MsedHexDump(cmd->getCmdBuffer(), SWAP32(hdr->cp.length) + sizeof (OPALComPacket)); + IFLOG(D) DtaAnnotatedDump(IF_SEND, cmd->getCmdBuffer(), IO_BUFFER_LENGTH); + IFLOG(D3) DtaHexDump(cmd->getCmdBuffer(), SWAP32(hdr->cp.length) + sizeof (OPALComPacket)); rc = sendCmd(IF_SEND, protocol, comID(), cmd->getCmdBuffer(), IO_BUFFER_LENGTH); if (0 != rc) { LOG(E) << "Command failed on send " << (uint16_t) rc; @@ -1147,8 +1147,8 @@ uint8_t MsedDevEnterprise::exec(MsedCommand * cmd, MsedResponse & resp, uint8_t } while ((0 != hdr->cp.outstandingData) && (0 == hdr->cp.minTransfer)); LOG(D3) << std::endl << "Dumping reply buffer"; - IFLOG(D) MsedAnnotatedDump(IF_RECV, cmd->getRespBuffer(), SWAP32(hdr->cp.length) + sizeof (OPALComPacket)); - IFLOG(D3) MsedHexDump(cmd->getRespBuffer(), SWAP32(hdr->cp.length) + sizeof (OPALComPacket)); + IFLOG(D) DtaAnnotatedDump(IF_RECV, cmd->getRespBuffer(), SWAP32(hdr->cp.length) + sizeof (OPALComPacket)); + IFLOG(D3) DtaHexDump(cmd->getRespBuffer(), SWAP32(hdr->cp.length) + sizeof (OPALComPacket)); if (0 != rc) { LOG(E) << "Command failed on recv" << (uint16_t) rc; return rc; @@ -1156,11 +1156,11 @@ uint8_t MsedDevEnterprise::exec(MsedCommand * cmd, MsedResponse & resp, uint8_t resp.init(cmd->getRespBuffer()); return 0; } -uint8_t MsedDevEnterprise::properties() +uint8_t DtaDevEnterprise::properties() { - LOG(D1) << "Entering MsedDevEnterprise::properties()"; - session = new MsedSession(this); // use the session IO without starting a session - MsedCommand *props = new MsedCommand(OPAL_UID::OPAL_SMUID_UID, OPAL_METHOD::PROPERTIES); + LOG(D1) << "Entering DtaDevEnterprise::properties()"; + session = new DtaSession(this); // use the session IO without starting a session + DtaCommand *props = new DtaCommand(OPAL_UID::OPAL_SMUID_UID, OPAL_METHOD::PROPERTIES); props->addToken(OPAL_TOKEN::STARTLIST); props->addToken(OPAL_TOKEN::STARTNAME); props->addToken("HostProperties"); @@ -1199,13 +1199,13 @@ uint8_t MsedDevEnterprise::properties() } disk_info.Properties = 1; delete props; - LOG(D1) << "Leaving MsedDevEnterprise::properties()"; + LOG(D1) << "Leaving DtaDevEnterprise::properties()"; return 0; } -void MsedDevEnterprise::puke() +void DtaDevEnterprise::puke() { - LOG(D1) << "Entering MsedDevEnterprise::puke()"; - MsedDev::puke(); + LOG(D1) << "Entering DtaDevEnterprise::puke()"; + DtaDev::puke(); if (disk_info.Properties) { cout << std::endl << "TPer Properties: " << std::endl; for (uint32_t i = 0, j = 1; i < propertiesResponse.getTokenCount(); i++) { @@ -1221,7 +1221,7 @@ void MsedDevEnterprise::puke() } } if (OPAL_TOKEN::STARTNAME == propertiesResponse.tokenIs(i)) { - if (OPAL_TOKEN::MSED_TOKENID_BYTESTRING == propertiesResponse.tokenIs(i + 1)) { + if (OPAL_TOKEN::DTA_TOKENID_BYTESTRING == propertiesResponse.tokenIs(i + 1)) { cout << " " << propertiesResponse.getString(i + 1) << " = " << propertiesResponse.getUint64(i + 2); i += 2; j++; @@ -1231,10 +1231,10 @@ void MsedDevEnterprise::puke() } } } -uint8_t MsedDevEnterprise::rawCmd(char *sp, char *hexauth, char *pass, +uint8_t DtaDevEnterprise::rawCmd(char *sp, char *hexauth, char *pass, char *hexinvokingUID, char *hexmethod,char *hexparms) { - LOG(D1) << "Entering MsedDevEnterprise::rawCmd"; + LOG(D1) << "Entering DtaDevEnterprise::rawCmd"; LOG(D1) << sp << " " << hexauth << " " << pass << " " ; LOG(D1) << hexinvokingUID << " " << hexmethod << " " << hexparms; @@ -1284,12 +1284,12 @@ uint8_t MsedDevEnterprise::rawCmd(char *sp, char *hexauth, char *pass, work += hexparms[i + 1] & 0x40 ? (hexparms[i + 1] & 0xf) + 9 : hexparms[i + 1] & 0x0f; parms.push_back(work); } - MsedCommand *cmd = new MsedCommand(); + DtaCommand *cmd = new DtaCommand(); cmd->reset(OPAL_UID::OPAL_AUTHORITY_TABLE, method); cmd->changeInvokingUid(invokingUID); cmd->addToken(parms); cmd->complete(); - session = new MsedSession(this); + session = new DtaSession(this); if (session->start((OPAL_UID) atoi(sp), pass, authority)) { delete cmd; delete session; @@ -1306,15 +1306,15 @@ uint8_t MsedDevEnterprise::rawCmd(char *sp, char *hexauth, char *pass, cmd->dumpResponse(); delete cmd; delete session; - LOG(D1) << "Exiting MsedDevEnterprise::rawCmd"; + LOG(D1) << "Exiting DtaDevEnterprise::rawCmd"; return 0; } -uint8_t MsedDevEnterprise::objDump(char *sp, char * auth, char *pass, +uint8_t DtaDevEnterprise::objDump(char *sp, char * auth, char *pass, char * objID) { - LOG(D1) << "Entering MsedDevEnterprise::objDump"; + LOG(D1) << "Entering DtaDevEnterprise::objDump"; LOG(D1) << sp << " " << auth << " " << pass << " " << objID; - MsedCommand *get = new MsedCommand(); + DtaCommand *get = new DtaCommand(); vector authority, object; uint8_t work; if (16 != strnlen(auth, 32)) { @@ -1346,7 +1346,7 @@ uint8_t MsedDevEnterprise::objDump(char *sp, char * auth, char *pass, get->complete(); LOG(I) << "Command:"; get->dumpCommand(); - session = new MsedSession(this); + session = new DtaSession(this); if (session->start((OPAL_UID)atoi(sp), pass, authority)) { delete get; delete session; @@ -1361,7 +1361,7 @@ uint8_t MsedDevEnterprise::objDump(char *sp, char * auth, char *pass, get->dumpResponse(); delete get; delete session; - LOG(D1) << "Exiting MsedDevEnterprise::objDump"; + LOG(D1) << "Exiting DtaDevEnterprise::objDump"; return 0; } #ifdef _MSC_VER diff --git a/Common/MsedDevEnterprise.h b/Common/DtaDevEnterprise.h similarity index 91% rename from Common/MsedDevEnterprise.h rename to Common/DtaDevEnterprise.h index e7fd65c8..35287518 100644 --- a/Common/MsedDevEnterprise.h +++ b/Common/DtaDevEnterprise.h @@ -1,56 +1,56 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ #pragma once -class MsedCommand; -class MsedSession; +class DtaCommand; +class DtaSession; #include "os.h" -#include "MsedDev.h" -#include "MsedDevOS.h" -#include "MsedStructures.h" -#include "MsedLexicon.h" -#include "MsedResponse.h" // wouldn't take class +#include "DtaDev.h" +#include "DtaDevOS.h" +#include "DtaStructures.h" +#include "DtaLexicon.h" +#include "DtaResponse.h" // wouldn't take class #include using namespace std; /** Device Class represents a disk device, conforming to the TCG Enterprise standard */ -class MsedDevEnterprise : public MsedDevOS { +class DtaDevEnterprise : public DtaDevOS { public: /** Constructor using an OS specific device descriptor. * @param devref reference to device is OS specific lexicon * */ - MsedDevEnterprise(const char * devref); + DtaDevEnterprise(const char * devref); /** Default destructor, does nothing*/ - ~MsedDevEnterprise(); + ~DtaDevEnterprise(); /** Inform TPer of the communication propertied I wiah to use and * receive the TPer maximum values */ uint8_t properties(); /** Send a command to the device and wait for the response - * @param cmd the MsedCommand object containg the command - * @param response the MsedResonse object containing the response + * @param cmd the DtaCommand object containg the command + * @param response the DtaResonse object containing the response * @param protocol The security protocol number to use for the command */ - uint8_t exec(MsedCommand * cmd, MsedResponse & resp, uint8_t protocol = 0x01); + uint8_t exec(DtaCommand * cmd, DtaResponse & resp, uint8_t protocol = 0x01); /** return the communications ID to be used for sessions to this device */ uint16_t comID(); /** Change the SID password from it's MSID default @@ -174,7 +174,7 @@ class MsedDevEnterprise : public MsedDevOS { * @param filename the filename of the disk image */ uint8_t loadPBA(char * password, char * filename); - /** User command to prepare the device for management by msed. + /** User command to prepare the device for management by sedutil. * Specific to the SSC that the device supports * @param password the password that is to be assigned to the SSC master entities */ diff --git a/Common/MsedDevGeneric.cpp b/Common/DtaDevGeneric.cpp similarity index 77% rename from Common/MsedDevGeneric.cpp rename to Common/DtaDevGeneric.cpp index ed96d9eb..aa0339d0 100644 --- a/Common/MsedDevGeneric.cpp +++ b/Common/DtaDevGeneric.cpp @@ -1,20 +1,20 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ #ifdef _MSC_VER @@ -27,14 +27,14 @@ along with msed. If not, see . #include #include #include -#include "MsedDevGeneric.h" -#include "MsedHashPwd.h" -#include "MsedEndianFixup.h" -#include "MsedStructures.h" -#include "MsedCommand.h" -#include "MsedResponse.h" -#include "MsedSession.h" -#include "MsedHexDump.h" +#include "DtaDevGeneric.h" +#include "DtaHashPwd.h" +#include "DtaEndianFixup.h" +#include "DtaStructures.h" +#include "DtaCommand.h" +#include "DtaResponse.h" +#include "DtaSession.h" +#include "DtaHexDump.h" using namespace std; @@ -42,23 +42,23 @@ using namespace std; * it is not yet known if the device is OPAL compliant */ -#define voidNOCODE(name, ...) void MsedDevGeneric::name(##__VA_ARGS__) { \ +#define voidNOCODE(name, ...) void DtaDevGeneric::name(##__VA_ARGS__) { \ LOG(E) << "Generic Device class does not support function " << #name << std::endl; \ } -#define uint8NOCODE(name, ...) uint8_t MsedDevGeneric::name(__VA_ARGS__) { \ +#define uint8NOCODE(name, ...) uint8_t DtaDevGeneric::name(__VA_ARGS__) { \ LOG(E) << "Generic Device class does not support function " << #name << std::endl; \ return 0xff; \ } -MsedDevGeneric::MsedDevGeneric(const char * devref) +DtaDevGeneric::DtaDevGeneric(const char * devref) { - MsedDevOS::init(devref); + DtaDevOS::init(devref); } -MsedDevGeneric::~MsedDevGeneric() +DtaDevGeneric::~DtaDevGeneric() { } -void MsedDevGeneric::init(const char * devref) +void DtaDevGeneric::init(const char * devref) { } uint8NOCODE(initialSetup, char *password) @@ -90,13 +90,13 @@ uint8NOCODE(eraseLockingRange_SUM, uint8_t lockingrange, char * password) uint8NOCODE(takeOwnership, char * newpassword) uint8NOCODE(setSIDPassword,char * oldpassword, char * newpassword, uint8_t hasholdpwd, uint8_t hashnewpwd) -uint16_t MsedDevGeneric::comID() +uint16_t DtaDevGeneric::comID() { LOG(E) << "Generic Device class does not support function " << "comID" << std::endl; return 0xff; } -uint8NOCODE(exec,MsedCommand * cmd, MsedResponse & resp, uint8_t protocol) +uint8NOCODE(exec,DtaCommand * cmd, DtaResponse & resp, uint8_t protocol) uint8NOCODE(objDump,char *sp, char * auth, char *pass,char * objID) uint8NOCODE(rawCmd,char *sp, char * auth, char *pass,char *invoker, char *method, char *plist) #ifdef _MSC_VER diff --git a/Common/MsedDevGeneric.h b/Common/DtaDevGeneric.h similarity index 92% rename from Common/MsedDevGeneric.h rename to Common/DtaDevGeneric.h index a0b4353c..17aa347f 100644 --- a/Common/MsedDevGeneric.h +++ b/Common/DtaDevGeneric.h @@ -1,31 +1,30 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ #pragma once -class MsedCommand; -class MsedSession; +class DtaCommand; +class DtaSession; #include "os.h" -#include "MsedDev.h" -#include "MsedDevOS.h" -#include "MsedStructures.h" -#include "MsedLexicon.h" -#include "MsedResponse.h" // wouldn't take class +#include "DtaDev.h" +#include "DtaDevOS.h" +#include "DtaStructures.h" + #include using namespace std; @@ -35,14 +34,14 @@ using namespace std; * it is not known if the device supports a SSC * */ -class MsedDevGeneric : public MsedDevOS { +class DtaDevGeneric : public DtaDevOS { public: /** Constructor using an OS specific device descriptor. * @param devref reference to device is OS specific lexicon * */ - MsedDevGeneric(const char * devref); + DtaDevGeneric(const char * devref); /** Default constructor */ - ~MsedDevGeneric(); + ~DtaDevGeneric(); /** OS specific initialization. * This function should perform the necessary authority and environment checking * to allow proper functioning of the program, open the device, perform an ATA @@ -52,8 +51,8 @@ class MsedDevGeneric : public MsedDevOS { * @param devref character representation of the device is standard OS lexicon */ void init(const char * devref) ; - /* msed.cpp */ - /** User command to prepare the device for management by msed. + /* sedutil.cpp */ + /** User command to prepare the device for management by sedutil. * Specific to the SSC that the device supports * @param password the password that is to be assigned to the SSC master entities */ @@ -207,13 +206,13 @@ class MsedDevGeneric : public MsedDevOS { /** Read MSID */ uint8_t printDefaultPassword(); - /* MsedSession.cpp */ + /* DtaSession.cpp */ /** Send a command to the device and wait for the response * @param cmd the MswdCommand object containg the command - * @param response the MsedResonse object containing the response + * @param response the DtaResonse object containing the response * @param protocol The security protocol number to use for the command */ - uint8_t exec(MsedCommand * cmd, MsedResponse & resp, uint8_t protocol = 1) ; + uint8_t exec(DtaCommand * cmd, DtaResponse & resp, uint8_t protocol = 1) ; /** return the communications ID to be used for sessions to this device */ uint16_t comID() ; }; diff --git a/Common/MsedDevOpal.cpp b/Common/DtaDevOpal.cpp similarity index 79% rename from Common/MsedDevOpal.cpp rename to Common/DtaDevOpal.cpp index 17805a80..a8df2ae5 100644 --- a/Common/MsedDevOpal.cpp +++ b/Common/DtaDevOpal.cpp @@ -1,20 +1,20 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ /** Device class for Opal 2.0 SSC @@ -25,32 +25,32 @@ along with msed. If not, see . #include #include #include -#include "MsedDevOpal.h" -#include "MsedHashPwd.h" -#include "MsedEndianFixup.h" -#include "MsedStructures.h" -#include "MsedCommand.h" -#include "MsedResponse.h" -#include "MsedSession.h" -#include "MsedHexDump.h" +#include "DtaDevOpal.h" +#include "DtaHashPwd.h" +#include "DtaEndianFixup.h" +#include "DtaStructures.h" +#include "DtaCommand.h" +#include "DtaResponse.h" +#include "DtaSession.h" +#include "DtaHexDump.h" using namespace std; -MsedDevOpal::MsedDevOpal() +DtaDevOpal::DtaDevOpal() { } -MsedDevOpal::~MsedDevOpal() +DtaDevOpal::~DtaDevOpal() { } -void MsedDevOpal::init(const char * devref) +void DtaDevOpal::init(const char * devref) { uint8_t lastRC; - MsedDevOS::init(devref); + DtaDevOS::init(devref); if((lastRC = properties()) != 0) { LOG(E) << "Properties exchange failed";} } -uint8_t MsedDevOpal::initialSetup(char * password) +uint8_t DtaDevOpal::initialSetup(char * password) { LOG(D1) << "Entering initialSetup()"; uint8_t lastRC; @@ -62,7 +62,7 @@ uint8_t MsedDevOpal::initialSetup(char * password) LOG(E) << "Initial setup failed - unable to activate LockingSP"; return lastRC; } - if ((lastRC = configureLockingRange(0, MSED_DISABLELOCKING, password)) != 0) { + if ((lastRC = configureLockingRange(0, DTA_DISABLELOCKING, password)) != 0) { LOG(E) << "Initial setup failed - unable to configure global locking range"; return lastRC; } @@ -84,7 +84,7 @@ uint8_t MsedDevOpal::initialSetup(char * password) return 0; } -uint8_t MsedDevOpal::setup_SUM(uint8_t lockingrange, uint64_t start, uint64_t length, char *Admin1Password, char * password) +uint8_t DtaDevOpal::setup_SUM(uint8_t lockingrange, uint64_t start, uint64_t length, char *Admin1Password, char * password) { LOG(D1) << "Entering setup_SUM()"; uint8_t lastRC; @@ -97,12 +97,12 @@ uint8_t MsedDevOpal::setup_SUM(uint8_t lockingrange, uint64_t start, uint64_t le if (!disk_info.Locking || !disk_info.SingleUser) { LOG(E) << "Setup_SUM failed - this drive does not support LockingSP / SUM"; - return MSEDERROR_INVALID_COMMAND; + return DTAERROR_INVALID_COMMAND; } if (disk_info.Locking_lockingEnabled && !disk_info.SingleUser_any) { LOG(E) << "Setup_SUM failed - LockingSP has already been configured in standard mode."; - return MSEDERROR_INVALID_COMMAND; + return DTAERROR_INVALID_COMMAND; } //If locking not enabled, run initial setup flow if (!disk_info.Locking_lockingEnabled) @@ -156,21 +156,21 @@ uint8_t MsedDevOpal::setup_SUM(uint8_t lockingrange, uint64_t start, uint64_t le LOG(D1) << "Exiting setup_SUM()"; return 0; } -MsedDevOpal::lrStatus_t MsedDevOpal::getLockingRange_status(uint8_t lockingrange, char * password) +DtaDevOpal::lrStatus_t DtaDevOpal::getLockingRange_status(uint8_t lockingrange, char * password) { uint8_t lastRC; lrStatus_t lrStatus; - LOG(D1) << "Entering MsedDevOpal:getLockingRange_status()"; + LOG(D1) << "Entering DtaDevOpal:getLockingRange_status()"; vector LR; LR.push_back(OPAL_SHORT_ATOM::BYTESTRING8); for (int i = 0; i < 8; i++) { LR.push_back(OPALUID[OPAL_UID::OPAL_LOCKINGRANGE_GLOBAL][i]); } - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; - lrStatus.command_status = MSEDERROR_OBJECT_CREATE_FAILED; + lrStatus.command_status = DTAERROR_OBJECT_CREATE_FAILED; return lrStatus; } if ((lastRC = session->start(OPAL_UID::OPAL_LOCKINGSP_UID, password, OPAL_UID::OPAL_ADMIN1_UID)) != 0) { @@ -191,7 +191,7 @@ MsedDevOpal::lrStatus_t MsedDevOpal::getLockingRange_status(uint8_t lockingrange { LOG(E) << "locking range getTable command did not return enough data"; delete session; - lrStatus.command_status = MSEDERROR_NO_LOCKING_INFO; + lrStatus.command_status = DTAERROR_NO_LOCKING_INFO; return lrStatus; } lrStatus.command_status = 0; @@ -206,23 +206,23 @@ MsedDevOpal::lrStatus_t MsedDevOpal::getLockingRange_status(uint8_t lockingrange << lrStatus.size << " RLKEna: " << lrStatus.RLKEna << " WLKEna: " << lrStatus.WLKEna << " RLocked: " << lrStatus.RLocked << " WLocked: " << lrStatus.WLocked; delete session; - LOG(D1) << "Exiting MsedDevOpal:getLockingRange_status()"; + LOG(D1) << "Exiting DtaDevOpal:getLockingRange_status()"; return lrStatus; } -uint8_t MsedDevOpal::listLockingRanges(char * password, int16_t rangeid) +uint8_t DtaDevOpal::listLockingRanges(char * password, int16_t rangeid) { uint8_t lastRC; - LOG(D1) << "Entering MsedDevOpal:listLockingRanges()" << rangeid; + LOG(D1) << "Entering DtaDevOpal:listLockingRanges()" << rangeid; vector LR; LR.push_back(OPAL_SHORT_ATOM::BYTESTRING8); for (int i = 0; i < 8; i++) { LR.push_back(OPALUID[OPAL_UID::OPAL_LOCKINGRANGE_GLOBAL][i]); } - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } if ((lastRC = session->start(OPAL_UID::OPAL_LOCKINGSP_UID, password, OPAL_UID::OPAL_ADMIN1_UID)) != 0) { delete session; @@ -237,10 +237,10 @@ uint8_t MsedDevOpal::listLockingRanges(char * password, int16_t rangeid) delete session; return lastRC; } - if (response.tokenIs(4) != _OPAL_TOKEN::MSED_TOKENID_UINT) { + if (response.tokenIs(4) != _OPAL_TOKEN::DTA_TOKENID_UINT) { LOG(E) << "Unable to determine number of ranges "; delete session; - return MSEDERROR_NO_LOCKING_INFO; + return DTAERROR_NO_LOCKING_INFO; } LOG(I) << "Locking Range Configuration for " << dev; uint32_t numRanges = response.getUint32(4) + 1; @@ -259,17 +259,17 @@ uint8_t MsedDevOpal::listLockingRanges(char * password, int16_t rangeid) " WLocked =" << (response.getUint8(24) ? " Y " : " N "); } delete session; - LOG(D1) << "Exiting MsedDevOpal:listLockingRanges()"; + LOG(D1) << "Exiting DtaDevOpal:listLockingRanges()"; return 0; } -uint8_t MsedDevOpal::setupLockingRange(uint8_t lockingrange, uint64_t start, +uint8_t DtaDevOpal::setupLockingRange(uint8_t lockingrange, uint64_t start, uint64_t length, char * password) { uint8_t lastRC; - LOG(D1) << "Entering MsedDevOpal:setupLockingRange()"; + LOG(D1) << "Entering DtaDevOpal:setupLockingRange()"; if (lockingrange < 1) { LOG(E) << "global locking range cannot be changed"; - return MSEDERROR_UNSUPORTED_LOCKING_RANGE; + return DTAERROR_UNSUPORTED_LOCKING_RANGE; } vector LR; LR.push_back(OPAL_SHORT_ATOM::BYTESTRING8); @@ -278,20 +278,20 @@ uint8_t MsedDevOpal::setupLockingRange(uint8_t lockingrange, uint64_t start, } LR[6] = 0x03; LR[8] = lockingrange; - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } if ((lastRC = session->start(OPAL_UID::OPAL_LOCKINGSP_UID, password, OPAL_UID::OPAL_ADMIN1_UID)) != 0) { delete session; return lastRC; } - MsedCommand *set = new MsedCommand(); + DtaCommand *set = new DtaCommand(); if (NULL == set) { LOG(E) << "Unable to create command object "; delete session; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } set->reset(OPAL_UID::OPAL_AUTHORITY_TABLE, OPAL_METHOD::SET); set->changeInvokingUid(LR); @@ -341,17 +341,17 @@ uint8_t MsedDevOpal::setupLockingRange(uint8_t lockingrange, uint64_t start, } LOG(I) << "LockingRange" << (uint16_t)lockingrange << " starting block " << start << " for " << length << " blocks configured as unlocked range"; - LOG(D1) << "Exiting MsedDevOpal:setupLockingRange()"; + LOG(D1) << "Exiting DtaDevOpal:setupLockingRange()"; return 0; } -uint8_t MsedDevOpal::setupLockingRange_SUM(uint8_t lockingrange, uint64_t start, +uint8_t DtaDevOpal::setupLockingRange_SUM(uint8_t lockingrange, uint64_t start, uint64_t length, char * password) { uint8_t lastRC; - LOG(D1) << "Entering MsedDevOpal:setupLockingRange_SUM()"; + LOG(D1) << "Entering DtaDevOpal:setupLockingRange_SUM()"; if (lockingrange < 1) { LOG(E) << "global locking range cannot be changed"; - return MSEDERROR_UNSUPORTED_LOCKING_RANGE; + return DTAERROR_UNSUPORTED_LOCKING_RANGE; } vector LR; LR.push_back(OPAL_SHORT_ATOM::BYTESTRING8); @@ -360,10 +360,10 @@ uint8_t MsedDevOpal::setupLockingRange_SUM(uint8_t lockingrange, uint64_t start, } LR[6] = 0x03; LR[8] = lockingrange; - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } vector auth; auth.push_back(OPAL_SHORT_ATOM::BYTESTRING8); @@ -376,11 +376,11 @@ uint8_t MsedDevOpal::setupLockingRange_SUM(uint8_t lockingrange, uint64_t start, delete session; return lastRC; } - MsedCommand *set = new MsedCommand(); + DtaCommand *set = new DtaCommand(); if (NULL == set) { LOG(E) << "Unable to create command object "; delete session; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } set->reset(OPAL_UID::OPAL_AUTHORITY_TABLE, OPAL_METHOD::SET); set->changeInvokingUid(LR); @@ -430,13 +430,13 @@ uint8_t MsedDevOpal::setupLockingRange_SUM(uint8_t lockingrange, uint64_t start, } LOG(I) << "LockingRange" << (uint16_t)lockingrange << " starting block " << start << " for " << length << " blocks configured as LOCKED range"; - LOG(D1) << "Exiting MsedDevOpal:setupLockingRange_SUM()"; + LOG(D1) << "Exiting DtaDevOpal:setupLockingRange_SUM()"; return 0; } -uint8_t MsedDevOpal::configureLockingRange(uint8_t lockingrange, uint8_t enabled, char * password) +uint8_t DtaDevOpal::configureLockingRange(uint8_t lockingrange, uint8_t enabled, char * password) { uint8_t lastRC; - LOG(D1) << "Entering MsedDevOpal::configureLockingRange()"; + LOG(D1) << "Entering DtaDevOpal::configureLockingRange()"; vector LR; LR.push_back(OPAL_SHORT_ATOM::BYTESTRING8); for (int i = 0; i < 8; i++) { @@ -446,20 +446,20 @@ uint8_t MsedDevOpal::configureLockingRange(uint8_t lockingrange, uint8_t enabled LR[6] = 0x03; LR[8] = lockingrange; } - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } if ((lastRC = session->start(OPAL_UID::OPAL_LOCKINGSP_UID, password, OPAL_UID::OPAL_ADMIN1_UID)) != 0) { delete session; return lastRC; } - MsedCommand *set = new MsedCommand(); + DtaCommand *set = new DtaCommand(); if (NULL == set) { LOG(E) << "Unable to create command object "; delete session; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } set->reset(OPAL_UID::OPAL_AUTHORITY_TABLE, OPAL_METHOD::SET); set->changeInvokingUid(LR); @@ -469,11 +469,11 @@ uint8_t MsedDevOpal::configureLockingRange(uint8_t lockingrange, uint8_t enabled set->addToken(OPAL_TOKEN::STARTLIST); set->addToken(OPAL_TOKEN::STARTNAME); set->addToken(OPAL_TOKEN::READLOCKENABLED); - set->addToken((enabled & MSED_READLOCKINGENABLED) ? OPAL_TRUE : OPAL_FALSE); + set->addToken((enabled & DTA_READLOCKINGENABLED) ? OPAL_TRUE : OPAL_FALSE); set->addToken(OPAL_TOKEN::ENDNAME); set->addToken(OPAL_TOKEN::STARTNAME); set->addToken(OPAL_TOKEN::WRITELOCKENABLED); - set->addToken((enabled & MSED_WRITELOCKINGENABLED) ? OPAL_TRUE : OPAL_FALSE); + set->addToken((enabled & DTA_WRITELOCKINGENABLED) ? OPAL_TRUE : OPAL_FALSE); set->addToken(OPAL_TOKEN::ENDNAME); set->addToken(OPAL_TOKEN::ENDLIST); set->addToken(OPAL_TOKEN::ENDNAME); @@ -489,15 +489,15 @@ uint8_t MsedDevOpal::configureLockingRange(uint8_t lockingrange, uint8_t enabled delete session; LOG(I) << "LockingRange" << (uint16_t) lockingrange << (enabled ? " enabled " : " disabled ") - << ((enabled & MSED_READLOCKINGENABLED) ? "ReadLocking" : "") - << ((enabled == (MSED_WRITELOCKINGENABLED | MSED_READLOCKINGENABLED)) ? "," : "") - << ((enabled & MSED_WRITELOCKINGENABLED) ? "WriteLocking" : ""); - LOG(D1) << "Exiting MsedDevOpal::configureLockingRange()"; + << ((enabled & DTA_READLOCKINGENABLED) ? "ReadLocking" : "") + << ((enabled == (DTA_WRITELOCKINGENABLED | DTA_READLOCKINGENABLED)) ? "," : "") + << ((enabled & DTA_WRITELOCKINGENABLED) ? "WriteLocking" : ""); + LOG(D1) << "Exiting DtaDevOpal::configureLockingRange()"; return 0; } -uint8_t MsedDevOpal::rekeyLockingRange(uint8_t lockingrange, char * password) +uint8_t DtaDevOpal::rekeyLockingRange(uint8_t lockingrange, char * password) { - LOG(D1) << "Entering MsedDevOpal::rekeyLockingRange()"; + LOG(D1) << "Entering DtaDevOpal::rekeyLockingRange()"; uint8_t lastRC; vector LR; LR.push_back(OPAL_SHORT_ATOM::BYTESTRING8); @@ -508,10 +508,10 @@ uint8_t MsedDevOpal::rekeyLockingRange(uint8_t lockingrange, char * password) LR[6] = 0x03; LR[8] = lockingrange; } - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } if ((lastRC = session->start(OPAL_UID::OPAL_LOCKINGSP_UID, password, OPAL_UID::OPAL_ADMIN1_UID)) != 0) { delete session; @@ -521,11 +521,11 @@ uint8_t MsedDevOpal::rekeyLockingRange(uint8_t lockingrange, char * password) delete session; return lastRC; } - MsedCommand *rekey = new MsedCommand(); + DtaCommand *rekey = new DtaCommand(); if (NULL == rekey) { LOG(E) << "Unable to create command object "; delete session; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } rekey->reset(OPAL_UID::OPAL_AUTHORITY_TABLE, OPAL_METHOD::GENKEY); rekey->changeInvokingUid(response.getRawToken(4)); @@ -541,18 +541,18 @@ uint8_t MsedDevOpal::rekeyLockingRange(uint8_t lockingrange, char * password) delete rekey; delete session; LOG(I) << "LockingRange" << (uint16_t)lockingrange << " reKeyed "; - LOG(D1) << "Exiting MsedDevOpal::rekeyLockingRange()"; + LOG(D1) << "Exiting DtaDevOpal::rekeyLockingRange()"; return 0; } -uint8_t MsedDevOpal::rekeyLockingRange_SUM(vector LR, vector UID, char * password) +uint8_t DtaDevOpal::rekeyLockingRange_SUM(vector LR, vector UID, char * password) { - LOG(D1) << "Entering MsedDevOpal::rekeyLockingRange_SUM()"; + LOG(D1) << "Entering DtaDevOpal::rekeyLockingRange_SUM()"; uint8_t lastRC; - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } if ((lastRC = session->start(OPAL_UID::OPAL_LOCKINGSP_UID, password, UID)) != 0) { delete session; @@ -562,11 +562,11 @@ uint8_t MsedDevOpal::rekeyLockingRange_SUM(vector LR, vector delete session; return lastRC; } - MsedCommand *rekey = new MsedCommand(); + DtaCommand *rekey = new DtaCommand(); if (NULL == rekey) { LOG(E) << "Unable to create command object "; delete session; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } rekey->reset(OPAL_UID::OPAL_AUTHORITY_TABLE, OPAL_METHOD::GENKEY); rekey->changeInvokingUid(response.getRawToken(4)); @@ -582,28 +582,28 @@ uint8_t MsedDevOpal::rekeyLockingRange_SUM(vector LR, vector delete rekey; delete session; LOG(I) << "LockingRange reKeyed "; - LOG(D1) << "Exiting MsedDevOpal::rekeyLockingRange_SUM()"; + LOG(D1) << "Exiting DtaDevOpal::rekeyLockingRange_SUM()"; return 0; } -uint8_t MsedDevOpal::revertLockingSP(char * password, uint8_t keep) +uint8_t DtaDevOpal::revertLockingSP(char * password, uint8_t keep) { - LOG(D1) << "Entering revert MsedDevOpal::revertLockingSP() keep = " << (uint16_t) keep; + LOG(D1) << "Entering revert DtaDevOpal::revertLockingSP() keep = " << (uint16_t) keep; uint8_t lastRC; vector keepGlobalLocking; keepGlobalLocking.push_back(0x83); keepGlobalLocking.push_back(0x06); keepGlobalLocking.push_back(0x00); keepGlobalLocking.push_back(0x00); - MsedCommand *cmd = new MsedCommand(); + DtaCommand *cmd = new DtaCommand(); if (NULL == cmd) { LOG(E) << "Create session object failed"; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Create session object failed"; delete cmd; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } if ((lastRC = session->start(OPAL_UID::OPAL_LOCKINGSP_UID, password, OPAL_UID::OPAL_ADMIN1_UID)) != 0) { delete cmd; @@ -629,20 +629,20 @@ uint8_t MsedDevOpal::revertLockingSP(char * password, uint8_t keep) LOG(I) << "Revert LockingSP complete"; session->expectAbort(); delete session; - LOG(D1) << "Exiting revert MsedDev:LockingSP()"; + LOG(D1) << "Exiting revert DtaDev:LockingSP()"; return 0; } -uint8_t MsedDevOpal::eraseLockingRange(uint8_t lockingrange, char * password) +uint8_t DtaDevOpal::eraseLockingRange(uint8_t lockingrange, char * password) { - LOG(D1) << "Entering MsedDevOpal::eraseLockingRange()" << lockingrange << " " << dev; + LOG(D1) << "Entering DtaDevOpal::eraseLockingRange()" << lockingrange << " " << dev; if (password == NULL) { LOG(D4) << "Referencing formal parameters " << lockingrange; } LOG(I) << "eraseLockingRange is not implemented. It is not part of the Opal SSC "; - LOG(D1) << "Exiting MsedDevOpal::eraseLockingRange()"; + LOG(D1) << "Exiting DtaDevOpal::eraseLockingRange()"; return 0; } -uint8_t MsedDevOpal::getAuth4User(char * userid, uint8_t uidorcpin, std::vector &userData) +uint8_t DtaDevOpal::getAuth4User(char * userid, uint8_t uidorcpin, std::vector &userData) { - LOG(D1) << "Entering MsedDevOpal::getAuth4User()"; + LOG(D1) << "Entering DtaDevOpal::getAuth4User()"; userData.clear(); userData. push_back(OPAL_SHORT_ATOM::BYTESTRING8); userData.push_back(0x00); @@ -650,7 +650,7 @@ uint8_t MsedDevOpal::getAuth4User(char * userid, uint8_t uidorcpin, std::vector< userData.push_back(0x00); if ((0 != uidorcpin) && (10 != uidorcpin)) { LOG(E) << "Invalid Userid data requested" << (uint16_t)uidorcpin; - return MSEDERROR_INVALID_PARAMETER; + return DTAERROR_INVALID_PARAMETER; } if(uidorcpin) userData.push_back(0x0b); @@ -672,21 +672,21 @@ uint8_t MsedDevOpal::getAuth4User(char * userid, uint8_t uidorcpin, std::vector< else { LOG(E) << "Invalid Userid " << userid; userData.clear(); - return MSEDERROR_INVALID_PARAMETER; + return DTAERROR_INVALID_PARAMETER; } } - LOG(D1) << "Exiting MsedDevOpal::getAuth4User()"; + LOG(D1) << "Exiting DtaDevOpal::getAuth4User()"; return 0; } -uint8_t MsedDevOpal::setPassword(char * password, char * userid, char * newpassword) +uint8_t DtaDevOpal::setPassword(char * password, char * userid, char * newpassword) { - LOG(D1) << "Entering MsedDevOpal::setPassword" ; + LOG(D1) << "Entering DtaDevOpal::setPassword" ; uint8_t lastRC; std::vector userCPIN, hash; - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } if ((lastRC = session->start(OPAL_UID::OPAL_LOCKINGSP_UID, password, OPAL_UID::OPAL_ADMIN1_UID)) != 0) { delete session; @@ -697,7 +697,7 @@ uint8_t MsedDevOpal::setPassword(char * password, char * userid, char * newpassw delete session; return lastRC; } - MsedHashPwd(hash, newpassword, this); + DtaHashPwd(hash, newpassword, this); if ((lastRC = setTable(userCPIN, OPAL_TOKEN::PIN, hash)) != 0) { LOG(E) << "Unable to set user " << userid << " new password "; delete session; @@ -705,18 +705,18 @@ uint8_t MsedDevOpal::setPassword(char * password, char * userid, char * newpassw } LOG(I) << userid << " password changed"; delete session; - LOG(D1) << "Exiting MsedDevOpal::setPassword()"; + LOG(D1) << "Exiting DtaDevOpal::setPassword()"; return 0; } -uint8_t MsedDevOpal::setNewPassword_SUM(char * password, char * userid, char * newpassword) +uint8_t DtaDevOpal::setNewPassword_SUM(char * password, char * userid, char * newpassword) { - LOG(D1) << "Entering MsedDevOpal::setNewPassword_SUM"; + LOG(D1) << "Entering DtaDevOpal::setNewPassword_SUM"; uint8_t lastRC; std::vector userCPIN, hash; - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } vector auth; if (!memcmp("Admin", userid, 5)) @@ -740,7 +740,7 @@ uint8_t MsedDevOpal::setNewPassword_SUM(char * password, char * userid, char * n { LOG(E) << "Invalid userid \"" << userid << "\"specified for setNewPassword_SUM"; delete session; - return MSEDERROR_INVALID_PARAMETER; + return DTAERROR_INVALID_PARAMETER; } if ((lastRC = session->start(OPAL_UID::OPAL_LOCKINGSP_UID, password, auth)) != 0) { delete session; @@ -751,7 +751,7 @@ uint8_t MsedDevOpal::setNewPassword_SUM(char * password, char * userid, char * n delete session; return lastRC; } - MsedHashPwd(hash, newpassword, this); + DtaHashPwd(hash, newpassword, this); if ((lastRC = setTable(userCPIN, OPAL_TOKEN::PIN, hash)) != 0) { LOG(E) << "Unable to set user " << userid << " new password "; delete session; @@ -759,12 +759,12 @@ uint8_t MsedDevOpal::setNewPassword_SUM(char * password, char * userid, char * n } LOG(I) << userid << " password changed"; delete session; - LOG(D1) << "Exiting MsedDevOpal::setNewPassword_SUM()"; + LOG(D1) << "Exiting DtaDevOpal::setNewPassword_SUM()"; return 0; } -uint8_t MsedDevOpal::setMBREnable(uint8_t mbrstate, char * Admin1Password) +uint8_t DtaDevOpal::setMBREnable(uint8_t mbrstate, char * Admin1Password) { - LOG(D1) << "Entering MsedDevOpal::setMBREnable"; + LOG(D1) << "Entering DtaDevOpal::setMBREnable"; uint8_t lastRC; // set MBRDone before changing MBREnable so the PBA isn't presented if ((lastRC = setMBRDone(1, Admin1Password)) != 0){ @@ -791,12 +791,12 @@ uint8_t MsedDevOpal::setMBREnable(uint8_t mbrstate, char * Admin1Password) LOG(I) << "MBREnable set off "; } } - LOG(D1) << "Exiting MsedDevOpal::setMBREnable"; + LOG(D1) << "Exiting DtaDevOpal::setMBREnable"; return 0; } -uint8_t MsedDevOpal::setMBRDone(uint8_t mbrstate, char * Admin1Password) +uint8_t DtaDevOpal::setMBRDone(uint8_t mbrstate, char * Admin1Password) { - LOG(D1) << "Entering MsedDevOpal::setMBRDone"; + LOG(D1) << "Entering DtaDevOpal::setMBRDone"; uint8_t lastRC; if (mbrstate) { if ((lastRC = setLockingSPvalue(OPAL_UID::OPAL_MBRCONTROL, OPAL_TOKEN::MBRDONE, @@ -818,17 +818,17 @@ uint8_t MsedDevOpal::setMBRDone(uint8_t mbrstate, char * Admin1Password) LOG(I) << "MBRDone set off "; } } - LOG(D1) << "Exiting MsedDevOpal::setMBRDone"; + LOG(D1) << "Exiting DtaDevOpal::setMBRDone"; return 0; } -uint8_t MsedDevOpal::setLockingRange(uint8_t lockingrange, uint8_t lockingstate, +uint8_t DtaDevOpal::setLockingRange(uint8_t lockingrange, uint8_t lockingstate, char * Admin1Password) { uint8_t lastRC; OPAL_TOKEN readlocked, writelocked; const char *msg; - LOG(D1) << "Entering MsedDevOpal::setLockingRange"; + LOG(D1) << "Entering DtaDevOpal::setLockingRange"; switch (lockingstate) { case OPAL_LOCKINGSTATE::READWRITE: readlocked = writelocked = OPAL_TOKEN::OPAL_FALSE; @@ -845,7 +845,7 @@ uint8_t MsedDevOpal::setLockingRange(uint8_t lockingrange, uint8_t lockingstate, break; default: LOG(E) << "Invalid locking state for setLockingRange"; - return MSEDERROR_INVALID_PARAMETER; + return DTAERROR_INVALID_PARAMETER; } vector LR; LR.push_back(OPAL_SHORT_ATOM::BYTESTRING8); @@ -856,20 +856,20 @@ uint8_t MsedDevOpal::setLockingRange(uint8_t lockingrange, uint8_t lockingstate, LR[6] = 0x03; LR[8] = lockingrange; } - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } if ((lastRC = session->start(OPAL_UID::OPAL_LOCKINGSP_UID, Admin1Password, OPAL_UID::OPAL_ADMIN1_UID)) != 0) { delete session; return lastRC; } - MsedCommand *set = new MsedCommand(); + DtaCommand *set = new DtaCommand(); if (NULL == set) { LOG(E) << "Unable to create command object "; delete session; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } set->reset(OPAL_UID::OPAL_AUTHORITY_TABLE, OPAL_METHOD::SET); set->changeInvokingUid(LR); @@ -898,17 +898,17 @@ uint8_t MsedDevOpal::setLockingRange(uint8_t lockingrange, uint8_t lockingstate, delete set; delete session; LOG(I) << "LockingRange" << (uint16_t)lockingrange << " set to " << msg; - LOG(D1) << "Exiting MsedDevOpal::setLockingRange"; + LOG(D1) << "Exiting DtaDevOpal::setLockingRange"; return 0; } -uint8_t MsedDevOpal::setLockingRange_SUM(uint8_t lockingrange, uint8_t lockingstate, +uint8_t DtaDevOpal::setLockingRange_SUM(uint8_t lockingrange, uint8_t lockingstate, char * password) { uint8_t lastRC; OPAL_TOKEN readlocked, writelocked; const char *msg; - LOG(D1) << "Entering MsedDevOpal::setLockingRange_SUM"; + LOG(D1) << "Entering DtaDevOpal::setLockingRange_SUM"; switch (lockingstate) { case OPAL_LOCKINGSTATE::READWRITE: readlocked = writelocked = OPAL_TOKEN::OPAL_FALSE; @@ -925,7 +925,7 @@ uint8_t MsedDevOpal::setLockingRange_SUM(uint8_t lockingrange, uint8_t lockingst break; default: LOG(E) << "Invalid locking state for setLockingRange"; - return MSEDERROR_INVALID_PARAMETER; + return DTAERROR_INVALID_PARAMETER; } vector LR; LR.push_back(OPAL_SHORT_ATOM::BYTESTRING8); @@ -936,10 +936,10 @@ uint8_t MsedDevOpal::setLockingRange_SUM(uint8_t lockingrange, uint8_t lockingst LR[6] = 0x03; LR[8] = lockingrange; } - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } vector auth; auth.push_back(OPAL_SHORT_ATOM::BYTESTRING8); @@ -953,11 +953,11 @@ uint8_t MsedDevOpal::setLockingRange_SUM(uint8_t lockingrange, uint8_t lockingst return lastRC; } - MsedCommand *set = new MsedCommand(); + DtaCommand *set = new DtaCommand(); if (NULL == set) { LOG(E) << "Unable to create command object "; delete session; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } set->reset(OPAL_UID::OPAL_AUTHORITY_TABLE, OPAL_METHOD::SET); set->changeInvokingUid(LR); @@ -998,23 +998,23 @@ uint8_t MsedDevOpal::setLockingRange_SUM(uint8_t lockingrange, uint8_t lockingst delete set; delete session; LOG(I) << "LockingRange" << (uint16_t)lockingrange << " set to " << msg; - LOG(D1) << "Exiting MsedDevOpal::setLockingRange_SUM"; + LOG(D1) << "Exiting DtaDevOpal::setLockingRange_SUM"; return 0; } -uint8_t MsedDevOpal::setLockingSPvalue(OPAL_UID table_uid, OPAL_TOKEN name, +uint8_t DtaDevOpal::setLockingSPvalue(OPAL_UID table_uid, OPAL_TOKEN name, OPAL_TOKEN value,char * password, char * msg) { - LOG(D1) << "Entering MsedDevOpal::setLockingSPvalue"; + LOG(D1) << "Entering DtaDevOpal::setLockingSPvalue"; uint8_t lastRC; vector table; table. push_back(OPAL_SHORT_ATOM::BYTESTRING8); for (int i = 0; i < 8; i++) { table.push_back(OPALUID[table_uid][i]); } - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } if ((lastRC = session->start(OPAL_UID::OPAL_LOCKINGSP_UID, password, OPAL_UID::OPAL_ADMIN1_UID)) != 0) { delete session; @@ -1030,20 +1030,20 @@ uint8_t MsedDevOpal::setLockingSPvalue(OPAL_UID table_uid, OPAL_TOKEN name, } delete session; - LOG(D1) << "Exiting MsedDevOpal::setLockingSPvalue()"; + LOG(D1) << "Exiting DtaDevOpal::setLockingSPvalue()"; return 0; } -uint8_t MsedDevOpal::enableUser(char * password, char * userid) +uint8_t DtaDevOpal::enableUser(char * password, char * userid) { - LOG(D1) << "Entering MsedDevOpal::enableUser"; + LOG(D1) << "Entering DtaDevOpal::enableUser"; uint8_t lastRC; vector userUID; - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } if ((lastRC = session->start(OPAL_UID::OPAL_LOCKINGSP_UID, password, OPAL_UID::OPAL_ADMIN1_UID)) != 0) { delete session; @@ -1061,23 +1061,23 @@ uint8_t MsedDevOpal::enableUser(char * password, char * userid) } LOG(I) << userid << " has been enabled "; delete session; - LOG(D1) << "Exiting MsedDevOpal::enableUser()"; + LOG(D1) << "Exiting DtaDevOpal::enableUser()"; return 0; } -uint8_t MsedDevOpal::revertTPer(char * password, uint8_t PSID) +uint8_t DtaDevOpal::revertTPer(char * password, uint8_t PSID) { - LOG(D1) << "Entering MsedDevOpal::revertTPer()"; + LOG(D1) << "Entering DtaDevOpal::revertTPer()"; uint8_t lastRC; - MsedCommand *cmd = new MsedCommand(); + DtaCommand *cmd = new DtaCommand(); if (NULL == cmd) { LOG(E) << "Unable to create command object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; delete cmd; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } OPAL_UID uid = OPAL_UID::OPAL_SID_UID; if (PSID) { @@ -1102,11 +1102,11 @@ uint8_t MsedDevOpal::revertTPer(char * password, uint8_t PSID) LOG(I) << "revertTper completed successfully"; delete cmd; delete session; - LOG(D1) << "Exiting MsedDevOpal::revertTPer()"; + LOG(D1) << "Exiting DtaDevOpal::revertTPer()"; return 0; } -uint8_t MsedDevOpal::loadPBA(char * password, char * filename) { - LOG(D1) << "Entering MsedDevOpal::loadPBAimage()" << filename << " " << dev; +uint8_t DtaDevOpal::loadPBA(char * password, char * filename) { + LOG(D1) << "Entering DtaDevOpal::loadPBAimage()" << filename << " " << dev; uint8_t lastRC; uint64_t fivepercent = 0; int complete = 4; @@ -1131,23 +1131,23 @@ uint8_t MsedDevOpal::loadPBA(char * password, char * filename) { pbafile.open(filename, ios::in | ios::binary); if (!pbafile) { LOG(E) << "Unable to open PBA image file " << filename; - return MSEDERROR_OPEN_ERR; + return DTAERROR_OPEN_ERR; } pbafile.seekg(0, pbafile.end); fivepercent = ((pbafile.tellg() / 20) / 1024) * 1024; if (0 == fivepercent) fivepercent++; pbafile.seekg(0, pbafile.beg); - MsedCommand *cmd = new MsedCommand(); + DtaCommand *cmd = new DtaCommand(); if (NULL == cmd) { LOG(E) << "Unable to create command object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } if ((lastRC = session->start(OPAL_UID::OPAL_LOCKINGSP_UID, password, OPAL_UID::OPAL_ADMIN1_UID)) != 0) { delete cmd; @@ -1161,10 +1161,10 @@ uint8_t MsedDevOpal::loadPBA(char * password, char * filename) { if (!(filepos % fivepercent)) { progress_bar[complete++] = star[0]; delete session; - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } if ((lastRC = session->start(OPAL_UID::OPAL_LOCKINGSP_UID, password, OPAL_UID::OPAL_ADMIN1_UID)) != 0) { delete cmd; @@ -1204,28 +1204,28 @@ uint8_t MsedDevOpal::loadPBA(char * password, char * filename) { delete session; pbafile.close(); LOG(I) << "PBA image " << filename << " written to " << dev; - LOG(D1) << "Exiting MsedDevOpal::loadPBAimage()"; + LOG(D1) << "Exiting DtaDevOpal::loadPBAimage()"; return 0; } -uint8_t MsedDevOpal::activateLockingSP(char * password) +uint8_t DtaDevOpal::activateLockingSP(char * password) { - LOG(D1) << "Entering MsedDevOpal::activateLockingSP()"; + LOG(D1) << "Entering DtaDevOpal::activateLockingSP()"; uint8_t lastRC; vector table; table. push_back(OPAL_SHORT_ATOM::BYTESTRING8); for (int i = 0; i < 8; i++) { table.push_back(OPALUID[OPAL_UID::OPAL_LOCKINGSP_UID][i]); } - MsedCommand *cmd = new MsedCommand(); + DtaCommand *cmd = new DtaCommand(); if (NULL == cmd) { LOG(E) << "Unable to create command object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } if ((lastRC = session->start(OPAL_UID::OPAL_ADMINSP_UID, password, OPAL_UID::OPAL_SID_UID)) != 0) { delete cmd; @@ -1244,7 +1244,7 @@ uint8_t MsedDevOpal::activateLockingSP(char * password) LOG(E) << "Locking SP lifecycle is not Manufactured-Inactive"; delete cmd; delete session; - return MSEDERROR_INVALID_LIFECYCLE; + return DTAERROR_INVALID_LIFECYCLE; } cmd->reset(OPAL_UID::OPAL_LOCKINGSP_UID, OPAL_METHOD::ACTIVATE); cmd->addToken(OPAL_TOKEN::STARTLIST); @@ -1259,13 +1259,13 @@ uint8_t MsedDevOpal::activateLockingSP(char * password) delete cmd; delete session; - LOG(D1) << "Exiting MsedDevOpal::activatLockingSP()"; + LOG(D1) << "Exiting DtaDevOpal::activatLockingSP()"; return 0; } -uint8_t MsedDevOpal::activateLockingSP_SUM(uint8_t lockingrange, char * password) +uint8_t DtaDevOpal::activateLockingSP_SUM(uint8_t lockingrange, char * password) { - LOG(D1) << "Entering MsedDevOpal::activateLockingSP_SUM()"; + LOG(D1) << "Entering DtaDevOpal::activateLockingSP_SUM()"; uint8_t lastRC; vector table; table.push_back(OPAL_SHORT_ATOM::BYTESTRING8); @@ -1281,15 +1281,15 @@ uint8_t MsedDevOpal::activateLockingSP_SUM(uint8_t lockingrange, char * password LR[6] = 0x03; LR[8] = lockingrange; } - MsedCommand *cmd = new MsedCommand(); + DtaCommand *cmd = new DtaCommand(); if (NULL == cmd) { LOG(E) << "Unable to create command object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } if ((lastRC = session->start(OPAL_UID::OPAL_ADMINSP_UID, password, OPAL_UID::OPAL_SID_UID)) != 0) { LOG(E) << "session->start failed with code " << lastRC; @@ -1309,14 +1309,14 @@ uint8_t MsedDevOpal::activateLockingSP_SUM(uint8_t lockingrange, char * password LOG(E) << "Locking SP lifecycle is not Manufactured-Inactive"; delete cmd; delete session; - return MSEDERROR_INVALID_LIFECYCLE; + return DTAERROR_INVALID_LIFECYCLE; } /*if (!disk_info.SingleUser) { LOG(E) << "This Locking SP does not support Single User Mode"; delete cmd; delete session; - return MSEDERROR_INVALID_COMMAND; + return DTAERROR_INVALID_COMMAND; }*/ cmd->reset(OPAL_UID::OPAL_LOCKINGSP_UID, OPAL_METHOD::ACTIVATE); cmd->addToken(OPAL_TOKEN::STARTLIST); @@ -1343,14 +1343,14 @@ uint8_t MsedDevOpal::activateLockingSP_SUM(uint8_t lockingrange, char * password delete cmd; delete session; - LOG(D1) << "Exiting MsedDevOpal::activateLockingSP_SUM()"; + LOG(D1) << "Exiting DtaDevOpal::activateLockingSP_SUM()"; return 0; } -uint8_t MsedDevOpal::eraseLockingRange_SUM(uint8_t lockingrange, char * password) +uint8_t DtaDevOpal::eraseLockingRange_SUM(uint8_t lockingrange, char * password) { uint8_t lastRC; - LOG(D1) << "Entering MsedDevOpal::eraseLockingRange_SUM"; + LOG(D1) << "Entering DtaDevOpal::eraseLockingRange_SUM"; vector LR; LR.push_back(OPAL_SHORT_ATOM::BYTESTRING8); for (int i = 0; i < 8; i++) { @@ -1360,21 +1360,21 @@ uint8_t MsedDevOpal::eraseLockingRange_SUM(uint8_t lockingrange, char * password LR[6] = 0x03; LR[8] = lockingrange; } - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } if ((lastRC = session->start(OPAL_UID::OPAL_LOCKINGSP_UID, password, OPAL_UID::OPAL_ADMIN1_UID)) != 0) { delete session; return lastRC; } - MsedCommand *cmd = new MsedCommand(); + DtaCommand *cmd = new DtaCommand(); if (NULL == cmd) { LOG(E) << "Unable to create command object "; delete session; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } cmd->reset(OPAL_UID::OPAL_AUTHORITY_TABLE, OPAL_METHOD::ERASE); cmd->changeInvokingUid(LR); @@ -1390,13 +1390,13 @@ uint8_t MsedDevOpal::eraseLockingRange_SUM(uint8_t lockingrange, char * password delete cmd; delete session; LOG(I) << "LockingRange" << (uint16_t)lockingrange << " erased"; - LOG(D1) << "Exiting MsedDevOpal::eraseLockingRange_SUM"; + LOG(D1) << "Exiting DtaDevOpal::eraseLockingRange_SUM"; return 0; } -uint8_t MsedDevOpal::takeOwnership(char * newpassword) +uint8_t DtaDevOpal::takeOwnership(char * newpassword) { - LOG(D1) << "Entering MsedDevOpal::takeOwnership()"; + LOG(D1) << "Entering DtaDevOpal::takeOwnership()"; uint8_t lastRC; if ((lastRC = getDefaultPassword()) != 0) { LOG(E) << "Unable to read MSID password "; @@ -1410,15 +1410,15 @@ uint8_t MsedDevOpal::takeOwnership(char * newpassword) LOG(D1) << "Exiting takeOwnership()"; return 0; } -uint8_t MsedDevOpal::getDefaultPassword() +uint8_t DtaDevOpal::getDefaultPassword() { - LOG(D1) << "Entering MsedDevOpal::getDefaultPassword()"; + LOG(D1) << "Entering DtaDevOpal::getDefaultPassword()"; uint8_t lastRC; vector hash; - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } if ((lastRC = session->start(OPAL_UID::OPAL_ADMINSP_UID)) != 0) { LOG(E) << "Unable to start Unauthenticated session " << dev; @@ -1438,7 +1438,7 @@ uint8_t MsedDevOpal::getDefaultPassword() LOG(D1) << "Exiting getDefaultPassword()"; return 0; } -uint8_t MsedDevOpal::printDefaultPassword() +uint8_t DtaDevOpal::printDefaultPassword() { const uint8_t rc = getDefaultPassword(); if (rc) { @@ -1449,16 +1449,16 @@ uint8_t MsedDevOpal::printDefaultPassword() fprintf(stdout, "MSID: %s\n", (char *)defaultPassword.c_str()); return 0; } -uint8_t MsedDevOpal::setSIDPassword(char * oldpassword, char * newpassword, +uint8_t DtaDevOpal::setSIDPassword(char * oldpassword, char * newpassword, uint8_t hasholdpwd, uint8_t hashnewpwd) { vector hash, table; - LOG(D1) << "Entering MsedDevOpal::setSIDPassword()"; + LOG(D1) << "Entering DtaDevOpal::setSIDPassword()"; uint8_t lastRC; - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } if (!hasholdpwd) session->dontHashPwd(); if ((lastRC = session->start(OPAL_UID::OPAL_ADMINSP_UID, @@ -1473,7 +1473,7 @@ uint8_t MsedDevOpal::setSIDPassword(char * oldpassword, char * newpassword, } hash.clear(); if (hashnewpwd) { - MsedHashPwd(hash, newpassword, this); + DtaHashPwd(hash, newpassword, this); } else { hash.push_back(0xd0); @@ -1488,11 +1488,11 @@ uint8_t MsedDevOpal::setSIDPassword(char * oldpassword, char * newpassword, return lastRC; } delete session; - LOG(D1) << "Exiting MsedDevOpal::setSIDPassword()"; + LOG(D1) << "Exiting DtaDevOpal::setSIDPassword()"; return 0; } -uint8_t MsedDevOpal::setTable(vector table, OPAL_TOKEN name, +uint8_t DtaDevOpal::setTable(vector table, OPAL_TOKEN name, OPAL_TOKEN value) { vector token; @@ -1500,15 +1500,15 @@ uint8_t MsedDevOpal::setTable(vector table, OPAL_TOKEN name, return(setTable(table, name, token)); } -uint8_t MsedDevOpal::setTable(vector table, OPAL_TOKEN name, +uint8_t DtaDevOpal::setTable(vector table, OPAL_TOKEN name, vector value) { - LOG(D1) << "Entering MsedDevOpal::setTable"; + LOG(D1) << "Entering DtaDevOpal::setTable"; uint8_t lastRC; - MsedCommand *set = new MsedCommand(); + DtaCommand *set = new DtaCommand(); if (NULL == set) { LOG(E) << "Unable to create command object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } set->reset(OPAL_UID::OPAL_AUTHORITY_TABLE, OPAL_METHOD::SET); set->changeInvokingUid(table); @@ -1530,18 +1530,18 @@ uint8_t MsedDevOpal::setTable(vector table, OPAL_TOKEN name, return lastRC; } delete set; - LOG(D1) << "Leaving MsedDevOpal::setTable"; + LOG(D1) << "Leaving DtaDevOpal::setTable"; return 0; } -uint8_t MsedDevOpal::getTable(vector table, uint16_t startcol, +uint8_t DtaDevOpal::getTable(vector table, uint16_t startcol, uint16_t endcol) { - LOG(D1) << "Entering MsedDevOpal::getTable"; + LOG(D1) << "Entering DtaDevOpal::getTable"; uint8_t lastRC; - MsedCommand *get = new MsedCommand(); + DtaCommand *get = new DtaCommand(); if (NULL == get) { LOG(E) << "Unable to create command object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } get->reset(OPAL_UID::OPAL_AUTHORITY_TABLE, OPAL_METHOD::GET); get->changeInvokingUid(table); @@ -1565,12 +1565,12 @@ uint8_t MsedDevOpal::getTable(vector table, uint16_t startcol, delete get; return 0; } -uint8_t MsedDevOpal::exec(MsedCommand * cmd, MsedResponse & resp, uint8_t protocol) +uint8_t DtaDevOpal::exec(DtaCommand * cmd, DtaResponse & resp, uint8_t protocol) { uint8_t lastRC; OPALHeader * hdr = (OPALHeader *) cmd->getCmdBuffer(); LOG(D3) << endl << "Dumping command buffer"; - IFLOG(D3) MsedHexDump(cmd->getCmdBuffer(), SWAP32(hdr->cp.length) + sizeof (OPALComPacket)); + IFLOG(D3) DtaHexDump(cmd->getCmdBuffer(), SWAP32(hdr->cp.length) + sizeof (OPALComPacket)); if((lastRC = sendCmd(IF_SEND, protocol, comID(), cmd->getCmdBuffer(), IO_BUFFER_LENGTH)) != 0) { LOG(E) << "Command failed on send " << (uint16_t) lastRC; return lastRC; @@ -1584,7 +1584,7 @@ uint8_t MsedDevOpal::exec(MsedCommand * cmd, MsedResponse & resp, uint8_t protoc } while ((0 != hdr->cp.outstandingData) && (0 == hdr->cp.minTransfer)); LOG(D3) << std::endl << "Dumping reply buffer"; - IFLOG(D3) MsedHexDump(cmd->getRespBuffer(), SWAP32(hdr->cp.length) + sizeof (OPALComPacket)); + IFLOG(D3) DtaHexDump(cmd->getRespBuffer(), SWAP32(hdr->cp.length) + sizeof (OPALComPacket)); if (0 != lastRC) { LOG(E) << "Command failed on recv" << (uint16_t) lastRC; return lastRC; @@ -1594,20 +1594,20 @@ uint8_t MsedDevOpal::exec(MsedCommand * cmd, MsedResponse & resp, uint8_t protoc } -uint8_t MsedDevOpal::properties() +uint8_t DtaDevOpal::properties() { - LOG(D1) << "Entering MsedDevOpal::properties()"; + LOG(D1) << "Entering DtaDevOpal::properties()"; uint8_t lastRC; - session = new MsedSession(this); // use the session IO without starting a session + session = new DtaSession(this); // use the session IO without starting a session if (NULL == session) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } - MsedCommand *props = new MsedCommand(OPAL_UID::OPAL_SMUID_UID, OPAL_METHOD::PROPERTIES); + DtaCommand *props = new DtaCommand(OPAL_UID::OPAL_SMUID_UID, OPAL_METHOD::PROPERTIES); if (NULL == props) { LOG(E) << "Unable to create command object "; delete session; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } props->addToken(OPAL_TOKEN::STARTLIST); props->addToken(OPAL_TOKEN::STARTNAME); @@ -1647,18 +1647,18 @@ uint8_t MsedDevOpal::properties() } disk_info.Properties = 1; delete props; - LOG(D1) << "Leaving MsedDevOpal::properties()"; + LOG(D1) << "Leaving DtaDevOpal::properties()"; return 0; } -void MsedDevOpal::puke() +void DtaDevOpal::puke() { - LOG(D1) << "Entering MsedDevOpal::puke()"; - MsedDev::puke(); + LOG(D1) << "Entering DtaDevOpal::puke()"; + DtaDev::puke(); if (disk_info.Properties) { cout << std::endl << "TPer Properties: "; for (uint32_t i = 0; i < propertiesResponse.getTokenCount(); i++) { if (OPAL_TOKEN::STARTNAME == propertiesResponse.tokenIs(i)) { - if (OPAL_TOKEN::MSED_TOKENID_BYTESTRING != propertiesResponse.tokenIs(i + 1)) + if (OPAL_TOKEN::DTA_TOKENID_BYTESTRING != propertiesResponse.tokenIs(i + 1)) cout << std::endl << "Host Properties: " << std::endl; else cout << " " << propertiesResponse.getString(i + 1) << " = " << propertiesResponse.getUint64(i + 2); @@ -1669,27 +1669,27 @@ void MsedDevOpal::puke() } } -uint8_t MsedDevOpal::objDump(char *sp, char * auth, char *pass, +uint8_t DtaDevOpal::objDump(char *sp, char * auth, char *pass, char * objID) { - LOG(D1) << "Entering MsedDevEnterprise::objDump"; + LOG(D1) << "Entering DtaDevEnterprise::objDump"; LOG(D1) << sp << " " << auth << " " << pass << " " << objID; uint8_t lastRC; - MsedCommand *get = new MsedCommand(); + DtaCommand *get = new DtaCommand(); if (NULL == get) { LOG(E) << "Unable to create command object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } vector authority, object; uint8_t work; if (16 != strnlen(auth, 32)) { LOG(E) << "Authority must be 16 byte ascii string of hex authority uid"; - return MSEDERROR_INVALID_PARAMETER; + return DTAERROR_INVALID_PARAMETER; } if (16 != strnlen(objID, 32)) { LOG(E) << "ObjectID must be 16 byte ascii string of hex object uid"; - return MSEDERROR_INVALID_PARAMETER; + return DTAERROR_INVALID_PARAMETER; } authority.push_back(OPAL_SHORT_ATOM::BYTESTRING8); for (uint32_t i = 0; i < 16; i += 2) { @@ -1712,11 +1712,11 @@ uint8_t MsedDevOpal::objDump(char *sp, char * auth, char *pass, get->complete(); LOG(I) << "Command:"; get->dumpCommand(); - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; delete get; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } if ((lastRC = session->start((OPAL_UID)atoi(sp), pass, authority)) != 0) { delete get; @@ -1732,12 +1732,12 @@ uint8_t MsedDevOpal::objDump(char *sp, char * auth, char *pass, get->dumpResponse(); delete get; delete session; - LOG(D1) << "Exiting MsedDevEnterprise::objDump"; + LOG(D1) << "Exiting DtaDevEnterprise::objDump"; return 0; } -uint8_t MsedDevOpal::rawCmd(char *sp, char * hexauth, char *pass, +uint8_t DtaDevOpal::rawCmd(char *sp, char * hexauth, char *pass, char *hexinvokingUID, char *hexmethod, char *hexparms) { - LOG(D1) << "Entering MsedDevEnterprise::rawCmd"; + LOG(D1) << "Entering DtaDevEnterprise::rawCmd"; LOG(D1) << sp << " " << hexauth << " " << pass << " "; LOG(D1) << hexinvokingUID << " " << hexmethod << " " << hexparms; uint8_t lastRC; @@ -1745,7 +1745,7 @@ uint8_t MsedDevOpal::rawCmd(char *sp, char * hexauth, char *pass, uint8_t work; if (16 != strnlen(hexauth, 32)) { LOG(E) << "Authority must be 16 byte ascii string of hex authority uid"; - return MSEDERROR_INVALID_PARAMETER; + return DTAERROR_INVALID_PARAMETER; } authority.push_back(OPAL_SHORT_ATOM::BYTESTRING8); for (uint32_t i = 0; i < 16; i += 2) { @@ -1755,7 +1755,7 @@ uint8_t MsedDevOpal::rawCmd(char *sp, char * hexauth, char *pass, } if (16 != strnlen(hexinvokingUID, 32)) { LOG(E) << "invoker must be 16 byte ascii string of invoking uid"; - return MSEDERROR_INVALID_PARAMETER; + return DTAERROR_INVALID_PARAMETER; } invokingUID.push_back(OPAL_SHORT_ATOM::BYTESTRING8); for (uint32_t i = 0; i < 16; i += 2) { @@ -1765,7 +1765,7 @@ uint8_t MsedDevOpal::rawCmd(char *sp, char * hexauth, char *pass, } if (16 != strnlen(hexmethod, 32)) { LOG(E) << "invoker must be 16 byte ascii string of method uid"; - return MSEDERROR_INVALID_PARAMETER; + return DTAERROR_INVALID_PARAMETER; } method.push_back(OPAL_SHORT_ATOM::BYTESTRING8); for (uint32_t i = 0; i < 16; i += 2) { @@ -1775,11 +1775,11 @@ uint8_t MsedDevOpal::rawCmd(char *sp, char * hexauth, char *pass, } if (1020 < strnlen(hexparms, 1024)) { LOG(E) << "Parmlist limited to 1020 characters"; - return MSEDERROR_INVALID_PARAMETER; + return DTAERROR_INVALID_PARAMETER; } if (strnlen(hexparms, 1024) % 2) { LOG(E) << "Parmlist must be even number of bytes"; - return MSEDERROR_INVALID_PARAMETER; + return DTAERROR_INVALID_PARAMETER; } for (uint32_t i = 0; i < strnlen(hexparms, 1024); i += 2) { @@ -1787,20 +1787,20 @@ uint8_t MsedDevOpal::rawCmd(char *sp, char * hexauth, char *pass, work += hexparms[i + 1] & 0x40 ? (hexparms[i + 1] & 0xf) + 9 : hexparms[i + 1] & 0x0f; parms.push_back(work); } - MsedCommand *cmd = new MsedCommand(); + DtaCommand *cmd = new DtaCommand(); if (NULL == cmd) { LOG(E) << "Unable to create command object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } cmd->reset(OPAL_UID::OPAL_AUTHORITY_TABLE, method); cmd->changeInvokingUid(invokingUID); cmd->addToken(parms); cmd->complete(); - session = new MsedSession(this); + session = new DtaSession(this); if (NULL == session) { LOG(E) << "Unable to create session object "; delete cmd; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } if ((lastRC = session->start((OPAL_UID)atoi(sp), pass, authority)) != 0) { delete cmd; @@ -1818,6 +1818,6 @@ uint8_t MsedDevOpal::rawCmd(char *sp, char * hexauth, char *pass, cmd->dumpResponse(); delete cmd; delete session; - LOG(D1) << "Exiting MsedDevEnterprise::rawCmd"; + LOG(D1) << "Exiting DtaDevEnterprise::rawCmd"; return 0; } diff --git a/Common/MsedDevOpal.h b/Common/DtaDevOpal.h similarity index 94% rename from Common/MsedDevOpal.h rename to Common/DtaDevOpal.h index 83330a4b..38baad45 100644 --- a/Common/MsedDevOpal.h +++ b/Common/DtaDevOpal.h @@ -1,31 +1,31 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ #pragma once -class MsedCommand; -class MsedSession; +class DtaCommand; +class DtaSession; -#include "MsedDev.h" -#include "MsedDevOS.h" -#include "MsedStructures.h" -#include "MsedLexicon.h" -#include "MsedResponse.h" // wouldn't take class +#include "DtaDev.h" +#include "DtaDevOS.h" +#include "DtaStructures.h" +#include "DtaLexicon.h" +#include "DtaResponse.h" // wouldn't take class #include using namespace std; @@ -33,12 +33,12 @@ using namespace std; * most of the code that works for OPAL 2.0 also works for OPAL 1.0 * that common code is implemented in this class */ -class MsedDevOpal : public MsedDevOS { +class DtaDevOpal : public DtaDevOS { public: /** Default Constructor */ - MsedDevOpal(); + DtaDevOpal(); /** default Destructor */ - ~MsedDevOpal(); + ~DtaDevOpal(); /** OS specific initialization. * This function should perform the necessary authority and environment checking * to allow proper functioning of the program, open the device, perform an ATA @@ -53,10 +53,10 @@ class MsedDevOpal : public MsedDevOS { uint8_t properties(); /** Send a command to the device and wait for the response * @param cmd the MswdCommand object containg the command - * @param response the MsedResonse object containing the response + * @param response the DtaResonse object containing the response * @param protocol The security protocol number to use for the command */ - uint8_t exec(MsedCommand * cmd, MsedResponse & resp, uint8_t protocol = 0x01); + uint8_t exec(DtaCommand * cmd, DtaResponse & resp, uint8_t protocol = 0x01); /** return the communications ID to be used for sessions to this device */ virtual uint16_t comID() = 0; /** Change the SID password from it's MSID default @@ -221,7 +221,7 @@ class MsedDevOpal : public MsedDevOS { * @param filename the filename of the disk image */ uint8_t loadPBA(char * password, char * filename); - /** User command to prepare the device for management by msed. + /** User command to prepare the device for management by sedutil. * Specific to the SSC that the device supports * @param password the password that is to be assigned to the SSC master entities */ diff --git a/Common/MsedDevOpal1.cpp b/Common/DtaDevOpal1.cpp similarity index 55% rename from Common/MsedDevOpal1.cpp rename to Common/DtaDevOpal1.cpp index a2578af2..267c9743 100644 --- a/Common/MsedDevOpal1.cpp +++ b/Common/DtaDevOpal1.cpp @@ -1,35 +1,35 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ -#include "MsedDevOpal1.h" +#include "DtaDevOpal1.h" using namespace std; -MsedDevOpal1::MsedDevOpal1 (const char * devref) +DtaDevOpal1::DtaDevOpal1 (const char * devref) { - MsedDevOpal::init(devref); + DtaDevOpal::init(devref); assert(isOpal1()); } -MsedDevOpal1::~MsedDevOpal1() +DtaDevOpal1::~DtaDevOpal1() { } -uint16_t MsedDevOpal1::comID() { return disk_info.OPAL10_basecomID; } +uint16_t DtaDevOpal1::comID() { return disk_info.OPAL10_basecomID; } diff --git a/Common/MsedDevOpal1.h b/Common/DtaDevOpal1.h similarity index 69% rename from Common/MsedDevOpal1.h rename to Common/DtaDevOpal1.h index 8193abdb..6742af14 100644 --- a/Common/MsedDevOpal1.h +++ b/Common/DtaDevOpal1.h @@ -1,25 +1,25 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ #pragma once #include "os.h" -#include "MsedDevOpal.h" +#include "DtaDevOpal.h" using namespace std; /** Class representing a disk device, this class is represents a disk that conforms @@ -28,10 +28,10 @@ using namespace std; * testing so far indicates that the functions implemented in this program * operate the same in OPAL 1.0 and Opal 2.0 */ -class MsedDevOpal1 : public MsedDevOpal { +class DtaDevOpal1 : public DtaDevOpal { public: - MsedDevOpal1(const char * devref); - ~MsedDevOpal1(); + DtaDevOpal1(const char * devref); + ~DtaDevOpal1(); /** return the communication ID to be used with this device */ uint16_t comID(); diff --git a/Common/MsedDevOpal2.cpp b/Common/DtaDevOpal2.cpp similarity index 55% rename from Common/MsedDevOpal2.cpp rename to Common/DtaDevOpal2.cpp index 8d25bdd4..2aefbfa5 100644 --- a/Common/MsedDevOpal2.cpp +++ b/Common/DtaDevOpal2.cpp @@ -1,35 +1,35 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ -#include "MsedDevOpal2.h" +#include "DtaDevOpal2.h" using namespace std; -MsedDevOpal2::MsedDevOpal2 (const char * devref) +DtaDevOpal2::DtaDevOpal2 (const char * devref) { - MsedDevOpal::init(devref); + DtaDevOpal::init(devref); assert(isOpal2()); } -MsedDevOpal2::~MsedDevOpal2() +DtaDevOpal2::~DtaDevOpal2() { } -uint16_t MsedDevOpal2::comID() { return disk_info.OPAL20_basecomID; } +uint16_t DtaDevOpal2::comID() { return disk_info.OPAL20_basecomID; } diff --git a/Common/MsedDevOpal2.h b/Common/DtaDevOpal2.h similarity index 69% rename from Common/MsedDevOpal2.h rename to Common/DtaDevOpal2.h index 51ef03e4..0e5d3fc2 100644 --- a/Common/MsedDevOpal2.h +++ b/Common/DtaDevOpal2.h @@ -1,25 +1,25 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ #pragma once #include "os.h" -#include "MsedDevOpal.h" +#include "DtaDevOpal.h" using namespace std; /** Class representing a disk device, this class is represents a disk that conforms @@ -28,10 +28,10 @@ using namespace std; * testing so far indicates that the functions implemented in this program * function the same in OPAL 1.0 and Opal 2.0 */ -class MsedDevOpal2 : public MsedDevOpal { +class DtaDevOpal2 : public DtaDevOpal { public: - MsedDevOpal2(const char * devref); - ~MsedDevOpal2(); + DtaDevOpal2(const char * devref); + ~DtaDevOpal2(); /** return the communication ID to be used with this device */ uint16_t comID(); diff --git a/Common/MsedEndianFixup.h b/Common/DtaEndianFixup.h similarity index 85% rename from Common/MsedEndianFixup.h rename to Common/DtaEndianFixup.h index 47d061d3..36ea73ce 100644 --- a/Common/MsedEndianFixup.h +++ b/Common/DtaEndianFixup.h @@ -1,20 +1,20 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ /* These are a few macros to fixup the endianess of the data diff --git a/Common/MsedHashPwd.cpp b/Common/DtaHashPwd.cpp similarity index 81% rename from Common/MsedHashPwd.cpp rename to Common/DtaHashPwd.cpp index 91fb1956..468d29fc 100644 --- a/Common/MsedHashPwd.cpp +++ b/Common/DtaHashPwd.cpp @@ -1,28 +1,28 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ #include "os.h" #include #include -#include "MsedHashPwd.h" -#include "MsedLexicon.h" -#include "MsedDev.h" +#include "DtaHashPwd.h" +#include "DtaLexicon.h" +#include "DtaDev.h" #include "log.h" extern "C" @@ -31,10 +31,10 @@ int gc_pbkdf2_sha1(const char *P, size_t Plen,const char *S, size_t Slen, using namespace std; -void MsedHashPassword(vector &hash, char * password, vector salt, +void DtaHashPassword(vector &hash, char * password, vector salt, unsigned int iter, uint8_t hashsize) { - LOG(D1) << " Entered MsedHashPassword"; + LOG(D1) << " Entered DtaHashPassword"; // if the hashsize can be > 255 the token overhead logic needs to be fixed assert(1 == sizeof(hashsize)); if (253 < hashsize) { LOG(E) << "Hashsize > 253 incorrect token generated"; } @@ -55,9 +55,9 @@ void MsedHashPassword(vector &hash, char * password, vector sa hash.insert(hash.begin(), 0xd0); } -void MsedHashPwd(vector &hash, char * password, MsedDev * d) +void DtaHashPwd(vector &hash, char * password, DtaDev * d) { - LOG(D1) << " Entered MsedHashPwd"; + LOG(D1) << " Entered DtaHashPwd"; char *serNum; if (d->no_hash_passwords) { @@ -67,14 +67,14 @@ void MsedHashPwd(vector &hash, char * password, MsedDev * d) // add the token overhead hash.insert(hash.begin(), (uint8_t)hash.size()); hash.insert(hash.begin(), 0xd0); - LOG(D1) << " Exit MsedHashPwd"; + LOG(D1) << " Exit DtaHashPwd"; return; } serNum = d->getSerialNum(); vector salt(serNum, serNum + 20); // vector salt(DEFAULTSALT); - MsedHashPassword(hash, password, salt); - LOG(D1) << " Exit MsedHashPwd"; // log for hash timing + DtaHashPassword(hash, password, salt); + LOG(D1) << " Exit DtaHashPwd"; // log for hash timing } struct PBKDF_TestTuple @@ -98,7 +98,7 @@ int testresult(std::vector &result, const char * expected, size_t len) return memcmp(result.data()+2, work, len); } -int TestMsed(const PBKDF_TestTuple *testSet, unsigned int testSetSize) +int Testsedutil(const PBKDF_TestTuple *testSet, unsigned int testSetSize) { int pass = 1; std::vector hash, seaSalt; @@ -112,14 +112,14 @@ int TestMsed(const PBKDF_TestTuple *testSet, unsigned int testSetSize) } printf("Password %s Salt %s Iterations %i Length %i\n", (char *)tuple.Password, (char *) tuple.Salt, tuple.iterations, tuple.hashlen); - MsedHashPassword(hash, (char *) tuple.Password, seaSalt, tuple.iterations, tuple.hashlen); + DtaHashPassword(hash, (char *) tuple.Password, seaSalt, tuple.iterations, tuple.hashlen); int fail = (testresult(hash, tuple.hexDerivedKey, tuple.hashlen) == 0); pass = pass & fail; } return pass; } -int MsedTestPBDKF2() +int TestPBKDF2() { int pass = 1; // from draft-ietf-smime-password-03.txt, at http://www.imc.org/draft-ietf-smime-password @@ -141,9 +141,9 @@ int MsedTestPBDKF2() // program receives char * from OS so this test would fail but is not possible IRL }; - cout << "\nPKCS #5 PBKDF2 validation suite running on Msed ... \n\n"; - pass = TestMsed(testSet, sizeof (testSet) / sizeof (testSet[0])) && pass; - cout << "\nPKCS #5 PBKDF2 validation suite on Msed ... "; + cout << "\nPKCS #5 PBKDF2 validation suite running ... \n\n"; + pass = Testsedutil(testSet, sizeof (testSet) / sizeof (testSet[0])) && pass; + cout << "\nPKCS #5 PBKDF2 validation suite ... "; if (pass) cout << "passed\n"; else diff --git a/Common/MsedHashPwd.h b/Common/DtaHashPwd.h similarity index 72% rename from Common/MsedHashPwd.h rename to Common/DtaHashPwd.h index 73c80fe1..8fc7683b 100644 --- a/Common/MsedHashPwd.h +++ b/Common/DtaHashPwd.h @@ -1,25 +1,25 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ #pragma once #include -class MsedDev; +class DtaDev; using namespace std; /** Hash the password using the drive serial number as salt. @@ -27,12 +27,12 @@ using namespace std; * it should prevent attacking the password with a prebuilt table * * This is an intermediary pass through so that the real hash - * function (MsedHashPassword) can be tested and verified. + * function (DtaHashPassword) can be tested and verified. * @param hash The field whare the hash is to be placed * @param password The password to be hashed * @param device the device where the password is to be used */ -void MsedHashPwd(vector &hash, char * password, MsedDev * device); +void DtaHashPwd(vector &hash, char * password, DtaDev * device); /** Hash a passwor using the PBDKF2 function * * @param hash Field where hash returned @@ -41,7 +41,7 @@ void MsedHashPwd(vector &hash, char * password, MsedDev * device); * @param iter number of iterations to be preformed * @param hashsize size of hash to be returned */ -void MsedHashPassword(vector &hash, char * password, vector salt, +void DtaHashPassword(vector &hash, char * password, vector salt, unsigned int iter = 75000, uint8_t hashsize = 32); /** Test the hshing function using publicly available test cased and report */ -int MsedTestPBDKF2(); +int TestPBKDF2(); diff --git a/Common/MsedHexDump.cpp b/Common/DtaHexDump.cpp similarity index 80% rename from Common/MsedHexDump.cpp rename to Common/DtaHexDump.cpp index c5d08789..05d19c00 100644 --- a/Common/MsedHexDump.cpp +++ b/Common/DtaHexDump.cpp @@ -1,26 +1,26 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ #include "os.h" #include #include -void MsedHexDump(void * address, int length) { +void DtaHexDump(void * address, int length) { uint8_t display[17]; uint8_t * cpos = (uint8_t *)address; uint8_t * epos = cpos + length; diff --git a/Common/MsedHexDump.h b/Common/DtaHexDump.h similarity index 89% rename from Common/MsedHexDump.h rename to Common/DtaHexDump.h index 9636c9d4..f1efcaa5 100644 --- a/Common/MsedHexDump.h +++ b/Common/DtaHexDump.h @@ -1,5 +1,5 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -19,4 +19,4 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * @param address Starting address for the dump * @param length Length of the area to be dumped */ -void MsedHexDump(void * address, int length); \ No newline at end of file +void DtaHexDump(void * address, int length); \ No newline at end of file diff --git a/Common/MsedLexicon.h b/Common/DtaLexicon.h similarity index 94% rename from Common/MsedLexicon.h rename to Common/DtaLexicon.h index 8c518612..0e157faf 100644 --- a/Common/MsedLexicon.h +++ b/Common/DtaLexicon.h @@ -1,20 +1,20 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ #pragma once @@ -173,10 +173,10 @@ typedef enum _OPAL_TOKEN { // properties HOSTPROPERTIES =0x00, // response tokenis() returned values - MSED_TOKENID_BYTESTRING = 0xe0, - MSED_TOKENID_SINT = 0xe1, - MSED_TOKENID_UINT = 0xe2, - MSED_TOKENID_TOKEN = 0xe3, // actual token is returned + DTA_TOKENID_BYTESTRING = 0xe0, + DTA_TOKENID_SINT = 0xe1, + DTA_TOKENID_UINT = 0xe2, + DTA_TOKENID_TOKEN = 0xe3, // actual token is returned // atoms STARTLIST = 0xf0, ENDLIST = 0xf1, diff --git a/Common/MsedOptions.cpp b/Common/DtaOptions.cpp similarity index 93% rename from Common/MsedOptions.cpp rename to Common/DtaOptions.cpp index 7c5ead6d..12132a8d 100644 --- a/Common/MsedOptions.cpp +++ b/Common/DtaOptions.cpp @@ -1,33 +1,33 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ #include "os.h" -#include "MsedOptions.h" -#include "MsedLexicon.h" +#include "DtaOptions.h" +#include "DtaLexicon.h" #include "Version.h" void usage() { - printf("msed v%s Copyright 2014,2015 Michael Romeo \n", GIT_VERSION); + printf("sedutil v%s Copyright 2014-2016 Bright Plaza Inc. \n", GIT_VERSION); printf("a utility to manage self encrypting drives that conform\n"); printf("to the Trusted Computing Group OPAL 2.0 SSC specification\n"); printf("General Usage: (see readme for extended commandset)\n"); - printf("msed <-v> <-n> \n"); + printf("sedutil-cli <-v> <-n> \n"); printf("-v (optional) increase verbosity, one to five v's\n"); printf("-n (optional) no password hashing. Passwords will be sent in clear text!\n"); printf("actions \n"); @@ -50,7 +50,7 @@ void usage() printf(" Setup a new Locking Range\n"); printf(" 0 = GLobal 1..n = LRn \n"); printf("--initialSetup \n"); - printf(" Setup the device for use with msed\n"); + printf(" Setup the device for use with sedutil\n"); printf(" is new SID and Admin1 password\n"); printf("--setSIDPassword \n"); printf(" Change the SID password\n"); @@ -87,27 +87,27 @@ void usage() printf(" print MSID \n"); printf("\n"); printf("Examples \n"); - printf("msed --scan \n"); - printf("msed --query %s \n", DEVICEEXAMPLE); - printf("msed --yesIreallywanttoERASEALLmydatausingthePSID %s \n", DEVICEEXAMPLE); - printf("msed --initialSetup %s \n", DEVICEEXAMPLE); + printf("sedutil-cli --scan \n"); + printf("sedutil-cli --query %s \n", DEVICEEXAMPLE); + printf("sedutil-cli --yesIreallywanttoERASEALLmydatausingthePSID %s \n", DEVICEEXAMPLE); + printf("sedutil-cli --initialSetup %s \n", DEVICEEXAMPLE); return; } -uint8_t MsedOptions(int argc, char * argv[], MSED_OPTIONS * opts) +uint8_t DtaOptions(int argc, char * argv[], DTA_OPTIONS * opts) { - memset(opts, 0, sizeof (MSED_OPTIONS)); + memset(opts, 0, sizeof (DTA_OPTIONS)); uint16_t loggingLevel = 2; uint8_t baseOptions = 2; // program and option CLog::Level() = CLog::FromInt(loggingLevel); if (2 > argc) { usage(); - return MSEDERROR_INVALID_COMMAND; + return DTAERROR_INVALID_COMMAND; } for (uint8_t i = 1; i < argc; i++) { if (!(strcmp("-h", argv[i])) || !(strcmp("--help", argv[i]))) { usage(); - return MSEDERROR_INVALID_COMMAND; + return DTAERROR_INVALID_COMMAND; } else if ('v' == argv[i][1]) { @@ -116,7 +116,7 @@ uint8_t MsedOptions(int argc, char * argv[], MSED_OPTIONS * opts) if (loggingLevel > 7) loggingLevel = 7; CLog::Level() = CLog::FromInt(loggingLevel); LOG(D) << "Log level set to " << CLog::ToString(CLog::FromInt(loggingLevel)); - LOG(D) << "msed version : " << GIT_VERSION; + LOG(D) << "sedutil version : " << GIT_VERSION; } else if (!(strcmp("-n", argv[i]))) { baseOptions += 1; @@ -127,7 +127,7 @@ uint8_t MsedOptions(int argc, char * argv[], MSED_OPTIONS * opts) (0 == opts->action)) { LOG(E) << "Argument " << (uint16_t) i << " (" << argv[i] << ") should be a command"; - return MSEDERROR_INVALID_COMMAND; + return DTAERROR_INVALID_COMMAND; } BEGIN_OPTION(initialSetup, 2) OPTION_IS(password) OPTION_IS(device) END_OPTION BEGIN_OPTION(setSIDPassword, 3) OPTION_IS(password) OPTION_IS(newpassword) @@ -450,7 +450,7 @@ uint8_t MsedOptions(int argc, char * argv[], MSED_OPTIONS * opts) BEGIN_OPTION(rawCmd, 7) i += 6; OPTION_IS(device) END_OPTION else { LOG(E) << "Invalid command line argument " << argv[i]; - return MSEDERROR_INVALID_COMMAND; + return DTAERROR_INVALID_COMMAND; } } return 0; diff --git a/Common/MsedOptions.h b/Common/DtaOptions.h similarity index 83% rename from Common/MsedOptions.h rename to Common/DtaOptions.h index cef9c0be..f6976cd0 100644 --- a/Common/MsedOptions.h +++ b/Common/DtaOptions.h @@ -1,30 +1,30 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ /** Structure representing the command line issued to the program */ -typedef struct _MSED_OPTIONS { +typedef struct _DTA_OPTIONS { uint8_t password; /**< password supplied */ uint8_t userid; /**< userid supplied */ uint8_t newpassword; /**< new password for password change */ uint8_t pbafile; /**< file name for loadPBAimage command */ uint8_t device; /**< device name */ - uint8_t action; /**< msedoption requested */ + uint8_t action; /**< option requested */ uint8_t mbrstate; /**< mbrstate for set mbr commands */ uint8_t lockingrange; /**< locking range to be manipulated */ uint8_t lockingstate; /**< locking state to set a lockingrange to */ @@ -32,7 +32,7 @@ typedef struct _MSED_OPTIONS { uint8_t lrlength; /** the length in blocks of a lockingrange */ bool no_hash_passwords; /** global parameter, disables hashing of passwords */ -} MSED_OPTIONS; +} DTA_OPTIONS; /** Print a usage message */ void usage(); /** Parse the command line and return a structure that describes the action desired @@ -40,9 +40,9 @@ void usage(); * @param argv program argv paramater * @param opts pointer to options structure to be filled out */ -uint8_t MsedOptions(int argc, char * argv[], MSED_OPTIONS * opts); -/** Command line options implemented in msed */ -typedef enum _msedoption { +uint8_t DtaOptions(int argc, char * argv[], DTA_OPTIONS * opts); +/** Command line options implemented in sedutil */ +typedef enum _sedutiloption { deadbeef, // 0 should indicate no action specified initialSetup, setSIDPassword, @@ -81,7 +81,7 @@ typedef enum _msedoption { printDefaultPassword, rawCmd, -} msedoption; +} sedutiloption; /** verify the number of arguments passed */ #define CHECKARGS(x) \ if((x+baseOptions) != argc) { \ @@ -92,7 +92,7 @@ if((x+baseOptions) != argc) { \ #define BEGIN_OPTION(cmdstring,args) \ else if (!(strcasecmp(#cmdstring, &argv[i][2]))) { \ CHECKARGS(args) \ - opts->action = msedoption::cmdstring; \ + opts->action = sedutiloption::cmdstring; \ /** end of an OPTION */ #define END_OPTION } diff --git a/Common/MsedResponse.cpp b/Common/DtaResponse.cpp similarity index 71% rename from Common/MsedResponse.cpp rename to Common/DtaResponse.cpp index 45e4c756..549ed37f 100644 --- a/Common/MsedResponse.cpp +++ b/Common/DtaResponse.cpp @@ -1,42 +1,42 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ #include "os.h" -#include "MsedResponse.h" -#include "MsedEndianFixup.h" +#include "DtaResponse.h" +#include "DtaEndianFixup.h" using namespace std; -MsedResponse::MsedResponse() +DtaResponse::DtaResponse() { - LOG(D1) << "Creating MsedResponse()"; + LOG(D1) << "Creating DtaResponse()"; } -MsedResponse::MsedResponse(void * buffer) +DtaResponse::DtaResponse(void * buffer) { - LOG(D1) << "Creating MsedResponse(buffer)"; + LOG(D1) << "Creating DtaResponse(buffer)"; init(buffer); } void -MsedResponse::init(void * buffer) +DtaResponse::init(void * buffer) { - LOG(D1) << "Entering MsedResponse::init"; + LOG(D1) << "Entering DtaResponse::init"; std::vector bytestring, empty_atom(1, 0xff); uint8_t * reply = (uint8_t *) buffer; uint32_t cpos = 0; @@ -65,51 +65,51 @@ MsedResponse::init(void * buffer) } } -OPAL_TOKEN MsedResponse::tokenIs(uint32_t tokenNum) +OPAL_TOKEN DtaResponse::tokenIs(uint32_t tokenNum) { - LOG(D1) << "Entering MsedResponse::tokenIs"; + LOG(D1) << "Entering DtaResponse::tokenIs"; if (!(response[tokenNum][0] & 0x80)) { //tiny atom if ((response[tokenNum][0] & 0x40)) - return OPAL_TOKEN::MSED_TOKENID_SINT; + return OPAL_TOKEN::DTA_TOKENID_SINT; else - return OPAL_TOKEN::MSED_TOKENID_UINT; + return OPAL_TOKEN::DTA_TOKENID_UINT; } else if (!(response[tokenNum][0] & 0x40)) { // short atom if ((response[tokenNum][0] & 0x20)) - return OPAL_TOKEN::MSED_TOKENID_BYTESTRING; + return OPAL_TOKEN::DTA_TOKENID_BYTESTRING; else if ((response[tokenNum][0] & 0x10)) - return OPAL_TOKEN::MSED_TOKENID_SINT; + return OPAL_TOKEN::DTA_TOKENID_SINT; else - return OPAL_TOKEN::MSED_TOKENID_UINT; + return OPAL_TOKEN::DTA_TOKENID_UINT; } else if (!(response[tokenNum][0] & 0x20)) { // medium atom if ((response[tokenNum][0] & 0x10)) - return OPAL_TOKEN::MSED_TOKENID_BYTESTRING; + return OPAL_TOKEN::DTA_TOKENID_BYTESTRING; else if ((response[tokenNum][0] & 0x08)) - return OPAL_TOKEN::MSED_TOKENID_SINT; + return OPAL_TOKEN::DTA_TOKENID_SINT; else - return OPAL_TOKEN::MSED_TOKENID_UINT; + return OPAL_TOKEN::DTA_TOKENID_UINT; } else if (!(response[tokenNum][0] & 0x10)) { // long atom if ((response[tokenNum][0] & 0x02)) - return OPAL_TOKEN::MSED_TOKENID_BYTESTRING; + return OPAL_TOKEN::DTA_TOKENID_BYTESTRING; else if ((response[tokenNum][0] & 0x01)) - return OPAL_TOKEN::MSED_TOKENID_SINT; + return OPAL_TOKEN::DTA_TOKENID_SINT; else - return OPAL_TOKEN::MSED_TOKENID_UINT; + return OPAL_TOKEN::DTA_TOKENID_UINT; } else // TOKEN return (OPAL_TOKEN) response[tokenNum][0]; } -uint32_t MsedResponse::getLength(uint32_t tokenNum) +uint32_t DtaResponse::getLength(uint32_t tokenNum) { return (uint32_t) response[tokenNum].size(); } -uint64_t MsedResponse::getUint64(uint32_t tokenNum) +uint64_t DtaResponse::getUint64(uint32_t tokenNum) { - LOG(D1) << "Entering MsedResponse::getUint64"; + LOG(D1) << "Entering DtaResponse::getUint64"; if (!(response[tokenNum][0] & 0x80)) { //tiny atom if ((response[tokenNum][0] & 0x40)) { LOG(E) << "unsigned int requested for signed tiny atom"; @@ -150,42 +150,42 @@ uint64_t MsedResponse::getUint64(uint32_t tokenNum) } } -uint32_t MsedResponse::getUint32(uint32_t tokenNum) +uint32_t DtaResponse::getUint32(uint32_t tokenNum) { - LOG(D1) << "Entering MsedResponse::getUint32"; + LOG(D1) << "Entering DtaResponse::getUint32"; uint64_t i = getUint64(tokenNum); if (i > 0xffffffff) { LOG(E) << "UINT32 truncated "; } return (uint32_t) i; } -uint16_t MsedResponse::getUint16(uint32_t tokenNum) +uint16_t DtaResponse::getUint16(uint32_t tokenNum) { - LOG(D1) << "Entering MsedResponse::getUint16"; + LOG(D1) << "Entering DtaResponse::getUint16"; uint64_t i = getUint64(tokenNum); if (i > 0xffff) { LOG(E) << "UINT16 truncated "; } return (uint16_t) i; } -uint8_t MsedResponse::getUint8(uint32_t tokenNum) +uint8_t DtaResponse::getUint8(uint32_t tokenNum) { - LOG(D1) << "Entering MsedResponse::getUint8"; + LOG(D1) << "Entering DtaResponse::getUint8"; uint64_t i = getUint64(tokenNum); if (i > 0xff) { LOG(E) << "UINT8 truncated "; } return (uint8_t) i; } -//int64_t MsedResponse::getSint(uint32_t tokenNum) { -// LOG(E) << "MsedResponse::getSint() is not implemented"; +//int64_t DtaResponse::getSint(uint32_t tokenNum) { +// LOG(E) << "DtaResponse::getSint() is not implemented"; //} -std::vector MsedResponse::getRawToken(uint32_t tokenNum) +std::vector DtaResponse::getRawToken(uint32_t tokenNum) { return response[tokenNum]; } -std::string MsedResponse::getString(uint32_t tokenNum) +std::string DtaResponse::getString(uint32_t tokenNum) { - LOG(D1) << "Entering MsedResponse::getString"; + LOG(D1) << "Entering DtaResponse::getString"; std::string s; s.erase(); int overhead = 0; @@ -212,9 +212,9 @@ std::string MsedResponse::getString(uint32_t tokenNum) return s; } -void MsedResponse::getBytes(uint32_t tokenNum, uint8_t bytearray[]) +void DtaResponse::getBytes(uint32_t tokenNum, uint8_t bytearray[]) { - LOG(D1) << "Entering MsedResponse::getBytes"; + LOG(D1) << "Entering DtaResponse::getBytes"; int overhead = 0; if (!(response[tokenNum][0] & 0x80)) { //tiny atom LOG(E) << "Cannot get a bytestring from a tiny atom"; @@ -239,13 +239,13 @@ void MsedResponse::getBytes(uint32_t tokenNum, uint8_t bytearray[]) } } -uint32_t MsedResponse::getTokenCount() +uint32_t DtaResponse::getTokenCount() { - LOG(D1) << "Entering MsedResponse::getTokenCount()"; + LOG(D1) << "Entering DtaResponse::getTokenCount()"; return (uint32_t) response.size(); } -MsedResponse::~MsedResponse() +DtaResponse::~DtaResponse() { - LOG(D1) << "Destroying MsedResponse"; + LOG(D1) << "Destroying DtaResponse"; } diff --git a/Common/MsedResponse.h b/Common/DtaResponse.h similarity index 85% rename from Common/MsedResponse.h rename to Common/DtaResponse.h index 15ded8c2..d834ac96 100644 --- a/Common/MsedResponse.h +++ b/Common/DtaResponse.h @@ -1,40 +1,40 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ #pragma once #include #include -#include "MsedStructures.h" -#include "MsedLexicon.h" +#include "DtaStructures.h" +#include "DtaLexicon.h" /** Object containing the parsed tokens. * a vector of vector that contains each token * returned in the TCG response */ -class MsedResponse { +class DtaResponse { public: - MsedResponse(); + DtaResponse(); /** constructor * @param buffer the response returned by a TCG command */ - MsedResponse(void * buffer); - ~MsedResponse(); + DtaResponse(void * buffer); + ~DtaResponse(); /** (re)initialize the object using a new buffer * @param buffer the response returned by a TCG command */ void init(void * buffer); diff --git a/Common/MsedSession.cpp b/Common/DtaSession.cpp similarity index 76% rename from Common/MsedSession.cpp rename to Common/DtaSession.cpp index 08108325..c4217cb3 100644 --- a/Common/MsedSession.cpp +++ b/Common/DtaSession.cpp @@ -1,51 +1,51 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ #include "os.h" #include -#include "MsedSession.h" -#include "MsedDev.h" -#include "MsedCommand.h" -#include "MsedResponse.h" -#include "MsedEndianFixup.h" -#include "MsedHexDump.h" -#include "MsedHashPwd.h" -#include "MsedStructures.h" +#include "DtaSession.h" +#include "DtaDev.h" +#include "DtaCommand.h" +#include "DtaResponse.h" +#include "DtaEndianFixup.h" +#include "DtaHexDump.h" +#include "DtaHashPwd.h" +#include "DtaStructures.h" using namespace std; -MsedSession::MsedSession(MsedDev * device) +DtaSession::DtaSession(DtaDev * device) { - LOG(D1) << "Creating MsedSsession()"; + LOG(D1) << "Creating DtaSsession()"; d = device; } uint8_t -MsedSession::start(OPAL_UID SP) +DtaSession::start(OPAL_UID SP) { return (start(SP, NULL, OPAL_UID::OPAL_UID_HEXFF)); } uint8_t -MsedSession::start(OPAL_UID SP, char * HostChallenge, OPAL_UID SignAuthority) +DtaSession::start(OPAL_UID SP, char * HostChallenge, OPAL_UID SignAuthority) { - LOG(D1) << "Entering MsedSession::startSession "; + LOG(D1) << "Entering DtaSession::startSession "; vector auth; auth.push_back(OPAL_SHORT_ATOM::BYTESTRING8); for (int i = 0; i < 8; i++) { @@ -54,16 +54,16 @@ MsedSession::start(OPAL_UID SP, char * HostChallenge, OPAL_UID SignAuthority) return(start(SP, HostChallenge, auth)); } uint8_t -MsedSession::start(OPAL_UID SP, char * HostChallenge, vector SignAuthority) +DtaSession::start(OPAL_UID SP, char * HostChallenge, vector SignAuthority) { - LOG(D1) << "Entering MsedSession::startSession "; + LOG(D1) << "Entering DtaSession::startSession "; vector hash; - MsedCommand *cmd = new MsedCommand(); + DtaCommand *cmd = new DtaCommand(); if (NULL == cmd) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } - MsedResponse response; + DtaResponse response; cmd->reset(OPAL_UID::OPAL_SMUID_UID, OPAL_METHOD::STARTSESSION); cmd->addToken(OPAL_TOKEN::STARTLIST); // [ (Open Bracket) cmd->addToken(105); // HostSessionID : sessionnumber @@ -74,7 +74,7 @@ MsedSession::start(OPAL_UID SP, char * HostChallenge, vector SignAuthor cmd->addToken(OPAL_TINY_ATOM::UINT_00); if (hashPwd) { hash.clear(); - MsedHashPwd(hash, HostChallenge, d); + DtaHashPwd(hash, HostChallenge, d); cmd->addToken(hash); } else { cmd->addToken(HostChallenge); @@ -109,16 +109,16 @@ MsedSession::start(OPAL_UID SP, char * HostChallenge, vector SignAuthor return 0; } uint8_t -MsedSession::authenticate(vector Authority, char * Challenge) +DtaSession::authenticate(vector Authority, char * Challenge) { - LOG(D1) << "Entering MsedSession::authenticate "; + LOG(D1) << "Entering DtaSession::authenticate "; vector hash; - MsedCommand *cmd = new MsedCommand(); + DtaCommand *cmd = new DtaCommand(); if (NULL == cmd) { LOG(E) << "Unable to create session object "; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } - MsedResponse response; + DtaResponse response; cmd->reset(OPAL_UID::OPAL_THISSP_UID, d->isEprise() ? OPAL_METHOD::EAUTHENTICATE : OPAL_METHOD::AUTHENTICATE); cmd->addToken(OPAL_TOKEN::STARTLIST); // [ (Open Bracket) cmd->addToken(Authority); @@ -131,7 +131,7 @@ MsedSession::authenticate(vector Authority, char * Challenge) cmd->addToken(OPAL_TINY_ATOM::UINT_00); if (hashPwd) { hash.clear(); - MsedHashPwd(hash, Challenge, d); + DtaHashPwd(hash, Challenge, d); cmd->addToken(hash); } else @@ -148,17 +148,17 @@ MsedSession::authenticate(vector Authority, char * Challenge) if (0 == response.getUint8(1)) { LOG(E) << "Session Authenticate failed (response = false)"; delete cmd; - return MSEDERROR_AUTH_FAILED; + return DTAERROR_AUTH_FAILED; } - LOG(D1) << "Exiting MsedSession::authenticate "; + LOG(D1) << "Exiting DtaSession::authenticate "; delete cmd; return 0; } uint8_t -MsedSession::sendCommand(MsedCommand * cmd, MsedResponse & response) +DtaSession::sendCommand(DtaCommand * cmd, DtaResponse & response) { - LOG(D1) << "Entering MsedSession::sendCommand()"; + LOG(D1) << "Entering DtaSession::sendCommand()"; cmd->setHSN(HSN); cmd->setTSN(TSN); cmd->setcomID(d->comID()); @@ -178,7 +178,7 @@ MsedSession::sendCommand(MsedCommand * cmd, MsedResponse & response) (0 == response.h.pkt.length) || (0 == response.h.subpkt.length)) { LOG(E) << "One or more header fields have 0 length"; - return MSEDERROR_COMMAND_ERROR; + return DTAERROR_COMMAND_ERROR; } // if we get an endsession response return 0 if (OPAL_TOKEN::ENDOFSESSION == response.tokenIs(0)) { @@ -189,7 +189,7 @@ MsedSession::sendCommand(MsedCommand * cmd, MsedResponse & response) (OPAL_TOKEN::STARTLIST == response.tokenIs(response.getTokenCount() - 5)))) { // no method status so we hope we reported the error someplace else LOG(E) << "Method Status missing"; - return MSEDERROR_NO_METHOD_STATUS; + return DTAERROR_NO_METHOD_STATUS; } if (OPALSTATUSCODE::SUCCESS != response.getUint8(response.getTokenCount() - 4)) { LOG(E) << "method status code " << @@ -199,30 +199,30 @@ MsedSession::sendCommand(MsedCommand * cmd, MsedResponse & response) } void -MsedSession::setProtocol(uint8_t value) +DtaSession::setProtocol(uint8_t value) { - LOG(D1) << "Entering MsedSession::setProtocol"; + LOG(D1) << "Entering DtaSession::setProtocol"; SecurityProtocol = value; } void -MsedSession::dontHashPwd() +DtaSession::dontHashPwd() { - LOG(D1) << "Entering MsedSession::setProtocol"; + LOG(D1) << "Entering DtaSession::setProtocol"; hashPwd = 0; } void -MsedSession::expectAbort() +DtaSession::expectAbort() { - LOG(D1) << "Entering MsedSession::methodStatus()"; + LOG(D1) << "Entering DtaSession::methodStatus()"; willAbort = 1; } char * -MsedSession::methodStatus(uint8_t status) +DtaSession::methodStatus(uint8_t status) { - LOG(D1) << "Entering MsedSession::methodStatus()"; + LOG(D1) << "Entering DtaSession::methodStatus()"; switch (status) { case OPALSTATUSCODE::AUTHORITY_LOCKED_OUT: return (char *) "AUTHORITY_LOCKED_OUT"; @@ -265,12 +265,12 @@ MsedSession::methodStatus(uint8_t status) } } -MsedSession::~MsedSession() +DtaSession::~DtaSession() { - LOG(D1) << "Destroying MsedSession"; - MsedResponse response; + LOG(D1) << "Destroying DtaSession"; + DtaResponse response; if (!willAbort) { - MsedCommand *cmd = new MsedCommand(); + DtaCommand *cmd = new DtaCommand(); if (NULL == cmd) { LOG(E) << "Unable to create command object "; } diff --git a/Common/MsedSession.h b/Common/DtaSession.h similarity index 83% rename from Common/MsedSession.h rename to Common/DtaSession.h index e0d6499c..39f11186 100644 --- a/Common/MsedSession.h +++ b/Common/DtaSession.h @@ -1,42 +1,42 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ #pragma once /* - * Manage the session to a TPer. + * Manage tDtaLexicon */ -#include "MsedLexicon.h" +#include "DtaLexicon.h" #include -class MsedCommand; -class MsedDev; -class MsedResponse; +class DtaCommand; +class DtaDev; +class DtaResponse; using namespace std; /** Encapsulate the session management functionality */ -class MsedSession { +class DtaSession { public: /** Constructor * @param device the device the session is to be conducted with */ - MsedSession(MsedDev * device); + DtaSession(DtaDev * device); /** Destructor ends the session if required */ - ~MsedSession(); + ~DtaSession(); /** start an anonymous session * @param SP the Security Provider to start the session with */ uint8_t start(OPAL_UID SP); @@ -72,18 +72,18 @@ class MsedSession { */ void expectAbort(); /** send a command to the device in this session - * @param cmd The MsedCommand object + * @param cmd The DtaCommand object * @param response The MesdResponse object */ - uint8_t sendCommand(MsedCommand * cmd, MsedResponse & response); + uint8_t sendCommand(DtaCommand * cmd, DtaResponse & response); private: /** Default constructor, private should never be called */ - MsedSession(); + DtaSession(); /** return a string explaining the method status * @param status the method status code returned */ char * methodStatus(uint8_t status); - MsedDev * d; /**< Pointer to device this session is with */ + DtaDev * d; /**< Pointer to device this session is with */ uint32_t bufferpos = 0; /**< psooition in the response buffer the parser is at */ uint32_t TSN = 0; /**< TPer session number */ uint32_t HSN = 0; /**< Host session number */ diff --git a/Common/MsedStructures.h b/Common/DtaStructures.h similarity index 97% rename from Common/MsedStructures.h rename to Common/DtaStructures.h index 72661967..d748ec17 100644 --- a/Common/MsedStructures.h +++ b/Common/DtaStructures.h @@ -1,20 +1,20 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ #pragma once @@ -271,12 +271,12 @@ typedef enum _ATACOMMAND { IDENTIFY = 0xec, } ATACOMMAND; -typedef enum _MSED_DEVICE_TYPE { +typedef enum _DTA_DEVICE_TYPE { DEVICE_TYPE_ATA, DEVICE_TYPE_SAS, DEVICE_TYPE_NVME, DEVICE_TYPE_OTHER, -} MSED_DEVICE_TYPE; +} DTA_DEVICE_TYPE; /** structure to store Disk information. */ typedef struct _OPAL_DiskInfo { @@ -330,7 +330,7 @@ typedef struct _OPAL_DiskInfo { uint16_t OPAL20_numUsers; uint8_t OPAL20_rangeCrossing; // IDENTIFY information - MSED_DEVICE_TYPE devType; + DTA_DEVICE_TYPE devType; uint8_t serialNum[20]; uint8_t null0; // make sn a cstring uint8_t firmwareRev[8]; diff --git a/Common/ReadMe.txt b/Common/ReadMe.txt index e45daa00..cce753f6 100644 --- a/Common/ReadMe.txt +++ b/Common/ReadMe.txt @@ -1,21 +1,20 @@ -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. - This file is part of msed. +This file is part of sedutil. - msed is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. +sedutil is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. - msed is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +sedutil is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with msed. If not, see . +You should have received a copy of the GNU General Public License +along with sedutil. If not, see . - ***** Warning ****** ***** Warning ****** PROPER USE OF CERTAIN FEATURES OF THIS PROGRAM ***** Warning ****** **WILL** CAUSE AN UNRECOVERABLE LOSS ALL OF THE DATA ON YOUR ***** Warning ****** DRIVE @@ -28,11 +27,6 @@ This software is Copyright 2014,2015 Michael Romeo ***** Warning ****** IF YOU ARE UNSURE OF WHAT YOU ARE DOING THEN ***** Warning ****** *PLEASE* GET SOME HELP USING THIS PROGRAM. ***** Warning ****** -msed - Manage Self Encrypting Drives - -This program and it's (tbd) accompanying Pre-Boot Authorization image allow -you to enable the locking in SED's that comply with the TCG OPAL 2.00 -standard. You must be administrator/root to run this program @@ -42,5 +36,4 @@ or changing the contents of /sys/module/libata/parameters/allow_tpm to a from a Currently the only operation that a general user would want to use is the PSID revert function see linux/PSIDRevert_LINUX.txt or win32/PSIDRevert_WINDOWS.txt -Source code is available on GitHub at https://github.com/r0m30/msed -Linux and Windows executables are available at //http:/www.r0m30.com/msed +Source code is available on GitHub at https://github.com/Drive-Trust-Alliance/sedutil diff --git a/Common/pbdkf2/config.h b/Common/pbkdf2/config.h similarity index 100% rename from Common/pbdkf2/config.h rename to Common/pbkdf2/config.h diff --git a/Common/pbdkf2/gc-gnulib.c b/Common/pbkdf2/gc-gnulib.c similarity index 100% rename from Common/pbdkf2/gc-gnulib.c rename to Common/pbkdf2/gc-gnulib.c diff --git a/Common/pbdkf2/gc-pbkdf2-sha1.c b/Common/pbkdf2/gc-pbkdf2-sha1.c similarity index 100% rename from Common/pbdkf2/gc-pbkdf2-sha1.c rename to Common/pbkdf2/gc-pbkdf2-sha1.c diff --git a/Common/pbdkf2/gc.h b/Common/pbkdf2/gc.h similarity index 100% rename from Common/pbdkf2/gc.h rename to Common/pbkdf2/gc.h diff --git a/Common/pbdkf2/hmac-sha1.c b/Common/pbkdf2/hmac-sha1.c similarity index 100% rename from Common/pbdkf2/hmac-sha1.c rename to Common/pbkdf2/hmac-sha1.c diff --git a/Common/pbdkf2/hmac.h b/Common/pbkdf2/hmac.h similarity index 100% rename from Common/pbdkf2/hmac.h rename to Common/pbkdf2/hmac.h diff --git a/Common/pbdkf2/memxor.c b/Common/pbkdf2/memxor.c similarity index 100% rename from Common/pbdkf2/memxor.c rename to Common/pbkdf2/memxor.c diff --git a/Common/pbdkf2/memxor.h b/Common/pbkdf2/memxor.h similarity index 100% rename from Common/pbdkf2/memxor.h rename to Common/pbkdf2/memxor.h diff --git a/Common/pbdkf2/sha1.c b/Common/pbkdf2/sha1.c similarity index 100% rename from Common/pbdkf2/sha1.c rename to Common/pbkdf2/sha1.c diff --git a/Common/pbdkf2/sha1.h b/Common/pbkdf2/sha1.h similarity index 100% rename from Common/pbdkf2/sha1.h rename to Common/pbkdf2/sha1.h diff --git a/Common/pbdkf2/stdalign.h b/Common/pbkdf2/stdalign.h similarity index 100% rename from Common/pbdkf2/stdalign.h rename to Common/pbkdf2/stdalign.h diff --git a/Common/msed.cpp b/Common/sedutil.cpp similarity index 72% rename from Common/msed.cpp rename to Common/sedutil.cpp index cfa7a3f2..1f3c733d 100644 --- a/Common/msed.cpp +++ b/Common/sedutil.cpp @@ -1,31 +1,31 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ #include #include "os.h" -#include "MsedHashPwd.h" -#include "MsedOptions.h" -#include "MsedLexicon.h" -#include "MsedDevGeneric.h" -#include "MsedDevOpal1.h" -#include "MsedDevOpal2.h" -#include "MsedDevEnterprise.h" +#include "DtaHashPwd.h" +#include "DtaOptions.h" +#include "DtaLexicon.h" +#include "DtaDevGeneric.h" +#include "DtaDevOpal1.h" +#include "DtaDevOpal2.h" +#include "DtaDevEnterprise.h" using namespace std; @@ -33,14 +33,14 @@ int diskScan() { char devname[25]; int i = 0; - MsedDev * d; + DtaDev * d; LOG(D1) << "Creating diskList"; printf("\nScanning for Opal compliant disks\n"); while (TRUE) { DEVICEMASK; //snprintf(devname,23,"/dev/sd%c",(char) 0x61+i) Linux //sprintf_s(devname, 23, "\\\\.\\PhysicalDrive%i", i) Windows - d = new MsedDevGeneric(devname); + d = new DtaDevGeneric(devname); if (d->isPresent()) { printf("%s", devname); if (d->isAnySSC()) @@ -66,8 +66,8 @@ int diskScan() int isValidSEDDisk(char *devname) { - MsedDev * d; - d = new MsedDevGeneric(devname); + DtaDev * d; + d = new DtaDevGeneric(devname); if (d->isPresent()) { printf("%s", devname); if (d->isAnySSC()) @@ -84,197 +84,197 @@ int isValidSEDDisk(char *devname) int main(int argc, char * argv[]) { - MSED_OPTIONS opts; - MsedDev *tempDev = NULL, *d = NULL; - if (MsedOptions(argc, argv, &opts)) { - return MSEDERROR_COMMAND_ERROR; + DTA_OPTIONS opts; + DtaDev *tempDev = NULL, *d = NULL; + if (DtaOptions(argc, argv, &opts)) { + return DTAERROR_COMMAND_ERROR; } - if ((opts.action != msedoption::scan) && - (opts.action != msedoption::validatePBKDF2) && - (opts.action != msedoption::isValidSED)) { + if ((opts.action != sedutiloption::scan) && + (opts.action != sedutiloption::validatePBKDF2) && + (opts.action != sedutiloption::isValidSED)) { if (opts.device > (argc - 1)) opts.device = 0; - tempDev = new MsedDevGeneric(argv[opts.device]); + tempDev = new DtaDevGeneric(argv[opts.device]); if (NULL == tempDev) { LOG(E) << "Create device object failed"; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } if ((!tempDev->isPresent()) || (!tempDev->isAnySSC())) { LOG(E) << "Invalid or unsupported disk " << argv[opts.device]; delete tempDev; - return MSEDERROR_COMMAND_ERROR; + return DTAERROR_COMMAND_ERROR; } if (tempDev->isOpal2()) - d = new MsedDevOpal2(argv[opts.device]); + d = new DtaDevOpal2(argv[opts.device]); else if (tempDev->isOpal1()) - d = new MsedDevOpal1(argv[opts.device]); + d = new DtaDevOpal1(argv[opts.device]); else if (tempDev->isEprise()) - d = new MsedDevEnterprise(argv[opts.device]); + d = new DtaDevEnterprise(argv[opts.device]); else { LOG(E) << "Unknown OPAL SSC "; - return MSEDERROR_INVALID_COMMAND; + return DTAERROR_INVALID_COMMAND; } delete tempDev; if (NULL == d) { LOG(E) << "Create device object failed"; - return MSEDERROR_OBJECT_CREATE_FAILED; + return DTAERROR_OBJECT_CREATE_FAILED; } - // make sure MsedDev::no_hash_passwords is initialized + // make sure DtaDev::no_hash_passwords is initialized d->no_hash_passwords = opts.no_hash_passwords; } switch (opts.action) { - case msedoption::initialSetup: - LOG(D) << "Performing initial setup to use msed on drive " << argv[opts.device]; + case sedutiloption::initialSetup: + LOG(D) << "Performing initial setup to use sedutil on drive " << argv[opts.device]; return (d->initialSetup(argv[opts.password])); - case msedoption::setup_SUM: + case sedutiloption::setup_SUM: LOG(D) << "Performing SUM setup on drive " << argv[opts.device]; return (d->setup_SUM(opts.lockingrange, atoll(argv[opts.lrstart]), atoll(argv[opts.lrlength]), argv[opts.password], argv[opts.newpassword])); break; - case msedoption::setSIDPassword: + case sedutiloption::setSIDPassword: LOG(D) << "Performing setSIDPassword "; return d->setSIDPassword(argv[opts.password], argv[opts.newpassword]); break; - case msedoption::setAdmin1Pwd: + case sedutiloption::setAdmin1Pwd: LOG(D) << "Performing setPAdmin1Pwd "; return d->setPassword(argv[opts.password], (char *) "Admin1", argv[opts.newpassword]); break; - case msedoption::loadPBAimage: + case sedutiloption::loadPBAimage: LOG(D) << "Loading PBA image " << argv[opts.pbafile] << " to " << opts.device; return d->loadPBA(argv[opts.password], argv[opts.pbafile]); break; - case msedoption::setLockingRange: + case sedutiloption::setLockingRange: LOG(D) << "Setting Locking Range " << (uint16_t) opts.lockingrange << " " << (uint16_t) opts.lockingstate; return d->setLockingRange(opts.lockingrange, opts.lockingstate, argv[opts.password]); break; - case msedoption::setLockingRange_SUM: + case sedutiloption::setLockingRange_SUM: LOG(D) << "Setting Locking Range " << (uint16_t)opts.lockingrange << " " << (uint16_t)opts.lockingstate << " in Single User Mode"; return d->setLockingRange_SUM(opts.lockingrange, opts.lockingstate, argv[opts.password]); break; - case msedoption::enableLockingRange: + case sedutiloption::enableLockingRange: LOG(D) << "Enabling Locking Range " << (uint16_t) opts.lockingrange; return (d->configureLockingRange(opts.lockingrange, - (MSED_READLOCKINGENABLED | MSED_WRITELOCKINGENABLED), argv[opts.password])); + (DTA_READLOCKINGENABLED | DTA_WRITELOCKINGENABLED), argv[opts.password])); break; - case msedoption::disableLockingRange: + case sedutiloption::disableLockingRange: LOG(D) << "Disabling Locking Range " << (uint16_t) opts.lockingrange; - return (d->configureLockingRange(opts.lockingrange, MSED_DISABLELOCKING, + return (d->configureLockingRange(opts.lockingrange, DTA_DISABLELOCKING, argv[opts.password])); break; - case msedoption::readonlyLockingRange: + case sedutiloption::readonlyLockingRange: LOG(D) << "Enabling Locking Range " << (uint16_t)opts.lockingrange; return (d->configureLockingRange(opts.lockingrange, - MSED_WRITELOCKINGENABLED, argv[opts.password])); + DTA_WRITELOCKINGENABLED, argv[opts.password])); break; - case msedoption::setupLockingRange: + case sedutiloption::setupLockingRange: LOG(D) << "Setup Locking Range " << (uint16_t)opts.lockingrange; return (d->setupLockingRange(opts.lockingrange, atoll(argv[opts.lrstart]), atoll(argv[opts.lrlength]), argv[opts.password])); break; - case msedoption::setupLockingRange_SUM: + case sedutiloption::setupLockingRange_SUM: LOG(D) << "Setup Locking Range " << (uint16_t)opts.lockingrange << " in Single User Mode"; return (d->setupLockingRange_SUM(opts.lockingrange, atoll(argv[opts.lrstart]), atoll(argv[opts.lrlength]), argv[opts.password])); break; - case msedoption::listLockingRanges: + case sedutiloption::listLockingRanges: LOG(D) << "List Locking Ranges "; return (d->listLockingRanges(argv[opts.password], -1)); break; - case msedoption::listLockingRange: + case sedutiloption::listLockingRange: LOG(D) << "List Locking Range of device" << argv[opts.device]; return (d->listLockingRanges(argv[opts.password], opts.lockingrange)); break; - case msedoption::setMBRDone: + case sedutiloption::setMBRDone: LOG(D) << "Setting MBRDone " << (uint16_t)opts.mbrstate; return (d->setMBRDone(opts.mbrstate, argv[opts.password])); break; - case msedoption::setMBREnable: + case sedutiloption::setMBREnable: LOG(D) << "Setting MBREnable " << (uint16_t)opts.mbrstate; return (d->setMBREnable(opts.mbrstate, argv[opts.password])); break; - case msedoption::enableuser: + case sedutiloption::enableuser: LOG(D) << "Performing enable user for user " << argv[opts.userid]; return d->enableUser(argv[opts.password], argv[opts.userid]); break; - case msedoption::activateLockingSP: + case sedutiloption::activateLockingSP: LOG(D) << "Activating the LockingSP on" << argv[opts.device]; return d->activateLockingSP(argv[opts.password]); break; - case msedoption::activateLockingSP_SUM: + case sedutiloption::activateLockingSP_SUM: LOG(D) << "Activating the LockingSP on" << argv[opts.device]; return d->activateLockingSP_SUM(opts.lockingrange, argv[opts.password]); break; - case msedoption::eraseLockingRange_SUM: + case sedutiloption::eraseLockingRange_SUM: LOG(D) << "Erasing LockingRange " << opts.lockingrange << " on" << argv[opts.device]; return d->eraseLockingRange_SUM(opts.lockingrange, argv[opts.password]); break; - case msedoption::query: + case sedutiloption::query: LOG(D) << "Performing diskquery() on " << argv[opts.device]; d->puke(); return 0; break; - case msedoption::scan: + case sedutiloption::scan: LOG(D) << "Performing diskScan() "; diskScan(); break; - case msedoption::isValidSED: + case sedutiloption::isValidSED: LOG(D) << "Verify whether " << argv[opts.device] << "is valid SED or not"; return isValidSEDDisk(argv[opts.device]); break; - case msedoption::takeOwnership: + case sedutiloption::takeOwnership: LOG(D) << "Taking Ownership of the drive at" << argv[opts.device]; return d->takeOwnership(argv[opts.password]); break; - case msedoption::revertLockingSP: + case sedutiloption::revertLockingSP: LOG(D) << "Performing revertLockingSP on " << argv[opts.device]; return d->revertLockingSP(argv[opts.password]); break; - case msedoption::setPassword: + case sedutiloption::setPassword: LOG(D) << "Performing setPassword for user " << argv[opts.userid]; return d->setPassword(argv[opts.password], argv[opts.userid], argv[opts.newpassword]); break; - case msedoption::setPassword_SUM: + case sedutiloption::setPassword_SUM: LOG(D) << "Performing setPassword in SUM mode for user " << argv[opts.userid]; return d->setNewPassword_SUM(argv[opts.password], argv[opts.userid], argv[opts.newpassword]); break; - case msedoption::revertTPer: + case sedutiloption::revertTPer: LOG(D) << "Performing revertTPer on " << argv[opts.device]; return d->revertTPer(argv[opts.password]); break; - case msedoption::revertNoErase: + case sedutiloption::revertNoErase: LOG(D) << "Performing revertLockingSP keep global locking range on " << argv[opts.device]; return d->revertLockingSP(argv[opts.password], 1); break; - case msedoption::validatePBKDF2: + case sedutiloption::validatePBKDF2: LOG(D) << "Performing PBKDF2 validation "; - MsedTestPBDKF2(); + TestPBKDF2(); break; - case msedoption::yesIreallywanttoERASEALLmydatausingthePSID: - case msedoption::PSIDrevert: + case sedutiloption::yesIreallywanttoERASEALLmydatausingthePSID: + case sedutiloption::PSIDrevert: LOG(D) << "Performing a PSID Revert on " << argv[opts.device] << " with password " << argv[opts.password]; return d->revertTPer(argv[opts.password],1); break; - case msedoption::eraseLockingRange: + case sedutiloption::eraseLockingRange: LOG(D) << "Erase Locking Range " << (uint16_t)opts.lockingrange; return (d->eraseLockingRange(opts.lockingrange, argv[opts.password])); break; - case msedoption::objDump: + case sedutiloption::objDump: LOG(D) << "Performing objDump " ; return d->objDump(argv[argc - 5], argv[argc - 4], argv[argc - 3], argv[argc - 2]); break; - case msedoption::printDefaultPassword: + case sedutiloption::printDefaultPassword: LOG(D) << "print default password"; d->printDefaultPassword(); return 0; break; - case msedoption::rawCmd: + case sedutiloption::rawCmd: LOG(D) << "Performing cmdDump "; return d->rawCmd(argv[argc - 7], argv[argc - 6], argv[argc - 5], argv[argc - 4], argv[argc - 3], argv[argc - 2]); break; @@ -282,5 +282,5 @@ int main(int argc, char * argv[]) LOG(E) << "Unable to determine what you want to do "; usage(); } - return MSEDERROR_INVALID_COMMAND; + return DTAERROR_INVALID_COMMAND; } diff --git a/Doxyfile b/Doxyfile index eeb0f76b..9483d4d8 100644 --- a/Doxyfile +++ b/Doxyfile @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = "msed - Manage Self-encrypting drives" +PROJECT_NAME = "sedutil - Drive Trust Alliance SED Utility" # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version @@ -743,7 +743,7 @@ WARN_LOGFILE = # spaces. # Note: If this tag is empty the current directory is searched. -INPUT = ./ ./msed ./msed/linux +INPUT = ./ ./common ./linux # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses @@ -778,7 +778,7 @@ RECURSIVE = NO # Note that relative paths are relative to the directory from which doxygen is # run. -EXCLUDE = msed/log.h +EXCLUDE = common/log.h # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # directories that are symbolic links (a Unix file system feature) are excluded diff --git a/LinuxPBA/GetPassPhrase.cpp b/LinuxPBA/GetPassPhrase.cpp index 2ace91b2..91ec484b 100644 --- a/LinuxPBA/GetPassPhrase.cpp +++ b/LinuxPBA/GetPassPhrase.cpp @@ -1,20 +1,20 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ diff --git a/LinuxPBA/GetPassPhrase.h b/LinuxPBA/GetPassPhrase.h index df303c96..89acef51 100644 --- a/LinuxPBA/GetPassPhrase.h +++ b/LinuxPBA/GetPassPhrase.h @@ -1,20 +1,20 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ #pragma once diff --git a/LinuxPBA/LinuxPBA.cpp b/LinuxPBA/LinuxPBA.cpp index 2745d5cf..c4b3a8fd 100644 --- a/LinuxPBA/LinuxPBA.cpp +++ b/LinuxPBA/LinuxPBA.cpp @@ -1,20 +1,20 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. - This file is part of msed. + This file is part of sedutil. - msed is free software: you can redistribute it and/or modify + sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - msed is distributed in the hope that it will be useful, + sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with msed. If not, see . + along with sedutil. If not, see . * C:E********************************************************************** */ @@ -32,15 +32,15 @@ int main(int argc, char** argv) { initscr(); raw(); attron(A_BOLD); - mvprintw(1,20,"MSED LINUX Pre Boot Authorization \n"); + mvprintw(1,20,"DTA LINUX Pre Boot Authorization \n"); attroff(A_BOLD); string p = GetPassPhrase("Please enter pass-phrase to unlock OPAL drives: "); UnlockSEDs((char *)p.c_str()); -#ifdef MSEDDEBUG +#ifdef DTADEBUG getch(); #endif mvprintw(8,20,"Starting OS \n"); -#ifndef MSEDDEBUG +#ifndef DTADEBUG sync(); reboot(RB_AUTOBOOT); #endif diff --git a/LinuxPBA/UnlockSEDs.cpp b/LinuxPBA/UnlockSEDs.cpp index 8e2ab0a6..58ade65c 100644 --- a/LinuxPBA/UnlockSEDs.cpp +++ b/LinuxPBA/UnlockSEDs.cpp @@ -1,27 +1,27 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ #include "os.h" #include "UnlockSEDs.h" -#include "MsedDevGeneric.h" -#include "MsedDevOpal1.h" -#include "MsedDevOpal2.h" +#include "DtaDevGeneric.h" +#include "DtaDevOpal1.h" +#include "DtaDevOpal2.h" #include @@ -30,14 +30,14 @@ uint8_t UnlockSEDs(char * password) { char devref[25]; int i = 0; int failed = 0; - MsedDev *tempDev; - MsedDev *d; + DtaDev *tempDev; + DtaDev *d; LOG(D4) << "Enter UnlockSEDs"; mvprintw(6,2,"Scanning...."); while (TRUE) { snprintf(devref,23,"/dev/sd%c",(char) 0x61+i); i += 1; - tempDev = new MsedDevGeneric(devref); + tempDev = new DtaDevGeneric(devref); if (!tempDev->isPresent()) {break;} if ((!tempDev->isOpal1()) && (!tempDev->isOpal2())) { mvprintw(7+i,2,"Drive %s not supported ",devref); @@ -45,9 +45,9 @@ uint8_t UnlockSEDs(char * password) { continue; } if (tempDev->isOpal2()) - d = new MsedDevOpal2(devref); + d = new DtaDevOpal2(devref); else - d = new MsedDevOpal1(devref); + d = new DtaDevOpal1(devref); delete tempDev; d->no_hash_passwords = false; failed = 0; diff --git a/LinuxPBA/UnlockSEDs.h b/LinuxPBA/UnlockSEDs.h index 0393174d..af1e5ce0 100644 --- a/LinuxPBA/UnlockSEDs.h +++ b/LinuxPBA/UnlockSEDs.h @@ -1,20 +1,20 @@ /* C:B************************************************************************** -This software is Copyright 2014,2015 Michael Romeo +This software is Copyright 2014-2016 Bright Plaza Inc. -This file is part of msed. +This file is part of sedutil. -msed is free software: you can redistribute it and/or modify +sedutil is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -msed is distributed in the hope that it will be useful, +sedutil is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with msed. If not, see . +along with sedutil. If not, see . * C:E********************************************************************** */ #pragma once diff --git a/LinuxPBA/nbproject/Makefile-Debug.mk b/LinuxPBA/nbproject/Makefile-Debug.mk index 12c285c1..eb0c39c0 100644 --- a/LinuxPBA/nbproject/Makefile-Debug.mk +++ b/LinuxPBA/nbproject/Makefile-Debug.mk @@ -35,24 +35,24 @@ OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM} # Object Files OBJECTFILES= \ - ${OBJECTDIR}/_ext/7daaf93a/MsedCommand.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedDev.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedDevGeneric.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal1.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal2.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedHashPwd.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedHexDump.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedResponse.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedSession.o \ - ${OBJECTDIR}/_ext/b7b6caba/gc-gnulib.o \ - ${OBJECTDIR}/_ext/b7b6caba/gc-pbkdf2-sha1.o \ - ${OBJECTDIR}/_ext/b7b6caba/hmac-sha1.o \ - ${OBJECTDIR}/_ext/b7b6caba/memxor.o \ - ${OBJECTDIR}/_ext/b7b6caba/sha1.o \ - ${OBJECTDIR}/_ext/822bcbe5/MsedDevLinuxNvme.o \ - ${OBJECTDIR}/_ext/822bcbe5/MsedDevLinuxSata.o \ - ${OBJECTDIR}/_ext/822bcbe5/MsedDevOS.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaCommand.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaDev.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaDevGeneric.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal1.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal2.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaHashPwd.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaHexDump.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaResponse.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaSession.o \ + ${OBJECTDIR}/_ext/b7b9df0c/gc-gnulib.o \ + ${OBJECTDIR}/_ext/b7b9df0c/gc-pbkdf2-sha1.o \ + ${OBJECTDIR}/_ext/b7b9df0c/hmac-sha1.o \ + ${OBJECTDIR}/_ext/b7b9df0c/memxor.o \ + ${OBJECTDIR}/_ext/b7b9df0c/sha1.o \ + ${OBJECTDIR}/_ext/822bcbe5/DtaDevLinuxNvme.o \ + ${OBJECTDIR}/_ext/822bcbe5/DtaDevLinuxSata.o \ + ${OBJECTDIR}/_ext/822bcbe5/DtaDevOS.o \ ${OBJECTDIR}/GetPassPhrase.o \ ${OBJECTDIR}/LinuxPBA.o \ ${OBJECTDIR}/UnlockSEDs.o @@ -82,110 +82,110 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/linuxpba: ${OBJECTFILES} ${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM} ${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/linuxpba ${OBJECTFILES} ${LDLIBSOPTIONS} -${OBJECTDIR}/_ext/7daaf93a/MsedCommand.o: ../Common/MsedCommand.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaCommand.o: ../Common/DtaCommand.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedCommand.o ../Common/MsedCommand.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaCommand.o ../Common/DtaCommand.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedDev.o: ../Common/MsedDev.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaDev.o: ../Common/DtaDev.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedDev.o ../Common/MsedDev.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaDev.o ../Common/DtaDev.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedDevGeneric.o: ../Common/MsedDevGeneric.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaDevGeneric.o: ../Common/DtaDevGeneric.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedDevGeneric.o ../Common/MsedDevGeneric.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaDevGeneric.o ../Common/DtaDevGeneric.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal.o: ../Common/MsedDevOpal.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal.o: ../Common/DtaDevOpal.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal.o ../Common/MsedDevOpal.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal.o ../Common/DtaDevOpal.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal1.o: ../Common/MsedDevOpal1.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal1.o: ../Common/DtaDevOpal1.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal1.o ../Common/MsedDevOpal1.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal1.o ../Common/DtaDevOpal1.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal2.o: ../Common/MsedDevOpal2.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal2.o: ../Common/DtaDevOpal2.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal2.o ../Common/MsedDevOpal2.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal2.o ../Common/DtaDevOpal2.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedHashPwd.o: ../Common/MsedHashPwd.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaHashPwd.o: ../Common/DtaHashPwd.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedHashPwd.o ../Common/MsedHashPwd.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaHashPwd.o ../Common/DtaHashPwd.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedHexDump.o: ../Common/MsedHexDump.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaHexDump.o: ../Common/DtaHexDump.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedHexDump.o ../Common/MsedHexDump.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaHexDump.o ../Common/DtaHexDump.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedResponse.o: ../Common/MsedResponse.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaResponse.o: ../Common/DtaResponse.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedResponse.o ../Common/MsedResponse.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaResponse.o ../Common/DtaResponse.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedSession.o: ../Common/MsedSession.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaSession.o: ../Common/DtaSession.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedSession.o ../Common/MsedSession.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaSession.o ../Common/DtaSession.cpp -${OBJECTDIR}/_ext/b7b6caba/gc-gnulib.o: ../Common/pbdkf2/gc-gnulib.c - ${MKDIR} -p ${OBJECTDIR}/_ext/b7b6caba +${OBJECTDIR}/_ext/b7b9df0c/gc-gnulib.o: ../Common/pbkdf2/gc-gnulib.c + ${MKDIR} -p ${OBJECTDIR}/_ext/b7b9df0c ${RM} "$@.d" - $(COMPILE.c) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b6caba/gc-gnulib.o ../Common/pbdkf2/gc-gnulib.c + $(COMPILE.c) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b9df0c/gc-gnulib.o ../Common/pbkdf2/gc-gnulib.c -${OBJECTDIR}/_ext/b7b6caba/gc-pbkdf2-sha1.o: ../Common/pbdkf2/gc-pbkdf2-sha1.c - ${MKDIR} -p ${OBJECTDIR}/_ext/b7b6caba +${OBJECTDIR}/_ext/b7b9df0c/gc-pbkdf2-sha1.o: ../Common/pbkdf2/gc-pbkdf2-sha1.c + ${MKDIR} -p ${OBJECTDIR}/_ext/b7b9df0c ${RM} "$@.d" - $(COMPILE.c) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b6caba/gc-pbkdf2-sha1.o ../Common/pbdkf2/gc-pbkdf2-sha1.c + $(COMPILE.c) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b9df0c/gc-pbkdf2-sha1.o ../Common/pbkdf2/gc-pbkdf2-sha1.c -${OBJECTDIR}/_ext/b7b6caba/hmac-sha1.o: ../Common/pbdkf2/hmac-sha1.c - ${MKDIR} -p ${OBJECTDIR}/_ext/b7b6caba +${OBJECTDIR}/_ext/b7b9df0c/hmac-sha1.o: ../Common/pbkdf2/hmac-sha1.c + ${MKDIR} -p ${OBJECTDIR}/_ext/b7b9df0c ${RM} "$@.d" - $(COMPILE.c) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b6caba/hmac-sha1.o ../Common/pbdkf2/hmac-sha1.c + $(COMPILE.c) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b9df0c/hmac-sha1.o ../Common/pbkdf2/hmac-sha1.c -${OBJECTDIR}/_ext/b7b6caba/memxor.o: ../Common/pbdkf2/memxor.c - ${MKDIR} -p ${OBJECTDIR}/_ext/b7b6caba +${OBJECTDIR}/_ext/b7b9df0c/memxor.o: ../Common/pbkdf2/memxor.c + ${MKDIR} -p ${OBJECTDIR}/_ext/b7b9df0c ${RM} "$@.d" - $(COMPILE.c) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b6caba/memxor.o ../Common/pbdkf2/memxor.c + $(COMPILE.c) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b9df0c/memxor.o ../Common/pbkdf2/memxor.c -${OBJECTDIR}/_ext/b7b6caba/sha1.o: ../Common/pbdkf2/sha1.c - ${MKDIR} -p ${OBJECTDIR}/_ext/b7b6caba +${OBJECTDIR}/_ext/b7b9df0c/sha1.o: ../Common/pbkdf2/sha1.c + ${MKDIR} -p ${OBJECTDIR}/_ext/b7b9df0c ${RM} "$@.d" - $(COMPILE.c) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b6caba/sha1.o ../Common/pbdkf2/sha1.c + $(COMPILE.c) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b9df0c/sha1.o ../Common/pbkdf2/sha1.c -${OBJECTDIR}/_ext/822bcbe5/MsedDevLinuxNvme.o: ../linux/MsedDevLinuxNvme.cpp +${OBJECTDIR}/_ext/822bcbe5/DtaDevLinuxNvme.o: ../linux/DtaDevLinuxNvme.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/822bcbe5 ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/822bcbe5/MsedDevLinuxNvme.o ../linux/MsedDevLinuxNvme.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/822bcbe5/DtaDevLinuxNvme.o ../linux/DtaDevLinuxNvme.cpp -${OBJECTDIR}/_ext/822bcbe5/MsedDevLinuxSata.o: ../linux/MsedDevLinuxSata.cpp +${OBJECTDIR}/_ext/822bcbe5/DtaDevLinuxSata.o: ../linux/DtaDevLinuxSata.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/822bcbe5 ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/822bcbe5/MsedDevLinuxSata.o ../linux/MsedDevLinuxSata.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/822bcbe5/DtaDevLinuxSata.o ../linux/DtaDevLinuxSata.cpp -${OBJECTDIR}/_ext/822bcbe5/MsedDevOS.o: ../linux/MsedDevOS.cpp +${OBJECTDIR}/_ext/822bcbe5/DtaDevOS.o: ../linux/DtaDevOS.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/822bcbe5 ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/822bcbe5/MsedDevOS.o ../linux/MsedDevOS.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/822bcbe5/DtaDevOS.o ../linux/DtaDevOS.cpp ${OBJECTDIR}/GetPassPhrase.o: GetPassPhrase.cpp ${MKDIR} -p ${OBJECTDIR} ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/GetPassPhrase.o GetPassPhrase.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/GetPassPhrase.o GetPassPhrase.cpp ${OBJECTDIR}/LinuxPBA.o: LinuxPBA.cpp ${MKDIR} -p ${OBJECTDIR} ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/LinuxPBA.o LinuxPBA.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/LinuxPBA.o LinuxPBA.cpp ${OBJECTDIR}/UnlockSEDs.o: UnlockSEDs.cpp ${MKDIR} -p ${OBJECTDIR} ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/UnlockSEDs.o UnlockSEDs.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/UnlockSEDs.o UnlockSEDs.cpp # Subprojects .build-subprojects: diff --git a/LinuxPBA/nbproject/Makefile-Debug_x86_64.mk b/LinuxPBA/nbproject/Makefile-Debug_x86_64.mk index 997504fa..cd1ce247 100644 --- a/LinuxPBA/nbproject/Makefile-Debug_x86_64.mk +++ b/LinuxPBA/nbproject/Makefile-Debug_x86_64.mk @@ -35,24 +35,24 @@ OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM} # Object Files OBJECTFILES= \ - ${OBJECTDIR}/_ext/7daaf93a/MsedCommand.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedDev.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedDevGeneric.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal1.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal2.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedHashPwd.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedHexDump.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedResponse.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedSession.o \ - ${OBJECTDIR}/_ext/b7b6caba/gc-gnulib.o \ - ${OBJECTDIR}/_ext/b7b6caba/gc-pbkdf2-sha1.o \ - ${OBJECTDIR}/_ext/b7b6caba/hmac-sha1.o \ - ${OBJECTDIR}/_ext/b7b6caba/memxor.o \ - ${OBJECTDIR}/_ext/b7b6caba/sha1.o \ - ${OBJECTDIR}/_ext/822bcbe5/MsedDevLinuxNvme.o \ - ${OBJECTDIR}/_ext/822bcbe5/MsedDevLinuxSata.o \ - ${OBJECTDIR}/_ext/822bcbe5/MsedDevOS.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaCommand.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaDev.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaDevGeneric.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal1.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal2.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaHashPwd.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaHexDump.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaResponse.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaSession.o \ + ${OBJECTDIR}/_ext/b7b9df0c/gc-gnulib.o \ + ${OBJECTDIR}/_ext/b7b9df0c/gc-pbkdf2-sha1.o \ + ${OBJECTDIR}/_ext/b7b9df0c/hmac-sha1.o \ + ${OBJECTDIR}/_ext/b7b9df0c/memxor.o \ + ${OBJECTDIR}/_ext/b7b9df0c/sha1.o \ + ${OBJECTDIR}/_ext/822bcbe5/DtaDevLinuxNvme.o \ + ${OBJECTDIR}/_ext/822bcbe5/DtaDevLinuxSata.o \ + ${OBJECTDIR}/_ext/822bcbe5/DtaDevOS.o \ ${OBJECTDIR}/GetPassPhrase.o \ ${OBJECTDIR}/LinuxPBA.o \ ${OBJECTDIR}/UnlockSEDs.o @@ -82,110 +82,110 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/linuxpba: ${OBJECTFILES} ${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM} ${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/linuxpba ${OBJECTFILES} ${LDLIBSOPTIONS} -${OBJECTDIR}/_ext/7daaf93a/MsedCommand.o: ../Common/MsedCommand.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaCommand.o: ../Common/DtaCommand.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedCommand.o ../Common/MsedCommand.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaCommand.o ../Common/DtaCommand.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedDev.o: ../Common/MsedDev.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaDev.o: ../Common/DtaDev.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedDev.o ../Common/MsedDev.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaDev.o ../Common/DtaDev.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedDevGeneric.o: ../Common/MsedDevGeneric.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaDevGeneric.o: ../Common/DtaDevGeneric.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedDevGeneric.o ../Common/MsedDevGeneric.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaDevGeneric.o ../Common/DtaDevGeneric.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal.o: ../Common/MsedDevOpal.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal.o: ../Common/DtaDevOpal.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal.o ../Common/MsedDevOpal.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal.o ../Common/DtaDevOpal.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal1.o: ../Common/MsedDevOpal1.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal1.o: ../Common/DtaDevOpal1.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal1.o ../Common/MsedDevOpal1.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal1.o ../Common/DtaDevOpal1.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal2.o: ../Common/MsedDevOpal2.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal2.o: ../Common/DtaDevOpal2.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal2.o ../Common/MsedDevOpal2.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal2.o ../Common/DtaDevOpal2.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedHashPwd.o: ../Common/MsedHashPwd.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaHashPwd.o: ../Common/DtaHashPwd.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedHashPwd.o ../Common/MsedHashPwd.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaHashPwd.o ../Common/DtaHashPwd.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedHexDump.o: ../Common/MsedHexDump.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaHexDump.o: ../Common/DtaHexDump.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedHexDump.o ../Common/MsedHexDump.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaHexDump.o ../Common/DtaHexDump.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedResponse.o: ../Common/MsedResponse.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaResponse.o: ../Common/DtaResponse.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedResponse.o ../Common/MsedResponse.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaResponse.o ../Common/DtaResponse.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedSession.o: ../Common/MsedSession.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaSession.o: ../Common/DtaSession.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedSession.o ../Common/MsedSession.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaSession.o ../Common/DtaSession.cpp -${OBJECTDIR}/_ext/b7b6caba/gc-gnulib.o: ../Common/pbdkf2/gc-gnulib.c - ${MKDIR} -p ${OBJECTDIR}/_ext/b7b6caba +${OBJECTDIR}/_ext/b7b9df0c/gc-gnulib.o: ../Common/pbkdf2/gc-gnulib.c + ${MKDIR} -p ${OBJECTDIR}/_ext/b7b9df0c ${RM} "$@.d" - $(COMPILE.c) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b6caba/gc-gnulib.o ../Common/pbdkf2/gc-gnulib.c + $(COMPILE.c) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b9df0c/gc-gnulib.o ../Common/pbkdf2/gc-gnulib.c -${OBJECTDIR}/_ext/b7b6caba/gc-pbkdf2-sha1.o: ../Common/pbdkf2/gc-pbkdf2-sha1.c - ${MKDIR} -p ${OBJECTDIR}/_ext/b7b6caba +${OBJECTDIR}/_ext/b7b9df0c/gc-pbkdf2-sha1.o: ../Common/pbkdf2/gc-pbkdf2-sha1.c + ${MKDIR} -p ${OBJECTDIR}/_ext/b7b9df0c ${RM} "$@.d" - $(COMPILE.c) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b6caba/gc-pbkdf2-sha1.o ../Common/pbdkf2/gc-pbkdf2-sha1.c + $(COMPILE.c) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b9df0c/gc-pbkdf2-sha1.o ../Common/pbkdf2/gc-pbkdf2-sha1.c -${OBJECTDIR}/_ext/b7b6caba/hmac-sha1.o: ../Common/pbdkf2/hmac-sha1.c - ${MKDIR} -p ${OBJECTDIR}/_ext/b7b6caba +${OBJECTDIR}/_ext/b7b9df0c/hmac-sha1.o: ../Common/pbkdf2/hmac-sha1.c + ${MKDIR} -p ${OBJECTDIR}/_ext/b7b9df0c ${RM} "$@.d" - $(COMPILE.c) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b6caba/hmac-sha1.o ../Common/pbdkf2/hmac-sha1.c + $(COMPILE.c) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b9df0c/hmac-sha1.o ../Common/pbkdf2/hmac-sha1.c -${OBJECTDIR}/_ext/b7b6caba/memxor.o: ../Common/pbdkf2/memxor.c - ${MKDIR} -p ${OBJECTDIR}/_ext/b7b6caba +${OBJECTDIR}/_ext/b7b9df0c/memxor.o: ../Common/pbkdf2/memxor.c + ${MKDIR} -p ${OBJECTDIR}/_ext/b7b9df0c ${RM} "$@.d" - $(COMPILE.c) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b6caba/memxor.o ../Common/pbdkf2/memxor.c + $(COMPILE.c) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b9df0c/memxor.o ../Common/pbkdf2/memxor.c -${OBJECTDIR}/_ext/b7b6caba/sha1.o: ../Common/pbdkf2/sha1.c - ${MKDIR} -p ${OBJECTDIR}/_ext/b7b6caba +${OBJECTDIR}/_ext/b7b9df0c/sha1.o: ../Common/pbkdf2/sha1.c + ${MKDIR} -p ${OBJECTDIR}/_ext/b7b9df0c ${RM} "$@.d" - $(COMPILE.c) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b6caba/sha1.o ../Common/pbdkf2/sha1.c + $(COMPILE.c) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b9df0c/sha1.o ../Common/pbkdf2/sha1.c -${OBJECTDIR}/_ext/822bcbe5/MsedDevLinuxNvme.o: ../linux/MsedDevLinuxNvme.cpp +${OBJECTDIR}/_ext/822bcbe5/DtaDevLinuxNvme.o: ../linux/DtaDevLinuxNvme.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/822bcbe5 ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/822bcbe5/MsedDevLinuxNvme.o ../linux/MsedDevLinuxNvme.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/822bcbe5/DtaDevLinuxNvme.o ../linux/DtaDevLinuxNvme.cpp -${OBJECTDIR}/_ext/822bcbe5/MsedDevLinuxSata.o: ../linux/MsedDevLinuxSata.cpp +${OBJECTDIR}/_ext/822bcbe5/DtaDevLinuxSata.o: ../linux/DtaDevLinuxSata.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/822bcbe5 ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/822bcbe5/MsedDevLinuxSata.o ../linux/MsedDevLinuxSata.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/822bcbe5/DtaDevLinuxSata.o ../linux/DtaDevLinuxSata.cpp -${OBJECTDIR}/_ext/822bcbe5/MsedDevOS.o: ../linux/MsedDevOS.cpp +${OBJECTDIR}/_ext/822bcbe5/DtaDevOS.o: ../linux/DtaDevOS.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/822bcbe5 ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/822bcbe5/MsedDevOS.o ../linux/MsedDevOS.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/822bcbe5/DtaDevOS.o ../linux/DtaDevOS.cpp ${OBJECTDIR}/GetPassPhrase.o: GetPassPhrase.cpp ${MKDIR} -p ${OBJECTDIR} ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/GetPassPhrase.o GetPassPhrase.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/GetPassPhrase.o GetPassPhrase.cpp ${OBJECTDIR}/LinuxPBA.o: LinuxPBA.cpp ${MKDIR} -p ${OBJECTDIR} ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/LinuxPBA.o LinuxPBA.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/LinuxPBA.o LinuxPBA.cpp ${OBJECTDIR}/UnlockSEDs.o: UnlockSEDs.cpp ${MKDIR} -p ${OBJECTDIR} ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -DMSEDDEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/UnlockSEDs.o UnlockSEDs.cpp + $(COMPILE.cc) -g -Werror -DDTADEBUG -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/UnlockSEDs.o UnlockSEDs.cpp # Subprojects .build-subprojects: diff --git a/LinuxPBA/nbproject/Makefile-Release.mk b/LinuxPBA/nbproject/Makefile-Release.mk index 30e2ee5c..e5136536 100644 --- a/LinuxPBA/nbproject/Makefile-Release.mk +++ b/LinuxPBA/nbproject/Makefile-Release.mk @@ -35,24 +35,24 @@ OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM} # Object Files OBJECTFILES= \ - ${OBJECTDIR}/_ext/7daaf93a/MsedCommand.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedDev.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedDevGeneric.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal1.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal2.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedHashPwd.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedHexDump.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedResponse.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedSession.o \ - ${OBJECTDIR}/_ext/b7b6caba/gc-gnulib.o \ - ${OBJECTDIR}/_ext/b7b6caba/gc-pbkdf2-sha1.o \ - ${OBJECTDIR}/_ext/b7b6caba/hmac-sha1.o \ - ${OBJECTDIR}/_ext/b7b6caba/memxor.o \ - ${OBJECTDIR}/_ext/b7b6caba/sha1.o \ - ${OBJECTDIR}/_ext/822bcbe5/MsedDevLinuxNvme.o \ - ${OBJECTDIR}/_ext/822bcbe5/MsedDevLinuxSata.o \ - ${OBJECTDIR}/_ext/822bcbe5/MsedDevOS.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaCommand.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaDev.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaDevGeneric.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal1.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal2.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaHashPwd.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaHexDump.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaResponse.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaSession.o \ + ${OBJECTDIR}/_ext/b7b9df0c/gc-gnulib.o \ + ${OBJECTDIR}/_ext/b7b9df0c/gc-pbkdf2-sha1.o \ + ${OBJECTDIR}/_ext/b7b9df0c/hmac-sha1.o \ + ${OBJECTDIR}/_ext/b7b9df0c/memxor.o \ + ${OBJECTDIR}/_ext/b7b9df0c/sha1.o \ + ${OBJECTDIR}/_ext/822bcbe5/DtaDevLinuxNvme.o \ + ${OBJECTDIR}/_ext/822bcbe5/DtaDevLinuxSata.o \ + ${OBJECTDIR}/_ext/822bcbe5/DtaDevOS.o \ ${OBJECTDIR}/GetPassPhrase.o \ ${OBJECTDIR}/LinuxPBA.o \ ${OBJECTDIR}/UnlockSEDs.o @@ -82,95 +82,95 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/linuxpba: ${OBJECTFILES} ${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM} ${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/linuxpba ${OBJECTFILES} ${LDLIBSOPTIONS} -${OBJECTDIR}/_ext/7daaf93a/MsedCommand.o: ../Common/MsedCommand.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaCommand.o: ../Common/DtaCommand.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedCommand.o ../Common/MsedCommand.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaCommand.o ../Common/DtaCommand.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedDev.o: ../Common/MsedDev.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaDev.o: ../Common/DtaDev.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedDev.o ../Common/MsedDev.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaDev.o ../Common/DtaDev.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedDevGeneric.o: ../Common/MsedDevGeneric.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaDevGeneric.o: ../Common/DtaDevGeneric.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedDevGeneric.o ../Common/MsedDevGeneric.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaDevGeneric.o ../Common/DtaDevGeneric.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal.o: ../Common/MsedDevOpal.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal.o: ../Common/DtaDevOpal.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal.o ../Common/MsedDevOpal.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal.o ../Common/DtaDevOpal.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal1.o: ../Common/MsedDevOpal1.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal1.o: ../Common/DtaDevOpal1.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal1.o ../Common/MsedDevOpal1.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal1.o ../Common/DtaDevOpal1.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal2.o: ../Common/MsedDevOpal2.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal2.o: ../Common/DtaDevOpal2.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal2.o ../Common/MsedDevOpal2.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal2.o ../Common/DtaDevOpal2.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedHashPwd.o: ../Common/MsedHashPwd.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaHashPwd.o: ../Common/DtaHashPwd.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedHashPwd.o ../Common/MsedHashPwd.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaHashPwd.o ../Common/DtaHashPwd.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedHexDump.o: ../Common/MsedHexDump.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaHexDump.o: ../Common/DtaHexDump.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedHexDump.o ../Common/MsedHexDump.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaHexDump.o ../Common/DtaHexDump.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedResponse.o: ../Common/MsedResponse.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaResponse.o: ../Common/DtaResponse.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedResponse.o ../Common/MsedResponse.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaResponse.o ../Common/DtaResponse.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedSession.o: ../Common/MsedSession.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaSession.o: ../Common/DtaSession.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedSession.o ../Common/MsedSession.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaSession.o ../Common/DtaSession.cpp -${OBJECTDIR}/_ext/b7b6caba/gc-gnulib.o: ../Common/pbdkf2/gc-gnulib.c - ${MKDIR} -p ${OBJECTDIR}/_ext/b7b6caba +${OBJECTDIR}/_ext/b7b9df0c/gc-gnulib.o: ../Common/pbkdf2/gc-gnulib.c + ${MKDIR} -p ${OBJECTDIR}/_ext/b7b9df0c ${RM} "$@.d" - $(COMPILE.c) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b6caba/gc-gnulib.o ../Common/pbdkf2/gc-gnulib.c + $(COMPILE.c) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b9df0c/gc-gnulib.o ../Common/pbkdf2/gc-gnulib.c -${OBJECTDIR}/_ext/b7b6caba/gc-pbkdf2-sha1.o: ../Common/pbdkf2/gc-pbkdf2-sha1.c - ${MKDIR} -p ${OBJECTDIR}/_ext/b7b6caba +${OBJECTDIR}/_ext/b7b9df0c/gc-pbkdf2-sha1.o: ../Common/pbkdf2/gc-pbkdf2-sha1.c + ${MKDIR} -p ${OBJECTDIR}/_ext/b7b9df0c ${RM} "$@.d" - $(COMPILE.c) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b6caba/gc-pbkdf2-sha1.o ../Common/pbdkf2/gc-pbkdf2-sha1.c + $(COMPILE.c) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b9df0c/gc-pbkdf2-sha1.o ../Common/pbkdf2/gc-pbkdf2-sha1.c -${OBJECTDIR}/_ext/b7b6caba/hmac-sha1.o: ../Common/pbdkf2/hmac-sha1.c - ${MKDIR} -p ${OBJECTDIR}/_ext/b7b6caba +${OBJECTDIR}/_ext/b7b9df0c/hmac-sha1.o: ../Common/pbkdf2/hmac-sha1.c + ${MKDIR} -p ${OBJECTDIR}/_ext/b7b9df0c ${RM} "$@.d" - $(COMPILE.c) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b6caba/hmac-sha1.o ../Common/pbdkf2/hmac-sha1.c + $(COMPILE.c) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b9df0c/hmac-sha1.o ../Common/pbkdf2/hmac-sha1.c -${OBJECTDIR}/_ext/b7b6caba/memxor.o: ../Common/pbdkf2/memxor.c - ${MKDIR} -p ${OBJECTDIR}/_ext/b7b6caba +${OBJECTDIR}/_ext/b7b9df0c/memxor.o: ../Common/pbkdf2/memxor.c + ${MKDIR} -p ${OBJECTDIR}/_ext/b7b9df0c ${RM} "$@.d" - $(COMPILE.c) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b6caba/memxor.o ../Common/pbdkf2/memxor.c + $(COMPILE.c) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b9df0c/memxor.o ../Common/pbkdf2/memxor.c -${OBJECTDIR}/_ext/b7b6caba/sha1.o: ../Common/pbdkf2/sha1.c - ${MKDIR} -p ${OBJECTDIR}/_ext/b7b6caba +${OBJECTDIR}/_ext/b7b9df0c/sha1.o: ../Common/pbkdf2/sha1.c + ${MKDIR} -p ${OBJECTDIR}/_ext/b7b9df0c ${RM} "$@.d" - $(COMPILE.c) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b6caba/sha1.o ../Common/pbdkf2/sha1.c + $(COMPILE.c) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b9df0c/sha1.o ../Common/pbkdf2/sha1.c -${OBJECTDIR}/_ext/822bcbe5/MsedDevLinuxNvme.o: ../linux/MsedDevLinuxNvme.cpp +${OBJECTDIR}/_ext/822bcbe5/DtaDevLinuxNvme.o: ../linux/DtaDevLinuxNvme.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/822bcbe5 ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/822bcbe5/MsedDevLinuxNvme.o ../linux/MsedDevLinuxNvme.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/822bcbe5/DtaDevLinuxNvme.o ../linux/DtaDevLinuxNvme.cpp -${OBJECTDIR}/_ext/822bcbe5/MsedDevLinuxSata.o: ../linux/MsedDevLinuxSata.cpp +${OBJECTDIR}/_ext/822bcbe5/DtaDevLinuxSata.o: ../linux/DtaDevLinuxSata.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/822bcbe5 ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/822bcbe5/MsedDevLinuxSata.o ../linux/MsedDevLinuxSata.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/822bcbe5/DtaDevLinuxSata.o ../linux/DtaDevLinuxSata.cpp -${OBJECTDIR}/_ext/822bcbe5/MsedDevOS.o: ../linux/MsedDevOS.cpp +${OBJECTDIR}/_ext/822bcbe5/DtaDevOS.o: ../linux/DtaDevOS.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/822bcbe5 ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/822bcbe5/MsedDevOS.o ../linux/MsedDevOS.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/822bcbe5/DtaDevOS.o ../linux/DtaDevOS.cpp ${OBJECTDIR}/GetPassPhrase.o: GetPassPhrase.cpp ${MKDIR} -p ${OBJECTDIR} diff --git a/LinuxPBA/nbproject/Makefile-Release_x86_64.mk b/LinuxPBA/nbproject/Makefile-Release_x86_64.mk index 6aad4fb0..63e53b1c 100644 --- a/LinuxPBA/nbproject/Makefile-Release_x86_64.mk +++ b/LinuxPBA/nbproject/Makefile-Release_x86_64.mk @@ -35,24 +35,24 @@ OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM} # Object Files OBJECTFILES= \ - ${OBJECTDIR}/_ext/7daaf93a/MsedCommand.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedDev.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedDevGeneric.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal1.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal2.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedHashPwd.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedHexDump.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedResponse.o \ - ${OBJECTDIR}/_ext/7daaf93a/MsedSession.o \ - ${OBJECTDIR}/_ext/b7b6caba/gc-gnulib.o \ - ${OBJECTDIR}/_ext/b7b6caba/gc-pbkdf2-sha1.o \ - ${OBJECTDIR}/_ext/b7b6caba/hmac-sha1.o \ - ${OBJECTDIR}/_ext/b7b6caba/memxor.o \ - ${OBJECTDIR}/_ext/b7b6caba/sha1.o \ - ${OBJECTDIR}/_ext/822bcbe5/MsedDevLinuxNvme.o \ - ${OBJECTDIR}/_ext/822bcbe5/MsedDevLinuxSata.o \ - ${OBJECTDIR}/_ext/822bcbe5/MsedDevOS.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaCommand.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaDev.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaDevGeneric.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal1.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal2.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaHashPwd.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaHexDump.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaResponse.o \ + ${OBJECTDIR}/_ext/7daaf93a/DtaSession.o \ + ${OBJECTDIR}/_ext/b7b9df0c/gc-gnulib.o \ + ${OBJECTDIR}/_ext/b7b9df0c/gc-pbkdf2-sha1.o \ + ${OBJECTDIR}/_ext/b7b9df0c/hmac-sha1.o \ + ${OBJECTDIR}/_ext/b7b9df0c/memxor.o \ + ${OBJECTDIR}/_ext/b7b9df0c/sha1.o \ + ${OBJECTDIR}/_ext/822bcbe5/DtaDevLinuxNvme.o \ + ${OBJECTDIR}/_ext/822bcbe5/DtaDevLinuxSata.o \ + ${OBJECTDIR}/_ext/822bcbe5/DtaDevOS.o \ ${OBJECTDIR}/GetPassPhrase.o \ ${OBJECTDIR}/LinuxPBA.o \ ${OBJECTDIR}/UnlockSEDs.o @@ -82,95 +82,95 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/linuxpba: ${OBJECTFILES} ${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM} ${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/linuxpba ${OBJECTFILES} ${LDLIBSOPTIONS} -s -${OBJECTDIR}/_ext/7daaf93a/MsedCommand.o: ../Common/MsedCommand.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaCommand.o: ../Common/DtaCommand.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedCommand.o ../Common/MsedCommand.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaCommand.o ../Common/DtaCommand.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedDev.o: ../Common/MsedDev.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaDev.o: ../Common/DtaDev.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedDev.o ../Common/MsedDev.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaDev.o ../Common/DtaDev.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedDevGeneric.o: ../Common/MsedDevGeneric.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaDevGeneric.o: ../Common/DtaDevGeneric.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedDevGeneric.o ../Common/MsedDevGeneric.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaDevGeneric.o ../Common/DtaDevGeneric.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal.o: ../Common/MsedDevOpal.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal.o: ../Common/DtaDevOpal.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal.o ../Common/MsedDevOpal.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal.o ../Common/DtaDevOpal.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal1.o: ../Common/MsedDevOpal1.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal1.o: ../Common/DtaDevOpal1.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal1.o ../Common/MsedDevOpal1.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal1.o ../Common/DtaDevOpal1.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal2.o: ../Common/MsedDevOpal2.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal2.o: ../Common/DtaDevOpal2.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedDevOpal2.o ../Common/MsedDevOpal2.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaDevOpal2.o ../Common/DtaDevOpal2.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedHashPwd.o: ../Common/MsedHashPwd.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaHashPwd.o: ../Common/DtaHashPwd.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedHashPwd.o ../Common/MsedHashPwd.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaHashPwd.o ../Common/DtaHashPwd.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedHexDump.o: ../Common/MsedHexDump.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaHexDump.o: ../Common/DtaHexDump.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedHexDump.o ../Common/MsedHexDump.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaHexDump.o ../Common/DtaHexDump.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedResponse.o: ../Common/MsedResponse.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaResponse.o: ../Common/DtaResponse.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedResponse.o ../Common/MsedResponse.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaResponse.o ../Common/DtaResponse.cpp -${OBJECTDIR}/_ext/7daaf93a/MsedSession.o: ../Common/MsedSession.cpp +${OBJECTDIR}/_ext/7daaf93a/DtaSession.o: ../Common/DtaSession.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7daaf93a ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/MsedSession.o ../Common/MsedSession.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7daaf93a/DtaSession.o ../Common/DtaSession.cpp -${OBJECTDIR}/_ext/b7b6caba/gc-gnulib.o: ../Common/pbdkf2/gc-gnulib.c - ${MKDIR} -p ${OBJECTDIR}/_ext/b7b6caba +${OBJECTDIR}/_ext/b7b9df0c/gc-gnulib.o: ../Common/pbkdf2/gc-gnulib.c + ${MKDIR} -p ${OBJECTDIR}/_ext/b7b9df0c ${RM} "$@.d" - $(COMPILE.c) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b6caba/gc-gnulib.o ../Common/pbdkf2/gc-gnulib.c + $(COMPILE.c) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b9df0c/gc-gnulib.o ../Common/pbkdf2/gc-gnulib.c -${OBJECTDIR}/_ext/b7b6caba/gc-pbkdf2-sha1.o: ../Common/pbdkf2/gc-pbkdf2-sha1.c - ${MKDIR} -p ${OBJECTDIR}/_ext/b7b6caba +${OBJECTDIR}/_ext/b7b9df0c/gc-pbkdf2-sha1.o: ../Common/pbkdf2/gc-pbkdf2-sha1.c + ${MKDIR} -p ${OBJECTDIR}/_ext/b7b9df0c ${RM} "$@.d" - $(COMPILE.c) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b6caba/gc-pbkdf2-sha1.o ../Common/pbdkf2/gc-pbkdf2-sha1.c + $(COMPILE.c) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b9df0c/gc-pbkdf2-sha1.o ../Common/pbkdf2/gc-pbkdf2-sha1.c -${OBJECTDIR}/_ext/b7b6caba/hmac-sha1.o: ../Common/pbdkf2/hmac-sha1.c - ${MKDIR} -p ${OBJECTDIR}/_ext/b7b6caba +${OBJECTDIR}/_ext/b7b9df0c/hmac-sha1.o: ../Common/pbkdf2/hmac-sha1.c + ${MKDIR} -p ${OBJECTDIR}/_ext/b7b9df0c ${RM} "$@.d" - $(COMPILE.c) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b6caba/hmac-sha1.o ../Common/pbdkf2/hmac-sha1.c + $(COMPILE.c) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b9df0c/hmac-sha1.o ../Common/pbkdf2/hmac-sha1.c -${OBJECTDIR}/_ext/b7b6caba/memxor.o: ../Common/pbdkf2/memxor.c - ${MKDIR} -p ${OBJECTDIR}/_ext/b7b6caba +${OBJECTDIR}/_ext/b7b9df0c/memxor.o: ../Common/pbkdf2/memxor.c + ${MKDIR} -p ${OBJECTDIR}/_ext/b7b9df0c ${RM} "$@.d" - $(COMPILE.c) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b6caba/memxor.o ../Common/pbdkf2/memxor.c + $(COMPILE.c) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b9df0c/memxor.o ../Common/pbkdf2/memxor.c -${OBJECTDIR}/_ext/b7b6caba/sha1.o: ../Common/pbdkf2/sha1.c - ${MKDIR} -p ${OBJECTDIR}/_ext/b7b6caba +${OBJECTDIR}/_ext/b7b9df0c/sha1.o: ../Common/pbkdf2/sha1.c + ${MKDIR} -p ${OBJECTDIR}/_ext/b7b9df0c ${RM} "$@.d" - $(COMPILE.c) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b6caba/sha1.o ../Common/pbdkf2/sha1.c + $(COMPILE.c) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/b7b9df0c/sha1.o ../Common/pbkdf2/sha1.c -${OBJECTDIR}/_ext/822bcbe5/MsedDevLinuxNvme.o: ../linux/MsedDevLinuxNvme.cpp +${OBJECTDIR}/_ext/822bcbe5/DtaDevLinuxNvme.o: ../linux/DtaDevLinuxNvme.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/822bcbe5 ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/822bcbe5/MsedDevLinuxNvme.o ../linux/MsedDevLinuxNvme.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/822bcbe5/DtaDevLinuxNvme.o ../linux/DtaDevLinuxNvme.cpp -${OBJECTDIR}/_ext/822bcbe5/MsedDevLinuxSata.o: ../linux/MsedDevLinuxSata.cpp +${OBJECTDIR}/_ext/822bcbe5/DtaDevLinuxSata.o: ../linux/DtaDevLinuxSata.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/822bcbe5 ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/822bcbe5/MsedDevLinuxSata.o ../linux/MsedDevLinuxSata.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/822bcbe5/DtaDevLinuxSata.o ../linux/DtaDevLinuxSata.cpp -${OBJECTDIR}/_ext/822bcbe5/MsedDevOS.o: ../linux/MsedDevOS.cpp +${OBJECTDIR}/_ext/822bcbe5/DtaDevOS.o: ../linux/DtaDevOS.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/822bcbe5 ${RM} "$@.d" - $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/822bcbe5/MsedDevOS.o ../linux/MsedDevOS.cpp + $(COMPILE.cc) -O2 -Werror -I../linux -I../Common -I../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/822bcbe5/DtaDevOS.o ../linux/DtaDevOS.cpp ${OBJECTDIR}/GetPassPhrase.o: GetPassPhrase.cpp ${MKDIR} -p ${OBJECTDIR} diff --git a/LinuxPBA/nbproject/configurations.xml b/LinuxPBA/nbproject/configurations.xml index 167b9ffe..074e039a 100644 --- a/LinuxPBA/nbproject/configurations.xml +++ b/LinuxPBA/nbproject/configurations.xml @@ -1,5 +1,5 @@ - + + + ../Common/pbkdf2/config.h + ../Common/pbkdf2/gc-gnulib.c + ../Common/pbkdf2/gc-pbkdf2-sha1.c + ../Common/pbkdf2/gc.h + ../Common/pbkdf2/hmac-sha1.c + ../Common/pbkdf2/hmac.h + ../Common/pbkdf2/memxor.c + ../Common/pbkdf2/memxor.h + ../Common/pbkdf2/sha1.c + ../Common/pbkdf2/sha1.h + ../Common/pbkdf2/stdalign.h + + ../Common/DtaCommand.cpp + ../Common/DtaDev.cpp + ../Common/DtaDevGeneric.cpp + ../linux/DtaDevLinuxNvme.cpp + ../linux/DtaDevLinuxSata.cpp + ../linux/DtaDevOS.cpp + ../Common/DtaDevOpal.cpp + ../Common/DtaDevOpal1.cpp + ../Common/DtaDevOpal2.cpp + ../Common/DtaHashPwd.cpp + ../Common/DtaHexDump.cpp + ../Common/DtaResponse.cpp + ../Common/DtaSession.cpp GetPassPhrase.cpp LinuxPBA.cpp - ../Common/MsedCommand.cpp - ../Common/MsedDev.cpp - ../Common/MsedDevGeneric.cpp - ../linux/MsedDevLinuxNvme.cpp - ../linux/MsedDevLinuxSata.cpp - ../linux/MsedDevOS.cpp - ../Common/MsedDevOpal.cpp - ../Common/MsedDevOpal1.cpp - ../Common/MsedDevOpal2.cpp - ../Common/MsedHashPwd.cpp - ../Common/MsedHexDump.cpp - ../Common/MsedResponse.cpp - ../Common/MsedSession.cpp UnlockSEDs.cpp - ../Common/pbdkf2/gc-gnulib.c - ../Common/pbdkf2/gc-pbkdf2-sha1.c - ../Common/pbdkf2/hmac-sha1.c - ../Common/pbdkf2/memxor.c - ../Common/pbdkf2/sha1.c Makefile + + ../Common/pbkdf2 + Makefile @@ -66,7 +77,7 @@ ../Common/pbdkf2 - MSEDDEBUG + DTADEBUG 3 @@ -79,7 +90,7 @@ ../Common/pbdkf2 - MSEDDEBUG + DTADEBUG 3 @@ -89,41 +100,53 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + @@ -177,41 +200,53 @@ - + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -266,41 +301,53 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + @@ -329,7 +376,7 @@ ../Common/pbdkf2 - MSEDDEBUG + DTADEBUG 3 @@ -342,7 +389,7 @@ ../Common/pbdkf2 - MSEDDEBUG + DTADEBUG 3 @@ -352,41 +399,53 @@ - + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/LinuxPBA/nbproject/private/configurations.xml b/LinuxPBA/nbproject/private/configurations.xml index 0e5ad0dd..96f30a5f 100644 --- a/LinuxPBA/nbproject/private/configurations.xml +++ b/LinuxPBA/nbproject/private/configurations.xml @@ -1,5 +1,5 @@ - + Makefile diff --git a/LinuxPBA/nbproject/project.xml b/LinuxPBA/nbproject/project.xml index 50836cc9..ccafbc86 100644 --- a/LinuxPBA/nbproject/project.xml +++ b/LinuxPBA/nbproject/project.xml @@ -9,7 +9,9 @@ h UTF-8 - + + ../Common/pbkdf2 + Debug diff --git a/README.md b/README.md index 5bd152b8..9ac40a0b 100644 --- a/README.md +++ b/README.md @@ -1,26 +1,24 @@ -![alt tag](https://avatars0.githubusercontent.com/u/13870012?v=3&s=200)I am joining forces with the Drive Trust Alliance (Drive-Trust-Alliance on GitHub) to bring the best possible open source SED tools to the community. Information on the Drive Trust Allinace can be found at https://drivetrust.com. +![alt tag](https://avatars0.githubusercontent.com/u/13870012?v=3&s=200) -New releases of SED software should be arriving soon from the DTA +This software is Copyright 2014-2016 Bright Plaza Inc. +This file is part of sedutil. -This software is Copyright 2014,2015 Michael Romeo +sedutil is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. - This file is part of msed. +sedutil is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. - msed is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. +You should have received a copy of the GNU General Public License +along with sedutil. If not, see . - msed is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with msed. If not, see . - -msed - Manage Self Encrypting Drives +sedutil - The Drive Trust Alliance Self Encrypting Drive Utility This program and it's accompanying Pre-Boot Authorization image allow you to enable the locking in SED's that comply with the TCG OPAL 2.00 @@ -31,11 +29,10 @@ You must be administrator/root to run the host managment program In Linux libata.allow_tpm must be set to 1. Either via adding libata.allow_tpm=1 to the kernel flags at boot time or changing the contents of /sys/module/libata/parameters/allow_tpm to a from a "0" to a "1" on a running system. -Currently there is only a PBA for BIOS machines and sleep (S3) is not supported. +***** sleep (S3) is not supported. -Source code is available on GitHub at https://github.com/r0m30/msed (host management program) and -https://github.com/syslinux (BIOS PBA) +Source code is available on GitHub at https://github.com/Drive-Trust-Alliance/sedutil -Linux and Windows executables are available at http://www.r0m30.com/msed/files +Linux and Windows executables are available at https://github.com/Drive-Trust-Alliance/sedutil/wiki/Executable-Distributions If you are looking for the PSID revert function see linux/PSIDRevert_LINUX.txt or win32/PSIDRevert_WINDOWS.txt diff --git a/README_build_win32.txt b/README_build_win32.txt index a739ff1c..9810322a 100644 --- a/README_build_win32.txt +++ b/README_build_win32.txt @@ -1,4 +1,4 @@ -Pre-requisites for building msed under Windows, tested under Windows 8.1 (which has stricter powershell defaults than Windows 7): +Pre-requisites for building sedutil under Windows, tested under Windows 8.1 (which has stricter powershell defaults than Windows 7): 1. Visual Studio 2013 Community Edition (minimum). 2. Git command-line client for Windows. [ http://git-scm.com/download/win ] diff --git a/images/buildrescue b/images/buildrescue index ca984796..63c972e1 100755 --- a/images/buildrescue +++ b/images/buildrescue @@ -29,10 +29,10 @@ sudo chmod 777 image mkdir -p image/boot/extlinux sudo ../scratch/${SYSLINUX}/bios/extlinux/extlinux --install image/boot/extlinux cp ../scratch/vmlinuz image/boot/ -echo "default msed" >>image/boot/extlinux/extlinux.conf +echo "default DTA" >>image/boot/extlinux/extlinux.conf echo "prompt 0" >>image/boot/extlinux/extlinux.conf echo "noescape 1" >>image/boot/extlinux/extlinux.conf -echo "label msed" >>image/boot/extlinux/extlinux.conf +echo "label DTA" >>image/boot/extlinux/extlinux.conf echo " kernel /boot/vmlinuz" >>image/boot/extlinux/extlinux.conf echo " initrd /boot/core.gz" >>image/boot/extlinux/extlinux.conf echo " append loglevel=0 libata.allow_tpm=1 tinycore base norestore noswap superuser" >>image/boot/extlinux/extlinux.conf diff --git a/images/buildroot/syslinux.cfg b/images/buildroot/syslinux.cfg index 0d47a609..b7186ccd 100755 --- a/images/buildroot/syslinux.cfg +++ b/images/buildroot/syslinux.cfg @@ -1,7 +1,7 @@ -default msed +default DTA prompt 0 noescape 1 -label msed +label DTA kernel bzImage initrd rootfs.cpio.xz append loglevel=0 libata.allow_tpm=1 diff --git a/linux/CLI/nbproject/Makefile-Debug_i686.mk b/linux/CLI/nbproject/Makefile-Debug_i686.mk index 37990193..8585688e 100644 --- a/linux/CLI/nbproject/Makefile-Debug_i686.mk +++ b/linux/CLI/nbproject/Makefile-Debug_i686.mk @@ -35,28 +35,28 @@ OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM} # Object Files OBJECTFILES= \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedAnnotatedDump.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedCommand.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedDev.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedDevEnterprise.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedDevGeneric.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal1.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal2.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedHashPwd.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedHexDump.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedOptions.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedResponse.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedSession.o \ - ${OBJECTDIR}/_ext/7a2a93ab/msed.o \ - ${OBJECTDIR}/_ext/cdbabf29/gc-gnulib.o \ - ${OBJECTDIR}/_ext/cdbabf29/gc-pbkdf2-sha1.o \ - ${OBJECTDIR}/_ext/cdbabf29/hmac-sha1.o \ - ${OBJECTDIR}/_ext/cdbabf29/memxor.o \ - ${OBJECTDIR}/_ext/cdbabf29/sha1.o \ - ${OBJECTDIR}/_ext/5c0/MsedDevLinuxNvme.o \ - ${OBJECTDIR}/_ext/5c0/MsedDevLinuxSata.o \ - ${OBJECTDIR}/_ext/5c0/MsedDevOS.o + ${OBJECTDIR}/_ext/7a2a93ab/DtaAnnotatedDump.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaCommand.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaDev.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaDevEnterprise.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaDevGeneric.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal1.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal2.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaHashPwd.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaHexDump.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaOptions.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaResponse.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaSession.o \ + ${OBJECTDIR}/_ext/cdbdd37b/gc-gnulib.o \ + ${OBJECTDIR}/_ext/cdbdd37b/gc-pbkdf2-sha1.o \ + ${OBJECTDIR}/_ext/cdbdd37b/hmac-sha1.o \ + ${OBJECTDIR}/_ext/cdbdd37b/memxor.o \ + ${OBJECTDIR}/_ext/cdbdd37b/sha1.o \ + ${OBJECTDIR}/_ext/7a2a93ab/sedutil.o \ + ${OBJECTDIR}/_ext/5c0/DtaDevLinuxNvme.o \ + ${OBJECTDIR}/_ext/5c0/DtaDevLinuxSata.o \ + ${OBJECTDIR}/_ext/5c0/DtaDevOS.o # C Compiler Flags @@ -83,115 +83,115 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/sedutil-cli: ${OBJECTFILES} ${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM} ${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/sedutil-cli ${OBJECTFILES} ${LDLIBSOPTIONS} -${OBJECTDIR}/_ext/7a2a93ab/MsedAnnotatedDump.o: ../../Common/MsedAnnotatedDump.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaAnnotatedDump.o: ../../Common/DtaAnnotatedDump.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedAnnotatedDump.o ../../Common/MsedAnnotatedDump.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaAnnotatedDump.o ../../Common/DtaAnnotatedDump.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedCommand.o: ../../Common/MsedCommand.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaCommand.o: ../../Common/DtaCommand.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedCommand.o ../../Common/MsedCommand.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaCommand.o ../../Common/DtaCommand.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedDev.o: ../../Common/MsedDev.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaDev.o: ../../Common/DtaDev.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedDev.o ../../Common/MsedDev.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaDev.o ../../Common/DtaDev.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedDevEnterprise.o: ../../Common/MsedDevEnterprise.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaDevEnterprise.o: ../../Common/DtaDevEnterprise.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedDevEnterprise.o ../../Common/MsedDevEnterprise.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaDevEnterprise.o ../../Common/DtaDevEnterprise.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedDevGeneric.o: ../../Common/MsedDevGeneric.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaDevGeneric.o: ../../Common/DtaDevGeneric.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedDevGeneric.o ../../Common/MsedDevGeneric.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaDevGeneric.o ../../Common/DtaDevGeneric.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal.o: ../../Common/MsedDevOpal.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal.o: ../../Common/DtaDevOpal.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal.o ../../Common/MsedDevOpal.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal.o ../../Common/DtaDevOpal.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal1.o: ../../Common/MsedDevOpal1.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal1.o: ../../Common/DtaDevOpal1.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal1.o ../../Common/MsedDevOpal1.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal1.o ../../Common/DtaDevOpal1.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal2.o: ../../Common/MsedDevOpal2.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal2.o: ../../Common/DtaDevOpal2.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal2.o ../../Common/MsedDevOpal2.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal2.o ../../Common/DtaDevOpal2.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedHashPwd.o: ../../Common/MsedHashPwd.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaHashPwd.o: ../../Common/DtaHashPwd.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedHashPwd.o ../../Common/MsedHashPwd.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaHashPwd.o ../../Common/DtaHashPwd.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedHexDump.o: ../../Common/MsedHexDump.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaHexDump.o: ../../Common/DtaHexDump.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedHexDump.o ../../Common/MsedHexDump.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaHexDump.o ../../Common/DtaHexDump.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedOptions.o: ../../Common/MsedOptions.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaOptions.o: ../../Common/DtaOptions.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedOptions.o ../../Common/MsedOptions.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaOptions.o ../../Common/DtaOptions.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedResponse.o: ../../Common/MsedResponse.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaResponse.o: ../../Common/DtaResponse.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedResponse.o ../../Common/MsedResponse.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaResponse.o ../../Common/DtaResponse.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedSession.o: ../../Common/MsedSession.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaSession.o: ../../Common/DtaSession.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedSession.o ../../Common/MsedSession.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaSession.o ../../Common/DtaSession.cpp -${OBJECTDIR}/_ext/7a2a93ab/msed.o: ../../Common/msed.cpp - ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab +${OBJECTDIR}/_ext/cdbdd37b/gc-gnulib.o: ../../Common/pbkdf2/gc-gnulib.c + ${MKDIR} -p ${OBJECTDIR}/_ext/cdbdd37b ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/msed.o ../../Common/msed.cpp + $(COMPILE.c) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbdd37b/gc-gnulib.o ../../Common/pbkdf2/gc-gnulib.c -${OBJECTDIR}/_ext/cdbabf29/gc-gnulib.o: ../../Common/pbdkf2/gc-gnulib.c - ${MKDIR} -p ${OBJECTDIR}/_ext/cdbabf29 +${OBJECTDIR}/_ext/cdbdd37b/gc-pbkdf2-sha1.o: ../../Common/pbkdf2/gc-pbkdf2-sha1.c + ${MKDIR} -p ${OBJECTDIR}/_ext/cdbdd37b ${RM} "$@.d" - $(COMPILE.c) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbabf29/gc-gnulib.o ../../Common/pbdkf2/gc-gnulib.c + $(COMPILE.c) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbdd37b/gc-pbkdf2-sha1.o ../../Common/pbkdf2/gc-pbkdf2-sha1.c -${OBJECTDIR}/_ext/cdbabf29/gc-pbkdf2-sha1.o: ../../Common/pbdkf2/gc-pbkdf2-sha1.c - ${MKDIR} -p ${OBJECTDIR}/_ext/cdbabf29 +${OBJECTDIR}/_ext/cdbdd37b/hmac-sha1.o: ../../Common/pbkdf2/hmac-sha1.c + ${MKDIR} -p ${OBJECTDIR}/_ext/cdbdd37b ${RM} "$@.d" - $(COMPILE.c) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbabf29/gc-pbkdf2-sha1.o ../../Common/pbdkf2/gc-pbkdf2-sha1.c + $(COMPILE.c) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbdd37b/hmac-sha1.o ../../Common/pbkdf2/hmac-sha1.c -${OBJECTDIR}/_ext/cdbabf29/hmac-sha1.o: ../../Common/pbdkf2/hmac-sha1.c - ${MKDIR} -p ${OBJECTDIR}/_ext/cdbabf29 +${OBJECTDIR}/_ext/cdbdd37b/memxor.o: ../../Common/pbkdf2/memxor.c + ${MKDIR} -p ${OBJECTDIR}/_ext/cdbdd37b ${RM} "$@.d" - $(COMPILE.c) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbabf29/hmac-sha1.o ../../Common/pbdkf2/hmac-sha1.c + $(COMPILE.c) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbdd37b/memxor.o ../../Common/pbkdf2/memxor.c -${OBJECTDIR}/_ext/cdbabf29/memxor.o: ../../Common/pbdkf2/memxor.c - ${MKDIR} -p ${OBJECTDIR}/_ext/cdbabf29 +${OBJECTDIR}/_ext/cdbdd37b/sha1.o: ../../Common/pbkdf2/sha1.c + ${MKDIR} -p ${OBJECTDIR}/_ext/cdbdd37b ${RM} "$@.d" - $(COMPILE.c) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbabf29/memxor.o ../../Common/pbdkf2/memxor.c + $(COMPILE.c) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbdd37b/sha1.o ../../Common/pbkdf2/sha1.c -${OBJECTDIR}/_ext/cdbabf29/sha1.o: ../../Common/pbdkf2/sha1.c - ${MKDIR} -p ${OBJECTDIR}/_ext/cdbabf29 +${OBJECTDIR}/_ext/7a2a93ab/sedutil.o: ../../Common/sedutil.cpp + ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.c) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbabf29/sha1.o ../../Common/pbdkf2/sha1.c + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/sedutil.o ../../Common/sedutil.cpp -${OBJECTDIR}/_ext/5c0/MsedDevLinuxNvme.o: ../MsedDevLinuxNvme.cpp +${OBJECTDIR}/_ext/5c0/DtaDevLinuxNvme.o: ../DtaDevLinuxNvme.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/5c0 ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/5c0/MsedDevLinuxNvme.o ../MsedDevLinuxNvme.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/5c0/DtaDevLinuxNvme.o ../DtaDevLinuxNvme.cpp -${OBJECTDIR}/_ext/5c0/MsedDevLinuxSata.o: ../MsedDevLinuxSata.cpp +${OBJECTDIR}/_ext/5c0/DtaDevLinuxSata.o: ../DtaDevLinuxSata.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/5c0 ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/5c0/MsedDevLinuxSata.o ../MsedDevLinuxSata.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/5c0/DtaDevLinuxSata.o ../DtaDevLinuxSata.cpp -${OBJECTDIR}/_ext/5c0/MsedDevOS.o: ../MsedDevOS.cpp +${OBJECTDIR}/_ext/5c0/DtaDevOS.o: ../DtaDevOS.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/5c0 ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/5c0/MsedDevOS.o ../MsedDevOS.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/5c0/DtaDevOS.o ../DtaDevOS.cpp # Subprojects .build-subprojects: diff --git a/linux/CLI/nbproject/Makefile-Debug_x86_64.mk b/linux/CLI/nbproject/Makefile-Debug_x86_64.mk index 03522247..e6ef4d0a 100644 --- a/linux/CLI/nbproject/Makefile-Debug_x86_64.mk +++ b/linux/CLI/nbproject/Makefile-Debug_x86_64.mk @@ -35,28 +35,28 @@ OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM} # Object Files OBJECTFILES= \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedAnnotatedDump.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedCommand.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedDev.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedDevEnterprise.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedDevGeneric.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal1.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal2.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedHashPwd.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedHexDump.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedOptions.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedResponse.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedSession.o \ - ${OBJECTDIR}/_ext/7a2a93ab/msed.o \ - ${OBJECTDIR}/_ext/cdbabf29/gc-gnulib.o \ - ${OBJECTDIR}/_ext/cdbabf29/gc-pbkdf2-sha1.o \ - ${OBJECTDIR}/_ext/cdbabf29/hmac-sha1.o \ - ${OBJECTDIR}/_ext/cdbabf29/memxor.o \ - ${OBJECTDIR}/_ext/cdbabf29/sha1.o \ - ${OBJECTDIR}/_ext/5c0/MsedDevLinuxNvme.o \ - ${OBJECTDIR}/_ext/5c0/MsedDevLinuxSata.o \ - ${OBJECTDIR}/_ext/5c0/MsedDevOS.o + ${OBJECTDIR}/_ext/7a2a93ab/DtaAnnotatedDump.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaCommand.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaDev.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaDevEnterprise.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaDevGeneric.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal1.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal2.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaHashPwd.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaHexDump.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaOptions.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaResponse.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaSession.o \ + ${OBJECTDIR}/_ext/cdbdd37b/gc-gnulib.o \ + ${OBJECTDIR}/_ext/cdbdd37b/gc-pbkdf2-sha1.o \ + ${OBJECTDIR}/_ext/cdbdd37b/hmac-sha1.o \ + ${OBJECTDIR}/_ext/cdbdd37b/memxor.o \ + ${OBJECTDIR}/_ext/cdbdd37b/sha1.o \ + ${OBJECTDIR}/_ext/7a2a93ab/sedutil.o \ + ${OBJECTDIR}/_ext/5c0/DtaDevLinuxNvme.o \ + ${OBJECTDIR}/_ext/5c0/DtaDevLinuxSata.o \ + ${OBJECTDIR}/_ext/5c0/DtaDevOS.o # C Compiler Flags @@ -83,115 +83,115 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/sedutil-cli: ${OBJECTFILES} ${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM} ${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/sedutil-cli ${OBJECTFILES} ${LDLIBSOPTIONS} -${OBJECTDIR}/_ext/7a2a93ab/MsedAnnotatedDump.o: ../../Common/MsedAnnotatedDump.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaAnnotatedDump.o: ../../Common/DtaAnnotatedDump.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedAnnotatedDump.o ../../Common/MsedAnnotatedDump.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaAnnotatedDump.o ../../Common/DtaAnnotatedDump.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedCommand.o: ../../Common/MsedCommand.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaCommand.o: ../../Common/DtaCommand.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedCommand.o ../../Common/MsedCommand.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaCommand.o ../../Common/DtaCommand.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedDev.o: ../../Common/MsedDev.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaDev.o: ../../Common/DtaDev.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedDev.o ../../Common/MsedDev.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaDev.o ../../Common/DtaDev.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedDevEnterprise.o: ../../Common/MsedDevEnterprise.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaDevEnterprise.o: ../../Common/DtaDevEnterprise.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedDevEnterprise.o ../../Common/MsedDevEnterprise.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaDevEnterprise.o ../../Common/DtaDevEnterprise.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedDevGeneric.o: ../../Common/MsedDevGeneric.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaDevGeneric.o: ../../Common/DtaDevGeneric.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedDevGeneric.o ../../Common/MsedDevGeneric.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaDevGeneric.o ../../Common/DtaDevGeneric.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal.o: ../../Common/MsedDevOpal.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal.o: ../../Common/DtaDevOpal.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal.o ../../Common/MsedDevOpal.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal.o ../../Common/DtaDevOpal.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal1.o: ../../Common/MsedDevOpal1.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal1.o: ../../Common/DtaDevOpal1.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal1.o ../../Common/MsedDevOpal1.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal1.o ../../Common/DtaDevOpal1.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal2.o: ../../Common/MsedDevOpal2.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal2.o: ../../Common/DtaDevOpal2.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal2.o ../../Common/MsedDevOpal2.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal2.o ../../Common/DtaDevOpal2.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedHashPwd.o: ../../Common/MsedHashPwd.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaHashPwd.o: ../../Common/DtaHashPwd.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedHashPwd.o ../../Common/MsedHashPwd.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaHashPwd.o ../../Common/DtaHashPwd.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedHexDump.o: ../../Common/MsedHexDump.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaHexDump.o: ../../Common/DtaHexDump.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedHexDump.o ../../Common/MsedHexDump.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaHexDump.o ../../Common/DtaHexDump.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedOptions.o: ../../Common/MsedOptions.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaOptions.o: ../../Common/DtaOptions.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedOptions.o ../../Common/MsedOptions.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaOptions.o ../../Common/DtaOptions.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedResponse.o: ../../Common/MsedResponse.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaResponse.o: ../../Common/DtaResponse.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedResponse.o ../../Common/MsedResponse.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaResponse.o ../../Common/DtaResponse.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedSession.o: ../../Common/MsedSession.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaSession.o: ../../Common/DtaSession.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedSession.o ../../Common/MsedSession.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaSession.o ../../Common/DtaSession.cpp -${OBJECTDIR}/_ext/7a2a93ab/msed.o: ../../Common/msed.cpp - ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab +${OBJECTDIR}/_ext/cdbdd37b/gc-gnulib.o: ../../Common/pbkdf2/gc-gnulib.c + ${MKDIR} -p ${OBJECTDIR}/_ext/cdbdd37b ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/msed.o ../../Common/msed.cpp + $(COMPILE.c) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbdd37b/gc-gnulib.o ../../Common/pbkdf2/gc-gnulib.c -${OBJECTDIR}/_ext/cdbabf29/gc-gnulib.o: ../../Common/pbdkf2/gc-gnulib.c - ${MKDIR} -p ${OBJECTDIR}/_ext/cdbabf29 +${OBJECTDIR}/_ext/cdbdd37b/gc-pbkdf2-sha1.o: ../../Common/pbkdf2/gc-pbkdf2-sha1.c + ${MKDIR} -p ${OBJECTDIR}/_ext/cdbdd37b ${RM} "$@.d" - $(COMPILE.c) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbabf29/gc-gnulib.o ../../Common/pbdkf2/gc-gnulib.c + $(COMPILE.c) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbdd37b/gc-pbkdf2-sha1.o ../../Common/pbkdf2/gc-pbkdf2-sha1.c -${OBJECTDIR}/_ext/cdbabf29/gc-pbkdf2-sha1.o: ../../Common/pbdkf2/gc-pbkdf2-sha1.c - ${MKDIR} -p ${OBJECTDIR}/_ext/cdbabf29 +${OBJECTDIR}/_ext/cdbdd37b/hmac-sha1.o: ../../Common/pbkdf2/hmac-sha1.c + ${MKDIR} -p ${OBJECTDIR}/_ext/cdbdd37b ${RM} "$@.d" - $(COMPILE.c) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbabf29/gc-pbkdf2-sha1.o ../../Common/pbdkf2/gc-pbkdf2-sha1.c + $(COMPILE.c) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbdd37b/hmac-sha1.o ../../Common/pbkdf2/hmac-sha1.c -${OBJECTDIR}/_ext/cdbabf29/hmac-sha1.o: ../../Common/pbdkf2/hmac-sha1.c - ${MKDIR} -p ${OBJECTDIR}/_ext/cdbabf29 +${OBJECTDIR}/_ext/cdbdd37b/memxor.o: ../../Common/pbkdf2/memxor.c + ${MKDIR} -p ${OBJECTDIR}/_ext/cdbdd37b ${RM} "$@.d" - $(COMPILE.c) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbabf29/hmac-sha1.o ../../Common/pbdkf2/hmac-sha1.c + $(COMPILE.c) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbdd37b/memxor.o ../../Common/pbkdf2/memxor.c -${OBJECTDIR}/_ext/cdbabf29/memxor.o: ../../Common/pbdkf2/memxor.c - ${MKDIR} -p ${OBJECTDIR}/_ext/cdbabf29 +${OBJECTDIR}/_ext/cdbdd37b/sha1.o: ../../Common/pbkdf2/sha1.c + ${MKDIR} -p ${OBJECTDIR}/_ext/cdbdd37b ${RM} "$@.d" - $(COMPILE.c) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbabf29/memxor.o ../../Common/pbdkf2/memxor.c + $(COMPILE.c) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbdd37b/sha1.o ../../Common/pbkdf2/sha1.c -${OBJECTDIR}/_ext/cdbabf29/sha1.o: ../../Common/pbdkf2/sha1.c - ${MKDIR} -p ${OBJECTDIR}/_ext/cdbabf29 +${OBJECTDIR}/_ext/7a2a93ab/sedutil.o: ../../Common/sedutil.cpp + ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.c) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbabf29/sha1.o ../../Common/pbdkf2/sha1.c + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/sedutil.o ../../Common/sedutil.cpp -${OBJECTDIR}/_ext/5c0/MsedDevLinuxNvme.o: ../MsedDevLinuxNvme.cpp +${OBJECTDIR}/_ext/5c0/DtaDevLinuxNvme.o: ../DtaDevLinuxNvme.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/5c0 ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/5c0/MsedDevLinuxNvme.o ../MsedDevLinuxNvme.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/5c0/DtaDevLinuxNvme.o ../DtaDevLinuxNvme.cpp -${OBJECTDIR}/_ext/5c0/MsedDevLinuxSata.o: ../MsedDevLinuxSata.cpp +${OBJECTDIR}/_ext/5c0/DtaDevLinuxSata.o: ../DtaDevLinuxSata.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/5c0 ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/5c0/MsedDevLinuxSata.o ../MsedDevLinuxSata.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/5c0/DtaDevLinuxSata.o ../DtaDevLinuxSata.cpp -${OBJECTDIR}/_ext/5c0/MsedDevOS.o: ../MsedDevOS.cpp +${OBJECTDIR}/_ext/5c0/DtaDevOS.o: ../DtaDevOS.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/5c0 ${RM} "$@.d" - $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/5c0/MsedDevOS.o ../MsedDevOS.cpp + $(COMPILE.cc) -g -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/5c0/DtaDevOS.o ../DtaDevOS.cpp # Subprojects .build-subprojects: diff --git a/linux/CLI/nbproject/Makefile-Release_i686.mk b/linux/CLI/nbproject/Makefile-Release_i686.mk index 8d85587a..a93b9274 100644 --- a/linux/CLI/nbproject/Makefile-Release_i686.mk +++ b/linux/CLI/nbproject/Makefile-Release_i686.mk @@ -35,28 +35,28 @@ OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM} # Object Files OBJECTFILES= \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedAnnotatedDump.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedCommand.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedDev.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedDevEnterprise.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedDevGeneric.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal1.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal2.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedHashPwd.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedHexDump.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedOptions.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedResponse.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedSession.o \ - ${OBJECTDIR}/_ext/7a2a93ab/msed.o \ - ${OBJECTDIR}/_ext/cdbabf29/gc-gnulib.o \ - ${OBJECTDIR}/_ext/cdbabf29/gc-pbkdf2-sha1.o \ - ${OBJECTDIR}/_ext/cdbabf29/hmac-sha1.o \ - ${OBJECTDIR}/_ext/cdbabf29/memxor.o \ - ${OBJECTDIR}/_ext/cdbabf29/sha1.o \ - ${OBJECTDIR}/_ext/5c0/MsedDevLinuxNvme.o \ - ${OBJECTDIR}/_ext/5c0/MsedDevLinuxSata.o \ - ${OBJECTDIR}/_ext/5c0/MsedDevOS.o + ${OBJECTDIR}/_ext/7a2a93ab/DtaAnnotatedDump.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaCommand.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaDev.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaDevEnterprise.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaDevGeneric.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal1.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal2.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaHashPwd.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaHexDump.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaOptions.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaResponse.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaSession.o \ + ${OBJECTDIR}/_ext/cdbdd37b/gc-gnulib.o \ + ${OBJECTDIR}/_ext/cdbdd37b/gc-pbkdf2-sha1.o \ + ${OBJECTDIR}/_ext/cdbdd37b/hmac-sha1.o \ + ${OBJECTDIR}/_ext/cdbdd37b/memxor.o \ + ${OBJECTDIR}/_ext/cdbdd37b/sha1.o \ + ${OBJECTDIR}/_ext/7a2a93ab/sedutil.o \ + ${OBJECTDIR}/_ext/5c0/DtaDevLinuxNvme.o \ + ${OBJECTDIR}/_ext/5c0/DtaDevLinuxSata.o \ + ${OBJECTDIR}/_ext/5c0/DtaDevOS.o # C Compiler Flags @@ -83,115 +83,115 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/sedutil-cli: ${OBJECTFILES} ${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM} ${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/sedutil-cli ${OBJECTFILES} ${LDLIBSOPTIONS} -${OBJECTDIR}/_ext/7a2a93ab/MsedAnnotatedDump.o: ../../Common/MsedAnnotatedDump.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaAnnotatedDump.o: ../../Common/DtaAnnotatedDump.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedAnnotatedDump.o ../../Common/MsedAnnotatedDump.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaAnnotatedDump.o ../../Common/DtaAnnotatedDump.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedCommand.o: ../../Common/MsedCommand.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaCommand.o: ../../Common/DtaCommand.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedCommand.o ../../Common/MsedCommand.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaCommand.o ../../Common/DtaCommand.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedDev.o: ../../Common/MsedDev.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaDev.o: ../../Common/DtaDev.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedDev.o ../../Common/MsedDev.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaDev.o ../../Common/DtaDev.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedDevEnterprise.o: ../../Common/MsedDevEnterprise.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaDevEnterprise.o: ../../Common/DtaDevEnterprise.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedDevEnterprise.o ../../Common/MsedDevEnterprise.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaDevEnterprise.o ../../Common/DtaDevEnterprise.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedDevGeneric.o: ../../Common/MsedDevGeneric.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaDevGeneric.o: ../../Common/DtaDevGeneric.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedDevGeneric.o ../../Common/MsedDevGeneric.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaDevGeneric.o ../../Common/DtaDevGeneric.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal.o: ../../Common/MsedDevOpal.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal.o: ../../Common/DtaDevOpal.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal.o ../../Common/MsedDevOpal.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal.o ../../Common/DtaDevOpal.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal1.o: ../../Common/MsedDevOpal1.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal1.o: ../../Common/DtaDevOpal1.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal1.o ../../Common/MsedDevOpal1.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal1.o ../../Common/DtaDevOpal1.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal2.o: ../../Common/MsedDevOpal2.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal2.o: ../../Common/DtaDevOpal2.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal2.o ../../Common/MsedDevOpal2.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal2.o ../../Common/DtaDevOpal2.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedHashPwd.o: ../../Common/MsedHashPwd.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaHashPwd.o: ../../Common/DtaHashPwd.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedHashPwd.o ../../Common/MsedHashPwd.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaHashPwd.o ../../Common/DtaHashPwd.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedHexDump.o: ../../Common/MsedHexDump.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaHexDump.o: ../../Common/DtaHexDump.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedHexDump.o ../../Common/MsedHexDump.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaHexDump.o ../../Common/DtaHexDump.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedOptions.o: ../../Common/MsedOptions.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaOptions.o: ../../Common/DtaOptions.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedOptions.o ../../Common/MsedOptions.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaOptions.o ../../Common/DtaOptions.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedResponse.o: ../../Common/MsedResponse.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaResponse.o: ../../Common/DtaResponse.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedResponse.o ../../Common/MsedResponse.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaResponse.o ../../Common/DtaResponse.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedSession.o: ../../Common/MsedSession.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaSession.o: ../../Common/DtaSession.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedSession.o ../../Common/MsedSession.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaSession.o ../../Common/DtaSession.cpp -${OBJECTDIR}/_ext/7a2a93ab/msed.o: ../../Common/msed.cpp - ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab +${OBJECTDIR}/_ext/cdbdd37b/gc-gnulib.o: ../../Common/pbkdf2/gc-gnulib.c + ${MKDIR} -p ${OBJECTDIR}/_ext/cdbdd37b ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/msed.o ../../Common/msed.cpp + $(COMPILE.c) -O2 -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbdd37b/gc-gnulib.o ../../Common/pbkdf2/gc-gnulib.c -${OBJECTDIR}/_ext/cdbabf29/gc-gnulib.o: ../../Common/pbdkf2/gc-gnulib.c - ${MKDIR} -p ${OBJECTDIR}/_ext/cdbabf29 +${OBJECTDIR}/_ext/cdbdd37b/gc-pbkdf2-sha1.o: ../../Common/pbkdf2/gc-pbkdf2-sha1.c + ${MKDIR} -p ${OBJECTDIR}/_ext/cdbdd37b ${RM} "$@.d" - $(COMPILE.c) -O2 -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbabf29/gc-gnulib.o ../../Common/pbdkf2/gc-gnulib.c + $(COMPILE.c) -O2 -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbdd37b/gc-pbkdf2-sha1.o ../../Common/pbkdf2/gc-pbkdf2-sha1.c -${OBJECTDIR}/_ext/cdbabf29/gc-pbkdf2-sha1.o: ../../Common/pbdkf2/gc-pbkdf2-sha1.c - ${MKDIR} -p ${OBJECTDIR}/_ext/cdbabf29 +${OBJECTDIR}/_ext/cdbdd37b/hmac-sha1.o: ../../Common/pbkdf2/hmac-sha1.c + ${MKDIR} -p ${OBJECTDIR}/_ext/cdbdd37b ${RM} "$@.d" - $(COMPILE.c) -O2 -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbabf29/gc-pbkdf2-sha1.o ../../Common/pbdkf2/gc-pbkdf2-sha1.c + $(COMPILE.c) -O2 -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbdd37b/hmac-sha1.o ../../Common/pbkdf2/hmac-sha1.c -${OBJECTDIR}/_ext/cdbabf29/hmac-sha1.o: ../../Common/pbdkf2/hmac-sha1.c - ${MKDIR} -p ${OBJECTDIR}/_ext/cdbabf29 +${OBJECTDIR}/_ext/cdbdd37b/memxor.o: ../../Common/pbkdf2/memxor.c + ${MKDIR} -p ${OBJECTDIR}/_ext/cdbdd37b ${RM} "$@.d" - $(COMPILE.c) -O2 -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbabf29/hmac-sha1.o ../../Common/pbdkf2/hmac-sha1.c + $(COMPILE.c) -O2 -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbdd37b/memxor.o ../../Common/pbkdf2/memxor.c -${OBJECTDIR}/_ext/cdbabf29/memxor.o: ../../Common/pbdkf2/memxor.c - ${MKDIR} -p ${OBJECTDIR}/_ext/cdbabf29 +${OBJECTDIR}/_ext/cdbdd37b/sha1.o: ../../Common/pbkdf2/sha1.c + ${MKDIR} -p ${OBJECTDIR}/_ext/cdbdd37b ${RM} "$@.d" - $(COMPILE.c) -O2 -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbabf29/memxor.o ../../Common/pbdkf2/memxor.c + $(COMPILE.c) -O2 -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbdd37b/sha1.o ../../Common/pbkdf2/sha1.c -${OBJECTDIR}/_ext/cdbabf29/sha1.o: ../../Common/pbdkf2/sha1.c - ${MKDIR} -p ${OBJECTDIR}/_ext/cdbabf29 +${OBJECTDIR}/_ext/7a2a93ab/sedutil.o: ../../Common/sedutil.cpp + ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.c) -O2 -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbabf29/sha1.o ../../Common/pbdkf2/sha1.c + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/sedutil.o ../../Common/sedutil.cpp -${OBJECTDIR}/_ext/5c0/MsedDevLinuxNvme.o: ../MsedDevLinuxNvme.cpp +${OBJECTDIR}/_ext/5c0/DtaDevLinuxNvme.o: ../DtaDevLinuxNvme.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/5c0 ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/5c0/MsedDevLinuxNvme.o ../MsedDevLinuxNvme.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/5c0/DtaDevLinuxNvme.o ../DtaDevLinuxNvme.cpp -${OBJECTDIR}/_ext/5c0/MsedDevLinuxSata.o: ../MsedDevLinuxSata.cpp +${OBJECTDIR}/_ext/5c0/DtaDevLinuxSata.o: ../DtaDevLinuxSata.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/5c0 ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/5c0/MsedDevLinuxSata.o ../MsedDevLinuxSata.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/5c0/DtaDevLinuxSata.o ../DtaDevLinuxSata.cpp -${OBJECTDIR}/_ext/5c0/MsedDevOS.o: ../MsedDevOS.cpp +${OBJECTDIR}/_ext/5c0/DtaDevOS.o: ../DtaDevOS.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/5c0 ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/5c0/MsedDevOS.o ../MsedDevOS.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/5c0/DtaDevOS.o ../DtaDevOS.cpp # Subprojects .build-subprojects: diff --git a/linux/CLI/nbproject/Makefile-Release_x86_64.mk b/linux/CLI/nbproject/Makefile-Release_x86_64.mk index cc7426da..b9ce2332 100644 --- a/linux/CLI/nbproject/Makefile-Release_x86_64.mk +++ b/linux/CLI/nbproject/Makefile-Release_x86_64.mk @@ -35,28 +35,28 @@ OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM} # Object Files OBJECTFILES= \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedAnnotatedDump.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedCommand.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedDev.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedDevEnterprise.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedDevGeneric.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal1.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal2.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedHashPwd.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedHexDump.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedOptions.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedResponse.o \ - ${OBJECTDIR}/_ext/7a2a93ab/MsedSession.o \ - ${OBJECTDIR}/_ext/7a2a93ab/msed.o \ - ${OBJECTDIR}/_ext/cdbabf29/gc-gnulib.o \ - ${OBJECTDIR}/_ext/cdbabf29/gc-pbkdf2-sha1.o \ - ${OBJECTDIR}/_ext/cdbabf29/hmac-sha1.o \ - ${OBJECTDIR}/_ext/cdbabf29/memxor.o \ - ${OBJECTDIR}/_ext/cdbabf29/sha1.o \ - ${OBJECTDIR}/_ext/5c0/MsedDevLinuxNvme.o \ - ${OBJECTDIR}/_ext/5c0/MsedDevLinuxSata.o \ - ${OBJECTDIR}/_ext/5c0/MsedDevOS.o + ${OBJECTDIR}/_ext/7a2a93ab/DtaAnnotatedDump.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaCommand.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaDev.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaDevEnterprise.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaDevGeneric.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal1.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal2.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaHashPwd.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaHexDump.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaOptions.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaResponse.o \ + ${OBJECTDIR}/_ext/7a2a93ab/DtaSession.o \ + ${OBJECTDIR}/_ext/cdbdd37b/gc-gnulib.o \ + ${OBJECTDIR}/_ext/cdbdd37b/gc-pbkdf2-sha1.o \ + ${OBJECTDIR}/_ext/cdbdd37b/hmac-sha1.o \ + ${OBJECTDIR}/_ext/cdbdd37b/memxor.o \ + ${OBJECTDIR}/_ext/cdbdd37b/sha1.o \ + ${OBJECTDIR}/_ext/7a2a93ab/sedutil.o \ + ${OBJECTDIR}/_ext/5c0/DtaDevLinuxNvme.o \ + ${OBJECTDIR}/_ext/5c0/DtaDevLinuxSata.o \ + ${OBJECTDIR}/_ext/5c0/DtaDevOS.o # C Compiler Flags @@ -83,115 +83,115 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/sedutil-cli: ${OBJECTFILES} ${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM} ${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/sedutil-cli ${OBJECTFILES} ${LDLIBSOPTIONS} -${OBJECTDIR}/_ext/7a2a93ab/MsedAnnotatedDump.o: ../../Common/MsedAnnotatedDump.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaAnnotatedDump.o: ../../Common/DtaAnnotatedDump.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedAnnotatedDump.o ../../Common/MsedAnnotatedDump.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaAnnotatedDump.o ../../Common/DtaAnnotatedDump.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedCommand.o: ../../Common/MsedCommand.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaCommand.o: ../../Common/DtaCommand.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedCommand.o ../../Common/MsedCommand.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaCommand.o ../../Common/DtaCommand.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedDev.o: ../../Common/MsedDev.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaDev.o: ../../Common/DtaDev.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedDev.o ../../Common/MsedDev.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaDev.o ../../Common/DtaDev.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedDevEnterprise.o: ../../Common/MsedDevEnterprise.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaDevEnterprise.o: ../../Common/DtaDevEnterprise.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedDevEnterprise.o ../../Common/MsedDevEnterprise.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaDevEnterprise.o ../../Common/DtaDevEnterprise.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedDevGeneric.o: ../../Common/MsedDevGeneric.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaDevGeneric.o: ../../Common/DtaDevGeneric.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedDevGeneric.o ../../Common/MsedDevGeneric.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaDevGeneric.o ../../Common/DtaDevGeneric.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal.o: ../../Common/MsedDevOpal.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal.o: ../../Common/DtaDevOpal.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal.o ../../Common/MsedDevOpal.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal.o ../../Common/DtaDevOpal.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal1.o: ../../Common/MsedDevOpal1.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal1.o: ../../Common/DtaDevOpal1.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal1.o ../../Common/MsedDevOpal1.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal1.o ../../Common/DtaDevOpal1.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal2.o: ../../Common/MsedDevOpal2.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal2.o: ../../Common/DtaDevOpal2.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedDevOpal2.o ../../Common/MsedDevOpal2.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaDevOpal2.o ../../Common/DtaDevOpal2.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedHashPwd.o: ../../Common/MsedHashPwd.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaHashPwd.o: ../../Common/DtaHashPwd.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedHashPwd.o ../../Common/MsedHashPwd.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaHashPwd.o ../../Common/DtaHashPwd.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedHexDump.o: ../../Common/MsedHexDump.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaHexDump.o: ../../Common/DtaHexDump.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedHexDump.o ../../Common/MsedHexDump.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaHexDump.o ../../Common/DtaHexDump.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedOptions.o: ../../Common/MsedOptions.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaOptions.o: ../../Common/DtaOptions.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedOptions.o ../../Common/MsedOptions.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaOptions.o ../../Common/DtaOptions.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedResponse.o: ../../Common/MsedResponse.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaResponse.o: ../../Common/DtaResponse.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedResponse.o ../../Common/MsedResponse.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaResponse.o ../../Common/DtaResponse.cpp -${OBJECTDIR}/_ext/7a2a93ab/MsedSession.o: ../../Common/MsedSession.cpp +${OBJECTDIR}/_ext/7a2a93ab/DtaSession.o: ../../Common/DtaSession.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/MsedSession.o ../../Common/MsedSession.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/DtaSession.o ../../Common/DtaSession.cpp -${OBJECTDIR}/_ext/7a2a93ab/msed.o: ../../Common/msed.cpp - ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab +${OBJECTDIR}/_ext/cdbdd37b/gc-gnulib.o: ../../Common/pbkdf2/gc-gnulib.c + ${MKDIR} -p ${OBJECTDIR}/_ext/cdbdd37b ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/msed.o ../../Common/msed.cpp + $(COMPILE.c) -O2 -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbdd37b/gc-gnulib.o ../../Common/pbkdf2/gc-gnulib.c -${OBJECTDIR}/_ext/cdbabf29/gc-gnulib.o: ../../Common/pbdkf2/gc-gnulib.c - ${MKDIR} -p ${OBJECTDIR}/_ext/cdbabf29 +${OBJECTDIR}/_ext/cdbdd37b/gc-pbkdf2-sha1.o: ../../Common/pbkdf2/gc-pbkdf2-sha1.c + ${MKDIR} -p ${OBJECTDIR}/_ext/cdbdd37b ${RM} "$@.d" - $(COMPILE.c) -O2 -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbabf29/gc-gnulib.o ../../Common/pbdkf2/gc-gnulib.c + $(COMPILE.c) -O2 -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbdd37b/gc-pbkdf2-sha1.o ../../Common/pbkdf2/gc-pbkdf2-sha1.c -${OBJECTDIR}/_ext/cdbabf29/gc-pbkdf2-sha1.o: ../../Common/pbdkf2/gc-pbkdf2-sha1.c - ${MKDIR} -p ${OBJECTDIR}/_ext/cdbabf29 +${OBJECTDIR}/_ext/cdbdd37b/hmac-sha1.o: ../../Common/pbkdf2/hmac-sha1.c + ${MKDIR} -p ${OBJECTDIR}/_ext/cdbdd37b ${RM} "$@.d" - $(COMPILE.c) -O2 -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbabf29/gc-pbkdf2-sha1.o ../../Common/pbdkf2/gc-pbkdf2-sha1.c + $(COMPILE.c) -O2 -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbdd37b/hmac-sha1.o ../../Common/pbkdf2/hmac-sha1.c -${OBJECTDIR}/_ext/cdbabf29/hmac-sha1.o: ../../Common/pbdkf2/hmac-sha1.c - ${MKDIR} -p ${OBJECTDIR}/_ext/cdbabf29 +${OBJECTDIR}/_ext/cdbdd37b/memxor.o: ../../Common/pbkdf2/memxor.c + ${MKDIR} -p ${OBJECTDIR}/_ext/cdbdd37b ${RM} "$@.d" - $(COMPILE.c) -O2 -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbabf29/hmac-sha1.o ../../Common/pbdkf2/hmac-sha1.c + $(COMPILE.c) -O2 -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbdd37b/memxor.o ../../Common/pbkdf2/memxor.c -${OBJECTDIR}/_ext/cdbabf29/memxor.o: ../../Common/pbdkf2/memxor.c - ${MKDIR} -p ${OBJECTDIR}/_ext/cdbabf29 +${OBJECTDIR}/_ext/cdbdd37b/sha1.o: ../../Common/pbkdf2/sha1.c + ${MKDIR} -p ${OBJECTDIR}/_ext/cdbdd37b ${RM} "$@.d" - $(COMPILE.c) -O2 -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbabf29/memxor.o ../../Common/pbdkf2/memxor.c + $(COMPILE.c) -O2 -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbdd37b/sha1.o ../../Common/pbkdf2/sha1.c -${OBJECTDIR}/_ext/cdbabf29/sha1.o: ../../Common/pbdkf2/sha1.c - ${MKDIR} -p ${OBJECTDIR}/_ext/cdbabf29 +${OBJECTDIR}/_ext/7a2a93ab/sedutil.o: ../../Common/sedutil.cpp + ${MKDIR} -p ${OBJECTDIR}/_ext/7a2a93ab ${RM} "$@.d" - $(COMPILE.c) -O2 -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/cdbabf29/sha1.o ../../Common/pbdkf2/sha1.c + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/7a2a93ab/sedutil.o ../../Common/sedutil.cpp -${OBJECTDIR}/_ext/5c0/MsedDevLinuxNvme.o: ../MsedDevLinuxNvme.cpp +${OBJECTDIR}/_ext/5c0/DtaDevLinuxNvme.o: ../DtaDevLinuxNvme.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/5c0 ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/5c0/MsedDevLinuxNvme.o ../MsedDevLinuxNvme.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/5c0/DtaDevLinuxNvme.o ../DtaDevLinuxNvme.cpp -${OBJECTDIR}/_ext/5c0/MsedDevLinuxSata.o: ../MsedDevLinuxSata.cpp +${OBJECTDIR}/_ext/5c0/DtaDevLinuxSata.o: ../DtaDevLinuxSata.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/5c0 ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/5c0/MsedDevLinuxSata.o ../MsedDevLinuxSata.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/5c0/DtaDevLinuxSata.o ../DtaDevLinuxSata.cpp -${OBJECTDIR}/_ext/5c0/MsedDevOS.o: ../MsedDevOS.cpp +${OBJECTDIR}/_ext/5c0/DtaDevOS.o: ../DtaDevOS.cpp ${MKDIR} -p ${OBJECTDIR}/_ext/5c0 ${RM} "$@.d" - $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/5c0/MsedDevOS.o ../MsedDevOS.cpp + $(COMPILE.cc) -Werror -I.. -I../../Common -I../../Common/pbdkf2 -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/5c0/DtaDevOS.o ../DtaDevOS.cpp # Subprojects .build-subprojects: diff --git a/linux/CLI/nbproject/configurations.xml b/linux/CLI/nbproject/configurations.xml index 8a4b7fd7..fde87997 100644 --- a/linux/CLI/nbproject/configurations.xml +++ b/linux/CLI/nbproject/configurations.xml @@ -4,35 +4,27 @@ - - ../../Common/pbdkf2/config.h - ../../Common/pbdkf2/gc.h - ../../Common/pbdkf2/hmac.h - ../../Common/pbdkf2/memxor.h - ../../Common/pbdkf2/sha1.h - ../../Common/pbdkf2/stdalign.h - - ../../Common/MsedAnnotatedDump.h - ../../Common/MsedCommand.h - ../../Common/MsedConstants.h - ../../Common/MsedDev.h - ../../Common/MsedDevEnterprise.h - ../../Common/MsedDevGeneric.h - ../MsedDevLinuxDrive.h - ../MsedDevLinuxNvme.h - ../MsedDevLinuxSata.h - ../MsedDevOS.h - ../../Common/MsedDevOpal.h - ../../Common/MsedDevOpal1.h - ../../Common/MsedDevOpal2.h - ../../Common/MsedEndianFixup.h - ../../Common/MsedHashPwd.h - ../../Common/MsedHexDump.h - ../../Common/MsedLexicon.h - ../../Common/MsedOptions.h - ../../Common/MsedResponse.h - ../../Common/MsedSession.h - ../../Common/MsedStructures.h + ../../Common/DtaAnnotatedDump.h + ../../Common/DtaCommand.h + ../../Common/DtaConstants.h + ../../Common/DtaDev.h + ../../Common/DtaDevEnterprise.h + ../../Common/DtaDevGeneric.h + ../DtaDevLinuxDrive.h + ../DtaDevLinuxNvme.h + ../DtaDevLinuxSata.h + ../DtaDevOS.h + ../../Common/DtaDevOpal.h + ../../Common/DtaDevOpal1.h + ../../Common/DtaDevOpal2.h + ../../Common/DtaEndianFixup.h + ../../Common/DtaHashPwd.h + ../../Common/DtaHexDump.h + ../../Common/DtaLexicon.h + ../../Common/DtaOptions.h + ../../Common/DtaResponse.h + ../../Common/DtaSession.h + ../../Common/DtaStructures.h ../../Common/log.h ../os.h @@ -43,30 +35,47 @@ - - ../../Common/pbdkf2/gc-gnulib.c - ../../Common/pbdkf2/gc-pbkdf2-sha1.c - ../../Common/pbdkf2/hmac-sha1.c - ../../Common/pbdkf2/memxor.c - ../../Common/pbdkf2/sha1.c + + ../../Common/pbkdf2/config.h + ../../Common/pbkdf2/gc-gnulib.c + ../../Common/pbkdf2/gc-pbkdf2-sha1.c + ../../Common/pbkdf2/gc.h + ../../Common/pbkdf2/hmac-sha1.c + ../../Common/pbkdf2/hmac.h + ../../Common/pbkdf2/memxor.c + ../../Common/pbkdf2/memxor.h + ../../Common/pbkdf2/sha1.c + ../../Common/pbkdf2/sha1.h + ../../Common/pbkdf2/stdalign.h - ../../Common/MsedAnnotatedDump.cpp - ../../Common/MsedCommand.cpp - ../../Common/MsedDev.cpp - ../../Common/MsedDevEnterprise.cpp - ../../Common/MsedDevGeneric.cpp - ../MsedDevLinuxNvme.cpp - ../MsedDevLinuxSata.cpp - ../MsedDevOS.cpp - ../../Common/MsedDevOpal.cpp - ../../Common/MsedDevOpal1.cpp - ../../Common/MsedDevOpal2.cpp - ../../Common/MsedHashPwd.cpp - ../../Common/MsedHexDump.cpp - ../../Common/MsedOptions.cpp - ../../Common/MsedResponse.cpp - ../../Common/MsedSession.cpp - ../../Common/msed.cpp + ../../Common/DtaAnnotatedDump.cpp + ../../Common/DtaCommand.cpp + ../../Common/DtaDev.cpp + ../../Common/DtaDevEnterprise.cpp + ../../Common/DtaDevGeneric.cpp + ../DtaDevLinuxNvme.cpp + ../DtaDevLinuxSata.cpp + ../DtaDevOS.cpp + ../../Common/DtaDevOpal.cpp + ../../Common/DtaDevOpal1.cpp + ../../Common/DtaDevOpal2.cpp + ../../Common/DtaHashPwd.cpp + ../../Common/DtaHexDump.cpp + ../../Common/DtaOptions.cpp + ../../Common/DtaResponse.cpp + ../../Common/DtaSession.cpp + ../../Common/sedutil.cpp + + + + + Makefile ../../Common/pbdkf2 + ../../Common/pbdkf2 + ../../Common/pbkdf2 Makefile @@ -121,108 +132,108 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/sedutil-cli - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + - + - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -269,108 +280,108 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/sedutil-cli - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -411,108 +422,108 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/sedutil-cli - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + - + - + flavor2="0"> + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -559,108 +570,108 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/sedutil-cli - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + - + - + flavor2="0"> + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/linux/CLI/nbproject/private/configurations.xml b/linux/CLI/nbproject/private/configurations.xml index f488abc1..9f071e6f 100644 --- a/linux/CLI/nbproject/private/configurations.xml +++ b/linux/CLI/nbproject/private/configurations.xml @@ -79,8 +79,6 @@ - -