From bd25f8043a261f59083d869f33ac0ecbd67cf02f Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周二, 12 11月 2019 10:24:46 +0800
Subject: [PATCH] fix submodules
---
src/templates/public_key.inja | 4 +++-
.gitmodules | 2 +-
extern/license-generator | 2 +-
src/library/os/os.c | 2 +-
CMakeLists.txt | 2 +-
5 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index f4a9967..ab17207 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
[submodule "extern/license-generator"]
path = extern/license-generator
url = https://github.com/open-license-manager/olm-license-generator.git
- branch = feature/issue_licenses_42
\ No newline at end of file
+ branch = develop
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ab019a..d99de77 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@
add_custom_command(
OUTPUT "${LCC_PROJECT_PUBLIC_KEY}" "${LCC_PROJECT_PRIVATE_KEY}"
- COMMAND license_generator::olm project initialize -s "${PROJECT_SOURCE_DIR}/src" -n "${LCC_PROJECT_NAME}" -p "${LCC_PROJECTS_BASE_DIR}"
+ COMMAND license_generator::olm project initialize -t "${PROJECT_SOURCE_DIR}/src/templates" -n "${LCC_PROJECT_NAME}" -p "${LCC_PROJECTS_BASE_DIR}"
COMMENT "generating ${LCC_PROJECT_PUBLIC_KEY}"
USES_TERMINAL
)
diff --git a/extern/license-generator b/extern/license-generator
index 5c4ebec..1c30436 160000
--- a/extern/license-generator
+++ b/extern/license-generator
@@ -1 +1 @@
-Subproject commit 5c4ebec01b66bc3ad508e711a373ed46cb0a95c3
+Subproject commit 1c3043608128d5b2582191d90c5495b0c3652181
diff --git a/src/library/os/os.c b/src/library/os/os.c
index d38c68a..802a46d 100644
--- a/src/library/os/os.c
+++ b/src/library/os/os.c
@@ -19,7 +19,7 @@
FUNCTION_RETURN verifySignature(const char* stringToVerify,
const char* signatureB64) {
EVP_MD_CTX *mdctx = NULL;
- const char *pubKey = PUBLIC_KEY;
+ const char pubKey[] = PUBLIC_KEY;
int func_ret = 0;
BIO* bio = BIO_new_mem_buf((void*) (pubKey), strlen(pubKey));
diff --git a/src/templates/public_key.inja b/src/templates/public_key.inja
index 19f4d42..2045daf 100644
--- a/src/templates/public_key.inja
+++ b/src/templates/public_key.inja
@@ -1,2 +1,4 @@
#define PRODUCT_NAME {{ product_name }}
-#define PUBLIC_KEY {1,2,3}
\ No newline at end of file
+#define PUBLIC_KEY { \
+{%for i in public_key%}{% if loop.index1 > 1 %},{% endif %}{{ i }}{%endfor%}\
+}
--
Gitblit v1.9.1