summaryrefslogtreecommitdiffstats
path: root/bcprov/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of a28cc596 to masterBrian Carlstrom2013-06-03129-5091/+6237
|\
| * bouncycastle 1.49 upgradeBrian Carlstrom2013-06-03129-5091/+6237
| * Fix PBKDF2WithHmacSHA1 to use high bitsWilliam Luh2013-05-284-10/+57
* | Track changes to JSSEKenny Root2013-04-301-2/+5
* | am 69e2c60c: am ba6f0e89: Merge "Track change to JSSE provider"Kenny Root2013-04-301-1/+1
|\ \
| * | am ba6f0e89: Merge "Track change to JSSE provider"Kenny Root2013-04-291-1/+1
| |\|
| | * Merge "Track change to JSSE provider"Kenny Root2013-04-301-1/+1
| | |\
| | | * Track change to JSSE providerKenny Root2013-04-291-1/+1
* | | | Merge "Fix PBKDF2WithHmacSHA1 to use high bits"William Luh2013-04-294-10/+57
|\ \ \ \ | |/ / / |/| | |
| * | | Fix PBKDF2WithHmacSHA1 to use high bitsWilliam Luh2013-04-174-10/+57
* | | | am 13a304fc: Merge "Revert of DERT61String change from 44021512997b337e6079e4...Brian Carlstrom2013-04-231-2/+6
|\ \ \ \ | |/ / / |/| / / | |/ /
| * / Revert of DERT61String change from 44021512997b337e6079e46fd4230ce979c20b6fBrian Carlstrom2013-04-221-2/+6
| |/
* | resolved conflicts for merge of aebc7ff8 to jb-mr2-devKenny Root2013-03-191-0/+6
|\|
| * Make ECDH KeyAgreement reject AlgorithmParameterSpec.Alex Klyubin2013-03-191-0/+6
* | am 43be13a7: Merge "Tracking libcore change to use longs instead of ints to s...Brian Carlstrom2013-03-051-9/+9
|\|
| * Tracking libcore change to use longs instead of ints to store pointers in Ope...Brian Carlstrom2013-02-271-9/+9
* | am dd20fc48: Merge "Fix CertPath APIs"Kenny Root2013-02-262-2/+6
|\|
| * Fix CertPath APIsKenny Root2013-02-202-2/+6
| * bouncycastle 1.48 upgradeBrian Carlstrom2013-02-12156-1405/+2284
| * resolved conflicts for merge of e0c8f221 to jb-mr1-dev-plus-aospBrian Carlstrom2013-02-011-2/+10
| |\
| | * Add certs to blacklist.Geremy Condra2013-01-221-2/+10
* | | bouncycastle 1.48 upgradeBrian Carlstrom2013-02-12156-1405/+2284
* | | am b8bddcfe: Merge "Restore PBE Cipher wrap and unwrap support from upstream"Brian Carlstrom2013-01-292-2/+227
|\| |
| * | Restore PBE Cipher wrap and unwrap support from upstreamBrian Carlstrom2013-01-292-2/+227
* | | am 6c392aa7: Merge "Add getIssuerAlternativeNames() to JCE API"Kenny Root2013-01-182-1/+7
|\| |
| * | Add getIssuerAlternativeNames() to JCE APIKenny Root2013-01-162-1/+7
* | | Add certs to blacklist.Geremy Condra2013-01-151-2/+10
* | | resolved conflicts for merge of 73f666df to masterKenny Root2013-01-093-6/+50
|\| |
| * | Add getSubjectAlternativeNames() to certificate JCEKenny Root2013-01-073-6/+50
* | | resolved conflicts for merge of 52112f9f to masterBrian Carlstrom2012-11-011-8/+14
|\| |
| * | am 036093e8: Fix registration of MD5withRSA SignaturesBrian Carlstrom2012-11-011-8/+14
| |\|
| | * Fix registration of MD5withRSA SignaturesBrian Carlstrom2012-11-011-8/+14
* | | resolved conflicts for merge of 9912a9c8 to masterKenny Root2012-10-122-0/+31
|\| |
| * | Fix non-BC EC private key usageKenny Root2012-10-122-0/+31
| |/
* / Allow CipherTest to run on RIBrian Carlstrom2012-09-281-1/+3
|/
* Make existing bouncycastle bcprov build on host and add host-only bcpkix buildBrian Carlstrom2012-09-19562-0/+93113
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 11:55:24 +0000