Migrate to openssl 1.1

This commit needs curl migrated to openssl1.1

Change-Id: I01aaf2b3b165dc69bfd30324e407655273563920

diff --git a/packaging/pubkey-pinning.spec b/packaging/pubkey-pinning.spec
index b4dc91571551d728158c3540466b837f0392f433..771777b0c5b4eb55b11e626c4d1a57fc8a7f382a 100644 (file)
--- a/packaging/pubkey-pinning.spec
+++ b/packaging/pubkey-pinning.spec
@@ -11,7 +11,7 @@ Source1:    %name.manifest
 BuildRequires: cmake
 BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(libcurl)
-BuildRequires: pkgconfig(openssl)
+BuildRequires: pkgconfig(openssl1.1)
 Requires: /sbin/ldconfig
 
 %description

diff --git a/src/curl/CMakeLists.txt b/src/curl/CMakeLists.txt
index f26aa2ae69cd35baacbc3970ba70b51d0a9a4726..2c09ffb2027490f36ad1bad83ae3bd341eb4a52d 100644 (file)
--- a/src/curl/CMakeLists.txt
+++ b/src/curl/CMakeLists.txt
@@ -18,7 +18,7 @@
 #
 PKG_CHECK_MODULES(TPKP_CURL_DEP
        REQUIRED
-       openssl
+       openssl1.1
        libcurl
        dlog
        )

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d19c1eff944987ebdd72c9d9b93618143638634b..9b184764e03b90105fafc74c9b3d8486c36eeefc 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -20,7 +20,7 @@ ADD_DEFINITIONS("-DBOOST_TEST_DYN_LINK")
 
 PKG_CHECK_MODULES(TEST_TPKP_DEP
        REQUIRED
-       openssl
+       openssl1.1
        libcurl
        )
 

diff --git a/tpkp-curl-deprecated.pc.in b/tpkp-curl-deprecated.pc.in
index f8cac953be49934d44dcec952a74e7dbb5785062..3f634bcf1930db92384dbd4811712d3d662b7930 100644 (file)
--- a/tpkp-curl-deprecated.pc.in
+++ b/tpkp-curl-deprecated.pc.in
@@ -4,6 +4,6 @@ includedir=@INCLUDEDIR@
 Name: tpkp-curl-deprecated
 Description: Tizen HPKP for curl
 Version: @VERSION@
-Requires: openssl libcurl
+Requires: openssl1.1 libcurl
 Libs: -L${libdir} -ltpkp-curl-deprecated -ltpkp-common-deprecated
 Cflags: -I${includedir}/tpkp/curl -I${includedir}/tpkp/common

diff --git a/tpkp-curl.pc.in b/tpkp-curl.pc.in
index a744c037fe0158e60624d2b005e25b1d93090b7d..219fd65aebbfb1e2b0f581c62c72cbc7db5cfdf3 100644 (file)
--- a/tpkp-curl.pc.in
+++ b/tpkp-curl.pc.in
@@ -4,6 +4,6 @@ includedir=@INCLUDEDIR@
 Name: tpkp-curl
 Description: Tizen HPKP for curl
 Version: @VERSION@
-Requires: openssl libcurl
+Requires: openssl1.1 libcurl
 Libs: -L${libdir} -ltpkp-curl -ltpkp-common
 Cflags: -I${includedir}/tpkp/curl -I${includedir}/tpkp/common