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

Commit dd4e4121 authored by Alex Klyubin's avatar Alex Klyubin Committed by android-build-merger
Browse files

Merge "Stop using 512 bit RSA keys in keyset unit tests." am: 59c9bfd4 am: b1e7f6d2 

am: 64868d11

* commit '64868d11':
  Stop using 512 bit RSA keys in keyset unit tests.
parents b88dd941 64868d11

core/tests/coretests/apks/keyset/permUse/AndroidManifest.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -21,11 +21,11 @@ 
    <key-sets>

    <key-sets>

        <key-set android:name="A">

        <key-set android:name="A">

          <public-key android:name="keyA"

          <public-key android:name="keyA"

                      android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJoN1Nsgqf0V4C/bbN8wo8O2X/S5D76+5Mb9mlIsHkUTUTbHCNk+LxHIUYLm89YbP9zImrV0bUHLUAZUyoMUCiMCAwEAAQ=="/>

                      android:value="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsMpNthdOxud7roPDZMMomOqXgJJdRfIWpkKEqmC61Mv+Nf6QY3TorEwJeghjSmqj7IbBKrtvfQq4E2XJO1HuspmQO4Ng2gvn+r+6EwNfKc9k55d6s+27SR867jKurBbHNtZMG+tjL1yH4r+tNzcuJCsgyAFqLmxFdcxEwzNvREyRpoYc5RDR0mmTwkMCUhJ6CId1EYEKiCEdNzxv+fWPEb21u+/MWpleGCILs8kglRVb2q/WOzAAvGr4FY5plfaE6N+lr7+UschQ+aMi1+uqewo2o0qPFVmZP5hnwj55K4UMzu/NhhDqQQsX4cSGES1KgHo5MTqRqZjN/I7emw5pFQIDAQAB"/>

        </key-set>

        </key-set>

        <key-set android:name="B">

        <key-set android:name="B">

          <public-key android:name="keyB"

          <public-key android:name="keyB"

                      android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMTfQsY8UuXiXmvw/y7Tpr7HoyfAC0nE/8Qdk3ZtEr9asa5qqP0F6xzCI1PGVFV+WLVRwm6FdB9StENL5EKyQFcCAwEAAQ==" />

                      android:value="MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEtGr5cL2N7ztHiHmphB1/1eq+43lEAmP36iiEJAfX+cVReGSPFXqNnnM8Vptd2boAe332lrFw9rKPmbkZA+jOTA==" />

        </key-set>

        </key-set>

        <upgrade-key-set android:name="A"/>

        <upgrade-key-set android:name="A"/>

        <upgrade-key-set android:name="B"/>

        <upgrade-key-set android:name="B"/>

core/tests/coretests/apks/keyset/uA/AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ 
    <key-sets>

    <key-sets>

        <key-set android:name="A" >

        <key-set android:name="A" >

          <public-key android:name="keyA"

          <public-key android:name="keyA"

                      android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJoN1Nsgqf0V4C/bbN8wo8O2X/S5D76+5Mb9mlIsHkUTUTbHCNk+LxHIUYLm89YbP9zImrV0bUHLUAZUyoMUCiMCAwEAAQ=="/>

                      android:value="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsMpNthdOxud7roPDZMMomOqXgJJdRfIWpkKEqmC61Mv+Nf6QY3TorEwJeghjSmqj7IbBKrtvfQq4E2XJO1HuspmQO4Ng2gvn+r+6EwNfKc9k55d6s+27SR867jKurBbHNtZMG+tjL1yH4r+tNzcuJCsgyAFqLmxFdcxEwzNvREyRpoYc5RDR0mmTwkMCUhJ6CId1EYEKiCEdNzxv+fWPEb21u+/MWpleGCILs8kglRVb2q/WOzAAvGr4FY5plfaE6N+lr7+UschQ+aMi1+uqewo2o0qPFVmZP5hnwj55K4UMzu/NhhDqQQsX4cSGES1KgHo5MTqRqZjN/I7emw5pFQIDAQAB"/>

        </key-set>

        </key-set>

        <upgrade-key-set android:name="A"/>

        <upgrade-key-set android:name="A"/>

    </key-sets>

    </key-sets>

core/tests/coretests/apks/keyset/uAB/AndroidManifest.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -20,9 +20,9 @@ 
    <key-sets>

    <key-sets>

        <key-set android:name="AB" >

        <key-set android:name="AB" >

          <public-key android:name="keyA"

          <public-key android:name="keyA"

                      android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJoN1Nsgqf0V4C/bbN8wo8O2X/S5D76+5Mb9mlIsHkUTUTbHCNk+LxHIUYLm89YbP9zImrV0bUHLUAZUyoMUCiMCAwEAAQ==" />

                      android:value="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsMpNthdOxud7roPDZMMomOqXgJJdRfIWpkKEqmC61Mv+Nf6QY3TorEwJeghjSmqj7IbBKrtvfQq4E2XJO1HuspmQO4Ng2gvn+r+6EwNfKc9k55d6s+27SR867jKurBbHNtZMG+tjL1yH4r+tNzcuJCsgyAFqLmxFdcxEwzNvREyRpoYc5RDR0mmTwkMCUhJ6CId1EYEKiCEdNzxv+fWPEb21u+/MWpleGCILs8kglRVb2q/WOzAAvGr4FY5plfaE6N+lr7+UschQ+aMi1+uqewo2o0qPFVmZP5hnwj55K4UMzu/NhhDqQQsX4cSGES1KgHo5MTqRqZjN/I7emw5pFQIDAQAB" />

          <public-key android:name="keyB"

          <public-key android:name="keyB"

                      android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMTfQsY8UuXiXmvw/y7Tpr7HoyfAC0nE/8Qdk3ZtEr9asa5qqP0F6xzCI1PGVFV+WLVRwm6FdB9StENL5EKyQFcCAwEAAQ==" />

                      android:value="MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEtGr5cL2N7ztHiHmphB1/1eq+43lEAmP36iiEJAfX+cVReGSPFXqNnnM8Vptd2boAe332lrFw9rKPmbkZA+jOTA==" />

        </key-set>

        </key-set>

        <upgrade-key-set android:name="AB"/>

        <upgrade-key-set android:name="AB"/>

    </key-sets>

    </key-sets>

core/tests/coretests/apks/keyset/uAuB/AndroidManifest.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -20,11 +20,11 @@ 
    <key-sets>

    <key-sets>

        <key-set android:name="A" >

        <key-set android:name="A" >

          <public-key android:name="keyA"

          <public-key android:name="keyA"

                      android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJoN1Nsgqf0V4C/bbN8wo8O2X/S5D76+5Mb9mlIsHkUTUTbHCNk+LxHIUYLm89YbP9zImrV0bUHLUAZUyoMUCiMCAwEAAQ==" />

                      android:value="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsMpNthdOxud7roPDZMMomOqXgJJdRfIWpkKEqmC61Mv+Nf6QY3TorEwJeghjSmqj7IbBKrtvfQq4E2XJO1HuspmQO4Ng2gvn+r+6EwNfKc9k55d6s+27SR867jKurBbHNtZMG+tjL1yH4r+tNzcuJCsgyAFqLmxFdcxEwzNvREyRpoYc5RDR0mmTwkMCUhJ6CId1EYEKiCEdNzxv+fWPEb21u+/MWpleGCILs8kglRVb2q/WOzAAvGr4FY5plfaE6N+lr7+UschQ+aMi1+uqewo2o0qPFVmZP5hnwj55K4UMzu/NhhDqQQsX4cSGES1KgHo5MTqRqZjN/I7emw5pFQIDAQAB" />

        </key-set>

        </key-set>

        <key-set android:name="B" >

        <key-set android:name="B" >

          <public-key android:name="keyB"

          <public-key android:name="keyB"

                      android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMTfQsY8UuXiXmvw/y7Tpr7HoyfAC0nE/8Qdk3ZtEr9asa5qqP0F6xzCI1PGVFV+WLVRwm6FdB9StENL5EKyQFcCAwEAAQ==" />

                      android:value="MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEtGr5cL2N7ztHiHmphB1/1eq+43lEAmP36iiEJAfX+cVReGSPFXqNnnM8Vptd2boAe332lrFw9rKPmbkZA+jOTA==" />

        </key-set>

        </key-set>

        <upgrade-key-set android:name="A"/>

        <upgrade-key-set android:name="A"/>

        <upgrade-key-set android:name="B"/>

        <upgrade-key-set android:name="B"/>

core/tests/coretests/apks/keyset/uB/AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ 
    <key-sets>

    <key-sets>

        <key-set android:name="B" >

        <key-set android:name="B" >

          <public-key android:name="keyB"

          <public-key android:name="keyB"

                      android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMTfQsY8UuXiXmvw/y7Tpr7HoyfAC0nE/8Qdk3ZtEr9asa5qqP0F6xzCI1PGVFV+WLVRwm6FdB9StENL5EKyQFcCAwEAAQ==" />

                      android:value="MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEtGr5cL2N7ztHiHmphB1/1eq+43lEAmP36iiEJAfX+cVReGSPFXqNnnM8Vptd2boAe332lrFw9rKPmbkZA+jOTA==" />

        </key-set>

        </key-set>

        <upgrade-key-set android:name="B"/>

        <upgrade-key-set android:name="B"/>

    </key-sets>

    </key-sets>