summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r72' into HEADHEADreplicant-6.0-0004-rc1replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001cm-13.0Jessica Wagantall2016-10-060-0/+0
|\
| * GCMParameters: in ASN1 encoding, use 12 when no value is specifiedSergio Giro2016-08-161-12/+3
* | Merge tag 'android-6.0.1_r66' into HEADJessica Wagantall2016-09-071-12/+3
|\ \
| * | GCMParameters: in ASN1 encoding, use 12 when no value is specifiedSergio Giro2016-07-221-12/+3
| |/
* | Merge tag 'android-6.0.1_r30' into HEADJessica Wagantall2016-04-180-0/+0
|\ \ | |/
| * GCMParameters: fix insecure tag sizeSergio Giro2016-02-271-3/+12
* | Merge tag 'android-6.0.1_r24' into HEADJessica Wagantall2016-04-051-3/+12
|\ \
| * \ merge in mnc-dr1.5-release history after reset to mnc-dr1.5-devThe Android Automerger2016-03-220-0/+0
| |\ \
| | * \ merge in mnc-dr1.5-release history after reset to mnc-dr1.5-devThe Android Automerger2016-03-180-0/+0
| | |\ \ | | |/ / | |/| |
| * | | GCMParameters: fix insecure tag sizeSergio Giro2016-03-011-3/+12
| |/ /
* | | Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/ex...staging/cm-13.0+r22Steve Kondik2016-03-110-0/+0
|\ \ \ | |/ /
| * | DO NOT MERGE bouncycastle: limit input length as specified by the NIST specSergio Giro2015-11-162-6/+117
* | | Merge tag 'android-6.0.1_r10' into HEADJessica Wagantall2016-01-052-6/+117
|\ \ \ | | |/ | |/|
| * | DO NOT MERGE bouncycastle: limit input length as specified by the NIST specSergio Giro2015-12-022-6/+117
| |/
* | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-250-0/+0
|\ \ | |/ |/|
| * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-110-0/+0
| |\
| | * Register DSA OID for KeyFactory not just SignatureKenny Root2015-06-023-18/+39
* | | GCM: fix mode and padding setKenny Root2015-07-232-11/+45
|/ /
* | Do not blacklist serial numbers that are too shortKenny Root2015-06-102-12/+22
* | Register DSA OID for KeyFactory not just SignatureKenny Root2015-06-013-18/+39
* | Revert "Register DSAwithSHA1 OID for KeyFactory"Kenny Root2015-06-012-17/+1
* | Register DSAwithSHA1 OID for KeyFactoryKenny Root2015-06-012-1/+17
|/
* Set default EC key size to 256-bitsKenny Root2015-05-132-5/+18
* Change default GCM name to AES/GCM/NOPADDINGKenny Root2015-05-132-13/+22
* Change Bouncycastle default AES key size to 128Kenny Root2015-05-132-7/+20
* bouncycastle: throw exception in failure expecting PKIX parametersSergio Giro2015-05-062-5/+33
* am fb93a769: Merge "bouncycastle: upgrade to version 1.52"Sergio Giro2015-04-21105-2648/+3941
|\
| * Merge "bouncycastle: upgrade to version 1.52"Sergio Giro2015-04-21105-2648/+3941
| |\
| | * bouncycastle: upgrade to version 1.52Sergio Giro2015-04-20105-2648/+3941
| |/
* | am b44aff7a: Merge "Remove -encoding UTF-8, it is now the default"Colin Cross2015-03-311-6/+0
|\ \ | |/
| * Merge "Remove -encoding UTF-8, it is now the default"Colin Cross2015-03-311-6/+0
| |\
| | * Remove -encoding UTF-8, it is now the defaultColin Cross2015-03-311-6/+0
| |/
* | am 75c09416: am 25324b6b: Merge "Build bouncycastle-hostdex only on linux hos...Narayan Kamath2015-01-071-2/+4
|\ \ | |/
| * am 25324b6b: Merge "Build bouncycastle-hostdex only on linux hosts."Narayan Kamath2015-01-071-2/+4
| |\
| | * Merge "Build bouncycastle-hostdex only on linux hosts."Narayan Kamath2015-01-071-2/+4
| | |\
| | | * Build bouncycastle-hostdex only on linux hosts.Narayan Kamath2015-01-061-2/+4
| | |/
* | | am 66020afc: am 2a64eecc: Avoid things that cause CertBlacklist to be preinit...Kenny Root2014-11-060-0/+0
|\ \ \ | |/ /
| * | am 2a64eecc: Avoid things that cause CertBlacklist to be preinitializedKenny Root2014-11-060-0/+0
| |\ \
| | * | Avoid things that cause CertBlacklist to be preinitializedKenny Root2014-11-053-25/+29
* | | | am 82a68225: am bd63be61: am 9454cc5f: Merge "Avoid things that cause CertBla...Kenny Root2014-10-260-0/+0
|\ \ \ \ | |/ / /
| * | | am bd63be61: am 9454cc5f: Merge "Avoid things that cause CertBlacklist to be ...Kenny Root2014-10-250-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | am 9454cc5f: Merge "Avoid things that cause CertBlacklist to be preinitialized"Kenny Root2014-10-173-26/+30
| | |\ \
* | | \ \ am c0144d74: am 4b898d5f: am 0ced44f2: Merge "Revert "Put the CertBlacklist i...Kenny Root2014-10-260-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 4b898d5f: am 0ced44f2: Merge "Revert "Put the CertBlacklist in a NoPreload...Kenny Root2014-10-250-0/+0
| |\ \ \ \ | | |/ / /
| | * | | am 0ced44f2: Merge "Revert "Put the CertBlacklist in a NoPreloadHolder""Kenny Root2014-10-172-14/+10
| | |\ \ \
* | | \ \ \ am 312be539: am b000361b: am 74e779b0: Merge "Put the CertBlacklist in a NoPr...Kenny Root2014-10-260-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am b000361b: am 74e779b0: Merge "Put the CertBlacklist in a NoPreloadHolder"Kenny Root2014-10-250-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 74e779b0: Merge "Put the CertBlacklist in a NoPreloadHolder"Kenny Root2014-10-172-10/+14
| | |\ \ \ \
* | | \ \ \ \ am 0fd6b0bb: am 9454cc5f: Merge "Avoid things that cause CertBlacklist to be ...Kenny Root2014-10-173-26/+30
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 9454cc5f: Merge "Avoid things that cause CertBlacklist to be preinitialized"Kenny Root2014-10-173-26/+30
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |