Skip to content

Commit f27703c

Browse files
committed
minor renaming relates to github #1232
1 parent 6593bce commit f27703c

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

pg/src/main/java/org/bouncycastle/bcpg/OnePassSignaturePacket.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class OnePassSignaturePacket
1414
private int hashAlgorithm;
1515
private int keyAlgorithm;
1616
private long keyID;
17-
private int isBracketing;
17+
private int isContaining;
1818

1919
OnePassSignaturePacket(
2020
BCPGInputStream in)
@@ -34,7 +34,7 @@ public class OnePassSignaturePacket
3434
keyID |= (long)in.read() << 8;
3535
keyID |= in.read();
3636

37-
isBracketing = in.read();
37+
isContaining = in.read();
3838
}
3939

4040
public OnePassSignaturePacket(
@@ -49,7 +49,7 @@ public OnePassSignaturePacket(
4949
this.hashAlgorithm = hashAlgorithm;
5050
this.keyAlgorithm = keyAlgorithm;
5151
this.keyID = keyID;
52-
this.isBracketing = (isNested) ? 0 : 1;
52+
this.isContaining = (isNested) ? 0 : 1;
5353
}
5454

5555
/**
@@ -86,15 +86,15 @@ public long getKeyID()
8686
}
8787

8888
/**
89-
* Return true, if the signature is bracketing.
89+
* Return true, if the signature contains any signatures that follow.
9090
* An bracketing OPS is followed by additional OPS packets and is calculated over all the data between itself
9191
* and its corresponding signature (it is an attestation for encapsulated signatures).
9292
*
9393
* @return true if encapsulating, false otherwise
9494
*/
95-
public boolean isBracketing()
95+
public boolean isContaining()
9696
{
97-
return isBracketing == 1;
97+
return isContaining == 1;
9898
}
9999

100100
/**
@@ -121,7 +121,7 @@ public void encode(
121121
pOut.write((byte)(keyID >> 8));
122122
pOut.write((byte)(keyID));
123123

124-
pOut.write(isBracketing);
124+
pOut.write(isContaining);
125125

126126
pOut.close();
127127

pg/src/main/java/org/bouncycastle/openpgp/PGPOnePassSignature.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,15 +204,15 @@ public int getKeyAlgorithm()
204204
}
205205

206206
/**
207-
* Return true, if the signature is bracketing.
207+
* Return true, if the signature is contains any signatures that follow.
208208
* An bracketing OPS is followed by additional OPS packets and is calculated over all the data between itself
209209
* and its corresponding signature (it is an attestation for contained signatures).
210210
*
211-
* @return true if encapsulating, false otherwise
211+
* @return true if containing, false otherwise
212212
*/
213-
public boolean isBracketing()
213+
public boolean isContaining()
214214
{
215-
return sigPack.isBracketing();
215+
return sigPack.isContaining();
216216
}
217217

218218
public byte[] getEncoded()

0 commit comments

Comments
 (0)