Merge pull request #1059 from jameshilliard/check-opal-get-status

vojtechtrefny · web-flow · commit 92560ae07c9a · 2024-09-11T11:06:57.000+02:00
crypto: check that IOC_OPAL_GET_STATUS is defined
diff --git a/src/plugins/crypto.c b/src/plugins/crypto.c
@@ -3642,7 +3642,7 @@ gboolean bd_crypto_fvault2_close (const gchar *fvault2_device, GError **error) {
  *
  * Tech category: %BD_CRYPTO_TECH_SED_OPAL-%BD_CRYPTO_TECH_MODE_QUERY
  */
-#ifndef HAVE_LINUX_OPAL
+#if !defined(HAVE_LINUX_OPAL) || !defined(IOC_OPAL_GET_STATUS)
 gboolean bd_crypto_opal_is_supported (const gchar *device G_GNUC_UNUSED, GError **error) {
     /* this will return FALSE and set error, because OPAL technology is not available */
     return bd_crypto_is_tech_avail (BD_CRYPTO_TECH_SED_OPAL, BD_CRYPTO_TECH_MODE_QUERY, error);

Original file line number	Diff line number	Diff line change
`@@ -3642,7 +3642,7 @@ gboolean bd_crypto_fvault2_close (const gchar fvault2_device, GError *error) {`
`3642`	`3642`	`*`
`3643`	`3643`	`* Tech category: %BD_CRYPTO_TECH_SED_OPAL-%BD_CRYPTO_TECH_MODE_QUERY`
`3644`	`3644`	`*/`
`3645`		`-#ifndef HAVE_LINUX_OPAL`
	`3645`	`+#if !defined(HAVE_LINUX_OPAL) \|\| !defined(IOC_OPAL_GET_STATUS)`
`3646`	`3646`	`gboolean bd_crypto_opal_is_supported (const gchar device G_GNUC_UNUSED, GError *error) {`
`3647`	`3647`	`/* this will return FALSE and set error, because OPAL technology is not available */`
`3648`	`3648`	`return bd_crypto_is_tech_avail (BD_CRYPTO_TECH_SED_OPAL, BD_CRYPTO_TECH_MODE_QUERY, error);`