Migrate to openssl 1.1

Change-Id: I07c36154ada7a74d59ba1e8d784309475157db33

diff --git a/packaging/yaca.spec b/packaging/yaca.spec
index 51357741bc73c7b8662d84b7715a835b86acbb53..59f0591ad6e3f3814f7e2ba6aca5e5f97f1fcf91 100644 (file)
--- a/packaging/yaca.spec
+++ b/packaging/yaca.spec
@@ -8,7 +8,7 @@ Summary:            Yet Another Crypto API
 BuildRequires:      cmake
 BuildRequires:      python3 >= 3.4
 BuildRequires:      pkgconfig(capi-base-common)
-BuildRequires:      pkgconfig(openssl)
+BuildRequires:      pkgconfig(openssl1.1)
 Requires(post):     /sbin/ldconfig
 Requires(postun):   /sbin/ldconfig
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2e022fcaa402bd0dd08e56ee0ee185b1e3cc9587..57c44880cb74f2034c411488c36fd8e7eb50213d 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -45,7 +45,7 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
                       VERSION    ${_LIB_VERSION_})
 
 ## Link libraries ##############################################################
-PKG_CHECK_MODULES(YACA_DEPS REQUIRED openssl capi-base-common)
+PKG_CHECK_MODULES(YACA_DEPS REQUIRED openssl1.1 capi-base-common)
 
 FIND_PACKAGE (Threads)
 

diff --git a/src/debug.c b/src/debug.c
index e49a4ca8b2464d27a2117a1b5f6c2ec28ca7eea6..169335c01c2dcbcc1f9cf8290528335c9a817d56 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -126,6 +126,7 @@ int error_handle(const char *file, int line, const char *function)
 #if OPENSSL_VERSION_NUMBER > 0x10100000L
        case ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_OSSL_PRIVATE_DECRYPT, RSA_R_DATA_GREATER_THAN_MOD_LEN):
        case ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_OSSL_PUBLIC_DECRYPT, RSA_R_DATA_GREATER_THAN_MOD_LEN):
+       case ERR_PACK(ERR_LIB_PEM, PEM_F_GET_NAME, PEM_R_NO_START_LINE):
 #else /* OPENSSL_VERSION_NUMBER > 0x10100000L */
        case ERR_PACK(ERR_LIB_RSA, RSA_F_PKEY_RSA_CTRL, RSA_R_INVALID_KEYBITS):
        case ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_EAY_PRIVATE_DECRYPT, RSA_R_DATA_GREATER_THAN_MOD_LEN):