FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

use containsKey for a supplied cmsAlgorithmProtect attribute by rootvector2 · Pull Request #2480 · bcgit/bc-java · GitHub

  1. bcgit
  2. bc-java

Repository navigation

use containsKey for a supplied cmsAlgorithmProtect attribute #2480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rootvector2 wants to merge 1 commit into from
Conversation 1 Commits 1 Checks 2 Files changed
Closed

use containsKey for a supplied cmsAlgorithmProtect attribute #2480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .java  (4) .md  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
2 changes: 2 additions & 0 deletions docs/releasenotes.md
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ Date: 2026, TBD
- The raw JCA provider bounded the PBKDF2 iteration count taken from an encoding (org.bouncycastle.pbe.max_iteration_count, default 10,000,000) but not the counts of the legacy PBES1 (PKCS#5 scheme 1) and PKCS#12 PBE families beside it. Their AlgorithmParameters (PKCS12PBE and its OID aliases, PBKDF1) accepted any count, narrowing one beyond the int range with intValue() so that 2^32 arrived as 0, and every Cipher, Mac and SecretKeyFactory derivation ran with whatever count it was given - including a count decoded by another provider's AlgorithmParameters, as when javax.crypto.EncryptedPrivateKeyInfo.getKeySpec() decrypts a PKCS#12 PBE-protected key with BC. As these schemes carry the count in unauthenticated parameters and derive before anything can be checked, a supplied blob could hold a derivation for tens of minutes. The parameter parse now rejects a negative, beyond-int or over-limit count, and the derivations reject a negative or over-limit count, under the same property as PBKDF2. The PKCS#12 key store derives through the same code, so a org.bouncycastle.pkcs12.max_it_count raised above 10,000,000 now needs org.bouncycastle.pbe.max_iteration_count raised with it.
- The light-weight CryptoProWrapEngine (RFC 4357 sec. 6.3) diversified the key encryption key in the caller's own array, so after init the KeyParameter it was given held the diversified key, and initialising again with the same parameters - to unwrap what had just been wrapped, say - diversified it a second time and used a different key. It also failed with a NullPointerException when given no S-box, although init has a branch for that case. It now diversifies a copy, and given no S-box uses the GOST 28147 engine's default S-box for the diversification, the one the wrap itself then uses. The provider's GOST 28147 key wrap ciphers were unaffected, as they always supply an S-box and build a new KeyParameter on every init.

- The CMS signed and authenticated attribute generators let the caller override a generated attribute with an entry in the AttributeTable passed to the constructor - contentType, signingTime and messageDigest were each guarded with Hashtable.containsKey() - but the RFC 6211 CMS algorithm protection attribute beside them was guarded with Hashtable.contains(), which tests values rather than keys, so with the table holding Attribute values against ASN1ObjectIdentifier keys the condition was never true and the generated attribute always replaced a supplied one. DefaultSignedAttributeTableGenerator and DefaultAuthenticatedAttributeTableGenerator now test the key as the attributes beside it already did, so the AttributeTable passed to the constructor can pin the algorithm identifiers the attribute binds rather than a wrapper having to rewrite the table the generator returns. No generator in the library supplies the attribute itself, so generated output is unchanged.

### 2.1.3 Additional Features and Functionality

- The CRMF certificate request message controls now include the RFC 4211 sec. 6.6 protocolEncrKey control, which names the key a CA is to encrypt its response with: org.bouncycastle.cert.crmf.ProtocolEncrKeyControl carries the SubjectPublicKeyInfo the control is defined to take, and CertificateRequestMessage.getControl() recognises id-regCtrl-protocolEncrKey alongside the regToken, authenticator and pkiArchiveOptions controls it already returned (github PR #2443).
Expand Down
8 changes: 4 additions & 4 deletions pkix/src/main/java/org/bouncycastle/cms/DefaultAuthenticatedAttributeTableGenerator.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ public DefaultAuthenticatedAttributeTableGenerator(

/**
* Create a standard attribute table from the passed in parameters - this will
* normally include contentType and messageDigest. If the constructor
* using an AttributeTable was used, entries in it for contentType and
* messageDigest will override the generated ones.
* normally include contentType, messageDigest, and CMS algorithm protection. If the
* constructor using an AttributeTable was used, entries in it for contentType,
* messageDigest, and CMS algorithm protection will override the generated ones.
*
* @param parameters source parameters for table generation.
*
Expand Down Expand Up @@ -87,7 +87,7 @@ protected Hashtable createStandardAttributeTable(
std.put(attr.getAttrType(), attr);
}

if (!std.contains(CMSAttributes.cmsAlgorithmProtect))
if (!std.containsKey(CMSAttributes.cmsAlgorithmProtect))
{
Attribute attr = new Attribute(CMSAttributes.cmsAlgorithmProtect, new DERSet(new CMSAlgorithmProtection(
(AlgorithmIdentifier)parameters.get(CMSAttributeTableGenerator.DIGEST_ALGORITHM_IDENTIFIER),
Expand Down
6 changes: 3 additions & 3 deletions pkix/src/main/java/org/bouncycastle/cms/DefaultSignedAttributeTableGenerator.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ public DefaultSignedAttributeTableGenerator(
/**
* Create a standard attribute table from the passed in parameters - this will
* normally include contentType, signingTime, messageDigest, and CMS algorithm protection.
* If the constructor using an AttributeTable was used, entries in it for contentType, signingTime, and
* messageDigest will override the generated ones.
* If the constructor using an AttributeTable was used, entries in it for contentType, signingTime,
* messageDigest, and CMS algorithm protection will override the generated ones.
*
* @param parameters source parameters for table generation.
*
Expand Down Expand Up @@ -95,7 +95,7 @@ protected Hashtable createStandardAttributeTable(
std.put(attr.getAttrType(), attr);
}

if (!std.contains(CMSAttributes.cmsAlgorithmProtect))
if (!std.containsKey(CMSAttributes.cmsAlgorithmProtect))
{
Attribute attr = new Attribute(CMSAttributes.cmsAlgorithmProtect, new DERSet(new CMSAlgorithmProtection(
(AlgorithmIdentifier)parameters.get(CMSAttributeTableGenerator.DIGEST_ALGORITHM_IDENTIFIER),
Expand Down
55 changes: 55 additions & 0 deletions pkix/src/test/java/org/bouncycastle/cms/test/NewAuthenticatedDataTest.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,29 @@
import java.security.cert.X509Certificate;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;

import javax.crypto.SecretKey;

import junit.framework.Assert;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.bouncycastle.asn1.ASN1EncodableVector;
import org.bouncycastle.asn1.ASN1Encoding;
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
import org.bouncycastle.asn1.ASN1Primitive;
import org.bouncycastle.asn1.DERNull;
import org.bouncycastle.asn1.DEROctetString;
import org.bouncycastle.asn1.DERSet;
import org.bouncycastle.asn1.cms.Attribute;
import org.bouncycastle.asn1.cms.AttributeTable;
import org.bouncycastle.asn1.cms.AuthenticatedData;
import org.bouncycastle.asn1.cms.CCMParameters;
import org.bouncycastle.asn1.cms.CMSAlgorithmProtection;
import org.bouncycastle.asn1.cms.CMSAttributes;
import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
import org.bouncycastle.asn1.cms.ContentInfo;
import org.bouncycastle.asn1.cms.GCMParameters;
Expand All @@ -36,11 +44,13 @@
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
import org.bouncycastle.cert.X509CertificateHolder;
import org.bouncycastle.cms.CMSAlgorithm;
import org.bouncycastle.cms.CMSAttributeTableGenerator;
import org.bouncycastle.cms.CMSRuntimeException;
import org.bouncycastle.cms.CMSAuthenticatedData;
import org.bouncycastle.cms.CMSAuthenticatedDataGenerator;
import org.bouncycastle.cms.CMSException;
import org.bouncycastle.cms.CMSProcessableByteArray;
import org.bouncycastle.cms.DefaultAuthenticatedAttributeTableGenerator;
import org.bouncycastle.cms.OriginatorInfoGenerator;
import org.bouncycastle.cms.PasswordRecipient;
import org.bouncycastle.cms.PasswordRecipientInformation;
Expand Down Expand Up @@ -138,6 +148,51 @@ public static Test suite()
return new CMSTestSetup(new TestSuite(NewAuthenticatedDataTest.class));
}

public void testSuppliedAlgorithmProtectionAttribute()
throws Exception
{
AlgorithmIdentifier sha1 = new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1);
AlgorithmIdentifier sha256 = new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha256);
AlgorithmIdentifier macAlgId = new AlgorithmIdentifier(PKCSObjectIdentifiers.id_hmacWithSHA256);

Map parameters = new HashMap();

parameters.put(CMSAttributeTableGenerator.CONTENT_TYPE, CMSObjectIdentifiers.data);
parameters.put(CMSAttributeTableGenerator.DIGEST_ALGORITHM_IDENTIFIER, sha256);
parameters.put(CMSAttributeTableGenerator.MAC_ALGORITHM_IDENTIFIER, macAlgId);
parameters.put(CMSAttributeTableGenerator.DIGEST, new byte[32]);

// with nothing supplied the attribute is generated from the parameters
AttributeTable generated = new DefaultAuthenticatedAttributeTableGenerator().getAttributes(parameters);

assertEquals(new CMSAlgorithmProtection(sha256, CMSAlgorithmProtection.MAC, macAlgId),
algorithmProtectionOf(generated));

// an entry supplied through the constructor overrides it, as contentType and messageDigest
// already do
CMSAlgorithmProtection supplied = new CMSAlgorithmProtection(
sha1, CMSAlgorithmProtection.MAC, macAlgId);

ASN1EncodableVector table = new ASN1EncodableVector();

table.add(new Attribute(CMSAttributes.cmsAlgorithmProtect, new DERSet(supplied)));

AttributeTable overridden = new DefaultAuthenticatedAttributeTableGenerator(
new AttributeTable(table)).getAttributes(parameters);

assertEquals(supplied, algorithmProtectionOf(overridden));
}

private static CMSAlgorithmProtection algorithmProtectionOf(AttributeTable table)
{
Attribute attr = table.get(CMSAttributes.cmsAlgorithmProtect);

assertNotNull(attr);
assertEquals(1, attr.getAttrValues().size());

return CMSAlgorithmProtection.getInstance(attr.getAttrValues().getObjectAt(0));
}

public void testKeyTransDESede()
throws Exception
{
Expand Down
46 changes: 46 additions & 0 deletions pkix/src/test/java/org/bouncycastle/cms/test/NewSignedDataTest.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import org.bouncycastle.asn1.bsi.BSIObjectIdentifiers;
import org.bouncycastle.asn1.cms.Attribute;
import org.bouncycastle.asn1.cms.AttributeTable;
import org.bouncycastle.asn1.cms.CMSAlgorithmProtection;
import org.bouncycastle.asn1.cms.CMSAttributes;
import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
import org.bouncycastle.asn1.cms.ContentInfo;
Expand Down Expand Up @@ -1940,6 +1941,51 @@ public AttributeTable getAttributes(Map parameters)
verifyRSASignatures(s, md.digest("Hello world!".getBytes()));
}

public void testSuppliedAlgorithmProtectionAttribute()
throws Exception
{
AlgorithmIdentifier sha1 = new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1);
AlgorithmIdentifier sha256 = new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha256);
AlgorithmIdentifier sigAlgId = new AlgorithmIdentifier(PKCSObjectIdentifiers.sha256WithRSAEncryption);

Map parameters = new HashMap();

parameters.put(CMSAttributeTableGenerator.CONTENT_TYPE, CMSObjectIdentifiers.data);
parameters.put(CMSAttributeTableGenerator.DIGEST_ALGORITHM_IDENTIFIER, sha256);
parameters.put(CMSAttributeTableGenerator.SIGNATURE_ALGORITHM_IDENTIFIER, sigAlgId);
parameters.put(CMSAttributeTableGenerator.DIGEST, new byte[32]);

// with nothing supplied the attribute is generated from the parameters
AttributeTable generated = new DefaultSignedAttributeTableGenerator().getAttributes(parameters);

assertEquals(new CMSAlgorithmProtection(sha256, CMSAlgorithmProtection.SIGNATURE, sigAlgId),
algorithmProtectionOf(generated));

// an entry supplied through the constructor overrides it, as contentType, signingTime and
// messageDigest already do
CMSAlgorithmProtection supplied = new CMSAlgorithmProtection(
sha1, CMSAlgorithmProtection.SIGNATURE, sigAlgId);

ASN1EncodableVector table = new ASN1EncodableVector();

table.add(new Attribute(CMSAttributes.cmsAlgorithmProtect, new DERSet(supplied)));

AttributeTable overridden = new DefaultSignedAttributeTableGenerator(
new AttributeTable(table)).getAttributes(parameters);

assertEquals(supplied, algorithmProtectionOf(overridden));
}

private static CMSAlgorithmProtection algorithmProtectionOf(AttributeTable table)
{
Attribute attr = table.get(CMSAttributes.cmsAlgorithmProtect);

assertNotNull(attr);
assertEquals(1, attr.getAttrValues().size());

return CMSAlgorithmProtection.getInstance(attr.getAttrValues().getObjectAt(0));
}

public void testSignerInformationExtension()
throws Exception
{
Expand Down
Loading
Back | FazBrowse Home | New Git URL