summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in nyc-release history after reset to nyc-devstaging/cm-14.0The Android Automerger2016-05-020-0/+0
|\
| * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-020-0/+0
| |\ | |/ |/|
* | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-010-0/+0
|\|
| * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-190-0/+0
| |\
| | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-130-0/+0
| | |\
| | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-120-0/+0
| | | |\
| | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-050-0/+0
| | | | |\
| | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-040-0/+0
| | | | | |\
| | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-040-0/+0
| | | | | | |\ | | | | | | |/ | | | | | |/|
| | | | | * | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-030-0/+0
| | | | | |\|
| | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-200-0/+0
| | | | | | |\
| | | | | | | * Use official name for SHA1withECDSAKenny Root2016-03-161-8/+10
| | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-010-0/+0
| | | | | | | |\
| | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-240-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-180-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-140-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-12-060-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-12-010-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-11-260-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * Add core-oj to the list of dependenciesPrzemyslaw Szczepaniak2015-11-231-2/+2
| | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-11-230-0/+0
| | | | | | | | | | | | | | |\
* | | | | | | | | | | | | | | | ASN1: Use an explicit locale for ASN1 UTC / Generalized times.Narayan Kamath2016-04-274-16/+72
|/ / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / Revert "Strings: hardcode "\n" as the line separator"Sergio Giro2016-04-181-36/+29
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge "EC: add bug number in TODO comment about registrations failing" into n...Sergio Giro2016-04-121-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | EC: add bug number in TODO comment about registrations failingSergio Giro2016-04-121-3/+8
| |/ / / / / / / / / / / /
* / / / / / / / / / / / / Strings: hardcode "\n" as the line separatorSergio Giro2016-04-111-29/+36
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge "Permit arbitrary DSA keys when verifying signatures." into nyc-devAlex Klyubin2016-04-051-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Permit arbitrary DSA keys when verifying signatures.Alex Klyubin2016-04-041-4/+0
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge "BaseBlockCipher: do not use PKCS12 for BCPBEKeys without IV" into nyc-devSergio Giro2016-04-051-5/+41
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | BaseBlockCipher: do not use PKCS12 for BCPBEKeys without IVSergio Giro2016-04-051-5/+41
| |/ / / / / / / / / /
* | | | | | | | | | | Remove workaround Jack bug on package renamingYohann Roussel2016-04-011-3/+0
* | | | | | | | | | | Add OCSP files for testing purposesKenny Root2016-04-0137-18/+3632
|/ / / / / / / / / /
* | | | | | | | | | Merge "KeyPairGeneratorSpi: remove TODO about creating a SecureRandom" into n...Sergio Giro2016-03-181-1/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | KeyPairGeneratorSpi: remove TODO about creating a SecureRandomSergio Giro2016-03-181-1/+0
* | | | | | | | | | | Merge "BaseBlockCipher: removed TODO about checking a fix" into nyc-devSergio Giro2016-03-181-1/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | BaseBlockCipher: removed TODO about checking a fixSergio Giro2016-03-181-1/+0
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "BaseBlockCipher: for BCEPBEKeys, ignore parameters if no IV is present...Sergio Giro2016-03-181-1/+9
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | BaseBlockCipher: for BCEPBEKeys, ignore parameters if no IV is presentSergio Giro2016-03-161-1/+9
| |/ / / / / / / / /
* / / / / / / / / / Use official name for SHA1withECDSAKenny Root2016-03-161-8/+10
|/ / / / / / / / /
* / / / / / / / / DSASigner: fix key check when no digest specifiedKenny Root2016-02-291-1/+1
|/ / / / / / / /
* | | | | | | | GCMParameters: fix insecure tag size am: 4d0e19131d am: 9ca2dfa49b am: bc2920...Sergio Giro2016-02-231-3/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | GCMParameters: fix insecure tag size am: 4d0e19131d am: 9ca2dfa49bSergio Giro2016-02-231-3/+12
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ GCMParameters: fix insecure tag size am: 4d0e19131dSergio Giro2016-02-231-3/+12
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ GCMParameters: fix insecure tag sizeSergio Giro2016-02-231-3/+12
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | GCMParameters: fix insecure tag sizeSergio Giro2016-02-231-3/+12
* | | | | | | | | | | Force bouncycastle to continue to use v51 (1.7) .class filesNeil Fuller2016-02-161-0/+6
| |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | bouncycastle: upgrade to version 1.54Sergio Giro2016-02-10265-2972/+11358
* | | | | | | | | | DSASigner: add imports missing after resolving conflictSergio Giro2016-02-011-0/+4
* | | | | | | | | | Merge "Restoring the contents of aosp after" am: 3e75bd6b40Sergio Giro2016-02-012064-320785/+3951
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge "Restoring the contents of aosp after"Sergio Giro2016-02-012064-320785/+3951
| |\ \ \ \ \ \ \ \ \ \