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

Support Passphrase-Format and -Begin headers in PgpSignEncryptOperation

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-04-13 17:39:38 +02:00
parent ba9d714c1b
commit cb56a44f77
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,6 +61,11 @@ public abstract class PgpSignEncryptData implements Parcelable {
public abstract boolean isAddBackupHeader(); public abstract boolean isAddBackupHeader();
public abstract boolean isHiddenRecipients(); public abstract boolean isHiddenRecipients();
@Nullable
public abstract String getPassphraseFormat();
@Nullable
public abstract String getPassphraseBegin();
public static Builder builder() { public static Builder builder() {
return new AutoValue_PgpSignEncryptData.Builder() return new AutoValue_PgpSignEncryptData.Builder()
.setSignatureMasterKeyId(Constants.key.none) .setSignatureMasterKeyId(Constants.key.none)
@@ -102,6 +107,9 @@ public abstract class PgpSignEncryptData implements Parcelable {
setAllowedSigningKeyIds(Collections.unmodifiableList(new ArrayList<>(allowedSigningKeyIds))); setAllowedSigningKeyIds(Collections.unmodifiableList(new ArrayList<>(allowedSigningKeyIds)));
return this; return this;
} }
public abstract Builder setPassphraseFormat(String passphraseFormat);
public abstract Builder setPassphraseBegin(String passphraseBegin);
} }
} }

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

@@ -206,6 +206,14 @@ public class PgpSignEncryptOperation extends BaseOperation<PgpSignEncryptInputPa
if (data.isAddBackupHeader()) { if (data.isAddBackupHeader()) {
armorOut.setHeader("BackupVersion", "2"); armorOut.setHeader("BackupVersion", "2");
} }
String passphraseFormat = data.getPassphraseFormat();
if (passphraseFormat != null) {
armorOut.setHeader("Passphrase-Format", passphraseFormat);
}
String passphraseBegin = data.getPassphraseBegin();
if (passphraseBegin != null) {
armorOut.setHeader("Passphrase-Begin", passphraseBegin);
}
out = armorOut; out = armorOut;
} else { } else {
out = outputStream; out = outputStream;