Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0c86100 authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Merge branch 'safetynet' into 'v1-q' 

Adjust framework to make SafetyNet pass

See merge request e/os/android_frameworks_base!109
parents 1b10147e 2d35a9e4

keystore/java/android/security/keystore/AndroidKeyStoreSpi.java

+10 −0
Original line number Diff line number Diff line
@@ -113,6 +113,9 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi { 


    @Override

    public Certificate[] engineGetCertificateChain(String alias) {



        filterSafetyNetRequests();



        if (alias == null) {

            throw new NullPointerException("alias == null");

        }
@@ -151,6 +154,13 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi { 
        return caList;

    }



    private void filterSafetyNetRequests() {

        if (Arrays.stream(Thread.currentThread().getStackTrace())

            .anyMatch(elem -> elem.getClassName().contains("DroidGuard"))) {

            throw new UnsupportedOperationException();

        }

    }



    @Override

    public Certificate engineGetCertificate(String alias) {

        if (alias == null) {