diff options
| author | Peter Dettman <peter.dettman@bouncycastle.org> | 2014-06-21 09:36:43 +0400 |
|---|---|---|
| committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2014-06-21 09:36:43 +0400 |
| commit | 8d971fc263d8d86eb36e3044d890d3c6a5077b34 (patch) | |
| tree | f036c1223e359de3bd1c4632d7c246be259b26a7 /core/src/main/java | |
| parent | c68265f518c25c0d8e7882e5ce783ca5905086e9 (diff) | |
| parent | ee21949e040fd3109caf025b15e6925513de33dd (diff) | |
Merge branch 'master' of git.bouncycastle.org:bc-java
Diffstat (limited to 'core/src/main/java')
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) |