Check for encryption before loading key

Now we check if we need an encryption key
before we try to get it.

Fixes #338: bls always fails when scsicrypto-sd plugin is loaded

Signed-off-by: Marco van Wieringen <marco.van.wieringen@bareos.com>

src/plugins/stored/scsicrypto-sd.c

@@ -314,19 +314,35 @@ static bRC do_set_scsi_encryption_key(void *value)
     */
    dcr = (DCR *)value;
    if (!dcr) {
+      Dmsg0(dbglvl, "scsicrypto-sd: Error: dcr is not set!\n");
       return bRC_Error;
    }
    dev = dcr->dev;
    if (!dev) {
+      Dmsg0(dbglvl, "scsicrypto-sd: Error: dev is not set!\n");
       return bRC_Error;
    }
    device = dev->device;
    if (!device) {
+      Dmsg0(dbglvl, "scsicrypto-sd: Error: device is not set!\n");
       return bRC_Error;
    }
 
    *StoredVolEncrKey = '\0';
    if (!get_volume_encryption_key(dcr, StoredVolEncrKey)) {
+      Dmsg0(dbglvl, "scsicrypto-sd: Could not get_volume_encryption_key!\n");
+
+      /*
+       * Check if encryption key is needed for reading this volume.
+       */
+      P(crypto_operation_mutex);
+      if (!need_scsi_crypto_key(dev->fd(), dev->dev_name, true)) {
+         V(crypto_operation_mutex);
+         Dmsg0(dbglvl, "scsicrypto-sd: No encryption key needed!\n");
+         return bRC_OK;
+      }
+      V(crypto_operation_mutex);
+
       return bRC_Error;
    }
 
@@ -404,14 +420,17 @@ static bRC do_clear_scsi_encryption_key(void *value)
     */
    dcr = (DCR *)value;
    if (!dcr) {
+      Dmsg0(dbglvl, "scsicrypto-sd: Error: dcr is not set!\n");
       return bRC_Error;
    }
    dev = dcr->dev;
    if (!dev) {
+      Dmsg0(dbglvl, "scsicrypto-sd: Error: dev is not set!\n");
       return bRC_Error;
    }
    device = dev->device;
    if (!device) {
+      Dmsg0(dbglvl, "scsicrypto-sd: Error: device is not set!\n");
       return bRC_Error;
    }