projects / platform / core / test / security-tests.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 08a4149 28c3e02)
Merge branch 'ckm' into tizen 99/291199/1 tizen_6.5 tizen_7.0
authorDariusz Michaluk <d.michaluk@samsung.com>
Tue, 11 Apr 2023 12:22:38 +0000 (14:22 +0200)
committerDariusz Michaluk <d.michaluk@samsung.com>
Tue, 11 Apr 2023 12:22:38 +0000 (14:22 +0200)
Change-Id: I568bc8337c9fca77181af04283efd7c28e1ddcdc

1  2 
packaging/security-tests.manifest patch | diff1 | diff2 | blob | history
packaging/security-tests.spec patch | diff1 | diff2 | blob | history
src/CMakeLists.txt patch | diff1 | diff2 | blob | history

diff --cc packaging/security-tests.manifest
Simple merge
diff --cc packaging/security-tests.spec
index 99ac084bf25b307045018276ead744c96e622ea5,51017be89c697a5db5bfae892353e6b7355cc432..0f99419d614d9844ba6929cce0b10f5f3e2f6ad5
--- 1/packaging/security-tests.spec
--- 2/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@@ -35,7 -35,9 +35,8 @@@ BuildRequires: pkgconfig(vconf
  BuildRequires: pkgconfig(libgum) >= 1.0.5
  BuildRequires: pkgconfig(security-privilege-manager)
  BuildRequires: pkgconfig(libsystemd)
+ BuildRequires: pkgconfig(device-certificate-manager) >= 2.1
  BuildRequires: openssl1.1
 -Requires: perf
  Requires: gdb
  Requires: diffutils
  Requires: iproute2
diff --cc src/CMakeLists.txt
Simple merge
Domain: Security / Uncategorized;