Loading play-services-safetynet-core/src/main/java/org/microg/gms/safetynet/Attestation.java +5 −5 Original line number Diff line number Diff line Loading @@ -46,7 +46,7 @@ public class Attestation { private Context context; private String packageName; private byte[] payload; private String droidGaurdResult; private String droidGuardResult; public Attestation(Context context, String packageName) { this.context = context; Loading @@ -58,7 +58,7 @@ public class Attestation { } public byte[] buildPayload(byte[] nonce) { this.droidGaurdResult = null; this.droidGuardResult = null; SafetyNetData payload = new SafetyNetData.Builder() .nonce(ByteString.of(nonce)) .currentTimeMs(System.currentTimeMillis()) Loading Loading @@ -92,8 +92,8 @@ public class Attestation { return MessageDigest.getInstance("SHA-256"); } public void setDroidGaurdResult(String droidGaurdResult) { this.droidGaurdResult = droidGaurdResult; public void setDroidGuardResult(String droidGuardResult) { this.droidGuardResult = droidGuardResult; } private ByteString getPackageFileDigest() { Loading Loading @@ -146,7 +146,7 @@ public class Attestation { if (payload == null) { throw new IllegalStateException("missing payload"); } return attest(new AttestRequest.Builder().safetyNetData(ByteString.of(payload)).droidGuardResult(droidGaurdResult).build(), apiKey).result; return attest(new AttestRequest.Builder().safetyNetData(ByteString.of(payload)).droidGuardResult(droidGuardResult).build(), apiKey).result; } private AttestResponse attest(AttestRequest request, String apiKey) throws IOException { Loading play-services-safetynet-core/src/main/kotlin/org/microg/gms/safetynet/SafetyNetClientService.kt +1 −1 Original line number Diff line number Diff line Loading @@ -84,7 +84,7 @@ class SafetyNetClientServiceImpl(private val context: Context, private val packa attestation.buildPayload(nonce) val data = mapOf("contentBinding" to attestation.payloadHashBase64) val dg = withContext(Dispatchers.IO) { DroidGuardResultCreator.getResult(context, "attest", data) } attestation.setDroidGaurdResult(Base64.encodeToString(dg, Base64.NO_WRAP + Base64.NO_PADDING + Base64.URL_SAFE)) attestation.setDroidGuardResult(Base64.encodeToString(dg, Base64.NO_WRAP + Base64.NO_PADDING + Base64.URL_SAFE)) val jwsResult = withContext(Dispatchers.IO) { attestation.attest(apiKey) } callbacks.onAttestationData(Status.SUCCESS, AttestationData(jwsResult)) } catch (e: Exception) { Loading Loading
play-services-safetynet-core/src/main/java/org/microg/gms/safetynet/Attestation.java +5 −5 Original line number Diff line number Diff line Loading @@ -46,7 +46,7 @@ public class Attestation { private Context context; private String packageName; private byte[] payload; private String droidGaurdResult; private String droidGuardResult; public Attestation(Context context, String packageName) { this.context = context; Loading @@ -58,7 +58,7 @@ public class Attestation { } public byte[] buildPayload(byte[] nonce) { this.droidGaurdResult = null; this.droidGuardResult = null; SafetyNetData payload = new SafetyNetData.Builder() .nonce(ByteString.of(nonce)) .currentTimeMs(System.currentTimeMillis()) Loading Loading @@ -92,8 +92,8 @@ public class Attestation { return MessageDigest.getInstance("SHA-256"); } public void setDroidGaurdResult(String droidGaurdResult) { this.droidGaurdResult = droidGaurdResult; public void setDroidGuardResult(String droidGuardResult) { this.droidGuardResult = droidGuardResult; } private ByteString getPackageFileDigest() { Loading Loading @@ -146,7 +146,7 @@ public class Attestation { if (payload == null) { throw new IllegalStateException("missing payload"); } return attest(new AttestRequest.Builder().safetyNetData(ByteString.of(payload)).droidGuardResult(droidGaurdResult).build(), apiKey).result; return attest(new AttestRequest.Builder().safetyNetData(ByteString.of(payload)).droidGuardResult(droidGuardResult).build(), apiKey).result; } private AttestResponse attest(AttestRequest request, String apiKey) throws IOException { Loading
play-services-safetynet-core/src/main/kotlin/org/microg/gms/safetynet/SafetyNetClientService.kt +1 −1 Original line number Diff line number Diff line Loading @@ -84,7 +84,7 @@ class SafetyNetClientServiceImpl(private val context: Context, private val packa attestation.buildPayload(nonce) val data = mapOf("contentBinding" to attestation.payloadHashBase64) val dg = withContext(Dispatchers.IO) { DroidGuardResultCreator.getResult(context, "attest", data) } attestation.setDroidGaurdResult(Base64.encodeToString(dg, Base64.NO_WRAP + Base64.NO_PADDING + Base64.URL_SAFE)) attestation.setDroidGuardResult(Base64.encodeToString(dg, Base64.NO_WRAP + Base64.NO_PADDING + Base64.URL_SAFE)) val jwsResult = withContext(Dispatchers.IO) { attestation.attest(apiKey) } callbacks.onAttestationData(Status.SUCCESS, AttestationData(jwsResult)) } catch (e: Exception) { Loading