Merge pull request #56 from dvucich/key_check

Fix the master key check in osdp_cp_setup()
goToMain · Jun 11, 2021 · 7a1f6db · 7a1f6db
2 parents 557298e + b35cabb
commit 7a1f6db
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/osdp_cp.c b/src/osdp_cp.c
@@ -1130,9 +1130,11 @@ osdp_t *osdp_cp_setup(int num_pd, osdp_pd_info_t *info, uint8_t *master_key)
 		}
 	}
 
-	if (master_key == NULL && scbk_count != num_pd) {
-		LOG_WRN("Master key / SCBK not passed; SC Disabled.");
-		SET_FLAG(ctx, FLAG_SC_DISABLED);
+	if (master_key == NULL) {
+		if (scbk_count != num_pd) {
+			LOG_WRN("Master key / SCBK not passed; SC Disabled.");
+			SET_FLAG(ctx, FLAG_SC_DISABLED);
+		}
 	} else {
 		LOG_WRN("Master Key based key derivation is discouraged! "
 		        "Consider passing individual SCBKs");