Revert "Merge remote-tracking branch 'origin/authorityverifyokhttp' into authoritychecktls"

This reverts commit 8576a4e, reversing
changes made to da19b28.

Author: kannanjgithub

core/src/main/java/io/grpc/internal/CertificateUtils.java

@@ -16,7 +16,6 @@
 
 package io.grpc.internal;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.GeneralSecurityException;
@@ -37,21 +36,8 @@ public class CertificateUtils {
   /**
    * Creates X509TrustManagers using the provided CA certs.
    */
-  public static TrustManager[] createTrustManager(byte[] rootCerts)
-      throws GeneralSecurityException {
-    InputStream rootCertsStream = new ByteArrayInputStream(rootCerts);
-    try {
-      return io.grpc.internal.CertificateUtils.createTrustManager(rootCertsStream);
-    } finally {
-      GrpcUtil.closeQuietly(rootCertsStream);
-    }
-  }
-
-  /**
-   * Creates X509TrustManagers using the provided input stream of CA certs.
-   */
   public static TrustManager[] createTrustManager(InputStream rootCerts)
-          throws GeneralSecurityException {
+      throws GeneralSecurityException {
     KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
     try {
       ks.load(null, null);
@@ -66,13 +52,13 @@ public static TrustManager[] createTrustManager(InputStream rootCerts)
     }
 
     TrustManagerFactory trustManagerFactory =
-            TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+        TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
     trustManagerFactory.init(ks);
     return trustManagerFactory.getTrustManagers();
   }
 
   private static X509Certificate[] getX509Certificates(InputStream inputStream)
-          throws CertificateException {
+      throws CertificateException {
     CertificateFactory factory = CertificateFactory.getInstance("X.509");
     Collection<? extends Certificate> certs = factory.generateCertificates(inputStream);
     return certs.toArray(new X509Certificate[0]);