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

Commit b0cbf860 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Gerrit Code Review
Browse files

Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding"

parents f5276c16 6bae82a2

core/java/android/webkit/BrowserFrame.java

+1 −1
Original line number Diff line number Diff line
@@ -1324,7 +1324,7 @@ class BrowserFrame extends Handler { 
    private native void nativeSslCertErrorCancel(int handle, int certError);



    native void nativeSslClientCert(int handle,

                                    int ctx,

                                    long ctx,

                                    byte[][] asn1DerEncodedCertificateChain);



    native void nativeSslClientCert(int handle,

core/java/android/webkit/ClientCertRequestHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public final class ClientCertRequestHandler extends Handler { 
    /**

     * Proceed with the specified private key bytes and client certificate chain.

     */

    private void setSslClientCertFromCtx(final int ctx, final byte[][] chainBytes) {

    private void setSslClientCertFromCtx(final long ctx, final byte[][] chainBytes) {

        post(new Runnable() {

                public void run() {

                    mBrowserFrame.nativeSslClientCert(mHandle, ctx, chainBytes);