From 75d28446869d75e35e29e024619e10fbfe58b008 Mon Sep 17 00:00:00 2001 From: Dariusz Michaluk Date: Mon, 29 Jul 2019 14:43:09 +0200 Subject: [PATCH] Migrate to openssl 1.1 Change-Id: Ie6911138811df8a740cb2e6641022d024009015f --- common/dbus_interfaces/CMakeLists.txt | 2 +- packaging/fido-asm.spec | 4 ++-- server/CMakeLists.txt | 3 +-- silent_auth/CMakeLists.txt | 2 +- test/shell_tc/CMakeLists.txt | 2 +- ui/CMakeLists.txt | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/common/dbus_interfaces/CMakeLists.txt b/common/dbus_interfaces/CMakeLists.txt index 3920e77..9fb7d20 100644 --- a/common/dbus_interfaces/CMakeLists.txt +++ b/common/dbus_interfaces/CMakeLists.txt @@ -12,7 +12,7 @@ pkg_check_modules(FIDO_ASM_DBUS_PKGS REQUIRED gobject-2.0 capi-base-common json-glib-1.0 - openssl + openssl1.1 ) FOREACH(flag ${FIDO_ASM_DBUS_PKGS_CFLAGS}) diff --git a/packaging/fido-asm.spec b/packaging/fido-asm.spec index 740060c..012ec0e 100755 --- a/packaging/fido-asm.spec +++ b/packaging/fido-asm.spec @@ -32,7 +32,7 @@ BuildRequires: pkgconfig(capi-appfw-app-manager) BuildRequires: pkgconfig(iotcon) BuildRequires: pkgconfig(capi-system-info) BuildRequires: pkgconfig(capi-system-system-settings) -BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(openssl1.1) BuildRequires: pkgconfig(vconf) BuildRequires: pkgconfig(capi-network-bluetooth) BuildRequires: pkgconfig(capi-network-wifi-direct) @@ -198,7 +198,7 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.26 BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(elementary) BuildRequires: pkgconfig(efl-extension) -BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(openssl1.1) BuildRequires: pkgconfig(libtzplatform-config) diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index 58c5e68..ccfcb45 100755 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -19,10 +19,9 @@ pkg_check_modules(SERVICE_PKGS REQUIRED capi-base-common capi-appfw-application capi-appfw-app-manager - openssl + openssl1.1 aul json-glib-1.0 - openssl capi-system-info capi-system-system-settings vconf diff --git a/silent_auth/CMakeLists.txt b/silent_auth/CMakeLists.txt index d632603..a9ef6b2 100644 --- a/silent_auth/CMakeLists.txt +++ b/silent_auth/CMakeLists.txt @@ -24,7 +24,7 @@ pkg_check_modules(SILENT_AUTH_PKGS REQUIRED glib-2.0 capi-base-common pkgmgr-info - openssl + openssl1.1 json-glib-1.0 capi-network-connection aul diff --git a/test/shell_tc/CMakeLists.txt b/test/shell_tc/CMakeLists.txt index 68f221a..233a3c6 100644 --- a/test/shell_tc/CMakeLists.txt +++ b/test/shell_tc/CMakeLists.txt @@ -15,7 +15,7 @@ pkg_check_modules(FIDO_ASM_SHELL_TC_PKGS REQUIRED cynara-session cynara-creds-gdbus capi-network-connection - openssl + openssl1.1 sqlite3 json-glib-1.0 capi-base-common diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt index b4870d6..660e8ec 100644 --- a/ui/CMakeLists.txt +++ b/ui/CMakeLists.txt @@ -34,7 +34,7 @@ pkg_check_modules(pkgs REQUIRED aul vconf efl-extension - openssl + openssl1.1 ) FOREACH(flag ${pkgs_CFLAGS}) -- 2.7.4