Fix compilation with older gcrypt

This commit is contained in:
Marvin W 2019-09-17 00:34:39 +02:00
parent 9daf18f031
commit f746ce74ce
No known key found for this signature in database
GPG key ID: 072E9235DB996F2A
2 changed files with 3 additions and 1 deletions

View file

@ -88,6 +88,8 @@ function(find_pkg_config_with_fallback_on_config_script name)
string(REGEX REPLACE "^(.* |)-L([^ ]*)( .*|)$" "\\2" ${name}_LIBRARY_DIRS "${${name}_LDFLAGS}") string(REGEX REPLACE "^(.* |)-L([^ ]*)( .*|)$" "\\2" ${name}_LIBRARY_DIRS "${${name}_LDFLAGS}")
find_library(${name}_LIBRARY ${${name}_LIBRARY_NAME} HINTS ${${name}_LIBRARY_DIRS}) find_library(${name}_LIBRARY ${${name}_LIBRARY_NAME} HINTS ${${name}_LIBRARY_DIRS})
mark_as_advanced(${name}_LIBRARY) 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_NAME)
unset(${name}_LIBRARY_DIRS) unset(${name}_LIBRARY_DIRS)

View file

@ -22,7 +22,7 @@ public class SymmetricCipher {
case GCrypt.Cipher.Mode.POLY1305: return "POLY1305"; case GCrypt.Cipher.Mode.POLY1305: return "POLY1305";
case GCrypt.Cipher.Mode.OCB: return "OCB"; case GCrypt.Cipher.Mode.OCB: return "OCB";
case GCrypt.Cipher.Mode.CFB8: return "CFB8"; 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"; return "NONE";
} }