Skip to content

Commit 2953540

Browse files
dghgitdghgit
committed
Merge branch 'main' of gitlab.cryptoworkshop.com:root/bc-java
2 parents e34ee36 + 3a53da9 commit 2953540

31 files changed

Lines changed: 289 additions & 121 deletions

‎core/src/main/java/org/bouncycastle/asn1/ASN1BMPString.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,19 @@ public static ASN1BMPString getInstance(Object obj)
6464
* Return a BMP String from a tagged object.
6565
*
6666
* @param taggedObject the tagged object holding the object we want
67-
* @param explicit true if the object is meant to be explicitly tagged false
67+
* @param declaredExplicit true if the object is meant to be explicitly tagged false
6868
* otherwise.
6969
* @exception IllegalArgumentException if the tagged object cannot be converted.
7070
* @return an ASN1BMPString instance.
7171
*/
72-
public static ASN1BMPString getInstance(ASN1TaggedObject taggedObject, boolean explicit)
72+
public static ASN1BMPString getInstance(ASN1TaggedObject taggedObject, boolean declaredExplicit)
7373
{
74-
return (ASN1BMPString)TYPE.getContextInstance(taggedObject, explicit);
74+
return (ASN1BMPString)TYPE.getContextTagged(taggedObject, declaredExplicit);
75+
}
76+
77+
public static ASN1BMPString getTagged(ASN1TaggedObject taggedObject, boolean declaredExplicit)
78+
{
79+
return (ASN1BMPString)TYPE.getTagged(taggedObject, declaredExplicit);
7580
}
7681

7782
final char[] string;

‎core/src/main/java/org/bouncycastle/asn1/ASN1BitString.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,14 @@ else if (obj instanceof byte[])
5656
throw new IllegalArgumentException("illegal object in getInstance: " + obj.getClass().getName());
5757
}
5858

59-
public static ASN1BitString getInstance(ASN1TaggedObject taggedObject, boolean explicit)
59+
public static ASN1BitString getInstance(ASN1TaggedObject taggedObject, boolean declaredExplicit)
6060
{
61-
return (ASN1BitString)TYPE.getContextInstance(taggedObject, explicit);
61+
return (ASN1BitString)TYPE.getContextTagged(taggedObject, declaredExplicit);
62+
}
63+
64+
public static ASN1BitString getTagged(ASN1TaggedObject taggedObject, boolean declaredExplicit)
65+
{
66+
return (ASN1BitString)TYPE.getTagged(taggedObject, declaredExplicit);
6267
}
6368

6469
private static final char[] table = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };

‎core/src/main/java/org/bouncycastle/asn1/ASN1Boolean.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,20 @@ public static ASN1Boolean getInstance(int value)
8787
* Return a Boolean from a tagged object.
8888
*
8989
* @param taggedObject the tagged object holding the object we want
90-
* @param explicit true if the object is meant to be explicitly
90+
* @param declaredExplicit true if the object is meant to be explicitly
9191
* tagged false otherwise.
9292
* @exception IllegalArgumentException if the tagged object cannot
9393
* be converted.
9494
* @return an ASN1Boolean instance.
9595
*/
96-
public static ASN1Boolean getInstance(ASN1TaggedObject taggedObject, boolean explicit)
96+
public static ASN1Boolean getInstance(ASN1TaggedObject taggedObject, boolean declaredExplicit)
9797
{
98-
return (ASN1Boolean)TYPE.getContextInstance(taggedObject, explicit);
98+
return (ASN1Boolean)TYPE.getContextTagged(taggedObject, declaredExplicit);
99+
}
100+
101+
public static ASN1Boolean getTagged(ASN1TaggedObject taggedObject, boolean declaredExplicit)
102+
{
103+
return (ASN1Boolean)TYPE.getTagged(taggedObject, declaredExplicit);
99104
}
100105

101106
private ASN1Boolean(byte value)

‎core/src/main/java/org/bouncycastle/asn1/ASN1Enumerated.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,20 @@ public static ASN1Enumerated getInstance(
5353
* return an Enumerated from a tagged object.
5454
*
5555
* @param taggedObject the tagged object holding the object we want
56-
* @param explicit true if the object is meant to be explicitly
56+
* @param declaredExplicit true if the object is meant to be explicitly
5757
* tagged false otherwise.
5858
* @exception IllegalArgumentException if the tagged object cannot
5959
* be converted.
6060
* @return an ASN1Enumerated instance, or null.
6161
*/
62-
public static ASN1Enumerated getInstance(ASN1TaggedObject taggedObject, boolean explicit)
62+
public static ASN1Enumerated getInstance(ASN1TaggedObject taggedObject, boolean declaredExplicit)
6363
{
64-
return (ASN1Enumerated)TYPE.getContextInstance(taggedObject, explicit);
64+
return (ASN1Enumerated)TYPE.getContextTagged(taggedObject, declaredExplicit);
65+
}
66+
67+
public static ASN1Enumerated getTagged(ASN1TaggedObject taggedObject, boolean declaredExplicit)
68+
{
69+
return (ASN1Enumerated)TYPE.getTagged(taggedObject, declaredExplicit);
6570
}
6671

6772
private final byte[] contents;

‎core/src/main/java/org/bouncycastle/asn1/ASN1External.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,14 @@ else if (obj instanceof byte[])
4848
throw new IllegalArgumentException("illegal object in getInstance: " + obj.getClass().getName());
4949
}
5050

51-
public static ASN1External getInstance(ASN1TaggedObject taggedObject, boolean explicit)
51+
public static ASN1External getInstance(ASN1TaggedObject taggedObject, boolean declaredExplicit)
5252
{
53-
return (ASN1External)TYPE.getContextInstance(taggedObject, explicit);
53+
return (ASN1External)TYPE.getContextTagged(taggedObject, declaredExplicit);
54+
}
55+
56+
public static ASN1External getTagged(ASN1TaggedObject taggedObject, boolean declaredExplicit)
57+
{
58+
return (ASN1External)TYPE.getTagged(taggedObject, declaredExplicit);
5459
}
5560

5661
ASN1ObjectIdentifier directReference;

‎core/src/main/java/org/bouncycastle/asn1/ASN1GeneralString.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,19 @@ public static ASN1GeneralString getInstance(Object obj)
6565
* Return a GeneralString from a tagged object.
6666
*
6767
* @param taggedObject the tagged object holding the object we want
68-
* @param explicit true if the object is meant to be explicitly tagged false
68+
* @param declaredExplicit true if the object is meant to be explicitly tagged false
6969
* otherwise.
7070
* @exception IllegalArgumentException if the tagged object cannot be converted.
7171
* @return an ASN1GeneralString instance.
7272
*/
73-
public static ASN1GeneralString getInstance(ASN1TaggedObject taggedObject, boolean explicit)
73+
public static ASN1GeneralString getInstance(ASN1TaggedObject taggedObject, boolean declaredExplicit)
7474
{
75-
return (ASN1GeneralString)TYPE.getContextInstance(taggedObject, explicit);
75+
return (ASN1GeneralString)TYPE.getContextTagged(taggedObject, declaredExplicit);
76+
}
77+
78+
public static ASN1GeneralString getTagged(ASN1TaggedObject taggedObject, boolean declaredExplicit)
79+
{
80+
return (ASN1GeneralString)TYPE.getTagged(taggedObject, declaredExplicit);
7681
}
7782

7883
final byte[] contents;

‎core/src/main/java/org/bouncycastle/asn1/ASN1GeneralizedTime.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,19 @@ public static ASN1GeneralizedTime getInstance(
9393
* return a Generalized Time object from a tagged object.
9494
*
9595
* @param taggedObject the tagged object holding the object we want
96-
* @param explicit true if the object is meant to be explicitly tagged false
96+
* @param declaredExplicit true if the object is meant to be explicitly tagged false
9797
* otherwise.
9898
* @return an ASN1GeneralizedTime instance.
9999
* @throws IllegalArgumentException if the tagged object cannot be converted.
100100
*/
101-
public static ASN1GeneralizedTime getInstance(ASN1TaggedObject taggedObject, boolean explicit)
101+
public static ASN1GeneralizedTime getInstance(ASN1TaggedObject taggedObject, boolean declaredExplicit)
102102
{
103-
return (ASN1GeneralizedTime)TYPE.getContextInstance(taggedObject, explicit);
103+
return (ASN1GeneralizedTime)TYPE.getContextTagged(taggedObject, declaredExplicit);
104+
}
105+
106+
public static ASN1GeneralizedTime getTagged(ASN1TaggedObject taggedObject, boolean declaredExplicit)
107+
{
108+
return (ASN1GeneralizedTime)TYPE.getTagged(taggedObject, declaredExplicit);
104109
}
105110

106111
final byte[] contents;

‎core/src/main/java/org/bouncycastle/asn1/ASN1GraphicString.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,19 @@ public static ASN1GraphicString getInstance(Object obj)
5757
* Return a GraphicString from a tagged object.
5858
*
5959
* @param taggedObject the tagged object holding the object we want.
60-
* @param explicit true if the object is meant to be explicitly tagged,
60+
* @param declaredExplicit true if the object is meant to be explicitly tagged,
6161
* false otherwise.
6262
* @exception IllegalArgumentException if the tagged object cannot be converted.
6363
* @return an ASN1GraphicString instance, or null.
6464
*/
65-
public static ASN1GraphicString getInstance(ASN1TaggedObject taggedObject, boolean explicit)
65+
public static ASN1GraphicString getInstance(ASN1TaggedObject taggedObject, boolean declaredExplicit)
6666
{
67-
return (ASN1GraphicString)TYPE.getContextInstance(taggedObject, explicit);
67+
return (ASN1GraphicString)TYPE.getContextTagged(taggedObject, declaredExplicit);
68+
}
69+
70+
public static ASN1GraphicString getTagged(ASN1TaggedObject taggedObject, boolean declaredExplicit)
71+
{
72+
return (ASN1GraphicString)TYPE.getTagged(taggedObject, declaredExplicit);
6873
}
6974

7075
final byte[] contents;

‎core/src/main/java/org/bouncycastle/asn1/ASN1IA5String.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,20 @@ public static ASN1IA5String getInstance(Object obj)
6363
* Return an IA5 String from a tagged object.
6464
*
6565
* @param taggedObject the tagged object holding the object we want
66-
* @param explicit true if the object is meant to be explicitly
66+
* @param declaredExplicit true if the object is meant to be explicitly
6767
* tagged false otherwise.
6868
* @exception IllegalArgumentException if the tagged object cannot
6969
* be converted.
7070
* @return an ASN1IA5String instance, or null.
7171
*/
72-
public static ASN1IA5String getInstance(ASN1TaggedObject taggedObject, boolean explicit)
72+
public static ASN1IA5String getInstance(ASN1TaggedObject taggedObject, boolean declaredExplicit)
7373
{
74-
return (ASN1IA5String)TYPE.getContextInstance(taggedObject, explicit);
74+
return (ASN1IA5String)TYPE.getContextTagged(taggedObject, declaredExplicit);
75+
}
76+
77+
public static ASN1IA5String getTagged(ASN1TaggedObject taggedObject, boolean declaredExplicit)
78+
{
79+
return (ASN1IA5String)TYPE.getTagged(taggedObject, declaredExplicit);
7580
}
7681

7782
final byte[] contents;

‎core/src/main/java/org/bouncycastle/asn1/ASN1Integer.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,20 @@ public static ASN1Integer getInstance(
6060
* Return an Integer from a tagged object.
6161
*
6262
* @param taggedObject the tagged object holding the object we want
63-
* @param explicit true if the object is meant to be explicitly
63+
* @param declaredExplicit true if the object is meant to be explicitly
6464
* tagged false otherwise.
6565
* @return an ASN1Integer instance.
6666
* @throws IllegalArgumentException if the tagged object cannot
6767
* be converted.
6868
*/
69-
public static ASN1Integer getInstance(ASN1TaggedObject taggedObject, boolean explicit)
69+
public static ASN1Integer getInstance(ASN1TaggedObject taggedObject, boolean declaredExplicit)
7070
{
71-
return (ASN1Integer)TYPE.getContextInstance(taggedObject, explicit);
71+
return (ASN1Integer)TYPE.getContextTagged(taggedObject, declaredExplicit);
72+
}
73+
74+
public static ASN1Integer getTagged(ASN1TaggedObject taggedObject, boolean declaredExplicit)
75+
{
76+
return (ASN1Integer)TYPE.getTagged(taggedObject, declaredExplicit);
7277
}
7378

7479
/**

0 commit comments

Comments
 (0)