- check unprotected header as a fallback; (#8)

eu-digital-green-certificates · May 12, 2021 · cb0cb9b · cb0cb9b
1 parent 542f8bd
commit cb0cb9b
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/decoder/src/main/java/dgca/verifier/app/decoder/cose/DefaultCoseService.kt b/decoder/src/main/java/dgca/verifier/app/decoder/cose/DefaultCoseService.kt
@@ -36,12 +36,16 @@ class DefaultCoseService : CoseService {
             val content = messageObject[2].GetByteString()
             val rgbProtected = messageObject[0].GetByteString()
             val key = HeaderKeys.KID.AsCBOR()
-            val objProtected = CBORObject.DecodeFromBytes(rgbProtected).get(key).GetByteString()
-            CoseData(content, objProtected)
+            var kid = CBORObject.DecodeFromBytes(rgbProtected).get(key)
+            // Kid in unprotected header
+            if (kid == null) {
+                kid = messageObject[1].get(key)
+            }
+            val kidByteString = kid.GetByteString()
+            CoseData(content, kidByteString)
 
         } catch (e: Throwable) {
             null
         }
     }
-}
-
+}