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

Commit 27785d27 authored by Thiébaud Weksteen's avatar Thiébaud Weksteen
Browse files

Update flag for checkServerTrusted 

The existing flag certificate_transparency_configuration should have
been used for this method, instead of introducting a new flag.

Bug: 319829948
Flag: android.security.certificate_transparency_configuration
Test: presubmit
Change-Id: I9f5adc1d192ae06bba2197bf07249f4f0f838184
parent 0b3b6a65

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -29956,7 +29956,7 @@ package android.net.http { 
  public class X509TrustManagerExtensions {

    ctor public X509TrustManagerExtensions(javax.net.ssl.X509TrustManager) throws java.lang.IllegalArgumentException;

    method public java.util.List<java.security.cert.X509Certificate> checkServerTrusted(java.security.cert.X509Certificate[], String, String) throws java.security.cert.CertificateException;

    method @FlaggedApi("android.net.platform.flags.x509_extensions_certificate_transparency") @NonNull public java.util.List<java.security.cert.X509Certificate> checkServerTrusted(@NonNull java.security.cert.X509Certificate[], @Nullable byte[], @Nullable byte[], @NonNull String, @NonNull String) throws java.security.cert.CertificateException;

    method @FlaggedApi("android.security.certificate_transparency_configuration") @NonNull public java.util.List<java.security.cert.X509Certificate> checkServerTrusted(@NonNull java.security.cert.X509Certificate[], @Nullable byte[], @Nullable byte[], @NonNull String, @NonNull String) throws java.security.cert.CertificateException;

    method public boolean isSameTrustConfiguration(String, String);

    method public boolean isUserAddedCertificate(java.security.cert.X509Certificate);

  }

core/java/android/net/http/X509TrustManagerExtensions.java

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.annotation.FlaggedApi; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.net.platform.flags.Flags;

import android.security.Flags;

import android.security.net.config.UserCertificateSource;



import com.android.org.conscrypt.TrustManagerImpl;
@@ -152,7 +152,7 @@ public class X509TrustManagerExtensions { 
     * @throws IllegalArgumentException if the TrustManager is not compatible.

     * @return the properly ordered chain used for verification as a list of X509Certificates.

     */

    @FlaggedApi(Flags.FLAG_X509_EXTENSIONS_CERTIFICATE_TRANSPARENCY)

    @FlaggedApi(Flags.FLAG_CERTIFICATE_TRANSPARENCY_CONFIGURATION)

    @NonNull

    public List<X509Certificate> checkServerTrusted(

            @SuppressLint("ArrayReturn") @NonNull X509Certificate[] chain,