cmake: enforce USE_SHA1 and USE_SHA256 validity

Author: ethomson

cmake/SelectHashes.cmake

@@ -2,13 +2,12 @@
 
 include(SanitizeBool)
 
-# USE_SHA1=CollisionDetection(ON)/HTTPS/Generic/OFF
 sanitizebool(USE_SHA1)
 sanitizebool(USE_SHA256)
 
 # sha1
 
-if(USE_SHA1 STREQUAL ON)
+if(USE_SHA1 STREQUAL "" OR USE_SHA1 STREQUAL ON)
 	SET(USE_SHA1 "CollisionDetection")
 elseif(USE_SHA1 STREQUAL "HTTPS")
 	if(USE_HTTPS STREQUAL "SecureTransport")
@@ -20,7 +19,7 @@ elseif(USE_SHA1 STREQUAL "HTTPS")
 	elseif(USE_HTTPS)
 		set(USE_SHA1 ${USE_HTTPS})
 	else()
-		set(USE_SHA1 "CollisionDetection")
+		message(FATAL_ERROR "asked for HTTPS SHA1 backend but HTTPS is not enabled")
 	endif()
 endif()
 
@@ -41,15 +40,21 @@ elseif(USE_SHA1 STREQUAL "mbedTLS")
 elseif(USE_SHA1 STREQUAL "Win32")
 	set(GIT_SHA1_WIN32 1)
 else()
-	message(FATAL_ERROR "Asked for unknown SHA1 backend: ${USE_SHA1}")
+	message(FATAL_ERROR "asked for unknown SHA1 backend: ${USE_SHA1}")
 endif()
 
 # sha256
 
-if(USE_SHA256 STREQUAL ON AND USE_HTTPS)
-	SET(USE_SHA256 "HTTPS")
-elseif(USE_SHA256 STREQUAL ON)
-	SET(USE_SHA256 "Builtin")
+if(USE_SHA256 STREQUAL "" OR USE_SHA256 STREQUAL ON)
+	if(USE_HTTPS)
+		SET(USE_SHA256 "HTTPS")
+	else()
+		SET(USE_SHA256 "builtin")
+	endif()
+endif()
+
+if(USE_SHA256 STREQUAL "Builtin")
+	set(USE_SHA256 "builtin")
 endif()
 
 if(USE_SHA256 STREQUAL "HTTPS")
@@ -64,7 +69,7 @@ if(USE_SHA256 STREQUAL "HTTPS")
 	endif()
 endif()
 
-if(USE_SHA256 STREQUAL "Builtin")
+if(USE_SHA256 STREQUAL "builtin")
 	set(GIT_SHA256_BUILTIN 1)
 elseif(USE_SHA256 STREQUAL "OpenSSL")
 	set(GIT_SHA256_OPENSSL 1)
@@ -81,7 +86,7 @@ elseif(USE_SHA256 STREQUAL "mbedTLS")
 elseif(USE_SHA256 STREQUAL "Win32")
 	set(GIT_SHA256_WIN32 1)
 else()
-	message(FATAL_ERROR "Asked for unknown SHA256 backend: ${USE_SHA256}")
+	message(FATAL_ERROR "asked for unknown SHA256 backend: ${USE_SHA256}")
 endif()
 
 # add library requirements

src/util/CMakeLists.txt

@@ -49,7 +49,7 @@ endif()
 
 list(SORT UTIL_SRC_SHA1)
 
-if(USE_SHA256 STREQUAL "Builtin")
+if(USE_SHA256 STREQUAL "builtin")
 	file(GLOB UTIL_SRC_SHA256 hash/builtin.* hash/rfc6234/*)
 elseif(USE_SHA256 STREQUAL "OpenSSL" OR USE_SHA256 STREQUAL "OpenSSL-Dynamic" OR USE_SHA256 STREQUAL "OpenSSL-FIPS")
 	add_definitions(-DOPENSSL_API_COMPAT=0x10100000L)
@@ -61,7 +61,7 @@ elseif(USE_SHA256 STREQUAL "mbedTLS")
 elseif(USE_SHA256 STREQUAL "Win32")
 	file(GLOB UTIL_SRC_SHA256 hash/win32.*)
 else()
-	message(FATAL_ERROR "Asked for unknown SHA256 backend: ${USE_SHA256}")
+	message(FATAL_ERROR "asked for unknown SHA256 backend: ${USE_SHA256}")
 endif()
 
 list(SORT UTIL_SRC_SHA256)