Bartlomiej Grzelewski [Wed, 27 Jan 2016 15:37:08 +0000 (16:37 +0100)]
Remove key-manager-listener dependency.
key-manager-listener package is empty.
Its functionality is provided by key-manager package now.
Change-Id: Ib7ce4575ae507825b408c80eccfe6e1df8543465
Krzysztof Jackiewicz [Tue, 12 Jan 2016 12:24:40 +0000 (13:24 +0100)]
CKM: Read ckm data dir location from tzplatform_config
[Problem] Key-manager reads data dir location from tzplatform_config.
Security-tests have the path hardcoded.
[Solution] Make security-tests read data dir location from tzplatform_config as
well.
[Verification] Run ckm-tests
Change-Id: I3e5c6f98bc34c27664218972e6ee76139b0a12e7
Krzysztof Jackiewicz [Tue, 5 Jan 2016 12:28:00 +0000 (13:28 +0100)]
CKM: Fix T3203_CAPI_lock_database
[Problem] Test is failing because ordinary user attempts to lock its database.
[Solution] Test is modified so that it's executed as root.
[Verification] Run ckm-tests --group=T320_CAPI_EMPTY_DATABASE
Change-Id: I5dd9893792be4dbcc4e2161dbe48f99bafcbc7dc
Krzysztof Jackiewicz [Tue, 5 Jan 2016 12:21:16 +0000 (13:21 +0100)]
CKM: Revert "Add PASSWORD_PROTECTION_DISABLE feature"
This reverts commit
83ce88e2df836f7fe23260f635c6ef69d26c748b.
Change-Id: I59bca49f8c4cb67fabda6a455ff7533a507abb6e
Bartlomiej Grzelewski [Tue, 22 Dec 2015 17:36:06 +0000 (18:36 +0100)]
CKM: Unblock ocsp test.
Change-Id: Icad1ae774a6413c72b0eb71fc6c76cddd898f464
Bartlomiej Grzelewski [Tue, 22 Dec 2015 15:30:19 +0000 (16:30 +0100)]
CKM: Remove ccMode related code.
Support for MDPP state was removed from key-manager code.
Also the change of ccMode is no longer suppoted in key-manager.
Change-Id: Ic06bc7294aeeb1a0d795154cb636d3977d8d330d
Bartlomiej Grzelewski [Mon, 30 Nov 2015 16:24:31 +0000 (17:24 +0100)]
Revert "CKM: Turn off all broken tests."
This reverts commit
86ba2aa7c6e01dd9193e08d01ba1c2f8bfc2d459.
Change-Id: Icd0af8e29d8eece9c1884d92cf34f61d5d37e569
Bartlomiej Grzelewski [Thu, 17 Dec 2015 10:52:44 +0000 (11:52 +0100)]
CKM: Remove GarbageCollector
Change-Id: I75e1a61f9e705c261000426c07b41fd5c466da30
Bartlomiej Grzelewski [Tue, 8 Dec 2015 16:00:36 +0000 (17:00 +0100)]
CKM: Replace deprecated certificate with new one.
Change-Id: If400a0f46b763d30703718b0635dfc33eb496285
Bartlomiej Grzelewski [Tue, 8 Dec 2015 11:13:42 +0000 (12:13 +0100)]
CKM: Comment out deprecated integration tests.
Change-Id: I3679ce2f8fb62731d973adabb2308f2bfdf05af5
Zbigniew Jasinski [Mon, 30 Nov 2015 11:57:48 +0000 (12:57 +0100)]
Merge branch 'tizen' into ckm
Change-Id: I420a571f81f4abdec743722b0ebac6c128b399d6
Bartlomiej Grzelewski [Fri, 27 Nov 2015 11:41:49 +0000 (12:41 +0100)]
CKM: Turn off all broken tests.
Change-Id: I21d32cae8a6681955efdd336c93a8345b1b7c754
Maciej J. Karpiuk [Mon, 29 Jun 2015 10:23:02 +0000 (12:23 +0200)]
CKM: test for encrypted initial values
Change-Id: Ic395d86caff2649d2a4adb801007dc68d1cc502f
Krzysztof Jackiewicz [Mon, 9 Nov 2015 08:40:49 +0000 (09:40 +0100)]
CKM: Get rid of GrabageCollector in initial values test
[Problem] GarbageCollector launched for System user will revoke all "System"
rules.
[Solution] GarbageCollector replaced by Env class for test.
[Verification] Run ckm-tests --group=T60_INITIAL_VALUES. There should be no
smack denials in logs.
Change-Id: Ie2c3090286bfc412201b6b46cf4e7cb1596d1c2b
Dongsun Lee [Fri, 20 Nov 2015 11:24:20 +0000 (20:24 +0900)]
Add PASSWORD_PROTECTION_DISABLE feature
Change-Id: I29215c373931c552c14cfa73ac1a8514a8bd1e62
Signed-off-by: Dongsun Lee <ds73.lee@samsung.com>
Krzysztof Jackiewicz [Tue, 27 Oct 2015 09:40:27 +0000 (10:40 +0100)]
CKM: Google certificate updated
[Problem] *.google.com certificate have expired.
[Solution] Certificate updated.
[Verification] Run ckm-tests --group=T307_CKMC_CAPI_CERTIFICATE_CHAINS
Change-Id: I70820a2f62b15e333ae497673ab75f3d53e1e8f0
Zbigniew Jasinski [Mon, 26 Oct 2015 14:00:36 +0000 (15:00 +0100)]
Merge branch 'tizen' into ckm
Change-Id: Ie5475e1937fa3035a2c4ba4412583bd0b7badf77
Zbigniew Jasinski [Mon, 26 Oct 2015 14:00:07 +0000 (15:00 +0100)]
Merge branch 'ckm' into tizen
Change-Id: Ic602f0abdd1aae730aeb668cebc50d3bca09616c
Kyungwook Tak [Mon, 5 Oct 2015 07:14:40 +0000 (16:14 +0900)]
[CKM] (ACR-429) Remove removed API related TC
- ckmc_get_cert_chain_trustedcert_with_alias
Change-Id: I6abe05e1fe729391d0d307d298d2aa158f6d78ff
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>
Kyungwook Tak [Wed, 14 Oct 2015 08:04:18 +0000 (17:04 +0900)]
Replace ckmc_label_shared_owner
Change-Id: I792190f989ff4f42823e34bdeb07b9d34b0c2738
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>
Kyungwook Tak [Mon, 5 Oct 2015 06:11:47 +0000 (15:11 +0900)]
ckmc API changed (ACR-392)
* ckmc_param_list_s* -> ckmc_param_list_h
* ckmc_generate_params's parameter changed
- ckmc_param_list_s *params -> ckmc_param_list_h *pparams
* ckmc_param_list_add_XXX -> ckmc_param_list_set_XXX
Change-Id: Ia3b0831772e76cfdbe77c6d9a9d04961018a37e3
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>
Oskar Świtalski [Thu, 1 Oct 2015 06:44:58 +0000 (08:44 +0200)]
Merge branch 'cynara' into tizen
Change-Id: I115ec35a71d6f2a08f2dc08bbc6b63e0b0156e50
Bartlomiej Grzelewski [Thu, 17 Sep 2015 15:00:43 +0000 (17:00 +0200)]
CKM: Add support for new error code: CKMC_ERROR_NOT_SUPPORTED.
Change-Id: I2eb31975f03f8b3d63107c9e0da6804ea248c5f1
Bartlomiej Grzelewski [Fri, 11 Sep 2015 12:45:43 +0000 (14:45 +0200)]
CKMI: Add ckm-integration tests.
Change-Id: I6a253a2a763e49d61c4b758b87ac240f06536bff
Bartlomiej Grzelewski [Fri, 11 Sep 2015 12:45:02 +0000 (14:45 +0200)]
CKMI: Implementation of ckm-policy.
Change-Id: I60da89cf4aeff7818f7ebd92a1e20eb7f6ac4d96
Bartlomiej Grzelewski [Fri, 11 Sep 2015 12:43:31 +0000 (14:43 +0200)]
CKMI: Implementation of ProcessSettings module.
Change-Id: I6e26297ec5238ad65d91120880a7a5df75ac9244
Bartlomiej Grzelewski [Wed, 9 Sep 2015 16:30:42 +0000 (18:30 +0200)]
Merge branch 'tizen' into ckm
Change-Id: I0f1e194e469e6dd00ef0627ed9d9357eef422afb
Bartlomiej Grzelewski [Wed, 9 Sep 2015 16:25:00 +0000 (18:25 +0200)]
Merge remote-tracking branch 'tizen/ckm' into tizen
Change-Id: Ibc41fc4de18b1aaaa5b87dda7b23d7c114f9bb70
Bartlomiej Grzelewski [Wed, 9 Sep 2015 16:22:51 +0000 (18:22 +0200)]
Merge remote-tracking branch 'tizen/security-manager' into tizen
Change-Id: I1cd3c0199be5ec53d3cafff715d9f1159bd9fc8f
Rafal Krypa [Thu, 3 Sep 2015 15:59:28 +0000 (17:59 +0200)]
security-manager: adapt tests to new application labeling schema
Security-manager labeling of application files has been changed
in patch https://review.tizen.org/gerrit/46841.
Adapting tests accordingly.
Change-Id: Ie3bcbaa385845544610bfd83817a71079c99fb8e
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Bartlomiej Grzelewski [Tue, 8 Sep 2015 16:01:16 +0000 (18:01 +0200)]
CKM: Fix T120 group of tests.
Change-Id: I8ddf507da7c40e786c9b657b09bf2166ebb930d8
Bartlomiej Grzelewski [Wed, 26 Aug 2015 15:59:38 +0000 (17:59 +0200)]
CKM: Use pkgId instead smack label in tests.
Change-Id: Ia912089bacff330df230292fa136d10848534300
Bartlomiej Grzelewski [Wed, 26 Aug 2015 13:28:28 +0000 (15:28 +0200)]
CKM: AccessProvider2 takes owner id instead smack label.
Change-Id: I9d75c180c06336faca33459645b189a64dc287f2
Bartlomiej Grzelewski [Tue, 25 Aug 2015 13:47:21 +0000 (15:47 +0200)]
CKM: Fix tests for initial-values: T6010, T6030, T6040.
Change-Id: I0182c9e9dcdb1e3f3d4efff9b7c8c1e8349094eb
Bartlomiej Grzelewski [Mon, 24 Aug 2015 16:50:06 +0000 (18:50 +0200)]
CKM: Fix system-db tests T5037, T5038, T5039.
One of the tests does not clean environement.
Change-Id: Ia7a4d2fd234c23566d009ab922a0e33cb96b63a5
Maciej J. Karpiuk [Tue, 25 Aug 2015 06:43:53 +0000 (08:43 +0200)]
CKM: added test for client app trying to add item to system DB [expected fail]
Change-Id: I1ed7359ac15ea5593ded8f77009454a1e517ea78
Bartlomiej Grzelewski [Tue, 25 Aug 2015 13:53:20 +0000 (15:53 +0200)]
Replace ckmc_remove_pkcs12 with ckmc_remove_alias.
Change-Id: Ia34541a7963661e074d3313c25970a63e35fd720
Dongsun Lee [Tue, 25 Aug 2015 07:32:55 +0000 (16:32 +0900)]
fix build break caused by libwebappenc API change
Change-Id: I5e6073196d267bb15ef41395dbbeab531b2503df
Signed-off-by: Dongsun Lee <ds73.lee@samsung.com>
Bartlomiej Grzelewski [Thu, 20 Aug 2015 12:47:24 +0000 (14:47 +0200)]
Fix tests of systemDB.
Change-Id: Icf05c56c39255525589f8ce79cadc96716c2674e
Zofia Abramowska [Thu, 16 Jul 2015 15:34:38 +0000 (17:34 +0200)]
Add SM privilege mapping tests
Change-Id: Ib1c86133b116bd7f77e380233144cf7866d900ed
Bartlomiej Grzelewski [Fri, 7 Aug 2015 14:27:51 +0000 (16:27 +0200)]
Adopt to new implementation of smack.
In new implmentation connect will success only if
client have "w" rule to system socket and system process
have "w" rule to client.
Change-Id: I68caadb430678b8e8ee5b235576ff4ea95103abe
Bartlomiej Grzelewski [Tue, 4 Aug 2015 13:50:27 +0000 (15:50 +0200)]
Adopt tests to CKM version 0.1.15.
Change-Id: I8c5c3b2f2fbee9778c084f4d9f7218a149defdca
Krzysztof Jackiewicz [Thu, 30 Jul 2015 10:30:58 +0000 (12:30 +0200)]
CKM: Update google certificate
[Problem] Google.com certificate have expired
[Solution] New certificate is used
[Verification] Run ckm-tests --group=T307_CKMC_CAPI_CERTIFICATE_CHAINS
Change-Id: Ic9e2ffe85ac770bb6e9245826013d3022d6feea0
Krzysztof Jackiewicz [Fri, 10 Jul 2015 10:27:30 +0000 (12:27 +0200)]
CKM: Unlock journald logs
[Problem] Journald logging fails after dropping root privileges and changing
the label.
[Solution] Change execute label to User so that sockets created by ckm-tests
are allowed to wx to System. Add permissions for custom label to wx to System::Run.
[Verification] Run ckm-tests and check journald logs for smack messages. There
should be none.
Change-Id: I8ddca950755f3b7079ae42fba4416b506ea9e35e
Krzysztof Jackiewicz [Thu, 9 Jul 2015 16:09:30 +0000 (18:09 +0200)]
CKM: Add tests for missing observer in encryption API
[Problem] There's no test for missing observer in encryption API tests.
[Solution] Tests added
[Verification] Run ckm-tests --group=CKM_ENCRYPTION_DECRYPTION --regexp=no_observer_async
Change-Id: I5f9930f6f23e6959f16f81756dfe55c75e1a2d35
Krzysztof Jackiewicz [Thu, 9 Jul 2015 12:20:03 +0000 (14:20 +0200)]
CKM: Implement asynchronous tests for encryption/decryption
[Feature] Encryption/decryption API implementation
[Solution] Add asynchronous environment to existing encryption/decryption tests
[Verification] Run ckm-tests --group=CKM_ENCRYPTION_DECRYPTION
Change-Id: I1ff9b89b45c643a95521381d676349a3c2408a22
Krzysztof Jackiewicz [Wed, 8 Jul 2015 11:18:34 +0000 (13:18 +0200)]
CKM: Extend test framework with multiple environment testing
[Problem] It's impossible to execute the same test in different environments.
[Solution] Add support for running the same test in multiple environments.
[Verification] Test with next commit
Change-Id: I8ad04d1d28364026f63cb2c5f44bad87e7b4343b
Krzysztof Jackiewicz [Thu, 21 May 2015 09:05:35 +0000 (11:05 +0200)]
CKM: Add tests for encryption/decryption
[Problem] No tests for encryption/decryption
[Solution] Tests added
[Verification] Run test: ckm-test --group=CKM_ENCRYPTION_DECRYPTION
Change-Id: I4a50ccccf692d8dd211247951bfd30fb892e898d
Krzysztof Jackiewicz [Thu, 2 Jul 2015 14:09:13 +0000 (16:09 +0200)]
CKM: Add test for empty certificate in getCertificateChain
[Problem] No test checking getCertificateChain behavior with empty certificate.
[Solution] Tests added.
[Verification] Run ckm-tests --regexp=T13122_get_chain_empty_cert &&
ckm-tests --regexp=T13121_get_chain_no_cert
Change-Id: I1b64facec253d4ec57d0955ef5e441c3ba958012
Dongsun Lee [Thu, 23 Jul 2015 03:24:23 +0000 (12:24 +0900)]
add test cases for libwebappenc
Change-Id: I2e433293c2566ecbaefd237e8e60a6e2dcf67a6e
Signed-off-by: Dongsun Lee <ds73.lee@samsung.com>
Krzysztof Jackiewicz [Mon, 29 Jun 2015 09:20:46 +0000 (11:20 +0200)]
CKM: Add C compilation test
[Problem] All tests are compiled using C++ so we can't detect C-compiler errors
[Solution] Add C compilation test.
[Verification] Successfull compilation.
Change-Id: I650a464fef6ea1874201c2e53a4086fba6188e13
Krzysztof Jackiewicz [Fri, 3 Jul 2015 14:38:10 +0000 (16:38 +0200)]
CKM: Add invalid param ocsp tests
[Problem] Not enought input param tests for ocsp API.
[Solution] New tests addded.
[Verification] Run ckm-tests --regexp=ocsp_check
Change-Id: I982c3e0c47500eb332e46d1027870d487603baf7
Krzysztof Jackiewicz [Fri, 19 Jun 2015 12:34:14 +0000 (14:34 +0200)]
CKM: Prevent exceptions in gc. Fix buffer comparison.
[Problem] Garbage collector destructor may throw exceptions. Buffers can be
different even if sizes match.
[Solution] Destructor protected with try catch. Buffer comparison fixed.
[Verification] Run tests
Change-Id: Iae33de10ee9e9b2bde6aa427a4f17b49eed6955e
Maciej J. Karpiuk [Thu, 9 Apr 2015 12:43:46 +0000 (14:43 +0200)]
CKM: add AES key manipulation tests.
Change-Id: I282a9201be1acc1013f010651c7c89c682d01ee2
Krzysztof Jackiewicz [Mon, 1 Jun 2015 09:04:05 +0000 (11:04 +0200)]
CKM: Additional assert for smack_new_label_from_self
[Problem] Label was not checked against NULL
[Solution] Check added
[Verification] Succesfull compilation + tests
Change-Id: I19cbc6b8f7dfe3dc094b9398215aa370c50ae327
Krzysztof Jackiewicz [Fri, 12 Jun 2015 09:45:21 +0000 (11:45 +0200)]
CKM: Remove logs to suppress smack errors
[Problem] Smack is complaining about denied access to /etc/dlog/platformlog.conf
which is caused by using dlog logs in tests.
[Solution] Existing logs are not important and have been removed.
[Verification] Run tests and check journalctl for smack errors. There should be
none.
Change-Id: Id46305b9cf0aae0029315a11a02fb68ff6700d57
Aleksander Zdyb [Thu, 5 Mar 2015 13:26:13 +0000 (14:26 +0100)]
Add tests for cynara-creds-socket
Change-Id: I9b4fe70b74424e6b1d70f12751ca87f0896b6f55
Krzysztof Jackiewicz [Thu, 21 May 2015 09:03:54 +0000 (11:03 +0200)]
CKM: Update common test utilities
[Problem] Utility functions should be accessible to other test suites.
Assert helpers don't show error name.
[Solution] Utilities moved to common file. Helpers updated.
[Verification] Run all tests.
Change-Id: I70d6239c0304284735496007500f18e348e14a51
Krzysztof Jackiewicz [Wed, 20 May 2015 11:47:51 +0000 (13:47 +0200)]
CKM: Add tests for algorithm parameters CAPI
[Cause] No tests for algorithm params
[Solution] Tests added
[Verification] Run ckm-tests --group=CKM_ALGO_PARAMS
Change-Id: I609b62f035fdf89d2691e299b8d92c3580869f01
Krzysztof Jackiewicz [Tue, 9 Jun 2015 08:26:25 +0000 (10:26 +0200)]
CKM: Add asserts for file copying
[Problem] If you manually remove contents of /opt/data/ckm/ initial-values
tests will fail because the target directory does not exist.
[Solution] Add asserts checking if input & output files are correct.
[Verification] Remove /otp/data/ckm/initial_values. Run:
ckm-tests --group=T60_INITIAL_VALUES. They should fail. Reinstall key-manager
run tests again. All should pass.
Change-Id: Ib6b7308747b74943ec9d7274284d1d56c9be1641
Krzysztof Jackiewicz [Tue, 9 Jun 2015 08:06:52 +0000 (10:06 +0200)]
CKM: Run async api tests in single process
[Problem] Timeouts during key generation. Test dependency.
[Solution] Single process test cases used. Test env fixed.
[Verification] Run tests.
Change-Id: I471c1003403f6638aa836d47b42f3c1e06952e7e
Tomasz Swierczek [Thu, 11 Jun 2015 08:40:00 +0000 (10:40 +0200)]
Merge branch 'tizen' into security-manager
Change-Id: I2fdb870ce012cedf1930644ce0ec47ce1a10a94c
Maciej J. Karpiuk [Wed, 10 Jun 2015 09:21:27 +0000 (11:21 +0200)]
Merge branch 'origin/tizen' into origin/ckm
Change-Id: If8bc45345b05df4e09e39ec233371320ebcf070a
Roman Kubiak [Mon, 8 Jun 2015 13:20:15 +0000 (06:20 -0700)]
Ignore 3 security-manager tests due to gumd timeouts.
3 tests are ignored until gumd is fixed.
Change-Id: Ibfcf8a405beac5c05751db13755b6284349a3b01
Maciej J. Karpiuk [Wed, 3 Jun 2015 11:43:56 +0000 (13:43 +0200)]
CKM: permanent test re-factored: no dependency on previous test execution.
Change-Id: I7b86d628cb2e8dca41d6e647e55341e7788a0aed
Maciej J. Karpiuk [Fri, 29 May 2015 12:01:40 +0000 (14:01 +0200)]
CKM: tests adjusted to single protocol command for key pair generation.
Change-Id: I3904958d497bf7e1d4e03232e8c9bccb8b3c4d47
Maciej J. Karpiuk [Wed, 27 May 2015 07:07:53 +0000 (09:07 +0200)]
Fix tests: ignore those that are not supported on Tizen 3.0 (labeled sockets).
Change-Id: I21af3336feef57b9b81af72e776c9e520dc6e34b
Krzysztof Jackiewicz [Wed, 27 May 2015 10:44:35 +0000 (12:44 +0200)]
Separate user uid/gid for libprivilege-control tests
[Problem] APP_UID/APP_GID is used by other tests and getting root uid/gid affects their results.
[Solution] Introduce separate uid/gid for libprivilege-control
[Verification] Run tests libprivilege-control-tests --output=text
Change-Id: Ib4773cddb0f0af11422684b20aa727a00433aa46
Krzysztof Jackiewicz [Tue, 26 May 2015 09:51:44 +0000 (11:51 +0200)]
CKM: Gdbbacktrace tries to become root
[Problem] When gdbbacktrace is executed as ordinary user it has no permissions
to attach with gdb or unlink output file.
[Solution] Add seteuid/gid(0) in the beginning of gdbbacktrace.
[Verification] Run any failing test that uses ScopedAccessProvider with uid/gid
There should be no "gdbbacktrace() failed: No backtrace information"
Change-Id: I8997ad1d8d1368402333e40b55ee4f5cb1b79005
Krzysztof Jackiewicz [Fri, 22 May 2015 08:28:38 +0000 (10:28 +0200)]
Fix libprivilege-control tests
[Problem] Libprivilege-control assigns the same label "User" to all
applications. Because of that some of tests make no sense. User id is fixed to
5000 but there's no such user in the system. Wrt-client binary does not exist
so getting its smack label fails.
[Solution] Meaningless asserts commented. User id retrieved from tzconfig. DAC
groups database cleared after every perm_app_set_privilege test.
[Verification] Run libprivilege-control-tests --output=text
Change-Id: Ib8e1f4deafd7033c7ac892af6afd9d46c724c062
Krzysztof Jackiewicz [Fri, 22 May 2015 10:01:51 +0000 (12:01 +0200)]
CKM: Make TA2000 and TA2010 independent
[Problem] Because of dependency between TA2000 and TA2010 the latter fails after
introduction of CKMAsyncAPIEnv.
[Solution] Made tests independent.
[Verification] Run tests: ckm-tests --group=CKM_ASYNC_API
Change-Id: I6a218c1c36e4f2f7c9725b74bdf94b5ae4a56559
Lukasz Wojciechowski [Thu, 21 May 2015 14:52:58 +0000 (16:52 +0200)]
Introduce environment class for CKM async API tests
CKMAsyncAPIEnv class takes care of initializing and deinitializing
environment before and after each test from CKM_ASYNC_API group.
This was formerly done by TA0000_init and TA9999_deinit tests that
in current solution were removed.
Change-Id: I27aa07c4c1b7b41964b4407937457432fa194911
Maciej J. Karpiuk [Tue, 19 May 2015 12:20:28 +0000 (14:20 +0200)]
Fix T1311_init.
Change-Id: Ic3bc158977dfe306cebd74446c03c208a4c22f63
Lukasz Wojciechowski [Thu, 21 May 2015 16:08:57 +0000 (18:08 +0200)]
Fix sorting tests in test groups
Patch "
cb0c3e5 Add init and finish functionality" changed way of
keeping test cases. Previously they were kept as list of structures,
now it's list of pointers.
In such case proper sorting needs a compare function, otherwise
it compares pointers.
Proper sorting predicate has been added.
Change-Id: I4ad755326456cdedce69ae71a0ab050df15899d9
Maciej J. Karpiuk [Fri, 22 May 2015 07:42:21 +0000 (09:42 +0200)]
Fix Key Manager tests: google certificates refreshed.
Change-Id: Ic7ee5ae06cc0ee2f624ce3f7c510385b445f70ce
Maciej J. Karpiuk [Wed, 20 May 2015 13:24:23 +0000 (15:24 +0200)]
Add tests for initial values provided in XML files.
Change-Id: Ie7c20d34729c6df58bdbcd1ed092d00a57fe6532
Maciej J. Karpiuk [Wed, 20 May 2015 11:00:50 +0000 (13:00 +0200)]
system-db proper clearing after test run.
Change-Id: I804faf8564ec868ee96e1a5a1a35c74eebe5d6e2
Krzysztof Jackiewicz [Tue, 12 May 2015 10:00:41 +0000 (12:00 +0200)]
CKM: Test for large data transfer
[Issue#] N/A
[Feature/Bug] N/A
[Problem] N/A
[Cause] We need to make sure that it's possible to transfer MBs of data between
client and server
[Solution] Test added
[Verification] Run:
ckm-tests --group=T3040_CKMC_QUICK_REMOVE_BIN_DATA_TEST_C_API
Change-Id: I53148572f7df7e6b6d2a3475a76c2afababbc63a
Maciej J. Karpiuk [Tue, 19 May 2015 12:20:28 +0000 (14:20 +0200)]
Fix T1311_init.
Change-Id: Ic3bc158977dfe306cebd74446c03c208a4c22f63
Krzysztof Jackiewicz [Mon, 18 May 2015 11:46:19 +0000 (13:46 +0200)]
CKM: Revert "CKM: Tests for algorithm parameters"
This reverts commit
df4d3773a6af6fe7939d87c5a3921ce5cf2e63da.
After CryptoAlgorithm API modification this test is no longer needed.
Change-Id: I8ba7114c679a6f4d955f2b4e6cfd9bf80bd412ea
Bartlomiej Grzelewski [Mon, 18 May 2015 12:26:31 +0000 (14:26 +0200)]
Fix test TA1650.
Change-Id: I0ed657959e6c3e71339a6dc2d61890334b457c59
Bartlomiej Grzelewski [Fri, 15 May 2015 14:46:05 +0000 (16:46 +0200)]
Fix implementation of count_aliases.
Change-Id: If6bd7ba464e96f16693b3c0aad68240ce5394b2d
Krzysztof Jackiewicz [Thu, 7 May 2015 15:40:18 +0000 (17:40 +0200)]
CKM: Tests for algorithm parameters
[Issue#] N/A
[Feature/Bug] N/A
[Problem] N/A
[Cause] N/A
[Solution] N/A
[Verification] Run ckm-tests --group=ALGO_PARAM_TEST
Change-Id: Idd5d5263ead78139efcde882d9829c4b225ab138
Aleksander Zdyb [Tue, 3 Mar 2015 11:32:14 +0000 (12:32 +0100)]
Add tests for Cynara's offline admin API
Change-Id: I18670e852e05ff35e1ea5b3de41115b65b7f0eaf
Maciej J. Karpiuk [Wed, 22 Apr 2015 08:43:21 +0000 (10:43 +0200)]
CKM: re-factoring tests after adding system-DB support.
Change-Id: Ia94c7de6604b61e8fb9d5522527dcce3c1019157
Maciej J. Karpiuk [Mon, 13 Apr 2015 14:12:41 +0000 (16:12 +0200)]
CKM: add tests for system-db.
Change-Id: I4dd89edbd2da9a2d0421aaea668ef6ba7cddbd3f
Aleksander Zdyb [Thu, 12 Feb 2015 09:21:36 +0000 (10:21 +0100)]
Let Cynara's admin API be tested in online and offline mode
Change-Id: I7698188997ac2f7a7902c1edce8d87151d2a1ab4
Zbigniew Jasinski [Thu, 30 Apr 2015 14:21:54 +0000 (16:21 +0200)]
Merge branch 'tizen' into cynara
Change-Id: Id45585ce7ff0566779229f240d957f4254071668
Radoslaw Bartosiak [Thu, 30 Apr 2015 09:50:13 +0000 (11:50 +0200)]
Add missing initialization of m_deferDeepness
Fix a change introduced in commit:
'Add init and finih functionality'
Change-Id: Ie3f52c6363788a43d94bf0e58e48ad754ba1d94d
Signed-off-by: Radoslaw Bartosiak <r.bartosiak@samsung.com>
Marcin Niesluchowski [Tue, 21 Oct 2014 12:42:20 +0000 (14:42 +0200)]
Adjust cynara wrapper to framework
Change-Id: Ie70abd318963316cd7e83b060969324e99973880
Marcin Niesluchowski [Wed, 1 Oct 2014 14:54:45 +0000 (16:54 +0200)]
Add init and finish functionality
Classes with init() and finish() methods may be passed as additional
arguments to test macros. Those classes are passed in tuple
accessible as an argument optionalArgsTuple of test case function.
See README for usage of new macros.
Change-Id: I8c25c1bb015e89298030ea7fa223f53aeacbec11
Pawel Wieczorek [Thu, 23 Apr 2015 08:15:43 +0000 (10:15 +0200)]
Merge branch 'security-manager' into tizen
Change-Id: I48f18681c2cc1a2bcba0ba09d4313fe418553358
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
Pawel Wieczorek [Wed, 22 Apr 2015 15:01:20 +0000 (17:01 +0200)]
Merge branch 'tizen' into security-manager
Conflicts:
packaging/security-tests.spec
src/security-manager-tests/CMakeLists.txt
src/security-manager-tests/test_DIR/app_dir/.level_1/.level_2/exec
src/security-manager-tests/test_DIR/app_dir/.level_1/.level_2/normal
src/security-manager-tests/test_DIR/app_dir/.level_1/exec
src/security-manager-tests/test_DIR/app_dir/.level_1/level_2/exec
src/security-manager-tests/test_DIR/app_dir/.level_1/level_2/normal
src/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_exec
src/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_normal
src/security-manager-tests/test_DIR/app_dir/.level_1/normal
src/security-manager-tests/test_DIR/app_dir/exec
src/security-manager-tests/test_DIR/app_dir/level_1/.level_2/exec
src/security-manager-tests/test_DIR/app_dir/level_1/.level_2/normal
src/security-manager-tests/test_DIR/app_dir/level_1/exec
src/security-manager-tests/test_DIR/app_dir/level_1/level_2/exec
src/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_exec
src/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_non_exec
src/security-manager-tests/test_DIR/app_dir/level_1/level_2/normal
src/security-manager-tests/test_DIR/app_dir/level_1/link_to_exec
src/security-manager-tests/test_DIR/app_dir/level_1/link_to_non_exec
src/security-manager-tests/test_DIR/app_dir/level_1/normal
src/security-manager-tests/test_DIR/app_dir/link_to_exec
src/security-manager-tests/test_DIR/app_dir/link_to_non_app_dir
src/security-manager-tests/test_DIR/app_dir/link_to_non_app_exec
src/security-manager-tests/test_DIR/app_dir/link_to_non_app_normal
src/security-manager-tests/test_DIR/app_dir/link_to_non_exec
src/security-manager-tests/test_DIR/app_dir/normal
src/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/.level_2/exec
src/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/.level_2/normal
src/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/exec
src/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/level_2/exec
src/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/level_2/normal
src/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/normal
src/security-manager-tests/test_DIR/app_dir_public_ro/exec
src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/.level_2/exec
src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/.level_2/normal
src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/exec
src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/exec
src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_exec
src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_non_exec
src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/normal
src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_exec
src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_non_exec
src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/normal
src/security-manager-tests/test_DIR/app_dir_public_ro/link_to_exec
src/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_dir
src/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_exec
src/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_normal
src/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_exec
src/security-manager-tests/test_DIR/app_dir_public_ro/normal
src/security-manager-tests/test_DIR/non_app_dir/.level_1/.level_2/exec
src/security-manager-tests/test_DIR/non_app_dir/.level_1/.level_2/normal
src/security-manager-tests/test_DIR/non_app_dir/.level_1/exec
src/security-manager-tests/test_DIR/non_app_dir/.level_1/level_2/exec
src/security-manager-tests/test_DIR/non_app_dir/.level_1/level_2/normal
src/security-manager-tests/test_DIR/non_app_dir/.level_1/normal
src/security-manager-tests/test_DIR/non_app_dir/exec
src/security-manager-tests/test_DIR/non_app_dir/level_1/.level_2/exec
src/security-manager-tests/test_DIR/non_app_dir/level_1/.level_2/normal
src/security-manager-tests/test_DIR/non_app_dir/level_1/exec
src/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/exec
src/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_exec
src/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_non_exec
src/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/normal
src/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_exec
src/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_non_exec
src/security-manager-tests/test_DIR/non_app_dir/level_1/normal
src/security-manager-tests/test_DIR/non_app_dir/link_to_exec
src/security-manager-tests/test_DIR/non_app_dir/link_to_non_exec
src/security-manager-tests/test_DIR/non_app_dir/normal
tests/common/CMakeLists.txt
tests/security-manager-tests/apps_rw/app_dir/.level_1/.level_2/exec
tests/security-manager-tests/apps_rw/app_dir/.level_1/.level_2/normal
tests/security-manager-tests/apps_rw/app_dir/.level_1/exec
tests/security-manager-tests/apps_rw/app_dir/.level_1/level_2/exec
tests/security-manager-tests/apps_rw/app_dir/.level_1/level_2/normal
tests/security-manager-tests/apps_rw/app_dir/.level_1/link_to_non_app_exec
tests/security-manager-tests/apps_rw/app_dir/.level_1/link_to_non_app_normal
tests/security-manager-tests/apps_rw/app_dir/.level_1/normal
tests/security-manager-tests/apps_rw/app_dir/exec
tests/security-manager-tests/apps_rw/app_dir/level_1/.level_2/exec
tests/security-manager-tests/apps_rw/app_dir/level_1/.level_2/normal
tests/security-manager-tests/apps_rw/app_dir/level_1/exec
tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/exec
tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/link_to_exec
tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/link_to_non_exec
tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/normal
tests/security-manager-tests/apps_rw/app_dir/level_1/link_to_exec
tests/security-manager-tests/apps_rw/app_dir/level_1/link_to_non_exec
tests/security-manager-tests/apps_rw/app_dir/level_1/normal
tests/security-manager-tests/apps_rw/app_dir/link_to_exec
tests/security-manager-tests/apps_rw/app_dir/link_to_non_app_dir
tests/security-manager-tests/apps_rw/app_dir/link_to_non_app_exec
tests/security-manager-tests/apps_rw/app_dir/link_to_non_app_normal
tests/security-manager-tests/apps_rw/app_dir/link_to_non_exec
tests/security-manager-tests/apps_rw/app_dir/normal
tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/.level_2/exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/.level_2/normal
tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/level_2/exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/level_2/normal
tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/normal
tests/security-manager-tests/apps_rw/app_dir_public_ro/exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/.level_2/exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/.level_2/normal
tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/link_to_exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/link_to_non_exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/normal
tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/link_to_exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/link_to_non_exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/normal
tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_dir
tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_normal
tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/normal
tests/security-manager-tests/apps_rw/non_app_dir/.level_1/.level_2/exec
tests/security-manager-tests/apps_rw/non_app_dir/.level_1/.level_2/normal
tests/security-manager-tests/apps_rw/non_app_dir/.level_1/exec
tests/security-manager-tests/apps_rw/non_app_dir/.level_1/level_2/exec
tests/security-manager-tests/apps_rw/non_app_dir/.level_1/level_2/normal
tests/security-manager-tests/apps_rw/non_app_dir/.level_1/normal
tests/security-manager-tests/apps_rw/non_app_dir/exec
tests/security-manager-tests/apps_rw/non_app_dir/level_1/.level_2/exec
tests/security-manager-tests/apps_rw/non_app_dir/level_1/.level_2/normal
tests/security-manager-tests/apps_rw/non_app_dir/level_1/exec
tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/exec
tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/link_to_exec
tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/link_to_non_exec
tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/normal
tests/security-manager-tests/apps_rw/non_app_dir/level_1/link_to_exec
tests/security-manager-tests/apps_rw/non_app_dir/level_1/link_to_non_exec
tests/security-manager-tests/apps_rw/non_app_dir/level_1/normal
tests/security-manager-tests/apps_rw/non_app_dir/link_to_exec
tests/security-manager-tests/apps_rw/non_app_dir/link_to_non_exec
tests/security-manager-tests/apps_rw/non_app_dir/normal
tests/security-manager-tests/test_DIR/app_dir/.level_1/.level_2/exec
tests/security-manager-tests/test_DIR/app_dir/.level_1/.level_2/normal
tests/security-manager-tests/test_DIR/app_dir/.level_1/exec
tests/security-manager-tests/test_DIR/app_dir/.level_1/level_2/exec
tests/security-manager-tests/test_DIR/app_dir/.level_1/level_2/normal
tests/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_exec
tests/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_normal
tests/security-manager-tests/test_DIR/app_dir/.level_1/normal
tests/security-manager-tests/test_DIR/app_dir/exec
tests/security-manager-tests/test_DIR/app_dir/level_1/.level_2/exec
tests/security-manager-tests/test_DIR/app_dir/level_1/.level_2/normal
tests/security-manager-tests/test_DIR/app_dir/level_1/exec
tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/exec
tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_exec
tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_non_exec
tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/normal
tests/security-manager-tests/test_DIR/app_dir/level_1/link_to_exec
tests/security-manager-tests/test_DIR/app_dir/level_1/link_to_non_exec
tests/security-manager-tests/test_DIR/app_dir/level_1/normal
tests/security-manager-tests/test_DIR/app_dir/link_to_exec
tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_dir
tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_exec
tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_normal
tests/security-manager-tests/test_DIR/app_dir/link_to_non_exec
tests/security-manager-tests/test_DIR/app_dir/normal
tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/.level_2/exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/.level_2/normal
tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/level_2/exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/level_2/normal
tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/normal
tests/security-manager-tests/test_DIR/app_dir_public_ro/exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/.level_2/exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/.level_2/normal
tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_non_exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/normal
tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_non_exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/normal
tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_dir
tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_normal
tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/normal
tests/security-manager-tests/test_DIR/non_app_dir/.level_1/.level_2/exec
tests/security-manager-tests/test_DIR/non_app_dir/.level_1/.level_2/normal
tests/security-manager-tests/test_DIR/non_app_dir/.level_1/exec
tests/security-manager-tests/test_DIR/non_app_dir/.level_1/level_2/exec
tests/security-manager-tests/test_DIR/non_app_dir/.level_1/level_2/normal
tests/security-manager-tests/test_DIR/non_app_dir/.level_1/normal
tests/security-manager-tests/test_DIR/non_app_dir/exec
tests/security-manager-tests/test_DIR/non_app_dir/level_1/.level_2/exec
tests/security-manager-tests/test_DIR/non_app_dir/level_1/.level_2/normal
tests/security-manager-tests/test_DIR/non_app_dir/level_1/exec
tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/exec
tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_exec
tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_non_exec
tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/normal
tests/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_exec
tests/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_non_exec
tests/security-manager-tests/test_DIR/non_app_dir/level_1/normal
tests/security-manager-tests/test_DIR/non_app_dir/link_to_exec
tests/security-manager-tests/test_DIR/non_app_dir/link_to_non_exec
tests/security-manager-tests/test_DIR/non_app_dir/normal
Change-Id: If7b091f075dd360826c7194e94443a35adf27b1e
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
Zbigniew Jasinski [Wed, 22 Apr 2015 08:52:50 +0000 (10:52 +0200)]
Merge branch 'cynara' into tizen
Change-Id: I2d1b3e38f0ccab3cec1a1a107fc778dfb604986f
Zbigniew Jasinski [Wed, 22 Apr 2015 08:49:05 +0000 (10:49 +0200)]
Merge branch 'tizen' into cynara
Change-Id: I8a7de3e8b797c0caf5096de797e896667ea0d3dc
Marcin Niesluchowski [Wed, 29 Oct 2014 10:44:56 +0000 (11:44 +0100)]
Fix smack_check() function
Change-Id: I0ce0e769b7eb5b50dff34eea00db86c54a80eed9
Krzysztof Jackiewicz [Fri, 17 Apr 2015 13:37:00 +0000 (15:37 +0200)]
Merge branch ckm into tizen
Change-Id: I27c9ffe96224209920222f00756c762edf820e17
Krzysztof Jackiewicz [Fri, 17 Apr 2015 13:20:13 +0000 (15:20 +0200)]
CKM: Add package dependency on key-manager-listener
[Issue#] N/A
[Feature/Bug] N/A
[Problem] Failing CC mode tests
[Cause] Missing dependency
[Solution] Dependency added
[Verification] Remove key-manager-listener from image. Try to install tests.
They should require key-manager-listener.
Change-Id: I017152d4e9d5c76ce7c6effc2c36dd342ca822e0
Krzysztof Jackiewicz [Thu, 16 Apr 2015 10:17:53 +0000 (12:17 +0200)]
Merging tizen into ckm. Stage 3.
Merged remote-tracking branch 'tizen.org/tizen' into ckm
Change-Id: Iffa2e26113f653cf4c6f685bc7e4dc7d25472ae5
Krzysztof Jackiewicz [Thu, 16 Apr 2015 10:08:44 +0000 (12:08 +0200)]
Merging tizen into ckm. Stage 2.
Merged commit '
7019d2b04887994ff0f87ab8020cc367ffe1994a' into ckm
Change-Id: I80f23e4825da2bb7167d43863e6ed1331a5f5776