From cbb11cd88d985db033c744b59291a2cf03fd16be Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周二, 13 10月 2020 21:53:31 +0800
Subject: [PATCH] #ifdef _DEBUG -> #ifndef NDEBUG for better cmake compatibility
---
src/library/os/windows/signature_verifier.cpp | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/library/os/windows/signature_verifier.cpp b/src/library/os/windows/signature_verifier.cpp
index 3c8779c..083845e 100644
--- a/src/library/os/windows/signature_verifier.cpp
+++ b/src/library/os/windows/signature_verifier.cpp
@@ -15,20 +15,21 @@
#include <wincrypt.h>
#include <iphlpapi.h>
#include <windows.h>
-#pragma comment(lib, "bcrypt.lib")
+//#pragma comment(lib, "bcrypt.lib")
#include <public_key.h>
#include "../../base/logger.h"
#include "../../base/base64.h"
-#include "../signature_verifier.h"
+#include "../signature_verifier.hpp"
#define RSA_KEY_BITLEN 1024
namespace license {
+namespace os {
using namespace std;
#define NT_SUCCESS(Status) (((NTSTATUS)(Status)) >= 0)
-static const void formatError(DWORD status, const char* description) {
+static const void formatError(DWORD status, const char *description) {
char msgBuffer[256];
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, status, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), &msgBuffer[0],
sizeof(msgBuffer) - 1, nullptr);
@@ -66,7 +67,7 @@
cout << (len & 0x80) << endl;
if ((len & 0x80) > 0) {
size_t blen = len & 0x7F;
- for (int i = 0; i < blen; i++) {
+ for (size_t i = 0; i < blen; i++) {
result += (*(ptr++) << (i * 8));
}
} else {
@@ -98,7 +99,7 @@
if (expected_length < length) {
return FUNC_RET_ERROR;
}
- for (int i = 0; i < length; i++) {
+ for (size_t i = 0; i < length; i++) {
location[i] = *(ptr++);
}
return FUNC_RET_OK;
@@ -123,7 +124,7 @@
sizeof(pubk), 0))) {
result = FUNC_RET_OK;
} else {
-#ifdef _DEBUG
+#ifndef NDEBUG
formatError(status, "error importing public key");
#endif
}
@@ -135,12 +136,11 @@
DWORD status;
FUNCTION_RETURN result = FUNC_RET_ERROR;
PBYTE pbSignature = nullptr;
- DWORD dwSigLen;
- BYTE* sigBlob = nullptr;
BCRYPT_ALG_HANDLE hSignAlg = nullptr;
- // FIXME!!
- sigBlob = unbase64(signatureBuffer.c_str(), (int)signatureBuffer.size(), (int*)&dwSigLen);
+ vector<uint8_t> signatureBlob = unbase64(signatureBuffer);
+ DWORD dwSigLen = (DWORD) signatureBlob.size();
+ BYTE* sigBlob = &signatureBlob[0];
if (NT_SUCCESS(status = BCryptOpenAlgorithmProvider(&hSignAlg, BCRYPT_RSA_ALGORITHM, NULL, 0))) {
if ((result = readPublicKey(hSignAlg, &phKey)) == FUNC_RET_OK) {
@@ -152,16 +152,17 @@
result = FUNC_RET_OK;
} else {
result = FUNC_RET_ERROR;
-#ifdef _DEBUG
+#ifndef NDEBUG
formatError(status, "error verifying signature");
#endif
}
} else {
LOG_DEBUG("Error reading public key");
}
- } else {
+ }
+ else {
result = FUNC_RET_NOT_AVAIL;
-#ifdef _DEBUG
+#ifndef NDEBUG
formatError(status, "error opening RSA provider");
#endif
}
@@ -172,9 +173,9 @@
if (hSignAlg != nullptr) {
BCryptCloseAlgorithmProvider(hSignAlg, 0);
}
- if (sigBlob) {
- free(sigBlob);
- }
+ //if (sigBlob) {
+ // free(sigBlob);
+ //}
return result;
}
@@ -206,13 +207,13 @@
result = verifyHash(pbHashData, cbHashDataLenght, signatureB64);
} else {
result = FUNC_RET_NOT_AVAIL;
-#ifdef _DEBUG
+#ifndef NDEBUG
formatError(status, "error hashing data");
#endif
}
} else {
result = FUNC_RET_NOT_AVAIL;
-#ifdef _DEBUG
+#ifndef NDEBUG
formatError(status, "error creating hash");
#endif
}
@@ -222,7 +223,7 @@
}
} else {
result = FUNC_RET_NOT_AVAIL;
-#ifdef _DEBUG
+#ifndef NDEBUG
formatError(status, "**** Error returned by BCryptGetProperty");
#endif
}
@@ -241,5 +242,5 @@
}
return result;
}
-
+} // namespace os
} /* namespace license */
--
Gitblit v1.9.1