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

Commit 809bcfc4 authored by nharold's avatar nharold Committed by Gerrit Code Review
Browse files

Merge changes from topic "ipsec-oneway-transform" 

* changes:
  Update IpSecService UnitTests
  Make Transforms Unidirectional
parents fa618751 5676f5fd

api/current.txt

+14 −11
Original line number Diff line number Diff line
@@ -25814,12 +25814,18 @@ package android.net { 
  }















  public final class IpSecManager {













    method public android.net.IpSecManager.SecurityParameterIndex allocateSecurityParameterIndex(int, java.net.InetAddress) throws android.net.IpSecManager.ResourceUnavailableException;













    method public android.net.IpSecManager.SecurityParameterIndex allocateSecurityParameterIndex(int, java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;













    method public void applyTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform) throws java.io.IOException;













    method public android.net.IpSecManager.SecurityParameterIndex allocateSecurityParameterIndex(java.net.InetAddress) throws android.net.IpSecManager.ResourceUnavailableException;













    method public android.net.IpSecManager.SecurityParameterIndex allocateSecurityParameterIndex(java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;













    method public void applyTransportModeTransform(java.net.Socket, int, android.net.IpSecTransform) throws java.io.IOException;













    method public void applyTransportModeTransform(java.net.DatagramSocket, int, android.net.IpSecTransform) throws java.io.IOException;













    method public void applyTransportModeTransform(java.io.FileDescriptor, int, android.net.IpSecTransform) throws java.io.IOException;















    method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket(int) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;















    method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket() throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;













    method public void removeTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform) throws java.io.IOException;













    method public void removeTransportModeTransforms(java.net.Socket, android.net.IpSecTransform) throws java.io.IOException;













    method public void removeTransportModeTransforms(java.net.DatagramSocket, android.net.IpSecTransform) throws java.io.IOException;













    method public void removeTransportModeTransforms(java.io.FileDescriptor, android.net.IpSecTransform) throws java.io.IOException;













    field public static final int DIRECTION_IN = 0; // 0x0













    field public static final int DIRECTION_OUT = 1; // 0x1















  }





























  public static final class IpSecManager.ResourceUnavailableException extends android.util.AndroidException {









@@ -25842,18 +25848,15 @@ package android.net {



























  public final class IpSecTransform implements java.lang.AutoCloseable {















    method public void close();













    field public static final int DIRECTION_IN = 0; // 0x0













    field public static final int DIRECTION_OUT = 1; // 0x1















  }





























  public static class IpSecTransform.Builder {















    ctor public IpSecTransform.Builder(android.content.Context);













    method public android.net.IpSecTransform buildTransportModeTransform(java.net.InetAddress) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;













    method public android.net.IpSecTransform.Builder setAuthenticatedEncryption(int, android.net.IpSecAlgorithm);













    method public android.net.IpSecTransform.Builder setAuthentication(int, android.net.IpSecAlgorithm);













    method public android.net.IpSecTransform.Builder setEncryption(int, android.net.IpSecAlgorithm);













    method public android.net.IpSecTransform buildTransportModeTransform(java.net.InetAddress, android.net.IpSecManager.SecurityParameterIndex) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;













    method public android.net.IpSecTransform.Builder setAuthenticatedEncryption(android.net.IpSecAlgorithm);













    method public android.net.IpSecTransform.Builder setAuthentication(android.net.IpSecAlgorithm);













    method public android.net.IpSecTransform.Builder setEncryption(android.net.IpSecAlgorithm);















    method public android.net.IpSecTransform.Builder setIpv4Encapsulation(android.net.IpSecManager.UdpEncapsulationSocket, int);













    method public android.net.IpSecTransform.Builder setSpi(int, android.net.IpSecManager.SecurityParameterIndex);















  }





























  public class LinkAddress implements android.os.Parcelable {

























core/java/android/net/IIpSecService.aidl



+3
−3




























Original line number
Diff line number
Diff line








@@ -31,7 +31,7 @@ import android.os.ParcelFileDescriptor;













interface IIpSecService















{















    IpSecSpiResponse allocateSecurityParameterIndex(













            int direction, in String remoteAddress, int requestedSpi, in IBinder binder);













            in String destinationAddress, int requestedSpi, in IBinder binder);































    void releaseSecurityParameterIndex(int resourceId);

























@@ -43,7 +43,7 @@ interface IIpSecService





























    void deleteTransportModeTransform(int transformId);





























    void applyTransportModeTransform(in ParcelFileDescriptor socket, int transformId);













    void applyTransportModeTransform(in ParcelFileDescriptor socket, int direction, int transformId);





























    void removeTransportModeTransform(in ParcelFileDescriptor socket, int transformId);













    void removeTransportModeTransforms(in ParcelFileDescriptor socket, int transformId);















}
























core/java/android/net/IpSecAlgorithm.java



+7
−1




























Original line number
Diff line number
Diff line








@@ -256,13 +256,19 @@ public final class IpSecAlgorithm implements Parcelable {













        return getName().equals(AUTH_CRYPT_AES_GCM);















    }





























    // Because encryption keys are sensitive and userdebug builds are used by large user pools













    // such as beta testers, we only allow sensitive info such as keys on eng builds.













    private static boolean isUnsafeBuild() {













        return Build.IS_DEBUGGABLE && Build.IS_ENG;













    }





























    @Override















    public String toString() {















        return new StringBuilder()















                .append("{mName=")















                .append(mName)















                .append(", mKey=")













                .append(Build.IS_DEBUGGABLE ? HexDump.toHexString(mKey) : "<hidden>")













                .append(isUnsafeBuild() ? HexDump.toHexString(mKey) : "<hidden>")















                .append(", mTruncLenBits=")















                .append(mTruncLenBits)















                .append("}")

































core/java/android/net/IpSecConfig.java



+76
−111




























Original line number
Diff line number
Diff line








@@ -32,24 +32,19 @@ public final class IpSecConfig implements Parcelable {













    // MODE_TRANSPORT or MODE_TUNNEL















    private int mMode = IpSecTransform.MODE_TRANSPORT;





























    // Needs to be valid only for tunnel mode















    // Preventing this from being null simplifies Java->Native binder













    private String mLocalAddress = "";













    private String mSourceAddress = "";































    // Preventing this from being null simplifies Java->Native binder













    private String mRemoteAddress = "";













    private String mDestinationAddress = "";































    // The underlying Network that represents the "gateway" Network















    // for outbound packets. It may also be used to select packets.















    private Network mNetwork;





























    /**













     * This class captures the parameters that specifically apply to inbound or outbound traffic.













     */













    public static class Flow {















    // Minimum requirements for identifying a transform













        // SPI identifying the IPsec flow in packet processing













        // and a remote IP address













    // SPI identifying the IPsec SA in packet processing













    // and a destination IP address















    private int mSpiResourceId = IpSecManager.INVALID_RESOURCE_ID;































    // Encryption Algorithm









@@ -61,31 +56,6 @@ public final class IpSecConfig implements Parcelable {













    // Authenticated Encryption Algorithm















    private IpSecAlgorithm mAuthenticatedEncryption;





























        @Override













        public String toString() {













            return new StringBuilder()













                    .append("{mSpiResourceId=")













                    .append(mSpiResourceId)













                    .append(", mEncryption=")













                    .append(mEncryption)













                    .append(", mAuthentication=")













                    .append(mAuthentication)













                    .append(", mAuthenticatedEncryption=")













                    .append(mAuthenticatedEncryption)













                    .append("}")













                    .toString();













        }



























        static boolean equals(IpSecConfig.Flow lhs, IpSecConfig.Flow rhs) {













            if (lhs == null || rhs == null) return (lhs == rhs);













            return (lhs.mSpiResourceId == rhs.mSpiResourceId













                    && IpSecAlgorithm.equals(lhs.mEncryption, rhs.mEncryption)













                    && IpSecAlgorithm.equals(lhs.mAuthentication, rhs.mAuthentication));













        }













    }



























    private final Flow[] mFlow = new Flow[] {new Flow(), new Flow()};





























    // For tunnel mode IPv4 UDP Encapsulation















    // IpSecTransform#ENCAP_ESP_*, such as ENCAP_ESP_OVER_UDP_IKE















    private int mEncapType = IpSecTransform.ENCAP_NONE;









@@ -100,36 +70,37 @@ public final class IpSecConfig implements Parcelable {













        mMode = mode;















    }





























    /** Set the local IP address for Tunnel mode */













    public void setLocalAddress(String localAddress) {













        mLocalAddress = localAddress;













    /** Set the source IP addres for this IPsec transform */













    public void setSourceAddress(String sourceAddress) {













        mSourceAddress = sourceAddress;















    }





























    /** Set the remote IP address for this IPsec transform */













    public void setRemoteAddress(String remoteAddress) {













        mRemoteAddress = remoteAddress;













    /** Set the destination IP address for this IPsec transform */













    public void setDestinationAddress(String destinationAddress) {













        mDestinationAddress = destinationAddress;















    }





























    /** Set the SPI for a given direction by resource ID */













    public void setSpiResourceId(int direction, int resourceId) {













        mFlow[direction].mSpiResourceId = resourceId;













    /** Set the SPI by resource ID */













    public void setSpiResourceId(int resourceId) {













        mSpiResourceId = resourceId;















    }





























    /** Set the encryption algorithm for a given direction */













    public void setEncryption(int direction, IpSecAlgorithm encryption) {













        mFlow[direction].mEncryption = encryption;













    /** Set the encryption algorithm */













    public void setEncryption(IpSecAlgorithm encryption) {













        mEncryption = encryption;















    }





























    /** Set the authentication algorithm for a given direction */













    public void setAuthentication(int direction, IpSecAlgorithm authentication) {













        mFlow[direction].mAuthentication = authentication;













    /** Set the authentication algorithm */













    public void setAuthentication(IpSecAlgorithm authentication) {













        mAuthentication = authentication;















    }





























    /** Set the authenticated encryption algorithm for a given direction */













    public void setAuthenticatedEncryption(int direction, IpSecAlgorithm authenticatedEncryption) {













        mFlow[direction].mAuthenticatedEncryption = authenticatedEncryption;













    /** Set the authenticated encryption algorithm */













    public void setAuthenticatedEncryption(IpSecAlgorithm authenticatedEncryption) {













        mAuthenticatedEncryption = authenticatedEncryption;















    }





























    /** Set the underlying network that will carry traffic for this transform */















    public void setNetwork(Network network) {















        mNetwork = network;















    }









@@ -155,28 +126,28 @@ public final class IpSecConfig implements Parcelable {













        return mMode;















    }





























    public String getLocalAddress() {













        return mLocalAddress;













    public String getSourceAddress() {













        return mSourceAddress;















    }





























    public int getSpiResourceId(int direction) {













        return mFlow[direction].mSpiResourceId;













    public int getSpiResourceId() {













        return mSpiResourceId;















    }





























    public String getRemoteAddress() {













        return mRemoteAddress;













    public String getDestinationAddress() {













        return mDestinationAddress;















    }





























    public IpSecAlgorithm getEncryption(int direction) {













        return mFlow[direction].mEncryption;













    public IpSecAlgorithm getEncryption() {













        return mEncryption;















    }





























    public IpSecAlgorithm getAuthentication(int direction) {













        return mFlow[direction].mAuthentication;













    public IpSecAlgorithm getAuthentication() {













        return mAuthentication;















    }





























    public IpSecAlgorithm getAuthenticatedEncryption(int direction) {













        return mFlow[direction].mAuthenticatedEncryption;













    public IpSecAlgorithm getAuthenticatedEncryption() {













        return mAuthenticatedEncryption;















    }































    public Network getNetwork() {










@@ -209,17 +180,13 @@ public final class IpSecConfig implements Parcelable {













    @Override















    public void writeToParcel(Parcel out, int flags) {















        out.writeInt(mMode);













        out.writeString(mLocalAddress);













        out.writeString(mRemoteAddress);













        out.writeString(mSourceAddress);













        out.writeString(mDestinationAddress);















        out.writeParcelable(mNetwork, flags);













        out.writeInt(mFlow[IpSecTransform.DIRECTION_IN].mSpiResourceId);













        out.writeParcelable(mFlow[IpSecTransform.DIRECTION_IN].mEncryption, flags);













        out.writeParcelable(mFlow[IpSecTransform.DIRECTION_IN].mAuthentication, flags);













        out.writeParcelable(mFlow[IpSecTransform.DIRECTION_IN].mAuthenticatedEncryption, flags);













        out.writeInt(mFlow[IpSecTransform.DIRECTION_OUT].mSpiResourceId);













        out.writeParcelable(mFlow[IpSecTransform.DIRECTION_OUT].mEncryption, flags);













        out.writeParcelable(mFlow[IpSecTransform.DIRECTION_OUT].mAuthentication, flags);













        out.writeParcelable(mFlow[IpSecTransform.DIRECTION_OUT].mAuthenticatedEncryption, flags);













        out.writeInt(mSpiResourceId);













        out.writeParcelable(mEncryption, flags);













        out.writeParcelable(mAuthentication, flags);













        out.writeParcelable(mAuthenticatedEncryption, flags);















        out.writeInt(mEncapType);















        out.writeInt(mEncapSocketResourceId);















        out.writeInt(mEncapRemotePort);









@@ -231,22 +198,15 @@ public final class IpSecConfig implements Parcelable {





























    private IpSecConfig(Parcel in) {















        mMode = in.readInt();













        mLocalAddress = in.readString();













        mRemoteAddress = in.readString();













        mSourceAddress = in.readString();













        mDestinationAddress = in.readString();















        mNetwork = (Network) in.readParcelable(Network.class.getClassLoader());













        mFlow[IpSecTransform.DIRECTION_IN].mSpiResourceId = in.readInt();













        mFlow[IpSecTransform.DIRECTION_IN].mEncryption =













                (IpSecAlgorithm) in.readParcelable(IpSecAlgorithm.class.getClassLoader());













        mFlow[IpSecTransform.DIRECTION_IN].mAuthentication =













        mSpiResourceId = in.readInt();













        mEncryption =















                (IpSecAlgorithm) in.readParcelable(IpSecAlgorithm.class.getClassLoader());













        mFlow[IpSecTransform.DIRECTION_IN].mAuthenticatedEncryption =













        mAuthentication =















                (IpSecAlgorithm) in.readParcelable(IpSecAlgorithm.class.getClassLoader());













        mFlow[IpSecTransform.DIRECTION_OUT].mSpiResourceId = in.readInt();













        mFlow[IpSecTransform.DIRECTION_OUT].mEncryption =













                (IpSecAlgorithm) in.readParcelable(IpSecAlgorithm.class.getClassLoader());













        mFlow[IpSecTransform.DIRECTION_OUT].mAuthentication =













                (IpSecAlgorithm) in.readParcelable(IpSecAlgorithm.class.getClassLoader());













        mFlow[IpSecTransform.DIRECTION_OUT].mAuthenticatedEncryption =













        mAuthenticatedEncryption =















                (IpSecAlgorithm) in.readParcelable(IpSecAlgorithm.class.getClassLoader());















        mEncapType = in.readInt();















        mEncapSocketResourceId = in.readInt();









@@ -260,10 +220,10 @@ public final class IpSecConfig implements Parcelable {













        strBuilder















                .append("{mMode=")















                .append(mMode == IpSecTransform.MODE_TUNNEL ? "TUNNEL" : "TRANSPORT")













                .append(", mLocalAddress=")













                .append(mLocalAddress)













                .append(", mRemoteAddress=")













                .append(mRemoteAddress)













                .append(", mSourceAddress=")













                .append(mSourceAddress)













                .append(", mDestinationAddress=")













                .append(mDestinationAddress)















                .append(", mNetwork=")















                .append(mNetwork)















                .append(", mEncapType=")









@@ -274,10 +234,14 @@ public final class IpSecConfig implements Parcelable {













                .append(mEncapRemotePort)















                .append(", mNattKeepaliveInterval=")















                .append(mNattKeepaliveInterval)













                .append(", mFlow[OUT]=")













                .append(mFlow[IpSecTransform.DIRECTION_OUT])













                .append(", mFlow[IN]=")













                .append(mFlow[IpSecTransform.DIRECTION_IN])













                .append("{mSpiResourceId=")













                .append(mSpiResourceId)













                .append(", mEncryption=")













                .append(mEncryption)













                .append(", mAuthentication=")













                .append(mAuthentication)













                .append(", mAuthenticatedEncryption=")













                .append(mAuthenticatedEncryption)















                .append("}");































        return strBuilder.toString();









@@ -299,17 +263,18 @@ public final class IpSecConfig implements Parcelable {













    public static boolean equals(IpSecConfig lhs, IpSecConfig rhs) {















        if (lhs == null || rhs == null) return (lhs == rhs);















        return (lhs.mMode == rhs.mMode













                && lhs.mLocalAddress.equals(rhs.mLocalAddress)













                && lhs.mRemoteAddress.equals(rhs.mRemoteAddress)













                && lhs.mSourceAddress.equals(rhs.mSourceAddress)













                && lhs.mDestinationAddress.equals(rhs.mDestinationAddress)















                && ((lhs.mNetwork != null && lhs.mNetwork.equals(rhs.mNetwork))















                        || (lhs.mNetwork == rhs.mNetwork))















                && lhs.mEncapType == rhs.mEncapType















                && lhs.mEncapSocketResourceId == rhs.mEncapSocketResourceId















                && lhs.mEncapRemotePort == rhs.mEncapRemotePort















                && lhs.mNattKeepaliveInterval == rhs.mNattKeepaliveInterval













                && IpSecConfig.Flow.equals(lhs.mFlow[IpSecTransform.DIRECTION_OUT],













                        rhs.mFlow[IpSecTransform.DIRECTION_OUT])













                && IpSecConfig.Flow.equals(lhs.mFlow[IpSecTransform.DIRECTION_IN],













                        rhs.mFlow[IpSecTransform.DIRECTION_IN]));













                && lhs.mSpiResourceId == rhs.mSpiResourceId













                && IpSecAlgorithm.equals(lhs.mEncryption, rhs.mEncryption)













                && IpSecAlgorithm.equals(













                        lhs.mAuthenticatedEncryption, rhs.mAuthenticatedEncryption)













                && IpSecAlgorithm.equals(lhs.mAuthentication, rhs.mAuthentication));















    }















}
























core/java/android/net/IpSecManager.java



+70
−49


























File changed.
Preview size limit exceeded, changes collapsed.