summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-04-18 03:01:02 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-04-18 03:01:02 +0200
commit0f9692e4dee6ba6471aca405e251a189c9388d1a (patch)
tree9fd92ae8c6afb051f9aeba000279f125f7b444b6
parent9ae4d93b0b3155716495dce6336859f9d2c4db6c (diff)
parentec3d409ea96bba641dbdf47bea858072255ef76f (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
-rw-r--r--examples/opcua/opcuaviewer/pki/own/certs/opcuaviewer.derbin1121 -> 1121 bytes
-rw-r--r--examples/opcua/opcuaviewer/pki/own/private/opcuaviewer.pem52
-rw-r--r--src/opcua/doc/src/security.qdoc2
-rw-r--r--tests/open62541-testserver/pki/trusted/certs/opcuaviewer.derbin1121 -> 1121 bytes
4 files changed, 26 insertions, 28 deletions
diff --git a/examples/opcua/opcuaviewer/pki/own/certs/opcuaviewer.der b/examples/opcua/opcuaviewer/pki/own/certs/opcuaviewer.der
index 1eeb26a..ef7ef42 100644
--- a/examples/opcua/opcuaviewer/pki/own/certs/opcuaviewer.der
+++ b/examples/opcua/opcuaviewer/pki/own/certs/opcuaviewer.der
Binary files differ
diff --git a/examples/opcua/opcuaviewer/pki/own/private/opcuaviewer.pem b/examples/opcua/opcuaviewer/pki/own/private/opcuaviewer.pem
index ce495ce..52aeb30 100644
--- a/examples/opcua/opcuaviewer/pki/own/private/opcuaviewer.pem
+++ b/examples/opcua/opcuaviewer/pki/own/private/opcuaviewer.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCb0fM15Zx3Q0Mp
-vOaoCBi908Gwv6+ZzaCf69y1B4H3lXe2jAu9D2AYO68uRqe/dzQ5TMqdKdupVeRP
-XrsLDEm7tpb+wLmzT3DyFeNjKfNZ5KlnFKadhYeK2eyh1pYQDPFgfKNBvz0VhY9f
-DNouVe+qcp38FfdM6BOQ7/n9GsuBWYdfmnOwzPZSwpNkY8tOIYUmmSATB0h5sTxq
-8L83oR7MrMx9sBs1GjdI3ghUufs9UZ0zxP6mrmqTD7ocQxDbjDBZbxgy9bn19zeV
-5l+wB+9DeIxthOGdXMIgR9g29DSFqtJGgLLOlmpgA3SVKCMUNj4neQrBiA4+kqVE
-2ncxESZPAgMBAAECggEARNmqG6CPWGtSG/kp+glJ1Wbh6NVqJA2l8cPoS907Ykib
-EwAil7FZhpuotkvmB0YGv2LdDEDYnKQlM6TqBOGzGsx9P6es5jwt7eoaBVEeBBRz
-fea0EFpWH9ZXJtOIjyMI7Ndl08FKnl3bkeY96cdzFN98S0zxbvwE2UAQN/RFA6v5
-CTIegCjDr3nLHCKVUzVWz/ns6IVTJBV11lwcU/ZedTMrPJNisobW9wVfu51Arv5g
-w+X+lb5CZWulimSrmyX23IEAiGSh7pNo5VL+H6SCYlfRIoXnS7J+RfCrsmJJs1xA
-xM6op52Wb4pQ02fu8Z68q05LsSCv1iDCOARG5GU94QKBgQDL0c48QwiNv3dgEJ45
-x9iLwWsGGrVLnrp85xxX4bgjB5oSkJg06/Ot1CRrFZPnlL786TgxbWhu3M26biNy
-b7ifsWS0kdr4neFDRmQ/v9R/eivI8iXxEnG92TxX7yNu5Ml/BuT7/Z19xhJX1i83
-kwJlZzl8gi9msItlbQFanDna2QKBgQDDtktPAzGozrk0gzG+hiNCy1C/ec/uTyyf
-RE2ZbLHHxkLU8dOIzujjeFQ1U/fNtg3GX4fGqp4My15HjVvyFpdYIHcwAbzC6DCf
-IsJdKUTVlbAZTSlr56xbNce3WMoI7LIdykQXyv5+Q2fM1NGu5iCSc6oOS/ePkoyh
-T3jL4WFBZwKBgQCtRfEhdA96ihKPXbFWB9rFfSpiJySHZCrAcq263I7xYM4QCFMN
-cqZX2ikXzGFQGDmBwzddddi5nwda/bUu3WHEiUfG5tSUVYwi6F3jgE7EDPXaQFoX
-JwoBTwQo8YlbBi9yyUa0H7jbKx9/AvxjL5xy3p2VhwuLLn1jPZdQE85viQKBgFu/
-YrCIu8f6GUKv2isJ8Q/IBnOs5DhAr5d+Sq6JERKpM/1l3Je+/9hbOYbCdWHfXbfI
-YvtUUsGGuQzsDNWBl7N9jMJZnib0+I4xmlJYHWfPQ32o+akXM2qS3KxsGFJ0u89R
-WfiZdhK1AL06a44FXfGp/We0XzrUJc8dVXCmmJQzAoGAXTq2o/0Q+at+JX0ylJCD
-v6FDxHWT1SgXK4u4M0cZl0gqnJs9uYz6fXm45vfs4rOBJA0K0Pd9M2y22m6BM3HS
-8I34Em8dFTlObkScZvtbeHUltUcXeE957l2+a32i64alTJCZ4fEoiJnzPjRzg2et
-F2ItxrH+I27dpzAG19VUgeA=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDj0NCbOXIToCPB
+JQetcDC+VaU8YtwhFb0WeeEPd18x6pNdnnYtEdQe8dcHD+7H2MT7tAMFOfvI2oMa
+90whLfErqXs9onUVrAPTO4g3zdonim5HqB/q7TuRapmlgUxltXo4anPm/I4UA6M8
+R9lH/PvErm1IUs5G83eeq8V5a53Y+lG8nOiuOI2wtep9Vzh8fK9esSr17L6dRj+4
+pm9tIjyBrAe3B+/XwHu4ZdYqY7q8ZZscZcjxStRakOnyU1DI95VplyRnlp6MSEr4
+w18GRdfhcC7Y7zF34h/FB0s0VneIycqcyjrninNtwN7XjkpPJz0wkQCvUsTm6mQP
+wyC5naehAgMBAAECggEAcnuvOTInF6G0Fg2rzAbDGAMmJDBx+tZXzYG2DfWpCwac
+w8EsFf4NoPdbXZsuHZPbebm+gtPeqdLVa6m2wj26InzrB9AqEpf83BvgmlqCNLim
+LrBYSdCpzKvLRpaxc7M9Fji4we1M4NXrJBHfKQQC6ZXWKTAjpRgYls4vUJM6IZzG
+oIkclpxKDZGdgeaFo89BchjYQzC9/UovHBXja1LrWLLiUT1cmGH4Hb5+8scgHI8I
+/AXRE1Os7E7BdhEViXcjrDuxTwukzNpZH73aimhpyO/hlY0733b3Wt8BCa8twTpk
+DMK4QTX+5/nFepf+PPLiLNiAJEgQtYNPBItISqKhmQKBgQD8Hk+L1ODo52W6s/2M
++IMKOqIDyioV8ybnRG6Eh+9042WAOLazSg3k/8ZpM/Oryd0UnRVPxCz8+1C71zWo
+aCNt9SRefTnkP9LCURgz8IiamsUr/9xg7y/li6pxiuGr/Ar8RJTgERe8hvt1g8tU
+tZnRzc3FyE7cKaYKBmmQJnx91wKBgQDnUrfobOKLUp7HtUuep/0mFiCjxhh+/Byr
+IHaKq5DYSWwcuIpeyc+AOl3wgUvUJ2mncneIUy74qB5Sek0fnRikW7gc6BHLyMn/
+KcxzW3zgXHdouhVeX1oqybTvm55O1avwQey3AwxfZFE9FGorFk1kLKgMLgthEg5b
+AGSUng0nRwKBgQC3XoxYlaJngzWYT6UQTQdx/ycrPnTRtiILftgrCHt/Nozyb01i
+pW/pqKZ0idamkZF8lquTcomODnOvy105eVSbevrSxp2+hzURI85IqJ+SYxMZZ2Sw
+FAdwGt8C6hIs9oo+5NqrBYOQGVT3Kb5PhC22TMtnGMNSmfArxnIs5/EPzQKBgDHn
+46tuSlXahkz5rQ3WmkPsRDBxHXnP9HNq9ogmSYKQHJX5rkiS64Rzky6/BlgIBMBO
+bsFniNu2kYwjvJ3Ua6uR6h+6ZZR8hi/ZmbVNiJxy9oQOmWuZ0L8oczO6dCX37TdR
+UbuOGc4+u1QdImaXUi0JgVvXVzcjCRvS8uApVRcjAoGBALOR+BuLKTko3+ySr8q2
+A0z9r8kpIJ2I+T5h+0RiyMDK8mp68r9BiJ5S8K2iDMBQrNO56haXFL7CMSJPh4dA
+MkXZrffD09vlsUwcblkiGODkt8YkC/k6v4xvHJwcjQuDe5Ud4AdXGq0Y45I+fT12
+muDN+fxZySCWcmb1wSEUAtXx
-----END PRIVATE KEY-----
diff --git a/src/opcua/doc/src/security.qdoc b/src/opcua/doc/src/security.qdoc
index a5ad8b4..4f14923 100644
--- a/src/opcua/doc/src/security.qdoc
+++ b/src/opcua/doc/src/security.qdoc
@@ -34,8 +34,6 @@
which means we get cryptographically encrypted and signed protocol,
user authentication and authorization support.
- Creating secure connections with Qt OPC UA is currently only supported using the \l {Setting up UACPP SDK} {UACPP backend plugin}.
-
To make this work, each application instances (installation of a program)
needs to have its own \c {Application Instance Certificate} and the according private key.
diff --git a/tests/open62541-testserver/pki/trusted/certs/opcuaviewer.der b/tests/open62541-testserver/pki/trusted/certs/opcuaviewer.der
index 1eeb26a..ef7ef42 100644
--- a/tests/open62541-testserver/pki/trusted/certs/opcuaviewer.der
+++ b/tests/open62541-testserver/pki/trusted/certs/opcuaviewer.der
Binary files differ