Migrate to openssl3

Change-Id: Ide4665e5754e583c1a55445f53f7880b01f58c84

diff --git a/cert-svc-vcore.pc.in b/cert-svc-vcore.pc.in
index 5a0a130..a317583 100644 (file)
--- a/cert-svc-vcore.pc.in
+++ b/cert-svc-vcore.pc.in
@@ -4,6 +4,6 @@ includedir=@INCLUDEDIR@
 Name: cert-svc-vcore
 Description: cert-svc-vcore
 Version: @VERSION@
-Requires: libxml-2.0 libxslt openssl1.1 xmlsec1
+Requires: libxml-2.0 libxslt openssl3 xmlsec1
 Libs: -L${libdir} -lcert-svc-vcore
 Cflags: -I${includedir}/cert-svc

diff --git a/packaging/cert-svc.spec b/packaging/cert-svc.spec
index b49889f..fe96968 100644 (file)
--- a/packaging/cert-svc.spec
+++ b/packaging/cert-svc.spec
@@ -12,8 +12,8 @@ BuildRequires: coreutils
 BuildRequires: findutils
 BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(klay)
-BuildRequires: openssl1.1
-BuildRequires: pkgconfig(openssl1.1)
+BuildRequires: openssl3
+BuildRequires: pkgconfig(openssl3)
 BuildRequires: pkgconfig(libpcrecpp)
 BuildRequires: pkgconfig(xmlsec1)
 BuildRequires: pkgconfig(libxml-2.0)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0a8d584..9d4c5f5 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,7 +22,7 @@ PKG_CHECK_MODULES(VCORE_DEPS
     REQUIRED
     libxml-2.0
     libpcrecpp
-    openssl1.1
+    openssl3
     xmlsec1
     dlog
     libsystemd

diff --git a/src/vcore/CertificateLoader.cpp b/src/vcore/CertificateLoader.cpp
index b3902ea..6e2c842 100644 (file)
--- a/src/vcore/CertificateLoader.cpp
+++ b/src/vcore/CertificateLoader.cpp
@@ -79,7 +79,7 @@ CertificateLoader::CertificateLoaderResult CertificateLoader::loadCertificateFro
 
        if (pKey != NULL) {
                if (EVP_PKEY_type(EVP_PKEY_base_id(pKey)) == EVP_PKEY_RSA) {
-                       RSA *pRSA = EVP_PKEY_get0_RSA(pKey);
+                       const RSA *pRSA = EVP_PKEY_get0_RSA(pKey);
 
                        if (pRSA) {
                                int keyLength = RSA_size(pRSA);

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a3c86e9..0db063b 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -21,7 +21,7 @@ SET(TARGET_PLUGIN_SAMPLE "cert-svc-validator-plugin")
 PKG_CHECK_MODULES(TEST_DEP
     REQUIRED
     libpcrecpp
-    openssl1.1
+    openssl3
     )
 
 SET(TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})

diff --git a/tests/capi/test-certificate.cpp b/tests/capi/test-certificate.cpp
index 5ea359b..a1944c2 100644 (file)
--- a/tests/capi/test-certificate.cpp
+++ b/tests/capi/test-certificate.cpp
@@ -239,7 +239,7 @@ RUNNER_TEST(T01053_cert_get_field_other)
        _get_string_field_and_check(
                cert,
                CERTSVC_KEY,
-               "                RSA Public-Key: (1024 bit)\n"
+               "                Public-Key: (1024 bit)\n"
                "                Modulus:\n"
                "                    00:d8:08:a3:a3:05:fb:e2:df:36:cd:e3:48:2f:3b:\n"
                "                    59:17:ce:e3:32:bf:9f:ef:f1:7c:fb:27:f9:7c:32:\n"