@@ -100,7 +100,7 @@ Android Key Attestation root certificates are documented
 
 ## Getting Revoked Serials
 
-It's important to check the revoked serials list to prevent allowing accepting
+It's important to check the revoked serials list to prevent accepting
 fraudulent attestations from known leaked keys. The revoked serials may be
 retrieved from https://android.googleapis.com/attestation/status. This list is
 updated relatively frequently so it's important to use a fresh copy of the
 
@@ -31,7 +31,7 @@ interface ChallengeChecker {
   /**
    * Checks the given [challenge] for validity.
    *
-   * @return A ListenableFuture containing True if the challenge is valid, else false.
+   * @return A ListenableFuture containing true if the challenge is valid, else false.
    */
   fun checkChallenge(challenge: ByteString): ListenableFuture<Boolean>
 }
@@ -266,7 +266,7 @@ sealed class SecurityLevelConstraint(
 
   /**
    * Checks that the keyMintSecurityLevel matches the security level claimed by the certificate.
-   * this constraint may be used in conjunction with other security level constraints. e.g. it may
+   * This constraint may be used in conjunction with other security level constraints. e.g. it may
    * be combined with [STRICT] to verify that the keyMintSecurityLevel is precisely
    * [SecurityLevel.STRONG_BOX] and that the security level matches the value claimed by the
    * Google-signed certificate.
 
@@ -201,7 +201,7 @@ constructor(
    * Verifies an Android Key Attestation certificate chain asynchronously.
    *
    * @param chain The attestation certificate chain to verify.
-   * @param coroutineScope The coroutine scope to from which to run the verification.
+   * @param coroutineScope The coroutine scope from which to run the verification.
    * @param challengeChecker The challenge checker to use for additional challenge validation.
    * @param log The log hook to use for logging.
    * @return A [ListenableFuture] containing the [VerificationResult].
@@ -285,7 +285,7 @@ constructor(
             inputLimits = constraintConfig.inputLimits,
           )
         ) {
-          // Should never happen since the extension's presence is checked by by validate().
+          // Should never happen since the extension's presence is checked by validate().
           "Key attestation extension not found"
         }
       } catch (e: ExtensionParsingException) {
 
@@ -21,7 +21,7 @@ import java.io.PrintStream
 import java.security.cert.X509Certificate
 import java.time.Instant
 
-// Any chain shorter than this is not possibly valid Key Attestation chain.
+// Any chain shorter than this cannot possibly be a valid Key Attestation chain.
 private const val MIN_CERTS_IN_VALID_CHAIN = 3
 
 class VerifierCli(private val output: PrintStream, private val instantSource: InstantSource) {
 
@@ -98,7 +98,7 @@ class KeyAttestationCertPath(certs: List<X509Certificate>) : CertPath("X.509") {
     }
 
   /*
-   * The security level of the certitificate chain.
+   * The security level of the certificate chain.
    *
    * This should match the attestation security level in the key description.
    */
 
@@ -45,7 +45,7 @@ import javax.security.auth.x500.X500Principal
  * A [CertPathValidatorSpi] for verifying Android Key Attestation certificate chains.
  *
  * Older Android devices produce Key Attestation certificate chains that do not fully conform to RFC
- * 5280 and thus cannot be validating using [sun.security.provider.certpath.PKIXCertPathValidator].
+ * 5280 and thus cannot be validated using [sun.security.provider.certpath.PKIXCertPathValidator].
  * This provider implements a more permissive [CertPathValidatorSpi] implementation that is able to
  * validate these chains.
  *
@@ -334,7 +334,7 @@ private class BasicChecker(
         // TODO(google-internal bug): Add support for ATTEST_KEY chains.
         if (cert.hasAttestationExtension()) {
           throw CertPathValidatorException(
-            "Only the target certificate should contain an attestation extension, attestation extenion found in ${step}",
+            "Only the target certificate should contain an attestation extension, attestation extension found in ${step}",
             /* cause = */ null,
             certPath,
             /* index = */ remainingCerts,
 
@@ -20,7 +20,7 @@ import java.security.Provider
 import java.security.ProviderException
 
 /**
- * A JCA provider for verifying Android Key Attestation certificates chains.
+ * A JCA provider for verifying Android Key Attestation certificate chains.
  *
  * https://docs.oracle.com/en/java/javase/21/security/howtoimplaprovider.html
  */
@@ -33,7 +33,7 @@ class KeyAttestationProvider : Provider("KeyAttestation", 0.1, "Android Key Atte
         this,
         "CertPathValidator",
         "KeyAttestation",
-        "com.google.wireless.android.security.attestationverifier.provider.KeyAttestationCertPathValidator",
+        "com.android.keyattestation.verifier.provider.KeyAttestationCertPathValidator",
       )
     )
   }
 
@@ -400,7 +400,7 @@ object CertLists {
   val REVOKED_SERIAL_NUMBER_LONG_STRING = "c35747a084470c3135aeefe2b8d40cd6".toBigInteger(16)
   @JvmField val REVOKED_SERIAL_NUMBER_ODD_LENGTH = 1228286566665971148.toBigInteger()
 
-  /* A chain where the attesstation certificate has {@link REVOKED_SERIAL_NUMBER}. */
+  /* A chain where the attestation certificate has {@link REVOKED_SERIAL_NUMBER}. */
   @JvmStatic
   val revoked by lazy {
     listOf(
 
@@ -47,7 +47,7 @@ import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder
 
 internal class KeyAttestationCertFactory(
   val fakeCalendar: FakeCalendar = FakeCalendar.DEFAULT,
-  val hardodedRootKey: KeyPair? = null,
+  val hardcodedRootKey: KeyPair? = null,
   val hardcodedRoot: X509Certificate? = null,
 ) {
   private val ecKeyPairGenerator =
@@ -64,7 +64,7 @@ internal class KeyAttestationCertFactory(
 
   internal fun generateRsaKeyPair() = rsaKeyPairGenerator.generateKeyPair()
 
-  val rootKey = hardodedRootKey ?: ecKeyPairGenerator.generateKeyPair()
+  val rootKey = hardcodedRootKey ?: ecKeyPairGenerator.generateKeyPair()
   val intermediateKey = ecKeyPairGenerator.generateKeyPair()
   val rkpKey = ecKeyPairGenerator.generateKeyPair()
   val attestationKey = ecKeyPairGenerator.generateKeyPair()
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ interface ChallengeChecker {`
`31`	`31`	`/**`
`32`	`32`	`* Checks the given [challenge] for validity.`
`33`	`33`	`*`
`34`		`- * @return A ListenableFuture containing True if the challenge is valid, else false.`
	`34`	`+ * @return A ListenableFuture containing true if the challenge is valid, else false.`
`35`	`35`	`*/`
`36`	`36`	`fun checkChallenge(challenge: ByteString): ListenableFuture<Boolean>`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ constructor(`
`201`	`201`	`* Verifies an Android Key Attestation certificate chain asynchronously.`
`202`	`202`	`*`
`203`	`203`	`* @param chain The attestation certificate chain to verify.`
`204`		`- * @param coroutineScope The coroutine scope to from which to run the verification.`
	`204`	`+ * @param coroutineScope The coroutine scope from which to run the verification.`
`205`	`205`	`* @param challengeChecker The challenge checker to use for additional challenge validation.`
`206`	`206`	`* @param log The log hook to use for logging.`
`207`	`207`	`* @return A [ListenableFuture] containing the [VerificationResult].`
`@@ -285,7 +285,7 @@ constructor(`
`285`	`285`	`inputLimits = constraintConfig.inputLimits,`
`286`	`286`	`)`
`287`	`287`	`) {`
`288`		`- // Should never happen since the extension's presence is checked by by validate().`
	`288`	`+ // Should never happen since the extension's presence is checked by validate().`
`289`	`289`	`"Key attestation extension not found"`
`290`	`290`	`}`
`291`	`291`	`} catch (e: ExtensionParsingException) {`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ class KeyAttestationCertPath(certs: List<X509Certificate>) : CertPath("X.509") {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`/*`
`101`		`- * The security level of the certitificate chain.`
	`101`	`+ * The security level of the certificate chain.`
`102`	`102`	`*`
`103`	`103`	`* This should match the attestation security level in the key description.`
`104`	`104`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import java.security.Provider`
`20`	`20`	`import java.security.ProviderException`
`21`	`21`
`22`	`22`	`/**`
`23`		`- * A JCA provider for verifying Android Key Attestation certificates chains.`
	`23`	`+ * A JCA provider for verifying Android Key Attestation certificate chains.`
`24`	`24`	`*`
`25`	`25`	`* https://docs.oracle.com/en/java/javase/21/security/howtoimplaprovider.html`
`26`	`26`	`*/`
`@@ -33,7 +33,7 @@ class KeyAttestationProvider : Provider("KeyAttestation", 0.1, "Android Key Atte`
`33`	`33`	`this,`
`34`	`34`	`"CertPathValidator",`
`35`	`35`	`"KeyAttestation",`
`36`		`- "com.google.wireless.android.security.attestationverifier.provider.KeyAttestationCertPathValidator",`
	`36`	`+ "com.android.keyattestation.verifier.provider.KeyAttestationCertPathValidator",`
`37`	`37`	`)`
`38`	`38`	`)`
`39`	`39`	`}`