Don't log about ignoring zero AAGUID when no AAGUID was given

emlun · emlun · commit 3b38ef6bba55 · 2022-09-13T21:09:16.000+02:00
diff --git a/webauthn-server-attestation/src/main/java/com/yubico/fido/metadata/FidoMetadataService.java b/webauthn-server-attestation/src/main/java/com/yubico/fido/metadata/FidoMetadataService.java
@@ -499,7 +499,7 @@ public Set<MetadataBLOBPayloadEntry> findEntries(
         certSubjectKeyIdentifiers,
         aaguid);
 
-    if (!nonzeroAaguid.isPresent()) {
+    if (aaguid.isPresent() && !nonzeroAaguid.isPresent()) {
       log.debug("findEntries: ignoring zero AAGUID");
     }
 

Original file line number	Diff line number	Diff line change
`@@ -499,7 +499,7 @@ public Set<MetadataBLOBPayloadEntry> findEntries(`
`499`	`499`	`certSubjectKeyIdentifiers,`
`500`	`500`	`aaguid);`
`501`	`501`
`502`		`- if (!nonzeroAaguid.isPresent()) {`
	`502`	`+ if (aaguid.isPresent() && !nonzeroAaguid.isPresent()) {`
`503`	`503`	`log.debug("findEntries: ignoring zero AAGUID");`
`504`	`504`	`}`
`505`	`505`