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 703886f8eb57475d09d92de7a2779394d92972ac..2265512e021fba44f390d1bc7eb90bd4d79d4e7a 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") }