From 525788359c6821a958ee7306ef3aa34d7b211a6f Mon Sep 17 00:00:00 2001
From: Alex Fong <alexfongg@gmail.com>
Date: Tue, 15 Mar 2016 10:24:28 +0800
Subject: (WIP) Change password when key is stripped #1692

Approach:
Find the first unstripped secret key and use it for passphrase verification
All unstripped keys will have their passphrase changed to new passphrase, if possible.

Current Progress:
Changing the passphrase of keys works fine.
Refactoring to combine "modifySecretKeyring" and newly added method, "modifyKeyRingPassword"
may be possible if given the go-ahead.
---
 .../keychain/service/ChangeUnlockParcel.java       | 48 ++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ChangeUnlockParcel.java

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ChangeUnlockParcel.java')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ChangeUnlockParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ChangeUnlockParcel.java
new file mode 100644
index 000000000..2bfe8254c
--- /dev/null
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ChangeUnlockParcel.java
@@ -0,0 +1,48 @@
+package org.sufficientlysecure.keychain.service;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import org.sufficientlysecure.keychain.util.Passphrase;
+
+public class ChangeUnlockParcel implements Parcelable {
+
+    // The new passphrase to use
+    public final Passphrase mNewPassphrase;
+
+    public ChangeUnlockParcel(Passphrase newPassphrase) {
+        if (newPassphrase == null) {
+            throw new AssertionError("newPassphrase must be non-null. THIS IS A BUG!");
+        }
+        mNewPassphrase = newPassphrase;
+    }
+
+    public ChangeUnlockParcel(Parcel source) {
+        mNewPassphrase = source.readParcelable(Passphrase.class.getClassLoader());
+    }
+
+    @Override
+    public void writeToParcel(Parcel destination, int flags) {
+        destination.writeParcelable(mNewPassphrase, flags);
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    public static final Creator<ChangeUnlockParcel> CREATOR = new Creator<ChangeUnlockParcel>() {
+        public ChangeUnlockParcel createFromParcel(final Parcel source) {
+            return new ChangeUnlockParcel(source);
+        }
+
+        public ChangeUnlockParcel[] newArray(final int size) {
+            return new ChangeUnlockParcel[size];
+        }
+    };
+
+    public String toString() {
+        return "passphrase (" + mNewPassphrase + ")";
+    }
+
+}
-- 
cgit v1.2.3