diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-11-25 00:26:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-11-25 00:26:44 +0000 |
| commit | 81cafc9f97b8e277c1f2faa0f2930d1c8481cbeb (patch) | |
| tree | 9f5085e4f75dbf3c609223e58ae8b8aaf2332332 | |
| parent | 38486704fc76eedaeac651f56d72e1d681da9f3e (diff) | |
| parent | 5a16e2b65a5e7de5902130171e6cdad818651d72 (diff) | |
| download | bouncycastle-brillo-m8-release.tar.gz | |
Merge "Expose PSS AlgorithmParameters to JCA."brillo-m8-releasebrillo-m8-dev
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/RSA.java | 4 | ||||
| -rw-r--r-- | patches/bcprov.patch | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/RSA.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/RSA.java index d4046f91..37ca5139 100644 --- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/RSA.java +++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/RSA.java @@ -26,9 +26,9 @@ public class RSA public void configure(ConfigurableProvider provider) { provider.addAlgorithm("AlgorithmParameters.OAEP", PREFIX + "AlgorithmParametersSpi$OAEP"); + provider.addAlgorithm("AlgorithmParameters.PSS", PREFIX + "AlgorithmParametersSpi$PSS"); + // BEGIN android-removed - // provider.addAlgorithm("AlgorithmParameters.PSS", PREFIX + "AlgorithmParametersSpi$PSS"); - // // provider.addAlgorithm("Alg.Alias.AlgorithmParameters.RSAPSS", "PSS"); // provider.addAlgorithm("Alg.Alias.AlgorithmParameters.RSASSA-PSS", "PSS"); // diff --git a/patches/bcprov.patch b/patches/bcprov.patch index 42dd0305..61ac0896 100644 --- a/patches/bcprov.patch +++ b/patches/bcprov.patch @@ -1455,12 +1455,10 @@ diff -Naur bcprov-jdk15on-152.orig/org/bouncycastle/jcajce/provider/asymmetric/R import org.bouncycastle.asn1.x509.X509ObjectIdentifiers; import org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi; import org.bouncycastle.jcajce.provider.config.ConfigurableProvider; -@@ -24,41 +26,49 @@ - public void configure(ConfigurableProvider provider) - { +@@ -26,39 +28,47 @@ provider.addAlgorithm("AlgorithmParameters.OAEP", PREFIX + "AlgorithmParametersSpi$OAEP"); -- provider.addAlgorithm("AlgorithmParameters.PSS", PREFIX + "AlgorithmParametersSpi$PSS"); -- + provider.addAlgorithm("AlgorithmParameters.PSS", PREFIX + "AlgorithmParametersSpi$PSS"); + - provider.addAlgorithm("Alg.Alias.AlgorithmParameters.RSAPSS", "PSS"); - provider.addAlgorithm("Alg.Alias.AlgorithmParameters.RSASSA-PSS", "PSS"); - @@ -1478,8 +1476,6 @@ diff -Naur bcprov-jdk15on-152.orig/org/bouncycastle/jcajce/provider/asymmetric/R - provider.addAlgorithm("Alg.Alias.AlgorithmParameters.NONEWITHRSASSA-PSS", "PSS"); - provider.addAlgorithm("Alg.Alias.AlgorithmParameters.NONEWITHRSAANDMGF1", "PSS"); + // BEGIN android-removed -+ // provider.addAlgorithm("AlgorithmParameters.PSS", PREFIX + "AlgorithmParametersSpi$PSS"); -+ // + // provider.addAlgorithm("Alg.Alias.AlgorithmParameters.RSAPSS", "PSS"); + // provider.addAlgorithm("Alg.Alias.AlgorithmParameters.RSASSA-PSS", "PSS"); + // |