Skip to content

Commit

Permalink
Merge branch 'master' into simple_encoding
Browse files Browse the repository at this point in the history
  • Loading branch information
Pro committed Mar 26, 2018
2 parents b8a3592 + 9093197 commit ee776f7
Show file tree
Hide file tree
Showing 73 changed files with 576 additions and 86 deletions.
2 changes: 1 addition & 1 deletion AUTHORS
Expand Up @@ -7,7 +7,7 @@ Gruener, Sten <s.gruener (at) plt.rwth-aachen.de>
Iatrou, Chris Paul <chris_paul.iatrou (at) tu-dresden.de>
Jeromin, Holger
Palm, Florian <f.palm (at) plt.rwth-aachen.de>
Pfrommer, Julius <julius.pfrommer (at) kit.edu>
Pfrommer, Julius <julius.pfrommer (at) iosb.fraunhofer.edu>
Profanter, Stefan <profanter (at) fortiss.org>
Stalder, Thomas <t.stalder (at) bluetimeconcept.ch>
Urbas, Leon <leon.urbas (at) tu-dresden.de>
2 changes: 2 additions & 0 deletions examples/CMakeLists.txt
Expand Up @@ -76,6 +76,8 @@ add_example(server_inheritance server_inheritance.c)

if(UA_ENABLE_ENCRYPTION)
add_example(server_basic128rsa15 encryption/server_basic128rsa15.c)
# Add secure client example application
add_example(client_basic128rsa15 encryption/client_basic128rsa15.c)
endif()

add_example(custom_datatype_client custom_datatype/client_types_custom.c)
Expand Down
190 changes: 190 additions & 0 deletions examples/encryption/client_basic128rsa15.c
@@ -0,0 +1,190 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* Copyright 2018 (c) Kalycito Infotech Private Limited
*/

#include <stdio.h>
#include <errno.h>

#include "open62541.h"

#define MIN_ARGS 3
#define FAILURE 1
#define CONNECTION_STRING "opc.tcp://localhost:4840"

/* loadFile parses the certificate file.
*
* @param path specifies the file name given in argv[]
* @return Returns the file content after parsing */
static UA_ByteString loadFile(const char *const path) {
UA_ByteString fileContents = UA_BYTESTRING_NULL;
if(path == NULL)
return fileContents;

/* Open the file */
FILE *fp = fopen(path, "rb");
if(!fp) {
errno = 0; /* We read errno also from the tcp layer */
return fileContents;
}

/* Get the file length, allocate the data and read */
fseek(fp, 0, SEEK_END);
fileContents.length = (size_t)ftell(fp);
fileContents.data = (UA_Byte*)UA_malloc(fileContents.length * sizeof(UA_Byte));
if(fileContents.data) {
fseek(fp, 0, SEEK_SET);
size_t read = fread(fileContents.data, sizeof(UA_Byte), fileContents.length, fp);
if(read != fileContents.length)
UA_ByteString_deleteMembers(&fileContents);
} else {
fileContents.length = 0;
}

fclose(fp);
return fileContents;
}

/* cleanupClient deletes the memory allocated for client configuration.
*
* @param client client configuration that need to be deleted
* @param remoteCertificate server certificate */
static void cleanupClient(UA_Client* client, UA_ByteString* remoteCertificate) {
UA_ByteString_delete(remoteCertificate); /* Dereference the memory */
UA_Client_delete(client); /* Disconnects the client internally */
}

/* main function for secure client implementation.
*
* @param argc count of command line variable provided
* @param argv[] array of strings include certificate, private key,
* trust list and revocation list
* @return Return an integer representing success or failure of application */
int main(int argc, char* argv[]) {
UA_Client* client = NULL;
UA_ByteString* remoteCertificate = NULL;
UA_StatusCode retval = UA_STATUSCODE_GOOD;
UA_ByteString* trustList = NULL;
size_t trustListSize = 0;
UA_ByteString* revocationList = NULL;
size_t revocationListSize = 0;

/* endpointArray is used to hold the available endpoints in the server
* endpointArraySize is used to hold the number of endpoints available */
UA_EndpointDescription* endpointArray = NULL;
size_t endpointArraySize = 0;

/* Load certificate and private key */
UA_ByteString certificate = loadFile(argv[1]);
UA_ByteString privateKey = loadFile(argv[2]);

if(argc < MIN_ARGS) {
UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
"The Certificate and key is missing."
"The required arguments are "
"<client-certificate.der> <client-private-key.der> "
"[<trustlist1.crl>, ...]");
return FAILURE;
}

/* The Get endpoint (discovery service) is done with
* security mode as none to see the server's capability
* and certificate */
client = UA_Client_new(UA_ClientConfig_default);
remoteCertificate = UA_ByteString_new();
retval = UA_Client_getEndpoints(client, CONNECTION_STRING,
&endpointArraySize, &endpointArray);
if(retval != UA_STATUSCODE_GOOD) {
UA_Array_delete(endpointArray, endpointArraySize,
&UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
cleanupClient(client, remoteCertificate);
return (int)retval;
}

printf("%i endpoints found\n", (int)endpointArraySize);
for(size_t endPointCount = 0; endPointCount < endpointArraySize; endPointCount++) {
printf("URL of endpoint %i is %.*s\n", (int)endPointCount,
(int)endpointArray[endPointCount].endpointUrl.length,
endpointArray[endPointCount].endpointUrl.data);
if(endpointArray[endPointCount].securityMode == UA_MESSAGESECURITYMODE_SIGNANDENCRYPT)
UA_ByteString_copy(&endpointArray[endPointCount].serverCertificate, remoteCertificate);
}

if(UA_ByteString_equal(remoteCertificate, &UA_BYTESTRING_NULL)) {
UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
"Server does not support Security Mode of"
" UA_MESSAGESECURITYMODE_SIGNANDENCRYPT");
cleanupClient(client, remoteCertificate);
return FAILURE;
}

UA_Array_delete(endpointArray, endpointArraySize,
&UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);

/* Load the trustList. Load revocationList is not supported now */
if(argc > MIN_ARGS) {
trustListSize = (size_t)argc-MIN_ARGS;
retval = UA_ByteString_allocBuffer(trustList, trustListSize);
if(retval != UA_STATUSCODE_GOOD) {
cleanupClient(client, remoteCertificate);
return (int)retval;
}

for(size_t trustListCount = 0; trustListCount < trustListSize; trustListCount++) {
trustList[trustListCount] = loadFile(argv[trustListCount+3]);
}
}

/* Secure client initialization */
client = UA_Client_secure_new(UA_ClientConfig_default,
certificate, privateKey,
remoteCertificate,
trustList, trustListSize,
revocationList, revocationListSize);
if(client == NULL) {
UA_ByteString_delete(remoteCertificate); /* Dereference the memory */
return FAILURE;
}

UA_ByteString_deleteMembers(&certificate);
UA_ByteString_deleteMembers(&privateKey);
for(size_t deleteCount = 0; deleteCount < trustListSize; deleteCount++) {
UA_ByteString_deleteMembers(&trustList[deleteCount]);
}

if(!client) {
UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
"Could not create the server config");
cleanupClient(client, remoteCertificate);
return FAILURE;
}

/* Secure client connect */
retval = UA_Client_connect(client, CONNECTION_STRING);
if(retval != UA_STATUSCODE_GOOD) {
cleanupClient(client, remoteCertificate);
return (int)retval;
}

UA_Variant value;
UA_Variant_init(&value);

/* NodeId of the variable holding the current time */
const UA_NodeId nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
retval = UA_Client_readValueAttribute(client, nodeId, &value);

if(retval == UA_STATUSCODE_GOOD &&
UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_DATETIME])) {
UA_DateTime raw_date = *(UA_DateTime *) value.data;
UA_DateTimeStruct dts = UA_DateTime_toStruct(raw_date);
UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "date is: %u-%u-%u %u:%u:%u.%03u\n",
dts.day, dts.month, dts.year, dts.hour, dts.min, dts.sec, dts.milliSec);
}

/* Clean up */
UA_Variant_deleteMembers(&value);
cleanupClient(client, remoteCertificate);
return (int)retval;
}
23 changes: 21 additions & 2 deletions include/ua_client.h
@@ -1,8 +1,8 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* Copyright 2015-2017 (c) Julius Pfrommer, Fraunhofer IOSB
* Copyright 2015-2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
* Copyright 2015-2016 (c) Sten Grüner
* Copyright 2015-2016 (c) Chris Iatrou
* Copyright 2015-2017 (c) Florian Palm
Expand All @@ -11,6 +11,7 @@
* Copyright 2017 (c) Stefan Profanter, fortiss GmbH
* Copyright 2017 (c) Mark Giraud, Fraunhofer IOSB
* Copyright 2018 (c) Thomas Stalder
* Copyright 2018 (c) Kalycito Infotech Private Limited
*/

#ifndef UA_CLIENT_H_
Expand Down Expand Up @@ -54,6 +55,24 @@ extern "C" {
UA_Client UA_EXPORT *
UA_Client_new(UA_ClientConfig config);

/* Creates a new secure client with the required configuration, certificate
* privatekey, trustlist and revocation list.
*
* @param config new secure configuration for client
* @param certificate client certificate
* @param privateKey client's private key
* @param remoteCertificate server certificate form the endpoints
* @param trustList list of trustable certificate
* @param trustListSize count of trustList
* @param revocationList list of revoked digital certificate
* @param revocationListSize count of revocationList
* @return Returns a client configuration for secure channel */
UA_Client UA_EXPORT *
UA_Client_secure_new(UA_ClientConfig config, UA_ByteString certificate,
UA_ByteString privateKey, const UA_ByteString *remoteCertificate,
const UA_ByteString *trustList, size_t trustListSize,
const UA_ByteString *revocationList, size_t revocationListSize);

/* Get the client connection status */
UA_ClientState UA_EXPORT
UA_Client_getState(UA_Client *client);
Expand Down
2 changes: 1 addition & 1 deletion include/ua_client_highlevel.h
Expand Up @@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* Copyright 2015-2018 (c) Julius Pfrommer, Fraunhofer IOSB
* Copyright 2015-2018 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
* Copyright 2015 (c) Oleksiy Vasylyev
* Copyright 2017 (c) Florian Palm
* Copyright 2016 (c) Chris Iatrou
Expand Down
2 changes: 1 addition & 1 deletion include/ua_constants.h
Expand Up @@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* Copyright 2016-2017 (c) Julius Pfrommer, Fraunhofer IOSB
* Copyright 2016-2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
* Copyright 2016 (c) Sten Grüner
* Copyright 2016-2017 (c) Stefan Profanter, fortiss GmbH
* Copyright 2017 (c) Florian Palm
Expand Down
2 changes: 1 addition & 1 deletion include/ua_plugin_access_control.h
Expand Up @@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* Copyright 2017 (c) Julius Pfrommer, Fraunhofer IOSB
* Copyright 2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
* Copyright 2017 (c) Stefan Profanter, fortiss GmbH
*/

Expand Down
2 changes: 1 addition & 1 deletion include/ua_plugin_log.h
Expand Up @@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* Copyright 2017 (c) Julius Pfrommer, Fraunhofer IOSB
* Copyright 2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
* Copyright 2017 (c) Stefan Profanter, fortiss GmbH
*/

Expand Down
2 changes: 1 addition & 1 deletion include/ua_plugin_network.h
Expand Up @@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* Copyright 2017 (c) Julius Pfrommer, Fraunhofer IOSB
* Copyright 2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
* Copyright 2017 (c) Stefan Profanter, fortiss GmbH
*/

Expand Down
2 changes: 1 addition & 1 deletion include/ua_plugin_nodestore.h
Expand Up @@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* Copyright 2017 (c) Julius Pfrommer, Fraunhofer IOSB
* Copyright 2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
* Copyright 2017 (c) Julian Grothoff
* Copyright 2017 (c) Stefan Profanter, fortiss GmbH
*/
Expand Down
2 changes: 1 addition & 1 deletion include/ua_plugin_securitypolicy.h
Expand Up @@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* Copyright 2017-2018 (c) Mark Giraud, Fraunhofer IOSB
* Copyright 2017 (c) Julius Pfrommer, Fraunhofer IOSB
* Copyright 2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
* Copyright 2017 (c) Stefan Profanter, fortiss GmbH
*/

Expand Down
2 changes: 1 addition & 1 deletion include/ua_server.h
Expand Up @@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* Copyright 2014-2017 (c) Julius Pfrommer, Fraunhofer IOSB
* Copyright 2014-2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
* Copyright 2015-2016 (c) Sten Grüner
* Copyright 2014-2015, 2017 (c) Florian Palm
* Copyright 2015-2016 (c) Chris Iatrou
Expand Down
2 changes: 1 addition & 1 deletion include/ua_server_config.h
Expand Up @@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* Copyright 2017 (c) Julius Pfrommer, Fraunhofer IOSB
* Copyright 2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
* Copyright 2017 (c) Stefan Profanter, fortiss GmbH
* Copyright 2017 (c) Henrik Norrman
*/
Expand Down
2 changes: 1 addition & 1 deletion include/ua_types.h
Expand Up @@ -4,7 +4,7 @@
*
* Copyright 2014 (c) Leon Urbas
* Copyright 2014, 2016-2017 (c) Florian Palm
* Copyright 2014-2017 (c) Julius Pfrommer, Fraunhofer IOSB
* Copyright 2014-2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
* Copyright 2015-2016 (c) Sten Grüner
* Copyright 2015-2016 (c) Chris Iatrou
* Copyright 2015 (c) Nick Goossens
Expand Down
2 changes: 1 addition & 1 deletion plugins/ua_accesscontrol_default.c
@@ -1,7 +1,7 @@
/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
* See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
*
* Copyright 2016-2017 (c) Julius Pfrommer, Fraunhofer IOSB
* Copyright 2016-2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
* Copyright 2017 (c) Stefan Profanter, fortiss GmbH
*/

Expand Down
2 changes: 1 addition & 1 deletion plugins/ua_accesscontrol_default.h
@@ -1,7 +1,7 @@
/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
* See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
*
* Copyright 2016-2017 (c) Julius Pfrommer, Fraunhofer IOSB
* Copyright 2016-2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
* Copyright 2017 (c) Stefan Profanter, fortiss GmbH
*/

Expand Down
2 changes: 1 addition & 1 deletion plugins/ua_clock.c
@@ -1,7 +1,7 @@
/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
* See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
*
* Copyright 2016-2017 (c) Julius Pfrommer, Fraunhofer IOSB
* Copyright 2016-2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
* Copyright 2017 (c) Stefan Profanter, fortiss GmbH
* Copyright 2017 (c) Thomas Stalder, Blue Time Concept SA
*/
Expand Down
2 changes: 1 addition & 1 deletion plugins/ua_config_default.c
@@ -1,7 +1,7 @@
/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
* See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
*
* Copyright 2017 (c) Julius Pfrommer, Fraunhofer IOSB
* Copyright 2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
* Copyright 2017 (c) Julian Grothoff
* Copyright 2017-2018 (c) Mark Giraud, Fraunhofer IOSB
* Copyright 2017 (c) Stefan Profanter, fortiss GmbH
Expand Down
2 changes: 1 addition & 1 deletion plugins/ua_config_default.h
@@ -1,7 +1,7 @@
/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
* See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
*
* Copyright 2017 (c) Julius Pfrommer, Fraunhofer IOSB
* Copyright 2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
* Copyright 2017 (c) Stefan Profanter, fortiss GmbH
* Copyright 2018 (c) Mark Giraud, Fraunhofer IOSB
*/
Expand Down
2 changes: 1 addition & 1 deletion plugins/ua_log_stdout.c
@@ -1,7 +1,7 @@
/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
* See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
*
* Copyright 2016-2017 (c) Julius Pfrommer, Fraunhofer IOSB
* Copyright 2016-2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
* Copyright 2017 (c) Thomas Stalder, Blue Time Concept SA
*/

Expand Down

0 comments on commit ee776f7

Please sign in to comment.