diff options
author | David Hook <dgh@cryptoworkshop.com> | 2014-06-21 08:46:46 +0400 |
---|---|---|
committer | David Hook <dgh@cryptoworkshop.com> | 2014-06-21 08:46:46 +0400 |
commit | f821ca8d8e5663e410475374f5c6d1fbca102ccd (patch) | |
tree | 299f87a4eca63d8e051597651f89daaedecb824d /core/src/main/java/org | |
parent | d67d0613f3fe728c1268be28c8d8e5b99d985a2f (diff) |
compatibility updates
Diffstat (limited to 'core/src/main/java/org')
3 files changed, 2 insertions, 5 deletions
diff --git a/core/src/main/java/org/bouncycastle/asn1/x500/style/BCStyle.java b/core/src/main/java/org/bouncycastle/asn1/x500/style/BCStyle.java index dc1cc366..1c2a9269 100644 --- a/core/src/main/java/org/bouncycastle/asn1/x500/style/BCStyle.java +++ b/core/src/main/java/org/bouncycastle/asn1/x500/style/BCStyle.java @@ -281,9 +281,7 @@ public class BCStyle defaultSymbols = copyHashTable(DefaultSymbols); defaultLookUp = copyHashTable(DefaultLookUp); } - - - @Override + protected ASN1Encodable encodeStringValue(ASN1ObjectIdentifier oid, String value) { if (oid.equals(EmailAddress) || oid.equals(DC)) diff --git a/core/src/main/java/org/bouncycastle/asn1/x500/style/RFC4519Style.java b/core/src/main/java/org/bouncycastle/asn1/x500/style/RFC4519Style.java index cc6a4281..13f6ef1e 100644 --- a/core/src/main/java/org/bouncycastle/asn1/x500/style/RFC4519Style.java +++ b/core/src/main/java/org/bouncycastle/asn1/x500/style/RFC4519Style.java @@ -175,7 +175,6 @@ public class RFC4519Style defaultLookUp = copyHashTable(DefaultLookUp); } - @Override protected ASN1Encodable encodeStringValue(ASN1ObjectIdentifier oid, String value) { if (oid.equals(dc)) diff --git a/core/src/main/java/org/bouncycastle/math/ec/tools/DiscoverEndomorphisms.java b/core/src/main/java/org/bouncycastle/math/ec/tools/DiscoverEndomorphisms.java index 3b332978..bf2bca23 100644 --- a/core/src/main/java/org/bouncycastle/math/ec/tools/DiscoverEndomorphisms.java +++ b/core/src/main/java/org/bouncycastle/math/ec/tools/DiscoverEndomorphisms.java @@ -173,7 +173,7 @@ public class DiscoverEndomorphisms printProperty("v2", "{ " + v2[0].toString(radix) + ", " + v2[1].toString(radix) + " }"); printProperty("(OPT) g1", g1.toString(radix)); printProperty("(OPT) g2", g2.toString(radix)); - printProperty("(OPT) bits", bits); + printProperty("(OPT) bits", Integer.toString(bits)); } private static void printProperty(String name, Object value) |