From 5cd1e8ee1c1d8fa7849627c888737f7eb0fd37b4 Mon Sep 17 00:00:00 2001
From: Mohamed Metwalli <mohamed.metwalli@sap.com>
Date: Mon, 7 Jun 2021 12:24:29 +0200
Subject: [PATCH] Remove dgc from hash (#3359)
---
.../coronatest/qrcode/RapidAntigenQrCodeExtractor.kt | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/qrcode/RapidAntigenQrCodeExtractor.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/qrcode/RapidAntigenQrCodeExtractor.kt
index 703886f8e..2265512e0 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/qrcode/RapidAntigenQrCodeExtractor.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/qrcode/RapidAntigenQrCodeExtractor.kt
@@ -147,15 +147,9 @@ class RapidAntigenQrCodeExtractor @Inject constructor() : QrCodeExtractor<Corona
private fun requireValidHash() {
val isQrCodeWithPersonalData = firstName != null && lastName != null && dateOfBirth != null
- val rawBuilder = StringBuilder(
+ val generatedHash =
"${raw.dateOfBirth}#${raw.firstName}#${raw.lastName}#${raw.timestamp}#${raw.testid}#${raw.salt}"
- )
- if (raw.dgc != null) {
- val asInt = if (raw.dgc == true) 1 else 0
- rawBuilder.append("#$asInt")
- }
-
- val generatedHash = rawBuilder.toString().toSHA256()
+ .toSHA256()
if (isQrCodeWithPersonalData && !generatedHash.equals(hash, true)) {
throw InvalidQRCodeException("Generated hash doesn't match QRCode hash")
}
--
GitLab