am d704c478: Merge "Assert that the padding extension is enabled by default."

* commit 'd704c478':
  Assert that the padding extension is enabled by default.

src/main/java/org/conscrypt/NativeCrypto.java

@@ -784,6 +784,7 @@ public final class NativeCrypto {
     public static final long SSL_MODE_CBC_RECORD_SPLITTING = 0x00000100L;
 
     // SSL options from ssl.h
+    public static final long SSL_OP_TLSEXT_PADDING                         = 0x00000010L;
     public static final long SSL_OP_NO_TICKET                              = 0x00004000L;
     public static final long SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION = 0x00010000L;
     public static final long SSL_OP_NO_SSLv3                               = 0x02000000L;

src/test/java/org/conscrypt/NativeCryptoTest.java

@@ -337,6 +337,8 @@ public class NativeCryptoTest extends TestCase {
         assertTrue((NativeCrypto.SSL_get_options(s) & NativeCrypto.SSL_OP_NO_TLSv1_1) == 0);
         assertTrue((NativeCrypto.SSL_get_options(s) & NativeCrypto.SSL_OP_NO_TLSv1_2) == 0);
 
+        assertTrue((NativeCrypto.SSL_get_options(s) & NativeCrypto.SSL_OP_TLSEXT_PADDING) != 0);
+
         long s2 = NativeCrypto.SSL_new(c);
         assertTrue(s != s2);
         NativeCrypto.SSL_free(s2);