Skip to content

Commit

Permalink
Fix ASN.1 External constructors taking tagged object
Browse files Browse the repository at this point in the history
  • Loading branch information
peterdettman committed Nov 5, 2021
1 parent 0b482bc commit eff6adf
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 5 additions & 3 deletions core/src/main/java/org/bouncycastle/asn1/ASN1External.java
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,11 @@ public static ASN1External getInstance(ASN1TaggedObject taggedObject, boolean ex
externalContent = obj.getObject();
}

ASN1External(ASN1ObjectIdentifier directReference, ASN1Integer indirectReference, ASN1Primitive dataValueDescriptor, DERTaggedObject externalData)
ASN1External(ASN1ObjectIdentifier directReference, ASN1Integer indirectReference, ASN1Primitive dataValueDescriptor,
DERTaggedObject externalData)
{
this(directReference, indirectReference, dataValueDescriptor, externalData.getTagNo(), externalData.toASN1Primitive());
this(directReference, indirectReference, dataValueDescriptor, externalData.getTagNo(),
externalData.getObject());
}

ASN1External(ASN1ObjectIdentifier directReference, ASN1Integer indirectReference, ASN1Primitive dataValueDescriptor, int encoding, ASN1Primitive externalData)
Expand All @@ -105,7 +107,7 @@ public static ASN1External getInstance(ASN1TaggedObject taggedObject, boolean ex
setIndirectReference(indirectReference);
setDataValueDescriptor(dataValueDescriptor);
setEncoding(encoding);
setExternalContent(externalData.toASN1Primitive());
setExternalContent(externalData);
}

ASN1Primitive toDERObject()
Expand Down
3 changes: 1 addition & 2 deletions core/src/main/java/org/bouncycastle/asn1/DERExternal.java
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ public DERExternal(DERSequence sequence)
public DERExternal(ASN1ObjectIdentifier directReference, ASN1Integer indirectReference,
ASN1Primitive dataValueDescriptor, DERTaggedObject externalData)
{
this(directReference, indirectReference, dataValueDescriptor, externalData.getTagNo(),
externalData.toASN1Primitive());
super(directReference, indirectReference, dataValueDescriptor, externalData);
}

/**
Expand Down
3 changes: 1 addition & 2 deletions core/src/main/java/org/bouncycastle/asn1/DLExternal.java
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ public DLExternal(DLSequence sequence)
public DLExternal(ASN1ObjectIdentifier directReference, ASN1Integer indirectReference,
ASN1Primitive dataValueDescriptor, DERTaggedObject externalData)
{
this(directReference, indirectReference, dataValueDescriptor, externalData.getTagNo(),
externalData.toASN1Primitive());
super(directReference, indirectReference, dataValueDescriptor, externalData);
}

/**
Expand Down

0 comments on commit eff6adf

Please sign in to comment.