--- src/org/bouncycastle/jcajce/provider/asymmetric/EC.java.orig 2016-09-20 11:40:35.862443204 +0100 +++ src/org/bouncycastle/jcajce/provider/asymmetric/EC.java 2016-09-20 11:40:55.397209179 +0100 @@ -85,40 +85,6 @@ registerOidAlgorithmParameters(provider, SECObjectIdentifiers.dhSinglePass_stdDH_sha512kdf_scheme, "EC"); registerOidAlgorithmParameters(provider, SECObjectIdentifiers.dhSinglePass_cofactorDH_sha512kdf_scheme, "EC"); - if (!Properties.isOverrideSet("org.bouncycastle.ec.disable_mqv")) - { - provider.addAlgorithm("KeyAgreement.ECMQV", PREFIX + "KeyAgreementSpi$MQV"); - - provider.addAlgorithm("KeyAgreement.ECMQVWITHSHA1CKDF", PREFIX + "KeyAgreementSpi$MQVwithSHA1CKDF"); - provider.addAlgorithm("KeyAgreement.ECMQVWITHSHA224CKDF", PREFIX + "KeyAgreementSpi$MQVwithSHA224CKDF"); - provider.addAlgorithm("KeyAgreement.ECMQVWITHSHA256CKDF", PREFIX + "KeyAgreementSpi$MQVwithSHA256CKDF"); - provider.addAlgorithm("KeyAgreement.ECMQVWITHSHA384CKDF", PREFIX + "KeyAgreementSpi$MQVwithSHA384CKDF"); - provider.addAlgorithm("KeyAgreement.ECMQVWITHSHA512CKDF", PREFIX + "KeyAgreementSpi$MQVwithSHA512CKDF"); - - provider.addAlgorithm("KeyAgreement." + X9ObjectIdentifiers.mqvSinglePass_sha1kdf_scheme, PREFIX + "KeyAgreementSpi$MQVwithSHA1KDFAndSharedInfo"); - provider.addAlgorithm("KeyAgreement." + SECObjectIdentifiers.mqvSinglePass_sha224kdf_scheme, PREFIX + "KeyAgreementSpi$MQVwithSHA224KDFAndSharedInfo"); - provider.addAlgorithm("KeyAgreement." + SECObjectIdentifiers.mqvSinglePass_sha256kdf_scheme, PREFIX + "KeyAgreementSpi$MQVwithSHA256KDFAndSharedInfo"); - provider.addAlgorithm("KeyAgreement." + SECObjectIdentifiers.mqvSinglePass_sha384kdf_scheme, PREFIX + "KeyAgreementSpi$MQVwithSHA384KDFAndSharedInfo"); - provider.addAlgorithm("KeyAgreement." + SECObjectIdentifiers.mqvSinglePass_sha512kdf_scheme, PREFIX + "KeyAgreementSpi$MQVwithSHA512KDFAndSharedInfo"); - - registerOid(provider, X9ObjectIdentifiers.dhSinglePass_stdDH_sha1kdf_scheme, "EC", new KeyFactorySpi.EC()); - registerOidAlgorithmParameters(provider, X9ObjectIdentifiers.mqvSinglePass_sha1kdf_scheme, "EC"); - - registerOid(provider, SECObjectIdentifiers.mqvSinglePass_sha224kdf_scheme, "ECMQV", new KeyFactorySpi.ECMQV()); - registerOidAlgorithmParameters(provider, SECObjectIdentifiers.mqvSinglePass_sha256kdf_scheme, "EC"); - - registerOid(provider, SECObjectIdentifiers.mqvSinglePass_sha256kdf_scheme, "ECMQV", new KeyFactorySpi.ECMQV()); - registerOidAlgorithmParameters(provider, SECObjectIdentifiers.mqvSinglePass_sha224kdf_scheme, "EC"); - - registerOid(provider, SECObjectIdentifiers.mqvSinglePass_sha384kdf_scheme, "ECMQV", new KeyFactorySpi.ECMQV()); - registerOidAlgorithmParameters(provider, SECObjectIdentifiers.mqvSinglePass_sha384kdf_scheme, "EC"); - - registerOid(provider, SECObjectIdentifiers.mqvSinglePass_sha512kdf_scheme, "ECMQV", new KeyFactorySpi.ECMQV()); - registerOidAlgorithmParameters(provider, SECObjectIdentifiers.mqvSinglePass_sha512kdf_scheme, "EC"); - - provider.addAlgorithm("KeyFactory.ECMQV", PREFIX + "KeyFactorySpi$ECMQV"); - provider.addAlgorithm("KeyPairGenerator.ECMQV", PREFIX + "KeyPairGeneratorSpi$ECMQV"); - } provider.addAlgorithm("KeyFactory.EC", PREFIX + "KeyFactorySpi$EC"); provider.addAlgorithm("KeyFactory.ECDSA", PREFIX + "KeyFactorySpi$ECDSA"); --- src/org/bouncycastle/crypto/agreement/ECMQVBasicAgreement.java.orig 2016-09-20 11:40:28.530531040 +0100 +++ src/org/bouncycastle/crypto/agreement/ECMQVBasicAgreement.java 2016-09-20 11:41:41.961651340 +0100 @@ -33,25 +33,7 @@ public BigInteger calculateAgreement(CipherParameters pubKey) { - if (Properties.isOverrideSet("org.bouncycastle.ec.disable_mqv")) - { throw new IllegalStateException("ECMQV explicitly disabled"); - } - - MQVPublicParameters pubParams = (MQVPublicParameters)pubKey; - - ECPrivateKeyParameters staticPrivateKey = privParams.getStaticPrivateKey(); - - ECPoint agreement = calculateMqvAgreement(staticPrivateKey.getParameters(), staticPrivateKey, - privParams.getEphemeralPrivateKey(), privParams.getEphemeralPublicKey(), - pubParams.getStaticPublicKey(), pubParams.getEphemeralPublicKey()).normalize(); - - if (agreement.isInfinity()) - { - throw new IllegalStateException("Infinity is not a valid agreement value for MQV"); - } - - return agreement.getAffineXCoord().toBigInteger(); } // The ECMQV Primitive as described in SEC-1, 3.4 --- src/org/bouncycastle/crypto/test/ECTest.java.orig 2016-09-20 11:52:11.637393530 +0100 +++ src/org/bouncycastle/crypto/test/ECTest.java 2016-09-20 11:52:17.272329681 +0100 @@ -912,9 +912,6 @@ testECDSASecP224k1sha256(); testECDSA239bitBinaryAndLargeDigest(); - testECMQVTestVector1(); - testECMQVTestVector2(); - testECMQVRandom(); } --- src/org/bouncycastle/jce/provider/test/MQVTest.java.orig 2016-09-20 11:54:54.783544937 +0100 +++ src/org/bouncycastle/jce/provider/test/MQVTest.java 2016-09-20 11:54:58.910498175 +0100 @@ -30,8 +30,6 @@ public void performTest() throws Exception { - testECMQVDeprecated(); - testECMQV(); } private void testECMQVDeprecated() --- src/org/bouncycastle/jce/provider/test/ECDSA5Test.java.orig 2016-09-20 11:56:37.244383963 +0100 +++ src/org/bouncycastle/jce/provider/test/ECDSA5Test.java 2016-09-20 11:57:01.009114688 +0100 @@ -1030,7 +1030,6 @@ testNamedCurveParameterPreservation(); testNamedCurveSigning(); testBSI(); - testMQVwithHMACOnePass(); testAlgorithmParameters(); } --- src/org/bouncycastle/jce/provider/test/CertPathValidatorTest.java.orig 2016-09-20 12:04:22.123044232 +0100 +++ src/org/bouncycastle/jce/provider/test/CertPathValidatorTest.java 2016-09-20 12:04:25.366005633 +0100 @@ -406,7 +406,6 @@ } checkCircProcessing(); - checkPolicyProcessingAtDomainMatch(); validateWithExtendedKeyUsage(); testEmptyPath(); } --- src/org/bouncycastle/jce/provider/JCEECPublicKey.java.orig 2016-09-20 12:21:45.396622666 +0100 +++ src/org/bouncycastle/jce/provider/JCEECPublicKey.java 2016-09-20 12:21:56.584489175 +0100 @@ -478,7 +478,7 @@ public void setPointFormat(String style) { - withCompression = !("UNCOMPRESSED".equalsIgnoreCase(style)); + withCompression = false; } public boolean equals(Object o) --- src/org/bouncycastle/jce/provider/JCEECPrivateKey.java.orig 2016-09-20 12:21:45.395622678 +0100 +++ src/org/bouncycastle/jce/provider/JCEECPrivateKey.java 2016-09-20 12:22:10.972317502 +0100 @@ -404,7 +404,7 @@ public void setPointFormat(String style) { - withCompression = !("UNCOMPRESSED".equalsIgnoreCase(style)); + withCompression = false; } public boolean equals(Object o) --- src/org/bouncycastle/jcajce/provider/asymmetric/ec/BCECPrivateKey.java.orig 2016-09-20 12:24:21.035765603 +0100 +++ src/org/bouncycastle/jcajce/provider/asymmetric/ec/BCECPrivateKey.java 2016-09-20 12:24:53.832374279 +0100 @@ -366,7 +366,7 @@ public void setPointFormat(String style) { - withCompression = !("UNCOMPRESSED".equalsIgnoreCase(style)); + withCompression = false; } public boolean equals(Object o) --- src/org/bouncycastle/jcajce/provider/asymmetric/ec/BCECPublicKey.java.orig 2016-09-20 12:24:21.036765591 +0100 +++ src/org/bouncycastle/jcajce/provider/asymmetric/ec/BCECPublicKey.java 2016-09-20 12:25:01.700280400 +0100 @@ -372,7 +372,7 @@ public void setPointFormat(String style) { - withCompression = !("UNCOMPRESSED".equalsIgnoreCase(style)); + withCompression = false; } public boolean equals(Object o) --- src/org/bouncycastle/jcajce/provider/asymmetric/ecgost/BCECGOST3410PublicKey.java.orig 2016-09-20 12:24:21.036765591 +0100 +++ src/org/bouncycastle/jcajce/provider/asymmetric/ecgost/BCECGOST3410PublicKey.java 2016-09-20 12:25:07.918206209 +0100 @@ -354,7 +354,7 @@ public void setPointFormat(String style) { - withCompression = !("UNCOMPRESSED".equalsIgnoreCase(style)); + withCompression = false; } public boolean equals(Object o) --- src/org/bouncycastle/jcajce/provider/asymmetric/ecgost/BCECGOST3410PrivateKey.java.orig 2016-09-20 12:24:21.037765580 +0100 +++ src/org/bouncycastle/jcajce/provider/asymmetric/ecgost/BCECGOST3410PrivateKey.java 2016-09-20 12:25:15.053121076 +0100 @@ -484,7 +484,7 @@ public void setPointFormat(String style) { - withCompression = !("UNCOMPRESSED".equalsIgnoreCase(style)); + withCompression = false; } public boolean equals(Object o) --- src/org/bouncycastle/jcajce/provider/asymmetric/dstu/BCDSTU4145PublicKey.java.orig 2016-09-20 12:24:21.038765568 +0100 +++ src/org/bouncycastle/jcajce/provider/asymmetric/dstu/BCDSTU4145PublicKey.java 2016-09-20 12:25:22.146036445 +0100 @@ -390,7 +390,7 @@ public void setPointFormat(String style) { - withCompression = !("UNCOMPRESSED".equalsIgnoreCase(style)); + withCompression = false; } public boolean equals(Object o) --- src/org/bouncycastle/jcajce/provider/asymmetric/dstu/BCDSTU4145PrivateKey.java.orig 2016-09-20 12:24:21.039765556 +0100 +++ src/org/bouncycastle/jcajce/provider/asymmetric/dstu/BCDSTU4145PrivateKey.java 2016-09-20 12:25:32.423913810 +0100 @@ -402,7 +402,7 @@ public void setPointFormat(String style) { - withCompression = !("UNCOMPRESSED".equalsIgnoreCase(style)); + withCompression = false; } public boolean equals(Object o)