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

Commit c497348c authored by Kenny Root's avatar Kenny Root Committed by Gerrit Code Review
Browse files

Merge changes from topic 'update-conscrypt' 

* changes:
  Delete obsolete and unused KeyStoreTests
  Track updates to Conscrypt
parents 057c7c31 91abf9f6

core/java/android/net/SSLCertificateSocketFactory.java

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.os.SystemProperties; 
import android.util.Log;



import com.android.internal.os.RoSystemProperties;

import com.android.org.conscrypt.Conscrypt;

import com.android.org.conscrypt.OpenSSLContextImpl;

import com.android.org.conscrypt.OpenSSLSocketImpl;

import com.android.org.conscrypt.SSLClientSessionCache;
@@ -212,7 +213,7 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { 
    private SSLSocketFactory makeSocketFactory(

            KeyManager[] keyManagers, TrustManager[] trustManagers) {

        try {

            OpenSSLContextImpl sslContext = OpenSSLContextImpl.getPreferred();

            OpenSSLContextImpl sslContext =  (OpenSSLContextImpl) Conscrypt.newPreferredSSLContextSpi();

            sslContext.engineInit(keyManagers, trustManagers, null);

            sslContext.engineGetClientSessionContext().setPersistentCache(mSessionCache);

            return sslContext.engineGetSocketFactory();

keystore/tests/Android.mk

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



# We only want this apk build for tests.

LOCAL_MODULE_TAGS := tests

LOCAL_CERTIFICATE := platform



LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle conscrypt

LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test



# Include all test java files.

LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_PACKAGE_NAME := KeyStoreTests



include $(BUILD_PACKAGE)

keystore/tests/AndroidManifest.xml

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2009 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="android.security.tests"

          android:sharedUserId="android.uid.system">



    <application>

        <uses-library android:name="android.test.runner" />

    </application>



    <instrumentation android:name="android.test.InstrumentationTestRunner"

        android:targetPackage="android.security.tests"

        android:label="KeyStore Tests">

    </instrumentation>

</manifest>

keystore/tests/src/android/security/KeyPairGeneratorSpecTest.java

deleted100644 → 0
+0 −152
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.security;



import android.test.AndroidTestCase;



import java.math.BigInteger;

import java.util.Date;



import javax.security.auth.x500.X500Principal;



public class KeyPairGeneratorSpecTest extends AndroidTestCase {

    private static final String TEST_ALIAS_1 = "test1";



    private static final X500Principal TEST_DN_1 = new X500Principal("CN=test1");



    private static final long NOW_MILLIS = System.currentTimeMillis();



    private static final BigInteger SERIAL_1 = BigInteger.ONE;



    /* We have to round this off because X509v3 doesn't store milliseconds. */

    private static final Date NOW = new Date(NOW_MILLIS - (NOW_MILLIS % 1000L));



    @SuppressWarnings("deprecation")

    private static final Date NOW_PLUS_10_YEARS = new Date(NOW.getYear() + 10, 0, 1);



    public void testConstructor_Success() throws Exception {

        KeyPairGeneratorSpec spec =

                new KeyPairGeneratorSpec(getContext(), TEST_ALIAS_1, "RSA", 1024, null, TEST_DN_1,

                        SERIAL_1, NOW, NOW_PLUS_10_YEARS, 0);



        assertEquals("Context should be the one specified", getContext(), spec.getContext());



        assertEquals("Alias should be the one specified", TEST_ALIAS_1, spec.getKeystoreAlias());



        assertEquals("Key algorithm should be the one specified", "RSA", spec.getKeyType());



        assertEquals("Key size should be the one specified", 1024, spec.getKeySize());



        assertEquals("subjectDN should be the one specified", TEST_DN_1, spec.getSubjectDN());



        assertEquals("startDate should be the one specified", NOW, spec.getStartDate());



        assertEquals("endDate should be the one specified", NOW_PLUS_10_YEARS, spec.getEndDate());

    }



    public void testBuilder_Success() throws Exception {

        KeyPairGeneratorSpec spec = new KeyPairGeneratorSpec.Builder(getContext())

                .setAlias(TEST_ALIAS_1)

                .setKeyType("RSA")

                .setKeySize(1024)

                .setSubject(TEST_DN_1)

                .setSerialNumber(SERIAL_1)

                .setStartDate(NOW)

                .setEndDate(NOW_PLUS_10_YEARS)

                .setEncryptionRequired()

                .build();



        assertEquals("Context should be the one specified", getContext(), spec.getContext());



        assertEquals("Alias should be the one specified", TEST_ALIAS_1, spec.getKeystoreAlias());



        assertEquals("Key algorithm should be the one specified", "RSA", spec.getKeyType());



        assertEquals("Key size should be the one specified", 1024, spec.getKeySize());



        assertEquals("subjectDN should be the one specified", TEST_DN_1, spec.getSubjectDN());



        assertEquals("startDate should be the one specified", NOW, spec.getStartDate());



        assertEquals("endDate should be the one specified", NOW_PLUS_10_YEARS, spec.getEndDate());



        assertEquals("encryption flag should be on", KeyStore.FLAG_ENCRYPTED, spec.getFlags());

    }



    public void testConstructor_NullContext_Failure() throws Exception {

        try {

            new KeyPairGeneratorSpec(null, TEST_ALIAS_1, "RSA", 1024, null, TEST_DN_1, SERIAL_1, NOW,

                    NOW_PLUS_10_YEARS, 0);

            fail("Should throw IllegalArgumentException when context is null");

        } catch (IllegalArgumentException success) {

        }

    }



    public void testConstructor_NullKeystoreAlias_Failure() throws Exception {

        try {

            new KeyPairGeneratorSpec(getContext(), null, "RSA", 1024, null, TEST_DN_1, SERIAL_1, NOW,

                    NOW_PLUS_10_YEARS, 0);

            fail("Should throw IllegalArgumentException when keystoreAlias is null");

        } catch (IllegalArgumentException success) {

        }

    }



    public void testConstructor_NullSubjectDN_Failure() throws Exception {

        try {

            new KeyPairGeneratorSpec(getContext(), TEST_ALIAS_1, "RSA", 1024, null, null, SERIAL_1, NOW,

                    NOW_PLUS_10_YEARS, 0);

            fail("Should throw IllegalArgumentException when subjectDN is null");

        } catch (IllegalArgumentException success) {

        }

    }



    public void testConstructor_NullSerial_Failure() throws Exception {

        try {

            new KeyPairGeneratorSpec(getContext(), TEST_ALIAS_1, "RSA", 1024, null, TEST_DN_1, null, NOW,

                    NOW_PLUS_10_YEARS, 0);

            fail("Should throw IllegalArgumentException when startDate is null");

        } catch (IllegalArgumentException success) {

        }

    }



    public void testConstructor_NullStartDate_Failure() throws Exception {

        try {

            new KeyPairGeneratorSpec(getContext(), TEST_ALIAS_1, "RSA", 1024, null, TEST_DN_1, SERIAL_1,

                    null, NOW_PLUS_10_YEARS, 0);

            fail("Should throw IllegalArgumentException when startDate is null");

        } catch (IllegalArgumentException success) {

        }

    }



    public void testConstructor_NullEndDate_Failure() throws Exception {

        try {

            new KeyPairGeneratorSpec(getContext(), TEST_ALIAS_1, "RSA", 1024, null, TEST_DN_1, SERIAL_1,

                    NOW, null, 0);

            fail("Should throw IllegalArgumentException when keystoreAlias is null");

        } catch (IllegalArgumentException success) {

        }

    }



    public void testConstructor_EndBeforeStart_Failure() throws Exception {

        try {

            new KeyPairGeneratorSpec(getContext(), TEST_ALIAS_1, "RSA", 1024, null, TEST_DN_1, SERIAL_1,

                    NOW_PLUS_10_YEARS, NOW, 0);

            fail("Should throw IllegalArgumentException when end is before start");

        } catch (IllegalArgumentException success) {

        }

    }

}

keystore/tests/src/android/security/KeyStoreTest.java

deleted100644 → 0
+0 −974

File deleted.

Preview size limit exceeded, changes collapsed.