summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-06-07am 711ae8b4: am e8fdb9d5: Merge "Add to suggested BouncyCastle upgrade regres...android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devBrian Carlstrom
2013-06-07am e8fdb9d5: Merge "Add to suggested BouncyCastle upgrade regression tests"tools_r22.2Brian Carlstrom
2013-06-07Merge "Add to suggested BouncyCastle upgrade regression tests"jb-mr1.1-dev-plus-aospBrian Carlstrom
2013-06-06Add to suggested BouncyCastle upgrade regression testsBrian Carlstrom
2013-06-03am 39bddb1f: am ff9f947b: Merge changes I8c8f1572,Idc2bbd24Brian Carlstrom
2013-06-03am ff9f947b: Merge changes I8c8f1572,Idc2bbd24Brian Carlstrom
2013-06-04Merge changes I8c8f1572,Idc2bbd24Brian Carlstrom
2013-06-03resolved conflicts for merge of a28cc596 to masterBrian Carlstrom
2013-06-03Track changes to JSSEKenny Root
2013-06-03Allow CipherTest to run on RIBrian Carlstrom
2013-06-03resolved conflicts for merge of dbfdf24c to stage-aosp-masterBrian Carlstrom
2013-06-03Merge "bouncycastle 1.49 upgrade"Brian Carlstrom
2013-06-03bouncycastle 1.49 upgradeBrian Carlstrom
2013-05-30am 3ef83094: resolved conflicts for merge of 67e643cb to stage-aosp-masterWilliam Luh
2013-05-30resolved conflicts for merge of 67e643cb to stage-aosp-masterWilliam Luh
2013-05-30Merge "Fix PBKDF2WithHmacSHA1 to use high bits"William Luh
2013-05-28Fix PBKDF2WithHmacSHA1 to use high bitsWilliam Luh
2013-04-30am c4e7b57a: Merge "Track changes to JSSE" into jb-mr2-dev-plus-aospKenny Root
2013-05-01Merge "Track changes to JSSE" into jb-mr2-dev-plus-aospKenny Root
2013-05-01Track changes to JSSEKenny Root
2013-05-01Merge "Track changes to JSSE"Kenny Root
2013-04-30am bdbaf4d4: am 918e3ef8: Merge "Track change to JSSE"Kenny Root
2013-04-30am 918e3ef8: Merge "Track change to JSSE"Kenny Root
2013-04-30Track changes to JSSEKenny Root
2013-05-01Merge "Track change to JSSE"tools_r22Kenny Root
2013-04-30Track change to JSSEKenny Root
2013-04-30am 69e2c60c: am ba6f0e89: Merge "Track change to JSSE provider"Kenny Root
2013-04-29am ba6f0e89: Merge "Track change to JSSE provider"Kenny Root
2013-04-30Merge "Track change to JSSE provider"Kenny Root
2013-04-29Track change to JSSE providerKenny Root
2013-04-29Merge "Fix PBKDF2WithHmacSHA1 to use high bits"William Luh
2013-04-23am 89f64f30: am 57c3bb55: Revert of DERT61String change from 44021512997b337e...Brian Carlstrom
2013-04-23am 57c3bb55: Revert of DERT61String change from 44021512997b337e6079e46fd4230...Brian Carlstrom
2013-04-23am 28f0a517: am 13a304fc: Merge "Revert of DERT61String change from 440215129...Brian Carlstrom
2013-04-23Revert of DERT61String change from 44021512997b337e6079e46fd4230ce979c20b6fandroid-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devBrian Carlstrom
2013-04-23am 13a304fc: Merge "Revert of DERT61String change from 44021512997b337e6079e4...Brian Carlstrom
2013-04-23Merge "Revert of DERT61String change from 44021512997b337e6079e46fd4230ce979c...Brian Carlstrom
2013-04-22Revert of DERT61String change from 44021512997b337e6079e46fd4230ce979c20b6fBrian Carlstrom
2013-04-17Fix PBKDF2WithHmacSHA1 to use high bitsWilliam Luh
2013-04-03am 7ba35979: am 7d18f46a: Merge "Make bouncycastle-nojarjar static to keep it...Brian Carlstrom
2013-04-03am 7d18f46a: Merge "Make bouncycastle-nojarjar static to keep it off the device"Brian Carlstrom
2013-04-04Merge "Make bouncycastle-nojarjar static to keep it off the device"Brian Carlstrom
2013-04-03Make bouncycastle-nojarjar static to keep it off the deviceBrian Carlstrom
2013-04-03am c7d0f2f2: resolved conflicts for merge of bc044035 to jb-mr2-dev-plus-aospBrian Carlstrom
2013-04-03resolved conflicts for merge of bc044035 to jb-mr2-dev-plus-aospBrian Carlstrom
2013-04-03Merge "Add bouncycastle-nojarjar for building okhttp-tests"Brian Carlstrom
2013-04-03Add bouncycastle-nojarjar for building okhttp-testsBrian Carlstrom
2013-03-19am 8c18c33a: resolved conflicts for merge of aebc7ff8 to jb-mr2-devKenny Root
2013-03-19resolved conflicts for merge of aebc7ff8 to jb-mr2-devKenny Root
2013-03-19am 3b69cbe7: Merge "Make ECDH KeyAgreement reject AlgorithmParameterSpec."Kenny Root