Skip to content

HDDS-4301. SCM CA certificate does not encode KeyUsage extension properly #1468

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

Merged
xiaoyuyao merged 2 commits into from
Oct 19, 2020
Merged

HDDS-4301. SCM CA certificate does not encode KeyUsage extension properly #1468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fb7ae7
HDDS-4301. SCM CA certificate does not encode KeyUsage extension prop…
xiaoyuyao Oct 1, 2020
f627fc1
remove unused import
xiaoyuyao Oct 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../java/org/apache/hadoop/hdds/security/x509/certificates/utils/CertificateSignRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ private Extension getKeyUsageExtension() throws IOException {
}
KeyUsage keyUsage = new KeyUsage(keyUsageFlag);
return new Extension(Extension.keyUsage, true,
new DEROctetString(keyUsage));
keyUsage.getEncoded());
}

private Optional<Extension> getSubjectAltNameExtension() throws
Expand Down
4 changes: 1 addition & 3 deletions ...n/java/org/apache/hadoop/hdds/security/x509/certificates/utils/SelfSignedCertificate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
import org.bouncycastle.asn1.ASN1EncodableVector;
import org.bouncycastle.asn1.ASN1Object;
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
import org.bouncycastle.asn1.DEROctetString;
import org.bouncycastle.asn1.DERSequence;
import org.bouncycastle.asn1.DERTaggedObject;
import org.bouncycastle.asn1.DERUTF8String;
Expand Down Expand Up @@ -145,8 +144,7 @@ private X509CertificateHolder generateCertificate(boolean isCA)
new BasicConstraints(true));
int keyUsageFlag = KeyUsage.keyCertSign | KeyUsage.cRLSign;
KeyUsage keyUsage = new KeyUsage(keyUsageFlag);
builder.addExtension(Extension.keyUsage, false,
new DEROctetString(keyUsage));
builder.addExtension(Extension.keyUsage, true, keyUsage);
if (altNames != null && altNames.size() >= 1) {
builder.addExtension(new Extension(Extension.subjectAlternativeName,
false, new GeneralNames(altNames.toArray(
Expand Down