aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmake/PkgConfigWithFallbackOnConfigScript.cmake2
-rw-r--r--plugins/crypto-vala/src/cipher.vala2
2 files changed, 3 insertions, 1 deletions
diff --git a/cmake/PkgConfigWithFallbackOnConfigScript.cmake b/cmake/PkgConfigWithFallbackOnConfigScript.cmake
index 563e4ab3..4bc94a33 100644
--- a/cmake/PkgConfigWithFallbackOnConfigScript.cmake
+++ b/cmake/PkgConfigWithFallbackOnConfigScript.cmake
@@ -88,6 +88,8 @@ function(find_pkg_config_with_fallback_on_config_script name)
string(REGEX REPLACE "^(.* |)-L([^ ]*)( .*|)$" "\\2" ${name}_LIBRARY_DIRS "${${name}_LDFLAGS}")
find_library(${name}_LIBRARY ${${name}_LIBRARY_NAME} HINTS ${${name}_LIBRARY_DIRS})
mark_as_advanced(${name}_LIBRARY)
+ set(${name}_LIBRARY ${${name}_LIBRARY} PARENT_SCOPE)
+ set(${name}_VERSION ${${name}_VERSION} PARENT_SCOPE)
unset(${name}_LIBRARY_NAME)
unset(${name}_LIBRARY_DIRS)
diff --git a/plugins/crypto-vala/src/cipher.vala b/plugins/crypto-vala/src/cipher.vala
index 75e5d26e..4a97ec25 100644
--- a/plugins/crypto-vala/src/cipher.vala
+++ b/plugins/crypto-vala/src/cipher.vala
@@ -22,7 +22,7 @@ public class SymmetricCipher {
case GCrypt.Cipher.Mode.POLY1305: return "POLY1305";
case GCrypt.Cipher.Mode.OCB: return "OCB";
case GCrypt.Cipher.Mode.CFB8: return "CFB8";
- case GCrypt.Cipher.Mode.XTS: return "XTS";
+ // case GCrypt.Cipher.Mode.XTS: return "XTS"; // Not supported in gcrypt < 1.8
}
return "NONE";
}