Skip to content

Commit

Permalink
Merge branch 'main' of gitlab.cryptoworkshop.com:root/bc-java
Browse files Browse the repository at this point in the history
  • Loading branch information
@dghgit
dghgit committed Mar 29, 2024
2 parents 5eaa290 + 61514fb commit e91cab0
Show file tree
Hide file tree
Showing 13 changed files with 1,113 additions and 36 deletions.
9 changes: 5 additions & 4 deletions core/src/test/java/org/bouncycastle/crypto/test/Ed25519Test.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ public static void main(String[] args)

public void performTest() throws Exception
{
basicSigTest();

for (int i = 0; i < 10; ++i)
{
testConsistency(Ed25519.Algorithm.Ed25519, null);
Expand All @@ -43,7 +45,6 @@ public void performTest() throws Exception
testConsistency(Ed25519.Algorithm.Ed25519ph, context);
}

basicSigTest();
testRegressionInfiniteLoop();
}

Expand Down Expand Up @@ -837,9 +838,9 @@ private void testRegressionInfiniteLoop() throws Exception

signer.init(false, pub);
signer.update(msg, 0, msg.length);
if (!signer.verifySignature(sig)) {
fail("signature verification failed for test vector: " + error);
}
boolean shouldVerify = signer.verifySignature(sig);

isTrue("signature verification failed for test vector: " + error, shouldVerify);
}
}
}
1,077 changes: 1,077 additions & 0 deletions core/src/test/java/org/bouncycastle/crypto/test/Ed448Test.java
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkix/src/main/java/org/bouncycastle/mozilla/SignedPublicKeyAndChallenge.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public boolean verify(String provider)
{
sig.update(spkacSeq.getPublicKeyAndChallenge().getEncoded());

return sig.verify(spkacSeq.getSignature().getBytes());
return sig.verify(spkacSeq.getSignature().getOctets());
}
catch (Exception e)
{
Expand Down
2 changes: 1 addition & 1 deletion pkix/src/main/java/org/bouncycastle/operator/jcajce/JcaContentVerifierProviderBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ public boolean verify(byte[] expected)
{
if (sigs[i] != null)
{
if (!sigs[i].verify(ASN1BitString.getInstance(sigSeq.getObjectAt(i)).getBytes()))
if (!sigs[i].verify(ASN1BitString.getInstance(sigSeq.getObjectAt(i)).getOctets()))
{
failed = true;
}
Expand Down
2 changes: 1 addition & 1 deletion pkix/src/test/java/org/bouncycastle/cert/test/PKCS10Test.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ private void createECRequest(String algorithm, ASN1ObjectIdentifier algOid, ASN1

sig.update(req.toASN1Structure().getCertificationRequestInfo().getEncoded());

if (!sig.verify(req.toASN1Structure().getSignature().getBytes()))
if (!sig.verify(req.toASN1Structure().getSignature().getOctets()))
{
fail("signature not mapped correctly.");
}
Expand Down
3 changes: 2 additions & 1 deletion ...in/java/org/bouncycastle/jcajce/provider/asymmetric/compositesignatures/SignatureSpi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import java.util.Collections;
import java.util.List;

import org.bouncycastle.asn1.ASN1BitString;
import org.bouncycastle.asn1.ASN1EncodableVector;
import org.bouncycastle.asn1.ASN1Encoding;
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
Expand Down Expand Up @@ -250,7 +251,7 @@ protected boolean engineVerify(byte[] signature)
{
this.componentSignatures.get(i).update(this.OIDBytes);
this.componentSignatures.get(i).update(digestResult); //in total, "OID || digest(message)" is the message fed into each component signature
if (!this.componentSignatures.get(i).verify(DERBitString.getInstance(signatureSequence.getObjectAt(i)).getBytes()))
if (!this.componentSignatures.get(i).verify(ASN1BitString.getInstance(signatureSequence.getObjectAt(i)).getOctets()))
{
fail = true;
}
Expand Down
20 changes: 10 additions & 10 deletions prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/CipherSpi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,11 @@ else if (key instanceof RSAPublicKey)
protected int engineGetOutputSize(
int inputLen)
{
if (tlsRsaSpec != null)
{
return TlsRsaKeyExchange.PRE_MASTER_SECRET_LENGTH;
}

try
{
return cipher.getOutputBlockSize();
Expand Down Expand Up @@ -334,6 +339,7 @@ else if (key instanceof RSAPrivateKey)
}
else if (params instanceof TLSRSAPremasterSecretParameterSpec)
{
// TODO Restrict mode to DECRYPT_MODE (and/or UNWRAP_MODE)
if (!(param instanceof RSAKeyParameters) || !((RSAKeyParameters)param).isPrivate())
{
throw new InvalidKeyException("RSA private key required for TLS decryption");
Expand All @@ -353,6 +359,7 @@ else if (params instanceof TLSRSAPremasterSecretParameterSpec)
}
else
{
// TODO Remove after checking all AsymmetricBlockCipher init methods?
param = new ParametersWithRandom(param, CryptoServicesRegistrar.getSecureRandom());
}

Expand Down Expand Up @@ -446,6 +453,7 @@ protected byte[] engineDoFinal(
int inputLen)
throws IllegalBlockSizeException, BadPaddingException
{
// TODO Can input actually be null?
if (input != null)
{
engineUpdate(input, inputOffset, inputLen);
Expand All @@ -462,16 +470,8 @@ protected int engineDoFinal(
int outputOffset)
throws IllegalBlockSizeException, BadPaddingException, ShortBufferException
{
int outputSize;
if (tlsRsaSpec != null)
{
outputSize = TlsRsaKeyExchange.PRE_MASTER_SECRET_LENGTH;
}
else
{
outputSize = engineGetOutputSize(input == null ? 0 : inputLen);
}

// TODO Can input actually be null?
int outputSize = engineGetOutputSize(input == null ? 0 : inputLen);
if (outputOffset > output.length - outputSize)
{
throw new ShortBufferException("output buffer too short for input.");
Expand Down
8 changes: 4 additions & 4 deletions prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509CRLImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ private void doVerify(PublicKey key, SignatureCreator sigCreator)
{
List<PublicKey> pubKeys = ((CompositePublicKey)key).getPublicKeys();
ASN1Sequence keySeq = ASN1Sequence.getInstance(c.getSignatureAlgorithm().getParameters());
ASN1Sequence sigSeq = ASN1Sequence.getInstance(ASN1BitString.getInstance(c.getSignature()).getBytes());
ASN1Sequence sigSeq = ASN1Sequence.getInstance(c.getSignature().getOctets());

boolean success = false;
for (int i = 0; i != pubKeys.size(); i++)
Expand All @@ -264,7 +264,7 @@ private void doVerify(PublicKey key, SignatureCreator sigCreator)
checkSignature(
(PublicKey)pubKeys.get(i), signature,
sigAlg.getParameters(),
ASN1BitString.getInstance(sigSeq.getObjectAt(i)).getBytes());
ASN1BitString.getInstance(sigSeq.getObjectAt(i)).getOctets());
success = true;
}
catch (SignatureException e)
Expand All @@ -286,7 +286,7 @@ private void doVerify(PublicKey key, SignatureCreator sigCreator)
else if (X509SignatureUtil.isCompositeAlgorithm(c.getSignatureAlgorithm()))
{
ASN1Sequence keySeq = ASN1Sequence.getInstance(c.getSignatureAlgorithm().getParameters());
ASN1Sequence sigSeq = ASN1Sequence.getInstance(ASN1BitString.getInstance(c.getSignature()).getBytes());
ASN1Sequence sigSeq = ASN1Sequence.getInstance(c.getSignature().getOctets());

boolean success = false;
for (int i = 0; i != sigSeq.size(); i++)
Expand All @@ -303,7 +303,7 @@ else if (X509SignatureUtil.isCompositeAlgorithm(c.getSignatureAlgorithm()))
checkSignature(
key, signature,
sigAlg.getParameters(),
ASN1BitString.getInstance(sigSeq.getObjectAt(i)).getBytes());
ASN1BitString.getInstance(sigSeq.getObjectAt(i)).getOctets());

success = true;
}
Expand Down
8 changes: 4 additions & 4 deletions prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509CertificateImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ private void doVerify(
{
List<PublicKey> pubKeys = ((CompositePublicKey)key).getPublicKeys();
ASN1Sequence keySeq = ASN1Sequence.getInstance(c.getSignatureAlgorithm().getParameters());
ASN1Sequence sigSeq = ASN1Sequence.getInstance(ASN1BitString.getInstance(c.getSignature()).getBytes());
ASN1Sequence sigSeq = ASN1Sequence.getInstance(c.getSignature().getOctets());

boolean success = false;
for (int i = 0; i != pubKeys.size(); i++)
Expand All @@ -645,7 +645,7 @@ private void doVerify(
checkSignature(
(PublicKey)pubKeys.get(i), signature,
sigAlg.getParameters(),
ASN1BitString.getInstance(sigSeq.getObjectAt(i)).getBytes());
ASN1BitString.getInstance(sigSeq.getObjectAt(i)).getOctets());
success = true;
}
catch (SignatureException e)
Expand All @@ -667,7 +667,7 @@ private void doVerify(
else if (X509SignatureUtil.isCompositeAlgorithm(c.getSignatureAlgorithm()))
{
ASN1Sequence keySeq = ASN1Sequence.getInstance(c.getSignatureAlgorithm().getParameters());
ASN1Sequence sigSeq = ASN1Sequence.getInstance(ASN1BitString.getInstance(c.getSignature()).getBytes());
ASN1Sequence sigSeq = ASN1Sequence.getInstance(c.getSignature().getOctets());

boolean success = false;
for (int i = 0; i != sigSeq.size(); i++)
Expand All @@ -684,7 +684,7 @@ else if (X509SignatureUtil.isCompositeAlgorithm(c.getSignatureAlgorithm()))
checkSignature(
key, signature,
sigAlg.getParameters(),
ASN1BitString.getInstance(sigSeq.getObjectAt(i)).getBytes());
ASN1BitString.getInstance(sigSeq.getObjectAt(i)).getOctets());

success = true;
}
Expand Down
5 changes: 2 additions & 3 deletions prov/src/main/java/org/bouncycastle/jce/netscape/NetscapeCertRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,7 @@ public NetscapeCertRequest (ASN1Sequence spkac)

SubjectPublicKeyInfo pubkeyinfo = SubjectPublicKeyInfo.getInstance(pkac.getObjectAt(0));

X509EncodedKeySpec xspec = new X509EncodedKeySpec(new DERBitString(
pubkeyinfo).getBytes());
X509EncodedKeySpec xspec = new X509EncodedKeySpec(pubkeyinfo.getEncoded(ASN1Encoding.DER));

keyAlg = pubkeyinfo.getAlgorithm();
pubkey = KeyFactory.getInstance(keyAlg.getAlgorithm().getId(), "BC")
Expand Down Expand Up @@ -207,7 +206,7 @@ public boolean verify(String challenge) throws NoSuchAlgorithmException,
Signature sig = Signature.getInstance(sigAlg.getAlgorithm().getId(),
"BC");
sig.initVerify(pubkey);
sig.update(content.getBytes());
sig.update(content.getOctets());

return sig.verify(sigBits);
}
Expand Down
2 changes: 1 addition & 1 deletion prov/src/main/java/org/bouncycastle/jce/provider/ProvOcspRevocationChecker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ static boolean validatedOcspResponse(BasicOCSPResponse basicResp, PKIXCertRevoca

sig.update(basicResp.getTbsResponseData().getEncoded(ASN1Encoding.DER));

if (sig.verify(basicResp.getSignature().getBytes()))
if (sig.verify(basicResp.getSignature().getOctets()))
{
if (nonce != null)
{
Expand Down
2 changes: 1 addition & 1 deletion prov/src/test/java/org/bouncycastle/jce/provider/test/EdECTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public void performTest()
// yes, the demo certificate is invalid...
sig.update(x25519Seq.getObjectAt(0).toASN1Primitive().getEncoded(ASN1Encoding.DL));

isTrue(sig.verify(x25519Cert.getSignature().getBytes()));
isTrue(sig.verify(x25519Cert.getSignature().getOctets()));

CertificateFactory certFact = CertificateFactory.getInstance("X.509", "BC");

Expand Down
9 changes: 4 additions & 5 deletions prov/src/test/java/org/bouncycastle/jce/provider/test/PKCS10CertRequestTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import org.bouncycastle.jce.spec.ECParameterSpec;
import org.bouncycastle.jce.spec.ECPrivateKeySpec;
import org.bouncycastle.jce.spec.ECPublicKeySpec;
import org.bouncycastle.math.ec.ECConstants;
import org.bouncycastle.math.ec.ECCurve;
import org.bouncycastle.util.encoders.Base64;
import org.bouncycastle.util.encoders.Hex;
Expand Down Expand Up @@ -215,7 +214,7 @@ private void createECRequest(String algorithm, ASN1ObjectIdentifier algOid, ASN1

sig.update(req.getCertificationRequestInfo().getEncoded());

if (!sig.verify(req.getSignature().getBytes()))
if (!sig.verify(req.getSignature().getOctets()))
{
fail("signature not mapped correctly.");
}
Expand Down Expand Up @@ -294,7 +293,7 @@ private void createECRequest(String algorithm, ASN1ObjectIdentifier algOid)

sig.update(req.getCertificationRequestInfo().getEncoded());

if (!sig.verify(req.getSignature().getBytes()))
if (!sig.verify(req.getSignature().getOctets()))
{
fail("signature not mapped correctly.");
}
Expand Down Expand Up @@ -344,7 +343,7 @@ private void createECGOSTRequest()

sig.update(req.getCertificationRequestInfo().getEncoded());

if (!sig.verify(req.getSignature().getBytes()))
if (!sig.verify(req.getSignature().getOctets()))
{
fail("signature not mapped correctly.");
}
Expand Down Expand Up @@ -401,7 +400,7 @@ private void createPSSTest(String algorithm)

sig.update(req.getCertificationRequestInfo().getEncoded());

if (!sig.verify(req.getSignature().getBytes()))
if (!sig.verify(req.getSignature().getOctets()))
{
fail("signature not mapped correctly.");
}
Expand Down

0 comments on commit e91cab0

Please sign in to comment.