diff options
| author | Peter Dettman <peter.dettman@bouncycastle.org> | 2014-06-21 09:38:18 +0400 |
|---|---|---|
| committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2014-06-21 09:38:18 +0400 |
| commit | 3c81504ccfb70d7a525adcfddbb02260d6e0b3cf (patch) | |
| tree | ff042f4aa9625cbbd88726e1f2fcf1fb3498ea3a /core/src/main/java/org/bouncycastle | |
| parent | 4d7c9082fb44cf6001684653516de376bab989cf (diff) | |
| parent | 8d971fc263d8d86eb36e3044d890d3c6a5077b34 (diff) | |
Merge branch 'master' into eriktews-pkcs15-decoding
Diffstat (limited to 'core/src/main/java/org/bouncycastle')
4 files changed, 7 insertions, 6 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/crypto/modes/GCMBlockCipher.java b/core/src/main/java/org/bouncycastle/crypto/modes/GCMBlockCipher.java index 0d458c46..024eb860 100644 --- a/core/src/main/java/org/bouncycastle/crypto/modes/GCMBlockCipher.java +++ b/core/src/main/java/org/bouncycastle/crypto/modes/GCMBlockCipher.java @@ -147,6 +147,10 @@ public class GCMBlockCipher multiplier.init(H); exp = null; } + else if (this.H == null) + { + throw new IllegalArgumentException("Key must be specified in initial init"); + } this.J0 = new byte[BLOCK_SIZE]; @@ -191,7 +195,7 @@ public class GCMBlockCipher if (forEncryption) { - return totalData + macSize; + return totalData + macSize; } return totalData < macSize ? 0 : totalData - macSize; 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) |