summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Fix compile issuesv5.14.0-beta2v5.14.0-beta1v5.14.0-alpha1Karsten Heimrich2019-09-182-2/+2
| | | | | | | | | * missing namespace * use right constructor Change-Id: I8e76cf4250af5519c9c4888db34ddfd6471ffec4 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Lucie Gerard <lucie.gerard@qt.io>
* Replace the deprecated setLinkLayerFrame() -> setCemi()Sona Kurazyan2019-09-031-1/+1
| | | | | | Task-number: QTBUG-76491 Change-Id: I8f5fa1fa5dfd162ae1be126b2356c1c3ee129b44 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Minor reformating, no functional changeKarsten Heimrich2019-08-202-2/+2
| | | | | Change-Id: I17c16c1e57fa4fbd71f0dc064515bc447b394d67 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Fix typoKarsten Heimrich2019-06-051-6/+6
| | | | | Change-Id: I06afbe1ba090becfad7620e5bd8deaac35c9f030 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Fix reverse default valuesKarsten Heimrich2019-04-151-0/+12
| | | | | Change-Id: I17e7e8ea519d4f4eaa45c03a8875f4f90ce090cd Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Fix auto-tests with deprecated method, update docsKarsten Heimrich2019-03-131-1/+1
| | | | | Change-Id: I765a1e546388d151f1716c7bc5451015691621bf Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Code cleanupKarsten Heimrich2019-02-112-15/+19
| | | | | | | | | * Move private classes into source files if possible * Expose some methods to check for cryptographic support * Remove private header and dependency on private module Change-Id: I633346ab66438b07abfbd0d0c3d529cb8f46f4fe Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Rename files (qknxcurve25519.* to qknxcryptographicengine.*)Karsten Heimrich2019-02-071-1/+1
| | | | | | Change-Id: I33f3ad771a81328928bafc847827b2089cf83ecb Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Rework the implementation of the KNXnet/IP secure classesKarsten Heimrich2019-02-042-67/+81
| | | | | | | | | | Merge the public and private key class. Adapt code and documentation where necessary. Remove PBKDF2 function. Change-Id: I3074e828e14480448074c8e6069edd1323c58458 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Rename function, adapt code and related documentationKarsten Heimrich2019-01-311-6/+6
| | | | | | | | | | calculate vs. compute, the later seems to be more appropriate because it indicates the complexity of the task. Change-Id: Ieffc8b46040d2f0a3d948ec6f6c0d1281a7cb837 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* AN159: Introduce secure user ID enumeration + documentationKarsten Heimrich2019-01-301-13/+7
| | | | | | Change-Id: I9c77c987a6adc80d3ce7372e282ad783b2842619 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-191-0/+8
|\ | | | | | | Change-Id: I31db29f2eb33238dc9f03f1e5309cf3c66fb03d7
| * Fix compile issue with VS2017 (Part 2)Karsten Heimrich2019-01-151-0/+8
| | | | | | | | | | Change-Id: I3b27eab8d3ddf7fcafb0cc0b8718ae7e0921726d Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Fix [-Wsign-compare] warningKarsten Heimrich2019-01-111-4/+4
| | | | | | | | | | | | Change-Id: Ieecc4675591a48016f69901f4b675aa17451ae20 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Fix check against wrong OpenSSL version numberKarsten Heimrich2019-01-111-3/+3
| | | | | | | | | | | | | | | | | | EVP_PKEY_new_raw_public_key and EVP_PKEY_get_raw_public_key are only available with OpenSSL version 1.1.1a, so make sure we use the right version number to perform the check. Change-Id: I6c6e6a6b1c945f7c3917e7c3e7ef3a66ac746ab0 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-253-15/+9
|\| | | | | | | Change-Id: Iee335e2e658b2531aaea6d8774cf34c6b6812b2a
| * Fix some minor warnings spotted by clangKarsten Heimrich2018-12-113-15/+9
| | | | | | | | | | Change-Id: Idd2d3aa9b202957e03917923784c2348ed371c0b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Remove ambiguous comparison operatorKarsten Heimrich2018-12-131-10/+0
| | | | | | | | | | Change-Id: I5c67cdb5eddac81f793c951409f039f1e6e931b4 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Introduce secure frame builder classes and auto-testsKarsten Heimrich2018-12-121-0/+140
|/ | | | | | Change-Id: I3b14e551708c000cf4a442aa085ccbd2b16569de Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Fix some minor warningsKarsten Heimrich2018-12-101-14/+12
| | | | | | | | | | * move variable into sub scope * avoid using a expression repeatedly * global variable shadows local variable * testing against null is superfluous without std::nothrow Change-Id: I86a3388fa46b8847a7604d8362dd08784b5f1e9f Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Fix broken implementation of KNX SRP block structuresKarsten Heimrich2018-12-101-42/+97
| | | | | | | | | * adapt auto test * fix wrong size values * fix wrong header types Change-Id: I669a39e051365ae4a719b2ede30fae595797830d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix CMake unit testsv5.12.0-beta4Andrew O'Doherty2018-11-051-1/+1
| | | | | | | | | | | Before failed with: ../qtknx/tests/auto/cmake/build/module_includes/main.cpp: In function int main(int, char**): ../qtknx/tests/auto/cmake/build/module_includes/main.cpp:10:10: error: expected primary-expression before localQKnx QKnx localQKnx; Change-Id: I8fc28676d06e592680d4d26835c4e33df28c25f9 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Fix KNX project parsing for ETS version >= 5.6.*Karsten Heimrich2018-10-263-2/+126
| | | | | | Task-number: QTBUG-70667 Change-Id: I626755acdbfa7f5bd2f187b5b3fee79346efa0c7 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Expand autotest QKnxNetIpDeviceConfigurationAcknowledgeAndrew O'Doherty2018-10-251-0/+51
| | | | | Change-Id: I18187a48d3443b4f3af7139bd10070936f8ec9bc Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Extend tst_QKnxNetIpConnectionStateResponseAndrew O'Doherty2018-10-251-0/+46
| | | | | Change-Id: I4a5db66b44ce5c2753d2b4451c8b3b63e9bc26f2 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Extend tst_QKnxNetIpConnectionStateRequestAndrew O'Doherty2018-10-251-0/+64
| | | | | Change-Id: I91bce8038477769ceadaf9c07f841c6aa839e0f1 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Extend autotest tst_QKnxNetIpDescriptionRequestAndrew O'Doherty2018-10-251-0/+51
| | | | | Change-Id: Ia40e8afee1edfc1d5a240e6f7352475ddc9a0453 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Extend autotest tst_QKnxNetIpRoutingLostMessageAndrew O'Doherty2018-10-251-0/+58
| | | | | Change-Id: Ib87a430fc74bf3dafd5be7413c7879419dd58ea2 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Extend autotest tst_QKnxNetIpTunnelingRequestAndrew O'Doherty2018-10-251-1/+97
| | | | | Change-Id: Ieaa2a0510ea786fdb0191cb0658563012660b7f2 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Extend autotest tst_QKnxNetIpTunnelingAcknowledgeAndrew O'Doherty2018-10-251-1/+83
| | | | | Change-Id: I476c5cd44d0919f8bd58ef0e402ad0b057432272 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Some fixes in QKnxNetIpRouter interface and documentationAndrew O'Doherty2018-09-191-2/+8
| | | | | | | | | | | | | | 1. Improve consistency of the class interface 2. Improve documentation example of signal routingIndicationReceived 3. Remove routing mode assignment in setFilterTable. Let the user handle the mode by calling setRoutingMode 4. Fixed qdoc issue: qknxnetiprouter.cpp:118: (qdoc) warning: Cannot find 'QKnxNetIpRouter::FilterTable' specified with '\typedef' in any header file Change-Id: Ife5fd6c1c6446b547bacca90c128504223bba631 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Rename QKnxNetIpRouter::FilterTable aliasAndrew O'Doherty2018-09-191-4/+4
| | | | | Change-Id: Ib9f9128d343e42e89670abdf41a434ae34d0af1c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Whitespace changesKarsten Heimrich2018-09-181-111/+99
| | | | | Change-Id: Idbcf179f803e278f1187021a848231ab020d4e2f Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Fix routing algorithmKarsten Heimrich2018-09-181-1/+1
| | | | | | | | 1. fix filter action for frames with group address 2. refactored algorithm Change-Id: I8e6362cd958744bbbab3297ab767e60c4935aa05 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Rename QKnxNetIpRoutingInterface class to QKnxNetIpRouterAndrew O'Doherty2018-09-183-94/+94
| | | | | Change-Id: I2641205492b5603c5229f0eebb4d582cf2c5ab78 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Change function names to be more verbose on their purposeKarsten Heimrich2018-09-171-3/+3
| | | | | | | Discussed here locally after it got noticed in the API review. Change-Id: I68258c23ca4016e5c19ebc0a352682f119747da2 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* MACos fix for tst_QKnxNetIpRoutingInterfaceAndrew O'Doherty2018-09-142-1/+3
| | | | | Change-Id: I41480294bd3b02f00dc53802c66f09ee56ba3e3d Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Fix broken MAC calculation, add auto-test and documentationKarsten Heimrich2018-09-131-14/+181
| | | | | Change-Id: Iba0f4a8977c88f93c74e9c099bbf191335a452f3 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Fix the behavior of the SRP classes and builders to match existing onesKarsten Heimrich2018-08-282-14/+11
| | | | | | | | | Adapt auto-test and documentation to take that into account. Make the mandatory bit set by default, cause that's how the spec recommends it. Change-Id: I62362a7d455405292328f16bab2bcaddd648680a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Blacklist the routing interface test on OSXKarsten Heimrich2018-08-271-0/+1
| | | | | Change-Id: I119f1af8c38350ccf83ae245f43a351fb4e23526 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Fix KNX cryptographic engine implementationKarsten Heimrich2018-08-221-0/+53
| | | | | Change-Id: Iffff0e4157467a38f842a87001f4216f4c87d17a Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Rename private file to be able to use it more generallyKarsten Heimrich2018-08-171-1/+1
| | | | | Change-Id: Id3f79c53b0287da600b94668e62b13c5ec4a0b42 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* AN183: Add support for receiving routing system broadcast framesKarsten Heimrich2018-08-171-16/+44
| | | | | Change-Id: I78ef9f283a1a8a1b503a78f62164fc4c0bd9b470 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Use class member instead of a function local interfaceKarsten Heimrich2018-08-171-2/+0
| | | | | Change-Id: Ib14b3f66e204f091032a1f5e9bef2a6d4401087a Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* AN183: Add support for sending routing system broadcast framesKarsten Heimrich2018-08-172-3/+44
| | | | | Change-Id: I08d13f19dfab20a3a58a5a123e8f8305cc7023af Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* AN159: Implement Curve25519 public, private key and shared secretKarsten Heimrich2018-08-174-0/+161
| | | | | Change-Id: I2c6a1f0d687d6f24983b0731a3b0c9bc15e561c6 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Add QKnxNetIpRoutingInterface class and auto-testAndrew O'Doherty2018-08-163-1/+524
| | | | | | | | The newly introduced class can be used for transmitting KNX frames between KNXnet/IP routers. Change-Id: Ief8a8731463e251367768f34894b04861f8b5835 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Fix KNXnet/IP routing indications shall only carry L_DATA.indAndrew O'Doherty2018-08-162-2/+26
| | | | | | | | | The KNXnet/IP body of the routing indication frame shall consist only of a cEMI encoded data link layer ndication message. See system specification 03_08_05 Routing v01.05.01, paragraph 3.8 Change-Id: Ib427855840afe54076db8bbb0dafe5a901089da3 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* AN159: Introduce secure session response frame proxy and auto-testKarsten Heimrich2018-08-103-1/+149
| | | | | | Change-Id: I685a8e2dcfbf40702ce994eedfbbca0cc8fc092e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* AN159: Introduce secure session request frame proxy and auto-testKarsten Heimrich2018-08-103-1/+140
| | | | | | Change-Id: If0e071b2252663852e7da2bdef80c23c205f8e32 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>