Make clang-format stricter and run it for all conscrypt

.clang-format

@@ -1,18 +1,21 @@
 ---
 Language: Cpp
-BasedOnStyle:  Google
+BasedOnStyle: Google
 AccessModifierOffset: -4
 AllowShortFunctionsOnASingleLine: Empty
 ColumnLimit: 100
 IndentWidth: 4
 ContinuationIndentWidth: 8
 TypenameMacros: ['STACK_OF']
+AlignEscapedNewlines: Left
+AlignAfterOpenBracket: Align
 ---
 Language: Java
 BasedOnStyle: Google
 ColumnLimit: 100
 IndentWidth: 4
 ContinuationIndentWidth: 8
+AlignAfterOpenBracket: Align
 JavaImportGroups:
 - android
 - androidx

android-stub/src/main/java/android/crypto/hpke/HpkeSpi.java

@@ -16,13 +16,13 @@
 
 package android.crypto.hpke;
 
+import libcore.util.NonNull;
+import libcore.util.Nullable;
+
 import java.security.GeneralSecurityException;
 import java.security.InvalidKeyException;
 import java.security.PrivateKey;
 import java.security.PublicKey;
-import libcore.util.NonNull;
-import libcore.util.Nullable;
-
 
 /**
  * Service Provider Interface for HPKE client API classes to communicate with implementations
@@ -64,13 +64,9 @@ public interface HpkeSpi {
      * @throws UnsupportedOperationException if the mode is not supported by this implementation
      * @throws IllegalStateException if this SPI has already been initialised
      */
-    void engineInitSender(
-            @NonNull PublicKey recipientKey,
-            @Nullable byte[] info,
-            @Nullable PrivateKey senderKey,
-            @Nullable byte[] psk,
-            @Nullable byte[] psk_id)
-            throws InvalidKeyException;
+    void engineInitSender(@NonNull PublicKey recipientKey, @Nullable byte[] info,
+                          @Nullable PrivateKey senderKey, @Nullable byte[] psk,
+                          @Nullable byte[] psk_id) throws InvalidKeyException;
 
     /**
      * Initialises an HPKE SPI in one of the sender modes described in RFC 9180 with
@@ -109,13 +105,9 @@ void engineInitSender(
      * @throws UnsupportedOperationException if the mode is not supported by this implementation
      * @throws IllegalStateException if this SPI has already been initialised
      */
-    void engineInitSenderWithSeed(
-            @NonNull PublicKey recipientKey,
-            @Nullable byte[] info,
-            @Nullable PrivateKey senderKey,
-            @Nullable byte[] psk,
-            @Nullable byte[] psk_id,
-            @NonNull byte[] sKe)
+    void engineInitSenderWithSeed(@NonNull PublicKey recipientKey, @Nullable byte[] info,
+                                  @Nullable PrivateKey senderKey, @Nullable byte[] psk,
+                                  @Nullable byte[] psk_id, @NonNull byte[] sKe)
             throws InvalidKeyException;
 
     /**
@@ -149,13 +141,9 @@ void engineInitSenderWithSeed(
      * @throws UnsupportedOperationException if the mode is not supported by this implementation
      * @throws IllegalStateException if this SPI has already been initialised
      */
-    void engineInitRecipient(
-            @NonNull byte[] encapsulated,
-            @NonNull PrivateKey recipientKey,
-            @Nullable byte[] info,
-            @Nullable PublicKey senderKey,
-            @Nullable byte[] psk,
-            @Nullable byte[] psk_id)
+    void engineInitRecipient(@NonNull byte[] encapsulated, @NonNull PrivateKey recipientKey,
+                             @Nullable byte[] info, @Nullable PublicKey senderKey,
+                             @Nullable byte[] psk, @Nullable byte[] psk_id)
             throws InvalidKeyException;
 
     /**
@@ -180,7 +168,8 @@ void engineInitRecipient(
      *         as a sender
      * @throws GeneralSecurityException on decryption failures
      */
-    @NonNull byte[] engineOpen(@NonNull byte[] ciphertext, @Nullable byte[] aad)
+    @NonNull
+    byte[] engineOpen(@NonNull byte[] ciphertext, @Nullable byte[] aad)
             throws GeneralSecurityException;
 
     /**

android-stub/src/main/java/android/pake/PakeServerKeyManagerParameters.java

@@ -72,8 +72,8 @@ public final class PakeServerKeyManagerParameters implements ManagerFactoryParam
      * @param serverId The server identifier for the link.
      * @return An unmodifiable list of PAKE options for the given link.
      */
-    public @NonNull List<PakeOption> getOptions(
-            @Nullable byte[] clientId, @Nullable byte[] serverId) {
+    public @NonNull List<PakeOption> getOptions(@Nullable byte[] clientId,
+                                                @Nullable byte[] serverId) {
         throw new RuntimeException("Stub!");
     }
 
@@ -139,7 +139,7 @@ public static final class Builder {
          * @throws InvalidParameterException If the provided options are invalid.
          */
         public @NonNull Builder setOptions(@Nullable byte[] clientId, @Nullable byte[] serverId,
-                @NonNull List<PakeOption> options) {
+                                           @NonNull List<PakeOption> options) {
             throw new RuntimeException("Stub!");
         }
 

android-stub/src/main/java/android/util/StatsEvent.java

@@ -16,7 +16,7 @@
 
 package android.util;
 
-@SuppressWarnings({"unused",  "DoNotCallSuggester"})
+@SuppressWarnings({"unused", "DoNotCallSuggester"})
 public final class StatsEvent {
     public static StatsEvent.Builder newBuilder() {
         throw new RuntimeException("Stub!");
@@ -38,10 +38,9 @@ public void release() {
         throw new RuntimeException("Stub!");
     }
 
-    private static final class Buffer {
-    }
+    private static final class Buffer {}
 
-    @SuppressWarnings({"unused",  "DoNotCallSuggester"})
+    @SuppressWarnings({"unused", "DoNotCallSuggester"})
     public static final class Builder {
         public StatsEvent.Builder setAtomId(int atomId) {
             throw new RuntimeException("Stub!");

android-stub/src/main/java/com/android/org/conscrypt/NativeCrypto.java

@@ -18,6 +18,7 @@
 
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
+
 import javax.net.ssl.SSLException;
 
 @SuppressWarnings("unused")
@@ -31,8 +32,8 @@ public interface SSLHandshakeCallbacks {
          *
          * @throws CertificateException if the certificate is untrusted
          */
-        void verifyCertificateChain(byte[][] asn1DerEncodedCertificateChain,
-                String authMethod) throws CertificateException;
+        void verifyCertificateChain(byte[][] asn1DerEncodedCertificateChain, String authMethod)
+                throws CertificateException;
         /**
          * Called on an SSL client when the server requests (or
          * requires a certificate). The client can respond by using
@@ -44,8 +45,7 @@ void verifyCertificateChain(byte[][] asn1DerEncodedCertificateChain,
          * convertible to strings with #keyType
          * @param asn1DerEncodedX500Principals CAs known to the server
          */
-        void clientCertificateRequested(
-                byte[] keyTypes, byte[][] asn1DerEncodedX500Principals)
+        void clientCertificateRequested(byte[] keyTypes, byte[][] asn1DerEncodedX500Principals)
                 throws CertificateEncodingException, SSLException;
         /**
          * Called when SSL handshake is completed. Note that this can

android-stub/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java

@@ -25,6 +25,7 @@
 import java.security.PrivateKey;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
+
 import javax.net.ssl.HandshakeCompletedListener;
 import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLSession;
@@ -46,7 +47,7 @@ protected OpenSSLSocketImpl(SSLParametersImpl sslParameters) throws IOException
     }
 
     protected OpenSSLSocketImpl(SSLParametersImpl sslParameters, String[] enabledProtocols,
-            String[] enabledCipherSuites) throws IOException {
+                                String[] enabledCipherSuites) throws IOException {
         throw new RuntimeException("Stub!");
     }
 
@@ -61,17 +62,18 @@ protected OpenSSLSocketImpl(InetAddress address, int port, SSLParametersImpl ssl
     }
 
     protected OpenSSLSocketImpl(String host, int port, InetAddress clientAddress, int clientPort,
-            SSLParametersImpl sslParameters) throws IOException {
+                                SSLParametersImpl sslParameters) throws IOException {
         throw new RuntimeException("Stub!");
     }
 
     protected OpenSSLSocketImpl(InetAddress address, int port, InetAddress clientAddress,
-            int clientPort, SSLParametersImpl sslParameters) throws IOException {
+                                int clientPort, SSLParametersImpl sslParameters)
+            throws IOException {
         throw new RuntimeException("Stub!");
     }
 
     protected OpenSSLSocketImpl(Socket socket, String host, int port, boolean autoClose,
-            SSLParametersImpl sslParameters) throws IOException {
+                                SSLParametersImpl sslParameters) throws IOException {
         throw new RuntimeException("Stub!");
     }
 

android-stub/src/main/java/dalvik/system/BlockGuard.java

@@ -24,7 +24,9 @@ public static Policy getThreadPolicy() {
         throw new UnsupportedOperationException("Stub!");
     }
 
-    public interface Policy { void onNetwork(); }
+    public interface Policy {
+        void onNetwork();
+    }
 
     public static class PolicyWrapper implements Policy {
         private PolicyWrapper() {}

android/src/main/java/org/conscrypt/BaseOpenSSLSocketAdapterFactory.java

@@ -20,11 +20,11 @@
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.UnknownHostException;
+
 import javax.net.ssl.SSLSocketFactory;
 
 @Internal
 public abstract class BaseOpenSSLSocketAdapterFactory extends SSLSocketFactory {
-
     private final OpenSSLSocketFactoryImpl delegate;
 
     protected BaseOpenSSLSocketAdapterFactory(OpenSSLSocketFactoryImpl delegate) {
@@ -47,8 +47,7 @@ public Socket createSocket() throws IOException {
     }
 
     @Override
-    public Socket createSocket(String hostname, int port)
-            throws IOException, UnknownHostException {
+    public Socket createSocket(String hostname, int port) throws IOException, UnknownHostException {
         return wrap((OpenSSLSocketImpl) delegate.createSocket(hostname, port));
     }
 
@@ -64,11 +63,8 @@ public Socket createSocket(InetAddress address, int port) throws IOException {
     }
 
     @Override
-    public Socket createSocket(InetAddress address,
-                               int port,
-                               InetAddress localAddress,
-                               int localPort)
-            throws IOException {
+    public Socket createSocket(InetAddress address, int port, InetAddress localAddress,
+                               int localPort) throws IOException {
         return wrap(
                 (OpenSSLSocketImpl) delegate.createSocket(address, port, localAddress, localPort));
     }

android/src/main/java/org/conscrypt/KitKatPlatformOpenSSLSocketAdapterFactory.java

@@ -25,7 +25,6 @@
  */
 @Internal
 public class KitKatPlatformOpenSSLSocketAdapterFactory extends BaseOpenSSLSocketAdapterFactory {
-
     public KitKatPlatformOpenSSLSocketAdapterFactory(OpenSSLSocketFactoryImpl delegate) {
         super(delegate);
     }

android/src/main/java/org/conscrypt/KitKatPlatformOpenSSLSocketImplAdapter.java

@@ -27,6 +27,7 @@
 import java.security.PrivateKey;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
+
 import javax.net.ssl.HandshakeCompletedListener;
 import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLParameters;
@@ -44,8 +45,6 @@
 @Internal
 public class KitKatPlatformOpenSSLSocketImplAdapter
         extends com.android.org.conscrypt.OpenSSLSocketImpl {
-
-
     private final AbstractConscryptSocket delegate;
 
     public KitKatPlatformOpenSSLSocketImplAdapter(AbstractConscryptSocket delegate)

android/src/main/java/org/conscrypt/NativeCryptoJni.java

@@ -22,13 +22,13 @@
  */
 class NativeCryptoJni {
     public static void init() {
-        if ("com.google.android.gms.org.conscrypt".equals(NativeCrypto.class.getPackage().getName())) {
+        if ("com.google.android.gms.org.conscrypt".equals(
+                    NativeCrypto.class.getPackage().getName())) {
             System.loadLibrary("conscrypt_gmscore_jni");
         } else {
             System.loadLibrary("conscrypt_jni");
         }
     }
 
-    private NativeCryptoJni() {
-    }
+    private NativeCryptoJni() {}
 }