cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop support for BackupVersion header in PgpSignEncryptOperation

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-04-13 19:34:34 +02:00
parent 4760a21c40
commit ffc28f408e
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptData.java
View File

@@ -58,7 +58,6 @@ public abstract class PgpSignEncryptData implements Parcelable {
public abstract boolean isEnableAsciiArmorOutput(); public abstract boolean isEnableAsciiArmorOutput();
public abstract boolean isCleartextSignature(); public abstract boolean isCleartextSignature();
public abstract boolean isDetachedSignature(); public abstract boolean isDetachedSignature();
public abstract boolean isAddBackupHeader();
public abstract boolean isHiddenRecipients(); public abstract boolean isHiddenRecipients();
@Nullable @Nullable
@@ -73,7 +72,6 @@ public abstract class PgpSignEncryptData implements Parcelable {
.setEnableAsciiArmorOutput(false) .setEnableAsciiArmorOutput(false)
.setCleartextSignature(false) .setCleartextSignature(false)
.setDetachedSignature(false) .setDetachedSignature(false)
.setAddBackupHeader(false)
.setHiddenRecipients(false) .setHiddenRecipients(false)
.setCompressionAlgorithm(OpenKeychainCompressionAlgorithmTags.USE_DEFAULT) .setCompressionAlgorithm(OpenKeychainCompressionAlgorithmTags.USE_DEFAULT)
.setSignatureHashAlgorithm(OpenKeychainHashAlgorithmTags.USE_DEFAULT) .setSignatureHashAlgorithm(OpenKeychainHashAlgorithmTags.USE_DEFAULT)
@@ -96,7 +94,6 @@ public abstract class PgpSignEncryptData implements Parcelable {
public abstract Builder setSignatureHashAlgorithm(int signatureHashAlgorithm); public abstract Builder setSignatureHashAlgorithm(int signatureHashAlgorithm);
public abstract Builder setSymmetricEncryptionAlgorithm(int symmetricEncryptionAlgorithm); public abstract Builder setSymmetricEncryptionAlgorithm(int symmetricEncryptionAlgorithm);
public abstract Builder setAddBackupHeader(boolean isAddBackupHeader);
public abstract Builder setEnableAsciiArmorOutput(boolean enableAsciiArmorOutput); public abstract Builder setEnableAsciiArmorOutput(boolean enableAsciiArmorOutput);
public abstract Builder setCleartextSignature(boolean isCleartextSignature); public abstract Builder setCleartextSignature(boolean isCleartextSignature);
public abstract Builder setDetachedSignature(boolean isDetachedSignature); public abstract Builder setDetachedSignature(boolean isDetachedSignature);

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
View File

@@ -202,10 +202,6 @@ public class PgpSignEncryptOperation extends BaseOperation<PgpSignEncryptInputPa
if (data.getCharset() != null) { if (data.getCharset() != null) {
armorOut.setHeader("Charset", data.getCharset()); armorOut.setHeader("Charset", data.getCharset());
} }
// add proprietary header to indicate that this is a key backup
if (data.isAddBackupHeader()) {
armorOut.setHeader("BackupVersion", "2");
}
String passphraseFormat = data.getPassphraseFormat(); String passphraseFormat = data.getPassphraseFormat();
if (passphraseFormat != null) { if (passphraseFormat != null) {
armorOut.setHeader("Passphrase-Format", passphraseFormat); armorOut.setHeader("Passphrase-Format", passphraseFormat);