Merge branch 'setWithIntegrityPacket' of https://github.com/pgpainles…

…s/bc-java into pgpainless-setWithIntegrityPacket
i-spark · Feb 14, 2021 · 456d05c · 456d05c
2 parents b4b81b4 + 6f19fa0
commit 456d05c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPDataEncryptorBuilder.java b/pg/src/main/java/org/bouncycastle/openpgp/operator/PGPDataEncryptorBuilder.java
@@ -34,4 +34,6 @@ PGPDataEncryptor build(byte[] keyBytes)
      * constructed and retained by the this builder.</p>
      */
     SecureRandom getSecureRandom();
+
+    PGPDataEncryptorBuilder setWithIntegrityPacket(boolean withIntegrityPacket);
 }
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPGPDataEncryptorBuilder.java b/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPGPDataEncryptorBuilder.java
@@ -45,6 +45,7 @@ public BcPGPDataEncryptorBuilder(int encAlgorithm)
      * @param withIntegrityPacket true if an integrity packet is to be included, false otherwise.
      * @return the current builder.
      */
+    @Override
     public BcPGPDataEncryptorBuilder setWithIntegrityPacket(boolean withIntegrityPacket)
     {
         this.withIntegrityPacket = withIntegrityPacket;

diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePGPDataEncryptorBuilder.java b/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePGPDataEncryptorBuilder.java
@@ -58,6 +58,7 @@ public JcePGPDataEncryptorBuilder(int encAlgorithm)
      * @param withIntegrityPacket true if an integrity packet is to be included, false otherwise.
      * @return the current builder.
      */
+    @Override
     public JcePGPDataEncryptorBuilder setWithIntegrityPacket(boolean withIntegrityPacket)
     {
         this.withIntegrityPacket = withIntegrityPacket;