MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2026-02-07 04:03:17 +00:00
Code Issues Releases Wiki Activity

Fixed preprocessor, so compiled correctly if OpenSSL is not linked

Browse Source
This commit is contained in:
Bryan Roe
2019-01-11 16:13:44 -08:00
parent 08eb5509aa
commit 2759cc799e
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
meshconsole/main.c
View File

@@ -121,8 +121,9 @@ char* crashMemory = ILib_POSIX_InstallCrashHandler(argv[0]);
if (argc > 1 && strcasecmp(argv[1], "-info") == 0)
{
printf("Compiled on: %s, %s\n", __TIME__, __DATE__);
#ifndef MICROSTACK_NOTLS
printf("Using %s\n", SSLeay_version(SSLEAY_VERSION));
#endif
return(0);
}

4
meshcore/agentcore.c
View File

@@ -336,7 +336,7 @@ void MeshServer_Connect(MeshAgentHostContainer *agent);
void MeshServer_ProcessCommand(ILibWebClient_StateObject wcdo, MeshAgentHostContainer *agent, char *buffer, int bufferLen);
char ContainerContextGUID[sizeof(JS_ENGINE_CONTEXT) + 1];
void MeshServer_ConnectEx(MeshAgentHostContainer *agent);
int agent_VerifyMeshCertificates(MeshAgentHostContainer *agent);
void MeshAgent_sendConsoleText(duk_context *ctx, char *txt)
{
@@ -2418,7 +2418,9 @@ void MeshServer_OnResponse(ILibWebClient_StateObject WebStateObject, int Interru
break;
case ILibWebClient_ReceiveStatus_Connection_Established: // New connection established.
{
#ifndef MICROSTACK_NOTLS
int len;
#endif
int idleLen;
if ((idleLen = ILibSimpleDataStore_Get(agent->masterDb, "controlChannelIdleTimeout", NULL, 0)) != 0)
{

2
meshcore/wincrypto.cpp
View File

@@ -17,7 +17,7 @@ limitations under the License.
// When compiled in 32bit, this module uses Windows CAPI which is compatible with Windows XP.
// When compiled in 64bit, this module uses Windows CNG (Crypto Next Gen) that is compatible and will use TPM modules.
#if !defined(_NOCAPI) && defined(WIN32)
#if !defined(_NOCAPI) && defined(WIN32) && !defined(MICROSTACK_NOTLS)
#include <windows.h>
#include <stdio.h>