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

Commit e0b7e916 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 4679 into donut

* changes:
  Replace the dummy code with Keystore for <keygen> support.
parents c6282977 0de8e439
Loading
Loading
Loading
Loading
+3 −9
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.webkit;

import android.os.Handler;
import android.os.Message;
import android.security.Keystore;
import android.util.Log;

final class JWebCoreJavaBridge extends Handler {
@@ -187,18 +188,11 @@ final class JWebCoreJavaBridge extends Handler {
    }

    private String[] getKeyStrengthList() {
        // FIXME: fake the list for now
        String[] list = new String[2];
        list[0] = "1024";
        list[1] = "512";
        return list;
        return Keystore.getInstance().getSupportedKeyStrenghs();
    }

    private String getSignedPublicKey(int index, String challenge, String url) {
        // FIXME: do nothing for now
        Log.w(LOGTAG, "getSignedPublicKey for " + index + " and challenge="
                + challenge + " and url=" + url);
        return "";
        return Keystore.getInstance().generateKeyPair(index, challenge, url);
    }

    private native void nativeConstructor();