Fix buildbreak on wayland x86_64

Change-Id: Id9ad5da78b5bee5bd1c15870c7857eb311ed1113

diff --git a/src/manager/CMakeLists.txt b/src/manager/CMakeLists.txt
index 5dfbc78..817583a 100644 (file)
--- a/src/manager/CMakeLists.txt
+++ b/src/manager/CMakeLists.txt
@@ -68,4 +68,4 @@ TARGET_LINK_LIBRARIES(${TARGET_KEY_MANAGER_COMMON}
 
 ################################################################################
 
-INSTALL(TARGETS ${TARGET_KEY_MANAGER_COMMON} DESTINATION lib)
+INSTALL(TARGETS ${TARGET_KEY_MANAGER_COMMON} DESTINATION ${LIB_INSTALL_DIR})

diff --git a/src/manager/client/client-common.cpp b/src/manager/client/client-common.cpp
index a05f7e3..aeb79cd 100644 (file)
--- a/src/manager/client/client-common.cpp
+++ b/src/manager/client/client-common.cpp
@@ -116,7 +116,7 @@ int connectSocket(int& sock, char const * const interface) {
             return CKM_API_ERROR_SOCKET;
         }
         int error = 0;
-        size_t len = sizeof(error);
+        socklen_t len = sizeof(error);
         retval = getsockopt(sock, SOL_SOCKET, SO_ERROR, &error, &len);
 
         if (-1 == retval) {

diff --git a/src/manager/common/base64.cpp b/src/manager/common/base64.cpp
index 1be549b..f184505 100644 (file)
--- a/src/manager/common/base64.cpp
+++ b/src/manager/common/base64.cpp
@@ -54,7 +54,7 @@ void Base64Encoder::finalize()
         ThrowMsg(Exception::AlreadyFinalized, "Already finalized.");
     }
     m_finalized = true;
-    BIO_flush(m_b64);
+    (void)BIO_flush(m_b64);
 }
 
 RawBuffer Base64Encoder::get()

diff --git a/src/manager/common/key-impl.cpp b/src/manager/common/key-impl.cpp
index ceb6ef0..79d248b 100644 (file)
--- a/src/manager/common/key-impl.cpp
+++ b/src/manager/common/key-impl.cpp
@@ -117,7 +117,7 @@ KeyImpl::KeyImpl(const RawBuffer &buf, const Password &password)
     }
 
     if (!pkey && buf[0] != '-') {
-        BIO_reset(bio.get());
+        (void)BIO_reset(bio.get());
         BIO_write(bio.get(), buf.data(), buf.size());
         pkey = d2i_PrivateKey_bio(bio.get(), NULL);
         isPrivate = true;
@@ -125,7 +125,7 @@ KeyImpl::KeyImpl(const RawBuffer &buf, const Password &password)
     }
 
     if (!pkey && buf[0] == '-') {
-        BIO_reset(bio.get());
+        (void)BIO_reset(bio.get());
         BIO_write(bio.get(), buf.data(), buf.size());
         pkey = PEM_read_bio_PUBKEY(bio.get(), NULL, passcb, const_cast<Password*>(&password));
         isPrivate = false;
@@ -133,7 +133,7 @@ KeyImpl::KeyImpl(const RawBuffer &buf, const Password &password)
     }
 
     if (!pkey && buf[0] == '-') {
-        BIO_reset(bio.get());
+        (void)BIO_reset(bio.get());
         BIO_write(bio.get(), buf.data(), buf.size());
         pkey = PEM_read_bio_PrivateKey(bio.get(), NULL, passcb, const_cast<Password*>(&password));
         isPrivate = true;