server_ctt starts without defined certificate

Before the server would just exist.  This fixes #1853.
This commit is contained in:
Julius Pfrommer 2018-07-09 19:17:01 +02:00 committed by Julius Pfrommer
parent f16aa923d0
commit adaa64f3fc

View File

@ -420,15 +420,15 @@ int main(int argc, char **argv) {
signal(SIGINT, stopHandler); /* catches ctrl-c */
signal(SIGTERM, stopHandler);
UA_ServerConfig *config;
#ifdef UA_ENABLE_ENCRYPTION
if(argc < 3) {
UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
"Missing arguments for encryption support. "
"Arguments are <server-certificate.der> "
"<private-key.der> [<trustlist1.crl>, ...]");
return 1;
}
config = UA_ServerConfig_new_minimal(4840, NULL);
} else {
/* Load certificate and private key */
UA_ByteString certificate = loadFile(argv[1]);
UA_ByteString privateKey = loadFile(argv[2]);
@ -445,30 +445,31 @@ int main(int argc, char **argv) {
UA_ByteString *revocationList = NULL;
size_t revocationListSize = 0;
UA_ServerConfig *config =
UA_ServerConfig_new_allSecurityPolicies(4840, &certificate, &privateKey,
config = UA_ServerConfig_new_allSecurityPolicies(4840, &certificate, &privateKey,
trustList, trustListSize,
revocationList, revocationListSize);
UA_ByteString_deleteMembers(&certificate);
UA_ByteString_deleteMembers(&privateKey);
for(size_t i = 0; i < trustListSize; i++)
UA_ByteString_deleteMembers(&trustList[i]);
}
#else
UA_ByteString certificate = UA_BYTESTRING_NULL;
if(argc < 2) {
UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
"Missing argument for the server certificate");
} else {
certificate = loadFile(argv[1]);
}
config = UA_ServerConfig_new_minimal(4840, &certificate);
UA_ByteString_deleteMembers(&certificate);
#endif
if(!config) {
UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
"Could not create the server config");
return 1;
}
#else
if(argc < 2) {
UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
"Missing argument for the server certificate");
return 1;
}
UA_ByteString certificate = loadFile(argv[1]);
UA_ServerConfig *config = UA_ServerConfig_new_minimal(4840, &certificate);
UA_ByteString_deleteMembers(&certificate);
#endif
/* Override with a custom access control policy */
config->accessControl.getUserAccessLevel = getUserAccessLevel_disallowSpecific;