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

Commit 90a7edac authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 1f2bb46b: Merge change 6204 into donut 

Merge commit '1f2bb46b'

* commit '1f2bb46b':
  Migrate to new keystore with the CertTool lib.
parents 71830eae 1f2bb46b

packages/VpnServices/src/com/android/server/vpn/L2tpIpsecService.java

+4 −4
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.server.vpn;



import android.net.vpn.L2tpIpsecProfile;

import android.security.Keystore;

import android.security.CertTool;



import java.io.IOException;
@@ -48,17 +48,17 @@ class L2tpIpsecService extends VpnService<L2tpIpsecProfile> { 
    }



    private String getCaCertPath() {

        return Keystore.getInstance().getCaCertificate(

        return CertTool.getInstance().getCaCertificate(

                getProfile().getCaCertificate());

    }



    private String getUserCertPath() {

        return Keystore.getInstance().getUserCertificate(

        return CertTool.getInstance().getUserCertificate(

                getProfile().getUserCertificate());

    }



    private String getUserkeyPath() {

        return Keystore.getInstance().getUserPrivateKey(

        return CertTool.getInstance().getUserPrivateKey(

                getProfile().getUserCertificate());

    }

}