From a7d354a72d22cde4de1494bf3475d8ea49e9cd2d Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 15 3月 2020 11:00:39 +0800
Subject: [PATCH] fix compilation errors
---
src/library/os/windows/signature_verifier.cpp | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/library/os/windows/signature_verifier.cpp b/src/library/os/windows/signature_verifier.cpp
index 3c8779c..0c9c60f 100644
--- a/src/library/os/windows/signature_verifier.cpp
+++ b/src/library/os/windows/signature_verifier.cpp
@@ -15,16 +15,17 @@
#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)
@@ -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) {
@@ -159,7 +159,8 @@
} else {
LOG_DEBUG("Error reading public key");
}
- } else {
+ }
+ else {
result = FUNC_RET_NOT_AVAIL;
#ifdef _DEBUG
formatError(status, "error opening RSA provider");
@@ -172,9 +173,9 @@
if (hSignAlg != nullptr) {
BCryptCloseAlgorithmProvider(hSignAlg, 0);
}
- if (sigBlob) {
- free(sigBlob);
- }
+ //if (sigBlob) {
+ // free(sigBlob);
+ //}
return result;
}
@@ -241,5 +242,5 @@
}
return result;
}
-
+} // namespace os
} /* namespace license */
--
Gitblit v1.9.1