Return ByteArray from parseFidoSerNumExtension

Author: emlun

webauthn-server-attestation/src/main/java/com/yubico/webauthn/attestation/CertificateUtil.java

@@ -25,6 +25,7 @@
 package com.yubico.webauthn.attestation;
 
 import com.yubico.internal.util.BinaryUtil;
+import com.yubico.webauthn.data.ByteArray;
 import java.security.cert.X509Certificate;
 import java.util.Optional;
 import lombok.experimental.UtilityClass;
@@ -44,8 +45,9 @@ private static byte[] parseSerNum(byte[] bytes) {
     }
   }
 
-  public static Optional<byte[]> parseFidoSerNumExtension(X509Certificate cert) {
+  public static Optional<ByteArray> parseFidoSerNumExtension(X509Certificate cert) {
     return Optional.ofNullable(cert.getExtensionValue(ID_FIDO_GEN_CE_SERNUM))
-        .map(CertificateUtil::parseSerNum);
+        .map(CertificateUtil::parseSerNum)
+        .map(ByteArray::new);
   }
 }

webauthn-server-attestation/src/test/scala/com/yubico/webauthn/attestation/CertificateUtilSpec.scala

@@ -71,7 +71,6 @@ class CertificateUtilSpec
             CertificateUtil
               .parseFidoSerNumExtension(cert)
               .toScala
-              .map(new ByteArray(_))
           result should equal(Some(sernum))
       }
     }
@@ -110,7 +109,6 @@ class CertificateUtilSpec
         CertificateUtil
           .parseFidoSerNumExtension(cert)
           .toScala
-          .map(new ByteArray(_))
 
       result should equal(Some(ByteArray.fromHex("01AFCEFB")))