summaryrefslogtreecommitdiffstats
path: root/bcprov/src/main/java/org/bouncycastle/crypto/generators/PKCS5S2ParametersGenerator.java
Commit message (Expand)AuthorAgeFilesLines
* bouncycastle: upgrade to version 1.54Sergio Giro2016-02-101-1/+2
* Restoring the contents of aosp afterSergio Giro2016-02-011-2/+6
* bouncycastle: Android tree with upstream code for version 1.50Sergio Giro2016-01-281-1/+1
* bouncycastle: Android tree with upstream code for version 1.49Sergio Giro2016-01-251-0/+153