VeraCrypt
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormanison <manison@users.noreply.github.com>2019-01-21 17:32:27 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2019-01-21 17:32:27 (GMT)
commita0a048928cdc55bfc8fb1830c2f282b3de752d41 (patch)
treee00d517c337e588ad61f444b35c97ae575895c81
parentce24edac4f9a132138817060b3a8f2a492ade2e4 (diff)
downloadVeraCrypt-DCS-a0a048928cdc55bfc8fb1830c2f282b3de752d41.zip
VeraCrypt-DCS-a0a048928cdc55bfc8fb1830c2f282b3de752d41.tar.gz
Rename functions conflicting with upstream edk (#10)
-rw-r--r--DcsCfg/DcsCfgCrypt.c2
-rw-r--r--DcsInt/DcsInt.c2
-rw-r--r--Include/Library/CommonLib.h4
-rw-r--r--Library/CommonLib/EfiConsole.c4
-rw-r--r--Library/DcsCfgLib/GptEdit.c2
-rw-r--r--Library/VeraCryptLib/DcsVeraCrypt.c2
6 files changed, 8 insertions, 8 deletions
diff --git a/DcsCfg/DcsCfgCrypt.c b/DcsCfg/DcsCfgCrypt.c
index 390f5ca..7bfb17f 100644
--- a/DcsCfg/DcsCfgCrypt.c
+++ b/DcsCfg/DcsCfgCrypt.c
@@ -1601,7 +1601,7 @@ UsbScApdu(
EFI_STATUS res;
CE(InitUsb());
CE(UsbGetIO(gUSBHandles[UsbIndex], &UsbIo));
- StrHexToBytes(cmd + sizeof(CCID_HEADER_OUT), &cmdLen, hexString);
+ DcsStrHexToBytes(cmd + sizeof(CCID_HEADER_OUT), &cmdLen, hexString);
CE(UsbScTransmit(UsbIo, cmd, cmdLen + sizeof(CCID_HEADER_OUT), resp, &respLen, &statusSc));
PrintBytes(resp, respLen);
return res;
diff --git a/DcsInt/DcsInt.c b/DcsInt/DcsInt.c
index f7c3965..0cc4c4e 100644
--- a/DcsInt/DcsInt.c
+++ b/DcsInt/DcsInt.c
@@ -869,7 +869,7 @@ OnExit(
if (action == NULL) return retValue;
if (OnExitGetParam(action, "guid", &guidStr, NULL)) {
EFI_GUID tmp;
- if (AsciiStrToGuid(&tmp, guidStr)) {
+ if (DcsAsciiStrToGuid(&tmp, guidStr)) {
guid = MEM_ALLOC(sizeof(EFI_GUID));
CopyMem(guid, &tmp, sizeof(EFI_GUID));
}
diff --git a/Include/Library/CommonLib.h b/Include/Library/CommonLib.h
index 9a15afd..17b0c72 100644
--- a/Include/Library/CommonLib.h
+++ b/Include/Library/CommonLib.h
@@ -412,7 +412,7 @@ AsciiHexToByte(
);
BOOLEAN
-AsciiStrToGuid(
+DcsAsciiStrToGuid(
OUT EFI_GUID *guid,
IN CHAR8 *str
);
@@ -425,7 +425,7 @@ AsciiHexToBytes(
);
BOOLEAN
-StrHexToBytes(
+DcsStrHexToBytes(
OUT UINT8 *b,
IN UINTN *bytesLen,
IN CHAR16 *str
diff --git a/Library/CommonLib/EfiConsole.c b/Library/CommonLib/EfiConsole.c
index 71373ab..daf087f 100644
--- a/Library/CommonLib/EfiConsole.c
+++ b/Library/CommonLib/EfiConsole.c
@@ -366,7 +366,7 @@ AsciiHexToByte(
}
BOOLEAN
-AsciiStrToGuid(
+DcsAsciiStrToGuid(
OUT EFI_GUID *guid,
IN CHAR8 *str
)
@@ -428,7 +428,7 @@ AsciiHexToBytes(
}
BOOLEAN
-StrHexToBytes(
+DcsStrHexToBytes(
OUT UINT8 *b,
IN UINTN *bytesLen,
IN CHAR16 *str
diff --git a/Library/DcsCfgLib/GptEdit.c b/Library/DcsCfgLib/GptEdit.c
index bae8f1e..5f5d0b0 100644
--- a/Library/DcsCfgLib/GptEdit.c
+++ b/Library/DcsCfgLib/GptEdit.c
@@ -636,7 +636,7 @@ GptAskGUID(
ok = TRUE;
}
else {
- ok = AsciiStrToGuid(&result, buf);
+ ok = DcsAsciiStrToGuid(&result, buf);
if (ok) {
CopyMem(guid, &result, sizeof(result));
}
diff --git a/Library/VeraCryptLib/DcsVeraCrypt.c b/Library/VeraCryptLib/DcsVeraCrypt.c
index 5d9be88..1249718 100644
--- a/Library/VeraCryptLib/DcsVeraCrypt.c
+++ b/Library/VeraCryptLib/DcsVeraCrypt.c
@@ -186,7 +186,7 @@ VCAuthLoadConfig()
ConfigReadString("PartitionGuidOS", "", strTemp, MAX_MSG);
if (strTemp[0] != 0) {
EFI_GUID g;
- if (AsciiStrToGuid(&g, strTemp)) {
+ if (DcsAsciiStrToGuid(&g, strTemp)) {
VCCONFIG_ALLOC(gPartitionGuidOS, sizeof(EFI_GUID));
if (gPartitionGuidOS != NULL) {
memcpy(gPartitionGuidOS, &g, sizeof(g));