Skip to content

Commit 0c3123b

Browse files
Conscrypt Teammiguelaranda0
Conscrypt Team
authored and
miguelaranda0
committed
Project import generated by Copybara.
PiperOrigin-RevId: 856215857
1 parent a2981b3 commit 0c3123b

File tree

12 files changed

+176
-17
lines changed

12 files changed

+176
-17
lines changed

‎android/src/main/AndroidManifest.xml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2-
<application/>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="org.conscrypt">
4+
5+
<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="30" />
6+
37
</manifest>

‎android/src/main/java/org/conscrypt/Platform.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import dalvik.system.BlockGuard;
2828
import dalvik.system.CloseGuard;
2929

30-
import org.conscrypt.NativeCrypto;
3130
import org.conscrypt.ct.CertificateTransparency;
3231
import org.conscrypt.metrics.CertificateTransparencyVerificationReason;
3332
import org.conscrypt.metrics.NoopStatsLog;
@@ -50,7 +49,6 @@
5049
import java.security.KeyStore;
5150
import java.security.KeyStoreException;
5251
import java.security.NoSuchAlgorithmException;
53-
import java.security.PrivateKey;
5452
import java.security.Security;
5553
import java.security.cert.CertificateException;
5654
import java.security.cert.X509Certificate;
@@ -76,6 +74,7 @@
7674
* Platform-specific methods for unbundled Android.
7775
*/
7876
@Internal
77+
@SuppressLint("DiscouragedPrivateApi")
7978
final public class Platform {
8079
private static final String TAG = "Conscrypt";
8180
private static boolean DEPRECATED_TLS_V1 = true;
@@ -332,9 +331,8 @@ private static void getSSLParametersFromImpl(SSLParameters params, SSLParameters
332331
m_setUseCipherSuitesOrder.invoke(params, impl.getUseCipherSuitesOrder());
333332

334333
try {
335-
Method setNamedGroupsMethod =
336-
params.getClass().getMethod("setNamedGroups", String[].class);
337-
setNamedGroupsMethod.invoke(params, (Object) impl.getNamedGroups());
334+
Method setNamedGroupsMethod = params.getClass().getMethod("setNamedGroups", String[].class);
335+
setNamedGroupsMethod.invoke(params, (Object) impl.getNamedGroups());
338336
} catch (NoSuchMethodException | IllegalArgumentException e) {
339337
// Do nothing.
340338
}
@@ -787,6 +785,7 @@ public static SSLSession wrapSSLSession(ExternalSession sslSession) {
787785
return sslSession;
788786
}
789787

788+
@SuppressWarnings("SoonBlockedPrivateApi")
790789
public static String getOriginalHostNameFromInetAddress(InetAddress addr) {
791790
if (Build.VERSION.SDK_INT > 27) {
792791
try {

‎common/src/main/java/org/conscrypt/TrustManagerImpl.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@
7171
import javax.net.ssl.X509ExtendedTrustManager;
7272

7373
/**
74-
*
7574
* TrustManager implementation. The implementation is based on CertPathValidator
7675
* PKIX and CertificateFactory X509 implementations. This implementations should
7776
* be provided by some certification provider.
7877
*
7978
* @see javax.net.ssl.X509ExtendedTrustManager
8079
*/
8180
@Internal
81+
@SuppressWarnings("CustomX509TrustManager")
8282
public final class TrustManagerImpl extends X509ExtendedTrustManager {
8383

8484
private static final Logger logger = Logger.getLogger(TrustManagerImpl.class.getName());
@@ -431,7 +431,8 @@ private byte[] getTlsSctDataFromSession(SSLSession session) {
431431

432432
byte[] data = null;
433433
try {
434-
Method m_getTlsSctData = session.getClass().getDeclaredMethod("getPeerSignedCertificateTimestamp");
434+
Method m_getTlsSctData =
435+
session.getClass().getDeclaredMethod("getPeerSignedCertificateTimestamp");
435436
m_getTlsSctData.setAccessible(true);
436437
Object rawData = m_getTlsSctData.invoke(session);
437438
if (rawData instanceof byte[]) {

‎common/src/test/java/org/conscrypt/HostnameVerifierTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import javax.net.ssl.SSLPeerUnverifiedException;
3232
import javax.net.ssl.SSLSession;
3333
import javax.security.auth.x500.X500Principal;
34-
import org.junit.Ignore;
34+
// g3-add: import org.junit.Ignore;
3535
import org.junit.Test;
3636
import org.junit.runner.RunWith;
3737
import org.junit.runners.Parameterized;

‎common/src/test/java/org/conscrypt/javax/crypto/XdhKeyFactoryTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.conscrypt.OpenSSLX25519PublicKey;
3131
import org.conscrypt.TestUtils;
3232
import org.conscrypt.XdhKeySpec;
33-
import org.junit.Ignore;
33+
// g3-add: import org.junit.Ignore;
3434
import org.junit.Test;
3535
import org.junit.runner.RunWith;
3636
import org.junit.runners.JUnit4;

‎common/src/test/java/org/conscrypt/javax/net/ssl/SSLSocketVersionCompatibilityTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
import org.conscrypt.tlswire.record.TlsRecord;
5353
import org.junit.After;
5454
import org.junit.Before;
55-
import org.junit.Ignore;
55+
// g3-add: import org.junit.Ignore;
5656
import org.junit.Test;
5757
import org.junit.runner.RunWith;
5858
import org.junit.runners.Parameterized;

‎openjdk/src/test/java/org/conscrypt/ConscryptAndroidSuite.java‎

Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
1+
/*
2+
* Copyright (C) 2023 The Android Open Source Project
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.conscrypt;
18+
19+
import static org.conscrypt.TestUtils.installConscryptAsDefaultProvider;
20+
21+
import org.conscrypt.ct.SerializationTest;
22+
import org.conscrypt.ct.VerifierTest;
23+
import org.conscrypt.java.security.AlgorithmParameterGeneratorTestDH;
24+
import org.conscrypt.java.security.AlgorithmParameterGeneratorTestDSA;
25+
import org.conscrypt.java.security.AlgorithmParametersPSSTest;
26+
import org.conscrypt.java.security.AlgorithmParametersTestAES;
27+
import org.conscrypt.java.security.AlgorithmParametersTestDES;
28+
import org.conscrypt.java.security.AlgorithmParametersTestDESede;
29+
import org.conscrypt.java.security.AlgorithmParametersTestDH;
30+
import org.conscrypt.java.security.AlgorithmParametersTestDSA;
31+
import org.conscrypt.java.security.AlgorithmParametersTestEC;
32+
import org.conscrypt.java.security.AlgorithmParametersTestGCM;
33+
import org.conscrypt.java.security.AlgorithmParametersTestOAEP;
34+
import org.conscrypt.java.security.KeyFactoryTestDH;
35+
import org.conscrypt.java.security.KeyFactoryTestDSA;
36+
import org.conscrypt.java.security.KeyFactoryTestEC;
37+
import org.conscrypt.java.security.KeyFactoryTestRSACrt;
38+
import org.conscrypt.java.security.KeyPairGeneratorTest;
39+
import org.conscrypt.java.security.KeyPairGeneratorTestDH;
40+
import org.conscrypt.java.security.KeyPairGeneratorTestDSA;
41+
import org.conscrypt.java.security.KeyPairGeneratorTestRSA;
42+
import org.conscrypt.java.security.KeyPairGeneratorTestXDH;
43+
import org.conscrypt.java.security.MessageDigestTest;
44+
import org.conscrypt.java.security.SignatureTest;
45+
import org.conscrypt.java.security.cert.CertificateFactoryTest;
46+
import org.conscrypt.java.security.cert.X509CRLTest;
47+
import org.conscrypt.java.security.cert.X509CertificateTest;
48+
import org.conscrypt.javax.crypto.AeadCipherTest;
49+
import org.conscrypt.javax.crypto.CipherBasicsTest;
50+
import org.conscrypt.javax.crypto.ECDHKeyAgreementTest;
51+
import org.conscrypt.javax.crypto.KeyGeneratorTest;
52+
import org.conscrypt.javax.crypto.ScryptTest;
53+
import org.conscrypt.javax.crypto.XDHKeyAgreementTest;
54+
import org.conscrypt.javax.crypto.XdhKeyFactoryTest;
55+
import org.conscrypt.javax.crypto.XdhKeyTest;
56+
import org.conscrypt.javax.net.ssl.KeyManagerFactoryTest;
57+
import org.conscrypt.javax.net.ssl.KeyStoreBuilderParametersTest;
58+
import org.conscrypt.javax.net.ssl.SNIHostNameTest;
59+
import org.conscrypt.javax.net.ssl.SSLParametersTest;
60+
import org.conscrypt.javax.net.ssl.X509KeyManagerTest;
61+
import org.conscrypt.metrics.CipherSuiteTest;
62+
import org.conscrypt.metrics.OptionalMethodTest;
63+
import org.conscrypt.metrics.ProtocolTest;
64+
import org.junit.BeforeClass;
65+
import org.junit.runner.RunWith;
66+
import org.junit.runners.Suite;
67+
68+
@RunWith(Suite.class)
69+
@Suite.SuiteClasses({
70+
// org.conscrypt tests
71+
AddressUtilsTest.class,
72+
ApplicationProtocolSelectorAdapterTest.class,
73+
ArrayUtilsTest.class,
74+
CertPinManagerTest.class,
75+
ChainStrengthAnalyzerTest.class,
76+
DuckTypedHpkeSpiTest.class,
77+
EdDsaTest.class,
78+
ExposedByteArrayOutputStreamTest.class,
79+
FileClientSessionCacheTest.class,
80+
HostnameVerifierTest.class,
81+
HpkeContextTest.class,
82+
HpkeContextRecipientTest.class,
83+
HpkeContextSenderTest.class,
84+
HpkeSuiteTest.class,
85+
HpkeTestVectorsTest.class,
86+
KeySpecUtilTest.class,
87+
MlDsaTest.class,
88+
NativeCryptoArgTest.class,
89+
NativeCryptoTest.class,
90+
NativeRefTest.class,
91+
NativeSslSessionTest.class,
92+
OpenSSLKeyTest.class,
93+
OpenSSLX509CertificateTest.class,
94+
SSLUtilsTest.class,
95+
SlhDsaTest.class,
96+
TestSessionBuilderTest.class,
97+
TrustManagerImplTest.class,
98+
X25519Test.class,
99+
XwingTest.class,
100+
// org.conscrypt.ct tests
101+
VerifierTest.class,
102+
SerializationTest.class,
103+
// java.security tests
104+
CertificateFactoryTest.class,
105+
X509CertificateTest.class,
106+
X509CRLTest.class,
107+
AlgorithmParameterGeneratorTestDH.class,
108+
AlgorithmParameterGeneratorTestDSA.class,
109+
AlgorithmParametersPSSTest.class,
110+
AlgorithmParametersTestAES.class,
111+
AlgorithmParametersTestDES.class,
112+
AlgorithmParametersTestDESede.class,
113+
AlgorithmParametersTestDH.class,
114+
AlgorithmParametersTestDSA.class,
115+
AlgorithmParametersTestEC.class,
116+
AlgorithmParametersTestGCM.class,
117+
AlgorithmParametersTestOAEP.class,
118+
BufferUtilsTest.class,
119+
CipherSuiteTest.class,
120+
KeyFactoryTestDH.class,
121+
KeyFactoryTestDSA.class,
122+
KeyFactoryTestEC.class,
123+
KeyFactoryTestRSACrt.class,
124+
KeyPairGeneratorTest.class,
125+
KeyPairGeneratorTestDH.class,
126+
KeyPairGeneratorTestDSA.class,
127+
KeyPairGeneratorTestRSA.class,
128+
KeyPairGeneratorTestXDH.class,
129+
MessageDigestTest.class,
130+
SignatureTest.class,
131+
// javax.crypto tests
132+
AeadCipherTest.class,
133+
CipherBasicsTest.class,
134+
MacTest.class,
135+
ECDHKeyAgreementTest.class,
136+
KeyGeneratorTest.class,
137+
XDHKeyAgreementTest.class,
138+
XdhKeyFactoryTest.class,
139+
XdhKeyTest.class,
140+
// javax.net.ssl tests
141+
KeyManagerFactoryTest.class,
142+
KeyStoreBuilderParametersTest.class,
143+
OptionalMethodTest.class,
144+
ProtocolTest.class,
145+
ScryptTest.class,
146+
SNIHostNameTest.class,
147+
SSLParametersTest.class,
148+
VeryBasicHttpServerTest.class,
149+
X509KeyManagerTest.class,
150+
})
151+
public class ConscryptAndroidSuite {
152+
@BeforeClass
153+
public static void setupStatic() {
154+
installConscryptAsDefaultProvider();
155+
}
156+
}

‎openjdk/src/test/java/org/conscrypt/ConscryptSocketTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
import javax.net.ssl.TrustManagerFactory;
6262
import org.junit.After;
6363
import org.junit.Before;
64-
import org.junit.Ignore;
64+
// g3-add: import org.junit.Ignore;
6565
import org.junit.Test;
6666
import org.junit.runner.RunWith;
6767
import org.junit.runners.Parameterized;

‎openjdk/src/test/java/org/conscrypt/OpenSSLX509CertificateTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import java.util.Arrays;
3838
import org.conscrypt.OpenSSLX509CertificateFactory.ParsingException;
3939
import org.junit.Assume;
40-
import org.junit.Ignore;
40+
// g3-add: import org.junit.Ignore;
4141
import org.junit.Test;
4242
import org.junit.runner.RunWith;
4343
import org.junit.runners.JUnit4;

‎openjdk/src/test/java/org/conscrypt/ServerSessionContextTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ int size(ServerSessionContext context) {
3939
int count = 0;
4040
Enumeration<byte[]> ids = context.getIds();
4141
while (ids.hasMoreElements()) {
42-
ids.nextElement();
42+
Object unused = ids.nextElement();
4343
count++;
4444
}
4545
return count;

0 commit comments

Comments
 (0)