fix submodules

gcontini

2019-11-10 bd25f8043a261f59083d869f33ac0ecbd67cf02f

fix submodules

 .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
    branch = develop

 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
)

 extern/license-generator

@@ -1 +1 @@
Subproject commit 5c4ebec01b66bc3ad508e711a373ed46cb0a95c3
Subproject commit 1c3043608128d5b2582191d90c5495b0c3652181

 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));

 src/templates/public_key.inja

@@ -1,2 +1,4 @@
#define PRODUCT_NAME {{ product_name }}
#define PUBLIC_KEY {1,2,3}
#define PUBLIC_KEY { \
{%for i in public_key%}{% if loop.index1 > 1 %},{% endif %}{{ i }}{%endfor%}\ 
}